diff --git a/libs/fluxc-annotations/.gitignore b/libs/fluxc-annotations/.gitignore
new file mode 100644
index 00000000000..796b96d1c40
--- /dev/null
+++ b/libs/fluxc-annotations/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/libs/fluxc-annotations/build.gradle b/libs/fluxc-annotations/build.gradle
new file mode 100644
index 00000000000..686ff919d52
--- /dev/null
+++ b/libs/fluxc-annotations/build.gradle
@@ -0,0 +1,26 @@
+plugins {
+    id "java"
+    alias(sharedLibs.plugins.automattic.publishToS3)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
+    withJavadocJar()
+}
+
+project.afterEvaluate {
+    publishing {
+        publications {
+            FluxCAnnotationsPublication(MavenPublication) {
+                from components.java
+
+                groupId "org.wordpress.fluxc"
+                artifactId "fluxc-annotations"
+                // version is set by 'publish-to-s3' plugin
+            }
+        }
+   }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Action.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Action.java
new file mode 100644
index 00000000000..d4f84ea245a
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Action.java
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.annotations;
+
+import org.wordpress.android.fluxc.annotations.action.NoPayload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Defines an individual action with optional payload. To annotate an option with no payload, don't set the
+ * {@link Action#payloadType}.
+ */
+@Target(ElementType.FIELD)
+public @interface Action {
+    Class payloadType() default NoPayload.class;
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/ActionEnum.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/ActionEnum.java
new file mode 100644
index 00000000000..6f3a5446b5d
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/ActionEnum.java
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Defines an enum of actions related to a particular store.
+ */
+@Target(value = ElementType.TYPE)
+public @interface ActionEnum {
+    String name() default "";
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/AnnotationConfig.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/AnnotationConfig.java
new file mode 100644
index 00000000000..334ca5f47cf
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/AnnotationConfig.java
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.annotations;
+
+public abstract class AnnotationConfig {
+    public static final String PACKAGE = "org.wordpress.android.fluxc.generated";
+    public static final String PACKAGE_ENDPOINTS = PACKAGE + ".endpoint";
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Endpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Endpoint.java
new file mode 100644
index 00000000000..5760cfb0345
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/Endpoint.java
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Declares a valid REST endpoint.
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface Endpoint {
+    String value();
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/Action.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/Action.java
new file mode 100644
index 00000000000..07a98b0a1e2
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/Action.java
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.annotations.action;
+
+public class Action<T> {
+    private final IAction mActionType;
+    private final T mPayload;
+
+    public Action(IAction actionType, T payload) {
+        mActionType = actionType;
+        mPayload = payload;
+    }
+
+    public IAction getType() {
+        return mActionType;
+    }
+
+    public T getPayload() {
+        return mPayload;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/ActionBuilder.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/ActionBuilder.java
new file mode 100644
index 00000000000..32e0c32b0bb
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/ActionBuilder.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.annotations.action;
+
+public abstract class ActionBuilder {
+    public static Action<Void> generateNoPayloadAction(IAction actionType) {
+        return new Action<>(actionType, null);
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/IAction.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/IAction.java
new file mode 100644
index 00000000000..15938d7f63d
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/IAction.java
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.annotations.action;
+
+public interface IAction {
+    String toString();
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/NoPayload.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/NoPayload.java
new file mode 100644
index 00000000000..1f5d3e0468d
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/action/NoPayload.java
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.annotations.action;
+
+public class NoPayload {
+    private NoPayload() {}
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointNode.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointNode.java
new file mode 100644
index 00000000000..17df90d06dd
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointNode.java
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EndpointNode {
+    private String mLocalEndpoint;
+    private EndpointNode mParent;
+    private List<EndpointNode> mChildren;
+
+    public EndpointNode(String localEndpoint) {
+        mLocalEndpoint = localEndpoint;
+    }
+
+    public String getLocalEndpoint() {
+        return mLocalEndpoint;
+    }
+
+    public void setLocalEndpoint(String localEndpoint) {
+        mLocalEndpoint = localEndpoint;
+    }
+
+    public EndpointNode getParent() {
+        return mParent;
+    }
+
+    public void setParent(EndpointNode parent) {
+        mParent = parent;
+    }
+
+    public void addChild(EndpointNode child) {
+        child.setParent(this);
+        if (mChildren == null) {
+            mChildren = new ArrayList<>();
+        }
+        mChildren.add(child);
+    }
+
+    public boolean hasChildren() {
+        return (mChildren != null && !mChildren.isEmpty());
+    }
+
+    public List<EndpointNode> getChildren() {
+        return mChildren;
+    }
+
+    public EndpointNode getRoot() {
+        if (mParent != null) {
+            return mParent.getRoot();
+        }
+        return this;
+    }
+
+    public void setChildren(List<EndpointNode> children) {
+        mChildren = children;
+    }
+
+    public String getFullEndpoint() {
+        String fullEndpoint = getLocalEndpoint().replaceAll("#[^/]*", ""); // Strip any type metadata, e.g. $name#String
+        if (getParent() == null) {
+            return fullEndpoint;
+        }
+        return getParent().getFullEndpoint() + fullEndpoint;
+    }
+
+    public String getCleanEndpointName() {
+        if (getLocalEndpoint().contains(":")) {
+            // For 'mixed' endpoints, e.g. item:$theItem, return the label part ('item')
+            return getLocalEndpoint().substring(0, getLocalEndpoint().indexOf(":")).replaceAll("-", "_");
+        } else {
+            return getLocalEndpoint().replaceAll("/|\\$|#.*|(?<!_or)(_ID|_id)|<|>|\\{|\\}", "")
+                                     .replaceAll("-", "_")
+                                     .replaceAll("\\.", "_");
+        }
+    }
+
+    public List<String> getEndpointTypes() {
+        Pattern pattern = Pattern.compile("#([^\\/]*)");
+        Matcher matcher = pattern.matcher(getLocalEndpoint());
+
+        if (matcher.find()) {
+            return Arrays.asList(matcher.group(1).split(","));
+        }
+
+        return Collections.emptyList();
+    }
+
+    public boolean isRoot() {
+        return mLocalEndpoint.equals("/");
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointTreeGenerator.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointTreeGenerator.java
new file mode 100644
index 00000000000..6fafac3f35d
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/EndpointTreeGenerator.java
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+public class EndpointTreeGenerator {
+    public static EndpointNode process(InputStream inputStream) throws IOException {
+        BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+
+        EndpointNode endpointTree = new EndpointNode("/");
+
+        String strLine;
+
+        while ((strLine = in.readLine()) != null) {
+            if (strLine.length() == 0) {
+                continue;
+            }
+            EndpointNode endpoint = new EndpointNode("");
+            boolean firstTime = true;
+            for (String str : strLine.replaceAll("^/|/$", "").split("/")) {
+                if (firstTime) {
+                    endpoint.setLocalEndpoint(str + "/");
+                    firstTime = false;
+                    continue;
+                }
+                endpoint.addChild(new EndpointNode(str + "/"));
+                endpoint = endpoint.getChildren().get(0);
+            }
+            insertNodeInNode(endpoint.getRoot(), endpointTree);
+        }
+
+        in.close();
+
+        return endpointTree;
+    }
+
+    private static void insertNodeInNode(EndpointNode endpointNodeToInsert, EndpointNode endpointTree) {
+        if (endpointTree.hasChildren()) {
+            for (EndpointNode endpoint : endpointTree.getChildren()) {
+                if (endpoint.getLocalEndpoint().equals(endpointNodeToInsert.getLocalEndpoint())) {
+                    if (endpointNodeToInsert.hasChildren()) {
+                        insertNodeInNode(endpointNodeToInsert.getChildren().get(0), endpoint);
+                    }
+                    return;
+                }
+            }
+        }
+        endpointTree.addChild(endpointNodeToInsert);
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/JPAPIEndpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/JPAPIEndpoint.java
new file mode 100644
index 00000000000..0fb0394ac44
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/JPAPIEndpoint.java
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class JPAPIEndpoint {
+    private static final String JP_PREFIX_V4 = "jetpack/v4";
+
+    private final String mEndpoint;
+
+    public JPAPIEndpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public JPAPIEndpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public JPAPIEndpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getPathV4() {
+        return "/" + JP_PREFIX_V4 + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WCWPAPIEndpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WCWPAPIEndpoint.java
new file mode 100644
index 00000000000..bc4d8dd1682
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WCWPAPIEndpoint.java
@@ -0,0 +1,75 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WCWPAPIEndpoint {
+    private static final String WC_PREFIX = "wc";
+
+    private static final String WC_PREFIX_V3 = "wc/v3";
+
+    private static final String WC_PREFIX_V1 = "wc/v1";
+
+    private static final String WC_PREFIX_V2 = "wc/v2";
+
+    private static final String WC_PREFIX_V4 = "wc/v4";
+
+    private static final String WC_PREFIX_V4_ANALYTICS = "wc-analytics";
+
+    private static final String WC_PREFIX_V1_ADDONS = "wc-product-add-ons/v1";
+
+    private static final String WC_PREFIX_TELEMETRY = "wc-telemetry";
+
+    private static final String WC_PREFIX_ADMIN = "wc-admin";
+
+    private final String mEndpoint;
+
+    public WCWPAPIEndpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WCWPAPIEndpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WCWPAPIEndpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getPathV3() {
+        return "/" + WC_PREFIX_V3 + mEndpoint;
+    }
+
+    public String getPathV2() {
+        return "/" + WC_PREFIX_V2 + mEndpoint;
+    }
+
+    public String getPathV1() {
+        return "/" + WC_PREFIX_V1 + mEndpoint;
+    }
+
+    public String getPathV4() {
+        return "/" + WC_PREFIX_V4 + mEndpoint;
+    }
+
+    public String getPathNoVersion() {
+        return "/" + WC_PREFIX + mEndpoint;
+    }
+
+    public String getPathV4Analytics() {
+        return "/" + WC_PREFIX_V4_ANALYTICS + mEndpoint;
+    }
+
+    public String getPathV1Addons() {
+        return "/" + WC_PREFIX_V1_ADDONS + mEndpoint;
+    }
+
+    public String getPathWcTelemetry() {
+        return "/" + WC_PREFIX_TELEMETRY + mEndpoint;
+    }
+
+    public String getPathWcAdmin() {
+        return "/" + WC_PREFIX_ADMIN + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPAPIEndpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPAPIEndpoint.java
new file mode 100644
index 00000000000..fa1801dce9a
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPAPIEndpoint.java
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WPAPIEndpoint {
+    private static final String WPCOM_REST_PREFIX = "https://public-api.wordpress.com";
+    private static final String WPAPI_PREFIX_V2 = "wp/v2";
+    private static final String WPCOM_WPAPI_PREFIX = WPCOM_REST_PREFIX + "/wp/v2/sites/";
+
+    private final String mEndpoint;
+
+    public WPAPIEndpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WPAPIEndpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WPAPIEndpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getUrlV2() {
+        return WPAPI_PREFIX_V2 + mEndpoint;
+    }
+
+    public String getWPComUrl(long siteId) {
+        return WPCOM_WPAPI_PREFIX + siteId + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComEndpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComEndpoint.java
new file mode 100644
index 00000000000..428fd06c101
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComEndpoint.java
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WPComEndpoint {
+    private static final String WPCOM_REST_PREFIX = "https://public-api.wordpress.com";
+    private static final String WPCOM_PREFIX_V1 = WPCOM_REST_PREFIX + "/rest/v1";
+    private static final String WPCOM_PREFIX_V1_1 = WPCOM_REST_PREFIX + "/rest/v1.1";
+    private static final String WPCOM_PREFIX_V1_2 = WPCOM_REST_PREFIX + "/rest/v1.2";
+    private static final String WPCOM_PREFIX_V1_3 = WPCOM_REST_PREFIX + "/rest/v1.3";
+    private static final String WPCOM_PREFIX_V1_5 = WPCOM_REST_PREFIX + "/rest/v1.5";
+    private static final String WPCOM_PREFIX_V0 = WPCOM_REST_PREFIX;
+
+    private final String mEndpoint;
+
+    public WPComEndpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WPComEndpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WPComEndpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getUrlV1() {
+        return WPCOM_PREFIX_V1 + mEndpoint;
+    }
+
+    public String getUrlV1_1() {
+        return WPCOM_PREFIX_V1_1 + mEndpoint;
+    }
+
+    public String getUrlV1_2() {
+        return WPCOM_PREFIX_V1_2 + mEndpoint;
+    }
+
+    public String getUrlV1_3() {
+        return WPCOM_PREFIX_V1_3 + mEndpoint;
+    }
+
+    public String getUrlV1_5() {
+        return WPCOM_PREFIX_V1_5 + mEndpoint;
+    }
+
+    public String getUrlV0() {
+        return WPCOM_PREFIX_V0 + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV2Endpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV2Endpoint.java
new file mode 100644
index 00000000000..039efa84d58
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV2Endpoint.java
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WPComV2Endpoint {
+    private static final String WPCOM_REST_PREFIX = "https://public-api.wordpress.com";
+    private static final String WPCOM_V2_PREFIX = WPCOM_REST_PREFIX + "/wpcom/v2";
+
+    private final String mEndpoint;
+
+    public WPComV2Endpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WPComV2Endpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WPComV2Endpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getUrl() {
+        return WPCOM_V2_PREFIX + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV3Endpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV3Endpoint.java
new file mode 100644
index 00000000000..55b21159d05
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPComV3Endpoint.java
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WPComV3Endpoint {
+    private static final String WPCOM_REST_PREFIX = "https://public-api.wordpress.com";
+    private static final String WPCOM_V3_PREFIX = WPCOM_REST_PREFIX + "/wpcom/v3";
+
+    private final String mEndpoint;
+
+    public WPComV3Endpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WPComV3Endpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WPComV3Endpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getUrl() {
+        return WPCOM_V3_PREFIX + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPOrgAPIEndpoint.java b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPOrgAPIEndpoint.java
new file mode 100644
index 00000000000..2e91a5b8f7c
--- /dev/null
+++ b/libs/fluxc-annotations/src/main/java/org/wordpress/android/fluxc/annotations/endpoint/WPOrgAPIEndpoint.java
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.annotations.endpoint;
+
+public class WPOrgAPIEndpoint {
+    private static final String WPORG_API_PREFIX = "https://api.wordpress.org";
+
+    private final String mEndpoint;
+
+    public WPOrgAPIEndpoint(String endpoint) {
+        mEndpoint = endpoint;
+    }
+
+    public WPOrgAPIEndpoint(String endpoint, long id) {
+        this(endpoint + id + "/");
+    }
+
+    public WPOrgAPIEndpoint(String endpoint, String value) {
+        this(endpoint + value + "/");
+    }
+
+    public String getEndpoint() {
+        return mEndpoint;
+    }
+
+    public String getUrl() {
+        if (mEndpoint.contains("plugins/info/1.0")) {
+            // For the plugins-info endpoint for 1.0 specifically, we want to request JSON data
+            // All other WP.org endpoints either return JSON by default, or their newest endpoint version does
+            return WPORG_API_PREFIX + mEndpoint.substring(0, mEndpoint.length() - 1) + ".json";
+        }
+        return WPORG_API_PREFIX + mEndpoint;
+    }
+}
diff --git a/libs/fluxc-plugin/build.gradle b/libs/fluxc-plugin/build.gradle
new file mode 100644
index 00000000000..7b6ead32737
--- /dev/null
+++ b/libs/fluxc-plugin/build.gradle
@@ -0,0 +1,111 @@
+plugins {
+    alias(sharedLibs.plugins.android.library)
+    alias(sharedLibs.plugins.kotlin.android)
+    alias(sharedLibs.plugins.kotlin.kapt)
+    alias(sharedLibs.plugins.automattic.publishToS3)
+}
+
+android {
+    namespace "org.wordpress.android.fluxc.plugins.woocommerce"
+
+    compileSdkVersion rootProject.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true",
+                ]
+            }
+        }
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    lint {
+        lintConfig file("${project.rootDir}/config/lint/lint.xml")
+        enable += 'UnknownNullness'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+    }
+}
+
+dependencies {
+    implementation fluxcProjectDependency
+
+    // WordPress libs
+    implementation(sharedLibs.wordpress.utils) {
+        // Using official volley package
+        exclude group: "com.mcxiaoke.volley"
+        exclude group: "com.android.support"
+    }
+
+    api sharedLibs.wellsql
+    kapt sharedLibs.wellsql.processor
+
+    // FluxC annotations
+    api fluxcAnnotationsProjectDependency
+    kapt fluxcProcessorProjectDependency
+
+    implementation sharedLibs.google.gson
+
+    // Dagger
+    implementation sharedLibs.google.dagger
+    kapt sharedLibs.google.dagger.compiler
+    compileOnly sharedLibs.glassfish.javax.annotation
+
+    // Coroutines
+    implementation sharedLibs.kotlinx.coroutines.core
+    implementation sharedLibs.kotlinx.coroutines.android
+
+    implementation sharedLibs.androidx.room.runtime
+    kapt sharedLibs.androidx.room.compiler
+    api sharedLibs.androidx.room.ktx
+
+    testImplementation sharedLibs.junit
+    testImplementation sharedLibs.robolectric
+    testImplementation sharedLibs.androidx.test.core
+    testImplementation sharedLibs.assertj.core
+    testImplementation sharedLibs.mockito.core
+    testImplementation sharedLibs.mockito.kotlin
+    testImplementation sharedLibs.kotlinx.coroutines.test
+
+    androidTestImplementation sharedLibs.androidx.room.testing
+    androidTestImplementation sharedLibs.androidx.test.runner
+    androidTestImplementation sharedLibs.androidx.test.ext.junit
+    androidTestImplementation sharedLibs.assertj.core
+
+    lintChecks sharedLibs.wordpress.lint
+}
+
+project.afterEvaluate {
+    publishing {
+        publications {
+            PluginWoocommercePublication(MavenPublication) {
+                from components.release
+
+                groupId "org.wordpress.fluxc.plugins"
+                artifactId "woocommerce"
+                // version is set by 'publish-to-s3' plugin
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/10.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/10.json
new file mode 100644
index 00000000000..361d137d8ec
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/10.json
@@ -0,0 +1,1322 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "6c40c25602a91c9a88bf0691cc0f8d56",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productId`, `siteId`) REFERENCES `Products`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProducts_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProducts_productId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` ON `${TABLE_NAME}` (`productId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "Products",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productCategoryId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productCategoryId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productCategoryId`, `siteId`) REFERENCES `ProductCategories`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productCategoryId",
+            "columnName": "productCategoryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productCategoryId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProductCategories_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProductCategories_productCategoryId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` ON `${TABLE_NAME}` (`productCategoryId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "ProductCategories",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6c40c25602a91c9a88bf0691cc0f8d56')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/11.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/11.json
new file mode 100644
index 00000000000..b8a74b343f6
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/11.json
@@ -0,0 +1,1328 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "39ae37638a6cb9fc908153b18ee9ea9f",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productId`, `siteId`) REFERENCES `Products`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProducts_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProducts_productId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` ON `${TABLE_NAME}` (`productId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "Products",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productCategoryId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productCategoryId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productCategoryId`, `siteId`) REFERENCES `ProductCategories`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productCategoryId",
+            "columnName": "productCategoryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productCategoryId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProductCategories_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProductCategories_productCategoryId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` ON `${TABLE_NAME}` (`productCategoryId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "ProductCategories",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '39ae37638a6cb9fc908153b18ee9ea9f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/12.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/12.json
new file mode 100644
index 00000000000..18d9cfef78b
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/12.json
@@ -0,0 +1,1505 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "0cca8009f3a179d0f911bcc61401c7f1",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productId`, `siteId`) REFERENCES `Products`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProducts_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProducts_productId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` ON `${TABLE_NAME}` (`productId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "Products",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productCategoryId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productCategoryId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productCategoryId`, `siteId`) REFERENCES `ProductCategories`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productCategoryId",
+            "columnName": "productCategoryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productCategoryId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProductCategories_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProductCategories_productCategoryId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` ON `${TABLE_NAME}` (`productCategoryId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "ProductCategories",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0cca8009f3a179d0f911bcc61401c7f1')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/13.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/13.json
new file mode 100644
index 00000000000..e3772105d08
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/13.json
@@ -0,0 +1,1520 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "0f27a46a235e2993401c68a3f71edcef",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productId`, `siteId`) REFERENCES `Products`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProducts_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProducts_productId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` ON `${TABLE_NAME}` (`productId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "Products",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productCategoryId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productCategoryId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productCategoryId`, `siteId`) REFERENCES `ProductCategories`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productCategoryId",
+            "columnName": "productCategoryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productCategoryId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProductCategories_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProductCategories_productCategoryId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` ON `${TABLE_NAME}` (`productCategoryId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "ProductCategories",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0f27a46a235e2993401c68a3f71edcef')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/14.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/14.json
new file mode 100644
index 00000000000..e5ba0334af2
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/14.json
@@ -0,0 +1,1370 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 14,
+    "identityHash": "29bd4b7bb5f85a1f50b9fe9a6b2aa8eb",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '29bd4b7bb5f85a1f50b9fe9a6b2aa8eb')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/15.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/15.json
new file mode 100644
index 00000000000..f1150108840
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/15.json
@@ -0,0 +1,1016 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 15,
+    "identityHash": "c1b4a5003f85e61f9427f4fa0edea3e1",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c1b4a5003f85e61f9427f4fa0edea3e1')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/16.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/16.json
new file mode 100644
index 00000000000..e32ab4c7f6c
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/16.json
@@ -0,0 +1,1023 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 16,
+    "identityHash": "152b7abad5ab1a500dc34a02e1e5a389",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '152b7abad5ab1a500dc34a02e1e5a389')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/17.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/17.json
new file mode 100644
index 00000000000..f1ce4729976
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/17.json
@@ -0,0 +1,1092 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 17,
+    "identityHash": "3b246a05145d072bab5f9cbae76ed922",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `displayKey` TEXT, `displayValue` TEXT, PRIMARY KEY(`localSiteId`, `orderId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayKey",
+            "columnName": "displayKey",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "displayValue",
+            "columnName": "displayValue",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3b246a05145d072bab5f9cbae76ed922')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/18.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/18.json
new file mode 100644
index 00000000000..2d7d1bca4a1
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/18.json
@@ -0,0 +1,1080 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 18,
+    "identityHash": "d430524ce447d0c639ed7a47a35a0827",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd430524ce447d0c639ed7a47a35a0827')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/19.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/19.json
new file mode 100644
index 00000000000..e9fcb4294b8
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/19.json
@@ -0,0 +1,1094 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "20424496bd0d2d7f0ec904dac725bb83",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '20424496bd0d2d7f0ec904dac725bb83')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/20.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/20.json
new file mode 100644
index 00000000000..6062825a433
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/20.json
@@ -0,0 +1,1164 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "77e57ef8e1d85a20baf0805ee3c18c12",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `granularity` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`granularity`, `productId`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "granularity",
+            "columnName": "granularity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "granularity",
+            "productId",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '77e57ef8e1d85a20baf0805ee3c18c12')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/21.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/21.json
new file mode 100644
index 00000000000..e8c39ff9413
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/21.json
@@ -0,0 +1,1164 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "15d66924533da0996f3ad884bbfdcfab",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_siteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `${TABLE_NAME}` (`remoteId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '15d66924533da0996f3ad884bbfdcfab')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/22.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/22.json
new file mode 100644
index 00000000000..43939d5528a
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/22.json
@@ -0,0 +1,1171 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "a08d1da9359217298fa9560aa8f69333",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a08d1da9359217298fa9560aa8f69333')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/23.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/23.json
new file mode 100644
index 00000000000..a595e46413f
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/23.json
@@ -0,0 +1,1171 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "a08d1da9359217298fa9560aa8f69333",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a08d1da9359217298fa9560aa8f69333')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/24.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/24.json
new file mode 100644
index 00000000000..79c67b659b6
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/24.json
@@ -0,0 +1,1178 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 24,
+    "identityHash": "f01bc4956b3c08f4ae847bff0626776b",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f01bc4956b3c08f4ae847bff0626776b')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/25.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/25.json
new file mode 100644
index 00000000000..a645a7bb11b
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/25.json
@@ -0,0 +1,1185 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 25,
+    "identityHash": "6d6c9173ad3574359b4e0f4788c9541e",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6d6c9173ad3574359b4e0f4788c9541e')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/26.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/26.json
new file mode 100644
index 00000000000..0e31b51953c
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/26.json
@@ -0,0 +1,1211 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "53e39092d40d7d55ad7d717d69b86547",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '53e39092d40d7d55ad7d717d69b86547')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/27.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/27.json
new file mode 100644
index 00000000000..399fd90ccf3
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/27.json
@@ -0,0 +1,1280 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 27,
+    "identityHash": "f2c454ea3a1d74cf4b7ec999502708bc",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f2c454ea3a1d74cf4b7ec999502708bc')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/28.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/28.json
new file mode 100644
index 00000000000..4fc20f1b73e
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/28.json
@@ -0,0 +1,1292 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 28,
+    "identityHash": "7c63d469a9a3b1302f2d2db3e4c627ac",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7c63d469a9a3b1302f2d2db3e4c627ac')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/29.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/29.json
new file mode 100644
index 00000000000..01a2966e2ff
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/29.json
@@ -0,0 +1,1299 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 29,
+    "identityHash": "7d96824894dd52540b779abb309e98c9",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7d96824894dd52540b779abb309e98c9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/3.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/3.json
new file mode 100644
index 00000000000..d4be4d18301
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/3.json
@@ -0,0 +1,298 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "f93440a02cd238b1abd2ab0bf6095530",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SSREntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER NOT NULL, `environment` TEXT, `database` TEXT, `activePlugins` TEXT, `theme` TEXT, `settings` TEXT, `security` TEXT, `pages` TEXT, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment",
+            "columnName": "environment",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "database",
+            "columnName": "database",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "activePlugins",
+            "columnName": "activePlugins",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "settings",
+            "columnName": "settings",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "security",
+            "columnName": "security",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pages",
+            "columnName": "pages",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f93440a02cd238b1abd2ab0bf6095530')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/30.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/30.json
new file mode 100644
index 00000000000..accaff46464
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/30.json
@@ -0,0 +1,1613 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 30,
+    "identityHash": "1e3ad3f4fb750ae397a8fee0c724ed14",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `transactionIds` TEXT, `depositsCount` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "transactionIds",
+            "columnName": "transactionIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositsCount",
+            "columnName": "depositsCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1e3ad3f4fb750ae397a8fee0c724ed14')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/31.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/31.json
new file mode 100644
index 00000000000..5eb5079c503
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/31.json
@@ -0,0 +1,1613 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 31,
+    "identityHash": "1e3ad3f4fb750ae397a8fee0c724ed14",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `transactionIds` TEXT, `depositsCount` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "transactionIds",
+            "columnName": "transactionIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositsCount",
+            "columnName": "depositsCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1e3ad3f4fb750ae397a8fee0c724ed14')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/32.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/32.json
new file mode 100644
index 00000000000..f3318bcd242
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/32.json
@@ -0,0 +1,1627 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 32,
+    "identityHash": "892bffac2c3dc56265f35a4375208c54",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `transactionIds` TEXT, `depositsCount` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "transactionIds",
+            "columnName": "transactionIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositsCount",
+            "columnName": "depositsCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '892bffac2c3dc56265f35a4375208c54')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/33.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/33.json
new file mode 100644
index 00000000000..83ee1ac94af
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/33.json
@@ -0,0 +1,1615 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 33,
+    "identityHash": "43fd0900518251fbd271b5ffe7a0d89f",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '43fd0900518251fbd271b5ffe7a0d89f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/34.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/34.json
new file mode 100644
index 00000000000..2752d51d77b
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/34.json
@@ -0,0 +1,1622 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 34,
+    "identityHash": "878b99bf2a221f0f462015ec1ff9f402",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', `shippingTax` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "shippingTax",
+            "columnName": "shippingTax",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '878b99bf2a221f0f462015ec1ff9f402')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/35.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/35.json
new file mode 100644
index 00000000000..c4cca134931
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/35.json
@@ -0,0 +1,1668 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 35,
+    "identityHash": "a01f7f90e7751f29876dda9a73c49ccc",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', `shippingTax` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "shippingTax",
+            "columnName": "shippingTax",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VisitorSummaryStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `date` TEXT NOT NULL, `granularity` TEXT NOT NULL, `views` INTEGER NOT NULL, `visitors` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `date`, `granularity`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "granularity",
+            "columnName": "granularity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "views",
+            "columnName": "views",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "visitors",
+            "columnName": "visitors",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "date",
+            "granularity"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a01f7f90e7751f29876dda9a73c49ccc')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/36.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/36.json
new file mode 100644
index 00000000000..501499d0de1
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/36.json
@@ -0,0 +1,1701 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 36,
+    "identityHash": "2b2e3799733db41ef697c524296acc82",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', `shippingTax` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "shippingTax",
+            "columnName": "shippingTax",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VisitorSummaryStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `date` TEXT NOT NULL, `granularity` TEXT NOT NULL, `views` INTEGER NOT NULL, `visitors` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `date`, `granularity`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "granularity",
+            "columnName": "granularity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "views",
+            "columnName": "views",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "visitors",
+            "columnName": "visitors",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "date",
+            "granularity"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ShippingMethod",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL, `title` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2b2e3799733db41ef697c524296acc82')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/37.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/37.json
new file mode 100644
index 00000000000..08dabe104c5
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/37.json
@@ -0,0 +1,1824 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 37,
+    "identityHash": "1e9b3d8837dc807d54beb93aa1655b43",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', `shippingTax` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "shippingTax",
+            "columnName": "shippingTax",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderMetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `isDisplayable` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`, `orderId`, `id`), FOREIGN KEY(`localSiteId`, `orderId`) REFERENCES `OrderEntity`(`localSiteId`, `orderId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDisplayable",
+            "columnName": "isDisplayable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "orderId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_OrderMetaData_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderMetaData_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "OrderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId",
+              "orderId"
+            ],
+            "referencedColumns": [
+              "localSiteId",
+              "orderId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VisitorSummaryStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `date` TEXT NOT NULL, `granularity` TEXT NOT NULL, `views` INTEGER NOT NULL, `visitors` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `date`, `granularity`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "granularity",
+            "columnName": "granularity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "views",
+            "columnName": "views",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "visitors",
+            "columnName": "visitors",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "date",
+            "granularity"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ShippingMethod",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL, `title` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CustomerFromAnalytics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `userId` INTEGER NOT NULL, `avgOrderValue` REAL NOT NULL, `city` TEXT NOT NULL, `country` TEXT NOT NULL, `dateLastActive` TEXT NOT NULL, `dateLastActiveGmt` TEXT NOT NULL, `dateLastOrder` TEXT NOT NULL, `dateRegistered` TEXT NOT NULL, `dateRegisteredGmt` TEXT NOT NULL, `email` TEXT NOT NULL, `name` TEXT NOT NULL, `ordersCount` INTEGER NOT NULL, `postcode` TEXT NOT NULL, `state` TEXT NOT NULL, `totalSpend` REAL NOT NULL, `username` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avgOrderValue",
+            "columnName": "avgOrderValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastActive",
+            "columnName": "dateLastActive",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastActiveGmt",
+            "columnName": "dateLastActiveGmt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastOrder",
+            "columnName": "dateLastOrder",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateRegistered",
+            "columnName": "dateRegistered",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateRegisteredGmt",
+            "columnName": "dateRegisteredGmt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ordersCount",
+            "columnName": "ordersCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalSpend",
+            "columnName": "totalSpend",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId",
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1e9b3d8837dc807d54beb93aa1655b43')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/38.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/38.json
new file mode 100644
index 00000000000..6def790dcd6
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/38.json
@@ -0,0 +1,1799 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 38,
+    "identityHash": "07da421084ee1c2ed5aad680d284c02d",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "addonLocalId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddonEntity_globalGroupLocalId",
+            "unique": false,
+            "columnNames": [
+              "globalGroupLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `${TABLE_NAME}` (`globalGroupLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "addonOptionLocalId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddonOptionEntity_addonLocalId",
+            "unique": false,
+            "columnNames": [
+              "addonLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `${TABLE_NAME}` (`addonLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedProductIds",
+            "columnName": "includedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedProductIds",
+            "columnName": "excludedProductIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "includedCategoryIds",
+            "columnName": "includedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "excludedCategoryIds",
+            "columnName": "excludedCategoryIds",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "couponId",
+            "localSiteId",
+            "email"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "globalGroupLocalId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "noteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `customerId` INTEGER NOT NULL DEFAULT 0, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `couponLines` TEXT NOT NULL DEFAULT '', `metaData` TEXT NOT NULL, `paymentUrl` TEXT NOT NULL DEFAULT '', `isEditable` INTEGER NOT NULL DEFAULT 1, `needsPayment` INTEGER, `needsProcessing` INTEGER, `giftCardCode` TEXT NOT NULL DEFAULT '', `giftCardAmount` TEXT NOT NULL DEFAULT '', `shippingTax` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`localSiteId`, `orderId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerId",
+            "columnName": "customerId",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "couponLines",
+            "columnName": "couponLines",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentUrl",
+            "columnName": "paymentUrl",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isEditable",
+            "columnName": "isEditable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "needsPayment",
+            "columnName": "needsPayment",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "needsProcessing",
+            "columnName": "needsProcessing",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardCode",
+            "columnName": "giftCardCode",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "giftCardAmount",
+            "columnName": "giftCardAmount",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "shippingTax",
+            "columnName": "shippingTax",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "orderId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_orderId",
+            "unique": false,
+            "columnNames": [
+              "localSiteId",
+              "orderId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` ON `${TABLE_NAME}` (`localSiteId`, `orderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MetaData",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `parentItemId` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, `type` TEXT NOT NULL DEFAULT 'ORDER', PRIMARY KEY(`localSiteId`, `parentItemId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentItemId",
+            "columnName": "parentItemId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'ORDER'"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "parentItemId",
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateReminder",
+            "columnName": "dateReminder",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "localId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_InboxNotes_remoteId_localSiteId",
+            "unique": true,
+            "columnNames": [
+              "remoteId",
+              "localSiteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `${TABLE_NAME}` (`remoteId`, `localSiteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InboxNoteActions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inboxNoteLocalId",
+            "columnName": "inboxNoteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "primary",
+            "columnName": "primary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "actionedText",
+            "columnName": "actionedText",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "remoteId",
+            "inboxNoteLocalId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_InboxNoteActions_inboxNoteLocalId",
+            "unique": false,
+            "columnNames": [
+              "inboxNoteLocalId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `${TABLE_NAME}` (`inboxNoteLocalId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "InboxNotes",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "inboxNoteLocalId"
+            ],
+            "referencedColumns": [
+              "localId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TopPerformerProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePeriod",
+            "columnName": "datePeriod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "quantity",
+            "columnName": "quantity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "millisSinceLastUpdated",
+            "columnName": "millisSinceLastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "datePeriod",
+            "productId",
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxBasedOnSetting",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `selectedOption` TEXT NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectedOption",
+            "columnName": "selectedOption",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TaxRate",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `country` TEXT, `state` TEXT, `postcode` TEXT, `city` TEXT, `rate` TEXT, `name` TEXT, `taxClass` TEXT, PRIMARY KEY(`id`, `localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDepositsOverview",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `depositsEnabled` INTEGER, `depositsBlocked` INTEGER, `defaultCurrency` TEXT, `delayDays` INTEGER, `weeklyAnchor` TEXT, `monthlyAnchor` INTEGER, `interval` TEXT, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "account.depositsEnabled",
+            "columnName": "depositsEnabled",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsBlocked",
+            "columnName": "depositsBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.defaultCurrency",
+            "columnName": "defaultCurrency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.delayDays",
+            "columnName": "delayDays",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.weeklyAnchor",
+            "columnName": "weeklyAnchor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.monthlyAnchor",
+            "columnName": "monthlyAnchor",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "account.depositsSchedule.interval",
+            "columnName": "interval",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "WooPaymentsDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `depositId` TEXT, `date` INTEGER, `type` TEXT, `amount` INTEGER, `status` TEXT, `bankAccount` TEXT, `currency` TEXT, `automatic` INTEGER, `fee` INTEGER, `feePercentage` REAL, `created` INTEGER, `depositType` TEXT NOT NULL, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "depositId",
+            "columnName": "depositId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bankAccount",
+            "columnName": "bankAccount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "automatic",
+            "columnName": "automatic",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "created",
+            "columnName": "created",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "depositType",
+            "columnName": "depositType",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsManualDeposits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `currency` TEXT, `date` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WooPaymentsBalance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `amount` INTEGER, `currency` TEXT, `fee` INTEGER, `feePercentage` REAL, `net` INTEGER, `balanceType` TEXT NOT NULL, `card` INTEGER, FOREIGN KEY(`localSiteId`) REFERENCES `WooPaymentsDepositsOverview`(`localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fee",
+            "columnName": "fee",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "feePercentage",
+            "columnName": "feePercentage",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "net",
+            "columnName": "net",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "balanceType",
+            "columnName": "balanceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sourceTypes.card",
+            "columnName": "card",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "WooPaymentsDepositsOverview",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "localSiteId"
+            ],
+            "referencedColumns": [
+              "localSiteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VisitorSummaryStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `date` TEXT NOT NULL, `granularity` TEXT NOT NULL, `views` INTEGER NOT NULL, `visitors` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `date`, `granularity`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "granularity",
+            "columnName": "granularity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "views",
+            "columnName": "views",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "visitors",
+            "columnName": "visitors",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "date",
+            "granularity"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ShippingMethod",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL, `title` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CustomerFromAnalytics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `id` INTEGER NOT NULL, `userId` INTEGER NOT NULL, `avgOrderValue` REAL NOT NULL, `city` TEXT NOT NULL, `country` TEXT NOT NULL, `dateLastActive` TEXT NOT NULL, `dateLastActiveGmt` TEXT NOT NULL, `dateLastOrder` TEXT NOT NULL, `dateRegistered` TEXT NOT NULL, `dateRegisteredGmt` TEXT NOT NULL, `email` TEXT NOT NULL, `name` TEXT NOT NULL, `ordersCount` INTEGER NOT NULL, `postcode` TEXT NOT NULL, `state` TEXT NOT NULL, `totalSpend` REAL NOT NULL, `username` TEXT NOT NULL, PRIMARY KEY(`localSiteId`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avgOrderValue",
+            "columnName": "avgOrderValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "city",
+            "columnName": "city",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastActive",
+            "columnName": "dateLastActive",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastActiveGmt",
+            "columnName": "dateLastActiveGmt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateLastOrder",
+            "columnName": "dateLastOrder",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateRegistered",
+            "columnName": "dateRegistered",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateRegisteredGmt",
+            "columnName": "dateRegisteredGmt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ordersCount",
+            "columnName": "ordersCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalSpend",
+            "columnName": "totalSpend",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId",
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '07da421084ee1c2ed5aad680d284c02d')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/4.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/4.json
new file mode 100644
index 00000000000..20b64bb5229
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/4.json
@@ -0,0 +1,592 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "5bf75b420b7268be1d990e841485b2ce",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` REAL NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SSREntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER NOT NULL, `environment` TEXT, `database` TEXT, `activePlugins` TEXT, `theme` TEXT, `settings` TEXT, `security` TEXT, `pages` TEXT, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "environment",
+            "columnName": "environment",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "database",
+            "columnName": "database",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "activePlugins",
+            "columnName": "activePlugins",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "settings",
+            "columnName": "settings",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "security",
+            "columnName": "security",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pages",
+            "columnName": "pages",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5bf75b420b7268be1d990e841485b2ce')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/5.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/5.json
new file mode 100644
index 00000000000..cf025d4ec1f
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/5.json
@@ -0,0 +1,530 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "34052cc9296465672d13b43d276b7ec2",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` REAL NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '34052cc9296465672d13b43d276b7ec2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/6.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/6.json
new file mode 100644
index 00000000000..9107fa5d83f
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/6.json
@@ -0,0 +1,530 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 6,
+    "identityHash": "b24e3b32c006d07264eb0cc3427b0138",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b24e3b32c006d07264eb0cc3427b0138')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/7.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/7.json
new file mode 100644
index 00000000000..b5feccf9284
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/7.json
@@ -0,0 +1,536 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 7,
+    "identityHash": "38081df5a9dc4a02c48a2f92c7987d00",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '38081df5a9dc4a02c48a2f92c7987d00')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/8.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/8.json
new file mode 100644
index 00000000000..777873b42d4
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/8.json
@@ -0,0 +1,599 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 8,
+    "identityHash": "f791ffbacf072bd61529514337a801e1",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f791ffbacf072bd61529514337a801e1')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/9.json b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/9.json
new file mode 100644
index 00000000000..ca27e96bd88
--- /dev/null
+++ b/libs/fluxc-plugin/schemas/org.wordpress.android.fluxc.persistence.WCAndroidDatabase/9.json
@@ -0,0 +1,1327 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 9,
+    "identityHash": "34ba60b1fb6c42ae54a6c4e216b3cdae",
+    "entities": [
+      {
+        "tableName": "AddonEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `siteRemoteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "productRemoteId",
+            "columnName": "productRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "display",
+            "columnName": "display",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "titleFormat",
+            "columnName": "titleFormat",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "required",
+            "columnName": "required",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictions",
+            "columnName": "restrictions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "min",
+            "columnName": "min",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "max",
+            "columnName": "max",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "GlobalAddonGroupEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "globalGroupLocalId"
+            ],
+            "referencedColumns": [
+              "globalGroupLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddonOptionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addonOptionLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `addonLocalId` INTEGER NOT NULL, `priceType` TEXT NOT NULL, `label` TEXT, `price` TEXT, `image` TEXT, FOREIGN KEY(`addonLocalId`) REFERENCES `AddonEntity`(`addonLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addonOptionLocalId",
+            "columnName": "addonOptionLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addonLocalId",
+            "columnName": "addonLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priceType",
+            "columnName": "priceType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "image",
+            "columnName": "image",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "addonOptionLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "AddonEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addonLocalId"
+            ],
+            "referencedColumns": [
+              "addonLocalId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Coupons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `code` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreatedGmt",
+            "columnName": "dateCreatedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModifiedGmt",
+            "columnName": "dateModifiedGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "discountType",
+            "columnName": "discountType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpires",
+            "columnName": "dateExpires",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateExpiresGmt",
+            "columnName": "dateExpiresGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageCount",
+            "columnName": "usageCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isForIndividualUse",
+            "columnName": "isForIndividualUse",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimit",
+            "columnName": "usageLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "usageLimitPerUser",
+            "columnName": "usageLimitPerUser",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limitUsageToXItems",
+            "columnName": "limitUsageToXItems",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingFree",
+            "columnName": "isShippingFree",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areSaleItemsExcluded",
+            "columnName": "areSaleItemsExcluded",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "minimumAmount",
+            "columnName": "minimumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumAmount",
+            "columnName": "maximumAmount",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_Coupons_id_siteId",
+            "unique": false,
+            "columnNames": [
+              "id",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `${TABLE_NAME}` (`id`, `siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CouponEmails",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `siteId`, `email`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "siteId",
+            "email"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponEmails_couponId_siteId_email",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId",
+              "email"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` ON `${TABLE_NAME}` (`couponId`, `siteId`, `email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProducts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productId`, `siteId`) REFERENCES `Products`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProducts_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProducts_productId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` ON `${TABLE_NAME}` (`productId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "Products",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CouponsAndProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`couponId` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `productCategoryId` INTEGER NOT NULL, `isExcluded` INTEGER NOT NULL, PRIMARY KEY(`couponId`, `productCategoryId`), FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`productCategoryId`, `siteId`) REFERENCES `ProductCategories`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "couponId",
+            "columnName": "couponId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productCategoryId",
+            "columnName": "productCategoryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isExcluded",
+            "columnName": "isExcluded",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "couponId",
+            "productCategoryId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_CouponsAndProductCategories_couponId_siteId",
+            "unique": false,
+            "columnNames": [
+              "couponId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` ON `${TABLE_NAME}` (`couponId`, `siteId`)"
+          },
+          {
+            "name": "index_CouponsAndProductCategories_productCategoryId_siteId",
+            "unique": false,
+            "columnNames": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` ON `${TABLE_NAME}` (`productCategoryId`, `siteId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "Coupons",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "couponId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          },
+          {
+            "table": "ProductCategories",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "productCategoryId",
+              "siteId"
+            ],
+            "referencedColumns": [
+              "id",
+              "siteId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GlobalAddonGroupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `siteRemoteId` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "globalGroupLocalId",
+            "columnName": "globalGroupLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "restrictedCategoriesIds",
+            "columnName": "restrictedCategoriesIds",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteRemoteId",
+            "columnName": "siteRemoteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalGroupLocalId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderNotes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `noteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noteId",
+            "columnName": "noteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderId",
+            "columnName": "orderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "author",
+            "columnName": "author",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSystemNote",
+            "columnName": "isSystemNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCustomerNote",
+            "columnName": "isCustomerNote",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "noteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Products",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `name` TEXT, `slug` TEXT, `permalink` TEXT, `dateCreated` TEXT, `dateModified` TEXT, `type` TEXT, `status` TEXT, `isFeatured` INTEGER, `catalogVisibility` TEXT, `description` TEXT, `shortDescription` TEXT, `sku` TEXT, `price` TEXT, `regularPrice` TEXT, `salePrice` TEXT, `isOnSale` INTEGER, `totalSales` INTEGER, `isPurchasable` INTEGER, `dateOnSaleFrom` TEXT, `dateOnSaleTo` TEXT, `dateOnSaleFromGmt` TEXT, `dateOnSaleToGmt` TEXT, `isVirtual` INTEGER, `isDownloadable` INTEGER, `downloadLimit` INTEGER, `downloadExpiry` INTEGER, `isSoldIndividually` INTEGER, `externalUrl` TEXT, `buttonText` TEXT, `taxStatus` TEXT, `taxClass` TEXT, `isStockManaged` INTEGER, `stockQuantity` REAL, `stockStatus` TEXT, `backorders` TEXT, `areBackordersAllowed` INTEGER, `isBackordered` INTEGER, `isShippingRequired` INTEGER, `isShippingTaxable` INTEGER, `shippingClass` TEXT, `shippingClassId` INTEGER, `areReviewsAllowed` INTEGER, `averageRating` TEXT, `ratingCount` INTEGER, `parentId` INTEGER, `purchaseNote` TEXT, `menuOrder` INTEGER, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "permalink",
+            "columnName": "permalink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isFeatured",
+            "columnName": "isFeatured",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "catalogVisibility",
+            "columnName": "catalogVisibility",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortDescription",
+            "columnName": "shortDescription",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sku",
+            "columnName": "sku",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "regularPrice",
+            "columnName": "regularPrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "salePrice",
+            "columnName": "salePrice",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnSale",
+            "columnName": "isOnSale",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalSales",
+            "columnName": "totalSales",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPurchasable",
+            "columnName": "isPurchasable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFrom",
+            "columnName": "dateOnSaleFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleTo",
+            "columnName": "dateOnSaleTo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleFromGmt",
+            "columnName": "dateOnSaleFromGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateOnSaleToGmt",
+            "columnName": "dateOnSaleToGmt",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isVirtual",
+            "columnName": "isVirtual",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadable",
+            "columnName": "isDownloadable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadLimit",
+            "columnName": "downloadLimit",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downloadExpiry",
+            "columnName": "downloadExpiry",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isSoldIndividually",
+            "columnName": "isSoldIndividually",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalUrl",
+            "columnName": "externalUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "buttonText",
+            "columnName": "buttonText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxStatus",
+            "columnName": "taxStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxClass",
+            "columnName": "taxClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isStockManaged",
+            "columnName": "isStockManaged",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockQuantity",
+            "columnName": "stockQuantity",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "stockStatus",
+            "columnName": "stockStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "backorders",
+            "columnName": "backorders",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areBackordersAllowed",
+            "columnName": "areBackordersAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBackordered",
+            "columnName": "isBackordered",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingRequired",
+            "columnName": "isShippingRequired",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isShippingTaxable",
+            "columnName": "isShippingTaxable",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClass",
+            "columnName": "shippingClass",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shippingClassId",
+            "columnName": "shippingClassId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "areReviewsAllowed",
+            "columnName": "areReviewsAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "averageRating",
+            "columnName": "averageRating",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ratingCount",
+            "columnName": "ratingCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "purchaseNote",
+            "columnName": "purchaseNote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "menuOrder",
+            "columnName": "menuOrder",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ProductCategories",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteId` INTEGER NOT NULL, `parentId` INTEGER, `name` TEXT, `slug` TEXT, PRIMARY KEY(`id`, `siteId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "slug",
+            "columnName": "slug",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "OrderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteOrderId` INTEGER NOT NULL, `number` TEXT NOT NULL, `status` TEXT NOT NULL, `currency` TEXT NOT NULL, `orderKey` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `dateModified` TEXT NOT NULL, `total` TEXT NOT NULL, `totalTax` TEXT NOT NULL, `shippingTotal` TEXT NOT NULL, `paymentMethod` TEXT NOT NULL, `paymentMethodTitle` TEXT NOT NULL, `datePaid` TEXT NOT NULL, `pricesIncludeTax` INTEGER NOT NULL, `customerNote` TEXT NOT NULL, `discountTotal` TEXT NOT NULL, `discountCodes` TEXT NOT NULL, `refundTotal` TEXT NOT NULL, `billingFirstName` TEXT NOT NULL, `billingLastName` TEXT NOT NULL, `billingCompany` TEXT NOT NULL, `billingAddress1` TEXT NOT NULL, `billingAddress2` TEXT NOT NULL, `billingCity` TEXT NOT NULL, `billingState` TEXT NOT NULL, `billingPostcode` TEXT NOT NULL, `billingCountry` TEXT NOT NULL, `billingEmail` TEXT NOT NULL, `billingPhone` TEXT NOT NULL, `shippingFirstName` TEXT NOT NULL, `shippingLastName` TEXT NOT NULL, `shippingCompany` TEXT NOT NULL, `shippingAddress1` TEXT NOT NULL, `shippingAddress2` TEXT NOT NULL, `shippingCity` TEXT NOT NULL, `shippingState` TEXT NOT NULL, `shippingPostcode` TEXT NOT NULL, `shippingCountry` TEXT NOT NULL, `shippingPhone` TEXT NOT NULL, `lineItems` TEXT NOT NULL, `shippingLines` TEXT NOT NULL, `feeLines` TEXT NOT NULL, `taxLines` TEXT NOT NULL, `metaData` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteOrderId",
+            "columnName": "remoteOrderId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orderKey",
+            "columnName": "orderKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateModified",
+            "columnName": "dateModified",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "total",
+            "columnName": "total",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalTax",
+            "columnName": "totalTax",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingTotal",
+            "columnName": "shippingTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethod",
+            "columnName": "paymentMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentMethodTitle",
+            "columnName": "paymentMethodTitle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "datePaid",
+            "columnName": "datePaid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pricesIncludeTax",
+            "columnName": "pricesIncludeTax",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "customerNote",
+            "columnName": "customerNote",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountTotal",
+            "columnName": "discountTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "discountCodes",
+            "columnName": "discountCodes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refundTotal",
+            "columnName": "refundTotal",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingFirstName",
+            "columnName": "billingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingLastName",
+            "columnName": "billingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCompany",
+            "columnName": "billingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress1",
+            "columnName": "billingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingAddress2",
+            "columnName": "billingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCity",
+            "columnName": "billingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingState",
+            "columnName": "billingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPostcode",
+            "columnName": "billingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingCountry",
+            "columnName": "billingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingEmail",
+            "columnName": "billingEmail",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "billingPhone",
+            "columnName": "billingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingFirstName",
+            "columnName": "shippingFirstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLastName",
+            "columnName": "shippingLastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCompany",
+            "columnName": "shippingCompany",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress1",
+            "columnName": "shippingAddress1",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingAddress2",
+            "columnName": "shippingAddress2",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCity",
+            "columnName": "shippingCity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingState",
+            "columnName": "shippingState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPostcode",
+            "columnName": "shippingPostcode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingCountry",
+            "columnName": "shippingCountry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingPhone",
+            "columnName": "shippingPhone",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lineItems",
+            "columnName": "lineItems",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shippingLines",
+            "columnName": "shippingLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "feeLines",
+            "columnName": "feeLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxLines",
+            "columnName": "taxLines",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "metaData",
+            "columnName": "metaData",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_OrderEntity_localSiteId_remoteOrderId",
+            "unique": true,
+            "columnNames": [
+              "localSiteId",
+              "remoteOrderId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` ON `${TABLE_NAME}` (`localSiteId`, `remoteOrderId`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '34ba60b1fb6c42ae54a6c4e216b3cdae')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationSchemasUtils.kt b/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationSchemasUtils.kt
new file mode 100644
index 00000000000..0d4f6a334b3
--- /dev/null
+++ b/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationSchemasUtils.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.Context
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.json.JSONObject
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+object MigrationSchemasUtils {
+    private const val SCHEMAS_FOLDER = "org.wordpress.android.fluxc.persistence.WCAndroidDatabase"
+    private const val HASH_TAG_NAME = "identityHash"
+    private const val DATABASE_TAG_NAME = "database"
+
+    fun getDBHashKey(dbVersion: Int): String = "DB_V${dbVersion}_HASH"
+
+    fun getIdentityHash(dbVersion: Int, context: Context): String {
+        val fileName = "$SCHEMAS_FOLDER/$dbVersion.json"
+
+        // Read JSON file from assets
+        val reader = context.assets.open(fileName).reader()
+        val jsonString = reader.readText()
+        reader.close()
+
+        // Parse JSON string
+        val jsonObject = JSONObject(jsonString)
+
+        // Return hash
+        return jsonObject.getJSONObject(DATABASE_TAG_NAME).getString(HASH_TAG_NAME)
+    }
+
+    val DB_HASHES = mapOf(
+        getDBHashKey(3) to "f93440a02cd238b1abd2ab0bf6095530",
+        getDBHashKey(4) to "5bf75b420b7268be1d990e841485b2ce",
+        getDBHashKey(5) to "34052cc9296465672d13b43d276b7ec2",
+        getDBHashKey(6) to "b24e3b32c006d07264eb0cc3427b0138",
+        getDBHashKey(7) to "38081df5a9dc4a02c48a2f92c7987d00",
+        getDBHashKey(8) to "f791ffbacf072bd61529514337a801e1",
+        getDBHashKey(9) to "34ba60b1fb6c42ae54a6c4e216b3cdae",
+        getDBHashKey(10) to "6c40c25602a91c9a88bf0691cc0f8d56",
+        getDBHashKey(11) to "39ae37638a6cb9fc908153b18ee9ea9f",
+        getDBHashKey(12) to "0cca8009f3a179d0f911bcc61401c7f1",
+        getDBHashKey(13) to "0f27a46a235e2993401c68a3f71edcef",
+        getDBHashKey(14) to "29bd4b7bb5f85a1f50b9fe9a6b2aa8eb",
+        getDBHashKey(15) to "c1b4a5003f85e61f9427f4fa0edea3e1",
+        getDBHashKey(16) to "152b7abad5ab1a500dc34a02e1e5a389",
+        getDBHashKey(17) to "3b246a05145d072bab5f9cbae76ed922",
+        getDBHashKey(18) to "d430524ce447d0c639ed7a47a35a0827",
+        getDBHashKey(19) to "20424496bd0d2d7f0ec904dac725bb83",
+        getDBHashKey(20) to "77e57ef8e1d85a20baf0805ee3c18c12",
+        getDBHashKey(21) to "15d66924533da0996f3ad884bbfdcfab",
+        getDBHashKey(22) to "a08d1da9359217298fa9560aa8f69333",
+        getDBHashKey(23) to "a08d1da9359217298fa9560aa8f69333",
+        getDBHashKey(24) to "f01bc4956b3c08f4ae847bff0626776b",
+        getDBHashKey(25) to "6d6c9173ad3574359b4e0f4788c9541e",
+        getDBHashKey(26) to "53e39092d40d7d55ad7d717d69b86547",
+        getDBHashKey(27) to "f2c454ea3a1d74cf4b7ec999502708bc",
+        getDBHashKey(28) to "7c63d469a9a3b1302f2d2db3e4c627ac",
+        getDBHashKey(29) to "7d96824894dd52540b779abb309e98c9",
+        getDBHashKey(30) to "1e3ad3f4fb750ae397a8fee0c724ed14",
+        getDBHashKey(31) to "1e3ad3f4fb750ae397a8fee0c724ed14",
+        getDBHashKey(32) to "892bffac2c3dc56265f35a4375208c54",
+        getDBHashKey(33) to "43fd0900518251fbd271b5ffe7a0d89f",
+        getDBHashKey(34) to "878b99bf2a221f0f462015ec1ff9f402",
+        getDBHashKey(35) to "a01f7f90e7751f29876dda9a73c49ccc",
+        getDBHashKey(36) to "2b2e3799733db41ef697c524296acc82",
+        getDBHashKey(37) to "1e9b3d8837dc807d54beb93aa1655b43",
+        getDBHashKey(38) to "07da421084ee1c2ed5aad680d284c02d"
+    )
+}
diff --git a/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationTests.kt b/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationTests.kt
new file mode 100644
index 00000000000..58dfa4b3a85
--- /dev/null
+++ b/libs/fluxc-plugin/src/androidTest/java/org/wordpress/android/fluxc/persistence/MigrationTests.kt
@@ -0,0 +1,337 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.migration.AutoMigrationSpec
+import androidx.room.testing.MigrationTestHelper
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_10_11
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_11_12
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_15_16
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_20_21
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_21_22
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_22_23
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_24_25
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_27_28
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_30_31
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_31_32
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_3_4
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_4_5
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_5_6
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_6_7
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_7_8
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_8_9
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_9_10
+
+@RunWith(AndroidJUnit4::class)
+class MigrationTests {
+    @Rule
+    @JvmField
+    val helper: MigrationTestHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        WCAndroidDatabase::class.java,
+        listOf<AutoMigrationSpec>()
+    )
+
+    @Test
+    fun testRoomDBSchemasUnchanged() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        for(i in 3..WC_DATABASE_VERSION){
+            val currentHash = MigrationSchemasUtils.getIdentityHash(i, context)
+            val expectedHash = MigrationSchemasUtils.DB_HASHES.getValue(
+                MigrationSchemasUtils.getDBHashKey(i)
+            )
+            assertThat(currentHash).isEqualTo(expectedHash)
+        }
+    }
+
+    @Test
+    fun testMigrate3To4() {
+        helper.apply {
+            createDatabase(TEST_DB, 3).close()
+            runMigrationsAndValidate(TEST_DB, 4, true, MIGRATION_3_4)
+        }
+    }
+
+    @Test
+    fun testMigrate4to5() {
+        helper.apply {
+            createDatabase(TEST_DB, 4).close()
+            runMigrationsAndValidate(TEST_DB, 5, true, MIGRATION_4_5)
+        }
+    }
+
+    @Test
+    fun testMigrate5to6() {
+        helper.apply {
+            createDatabase(TEST_DB, 5).close()
+            runMigrationsAndValidate(TEST_DB, 6, true, MIGRATION_5_6)
+        }
+    }
+
+    @Test
+    fun testMigrate6to7() {
+        helper.apply {
+            createDatabase(TEST_DB, 6).apply {
+                execSQL(
+                    // language=RoomSql
+                    """
+                            INSERT INTO OrderEntity VALUES(1, 2, 3, '123', 'processing', '$', 'key', 'date of creation', 'date of modification', '123', '456', '789', 'card', 'by card', 'date paid', 1, 'sample customer note', '213', 'CODE', 123, 'billing first name', 'billing last name', 'billing company', 'billing address1', 'billing address2', 'billing city', 'billing state', 'billing postcode', 'billing country', 'billing email', 'billing phone', 'shipping first name', 'shipping last name', 'shipping company', 'shipping address1', 'shipping address2', 'shipping city', 'shipping state', 'shipping postcode', 'shipping country', 'shipping phone', 'line items', 'shipping lines', 'fee lines', 'meta data')
+                        """.trimIndent()
+                )
+            }.close()
+
+            val migratedDb = runMigrationsAndValidate(TEST_DB, 7, true, MIGRATION_6_7)
+
+            migratedDb.query(
+                // language=RoomSql
+                """
+                        SELECT * FROM OrderEntity
+                    """.trimIndent()
+            )
+        }
+    }
+
+    @Test
+    fun testMigration7to8() {
+        helper.apply {
+            createDatabase(TEST_DB, 7).close()
+            runMigrationsAndValidate(TEST_DB, 8, true, MIGRATION_7_8)
+        }
+    }
+
+    @Test
+    fun testMigration8to9() {
+        helper.apply {
+            createDatabase(TEST_DB, 8).close()
+            runMigrationsAndValidate(TEST_DB, 9, true, MIGRATION_8_9)
+        }
+    }
+
+    @Test
+    fun testMigrate9to10() {
+        helper.apply {
+            createDatabase(TEST_DB, 9).close()
+            runMigrationsAndValidate(TEST_DB, 10, true, MIGRATION_9_10)
+        }
+    }
+
+    @Test
+    fun testMigrate10to11() {
+        helper.apply {
+            createDatabase(TEST_DB, 10).close()
+            runMigrationsAndValidate(TEST_DB, 11, true, MIGRATION_10_11)
+        }
+    }
+
+    @Test
+    fun testMigrate11to12() {
+        helper.apply {
+            createDatabase(TEST_DB, 11).close()
+            runMigrationsAndValidate(TEST_DB, 12, true, MIGRATION_11_12)
+        }
+    }
+
+    @Test
+    fun testMigrate12to13() {
+        helper.apply {
+            createDatabase(TEST_DB, 12).close()
+            runMigrationsAndValidate(TEST_DB, 13, true)
+        }
+    }
+
+    @Test
+    fun testMigrate15to16() {
+        helper.apply {
+            createDatabase(TEST_DB, 15).apply {
+                execSQL(
+                    // language=RoomSql
+                    """
+                    INSERT INTO OrderEntity VALUES(1, 2, 3, '123', 'processing', '$', 'key', 'date of creation', 'date of modification', '123', '456', '789', 'card', 'by card', 'date paid', 1, 'sample customer note', '213', 'CODE', 123, 'billing first name', 'billing last name', 'billing company', 'billing address1', 'billing address2', 'billing city', 'billing state', 'billing postcode', 'billing country', 'billing email', 'billing phone', 'shipping first name', 'shipping last name', 'shipping company', 'shipping address1', 'shipping address2', 'shipping city', 'shipping state', 'shipping postcode', 'shipping country', 'shipping phone', 'line items', 'shipping lines', 'fee lines', 'meta data', 'payment url')
+                    """.trimIndent()
+                )
+            }.close()
+
+            val migratedDb = runMigrationsAndValidate(TEST_DB, 16, true, MIGRATION_15_16)
+            val cursor = migratedDb.query(
+                // language=RoomSql
+                """
+                        SELECT * FROM OrderEntity
+                    """.trimIndent()
+            )
+            // Ensure we delete all saved OrderEntities and use the API as the source of true
+            assertThat(cursor.count).isEqualTo(0)
+            cursor.close()
+        }
+    }
+
+    @Test
+    fun testMigrate20to21() {
+        helper.apply {
+            createDatabase(TEST_DB, 20).apply {
+                execSQL(
+                    // language=RoomSql
+                    """
+                    INSERT INTO TopPerformerProducts VALUES(
+                        202934350,
+                        "2022-10-01T00:00:00-2022-10-31T23:59:59",
+                        78,
+                        "WooCommerce Tote Bag",
+                        "https://samplesite.com/awesomeproduct.jpg",
+                        2,
+                        "/$",
+                        11.0,
+                        1666727639491 
+                    )
+                    """.trimIndent()
+                )
+            }.close()
+
+            val migratedDb = runMigrationsAndValidate(TEST_DB, 21, true, MIGRATION_20_21)
+            val cursor = migratedDb.query(
+                // language=RoomSql
+                """
+                        SELECT * FROM TopPerformerProducts
+                    """.trimIndent()
+            )
+            // Ensure we delete all saved TopPerformerProducts
+            assertThat(cursor.count).isEqualTo(0)
+            cursor.close()
+        }
+    }
+
+    @Test
+    fun testMigrate21to22() {
+        helper.apply {
+            createDatabase(TEST_DB, 21).close()
+            runMigrationsAndValidate(TEST_DB, 22, true, MIGRATION_21_22)
+        }
+    }
+
+    @Test
+    fun testMigrate22to23() {
+        helper.apply {
+            createDatabase(TEST_DB, 22).close()
+            runMigrationsAndValidate(TEST_DB, 23, true, MIGRATION_22_23)
+        }
+    }
+
+    @Test
+    fun testMigrate23to24() {
+        helper.apply {
+            createDatabase(TEST_DB, 23).close()
+            runMigrationsAndValidate(TEST_DB, 24, false)
+        }
+    }
+
+    @Test
+    fun testMigrate24to25() {
+        helper.apply {
+            createDatabase(TEST_DB, 24).close()
+            runMigrationsAndValidate(TEST_DB, 25, true, MIGRATION_24_25)
+        }
+    }
+
+    @Test
+    fun testMigrate25to26() {
+        helper.apply {
+            createDatabase(TEST_DB, 25).close()
+            runMigrationsAndValidate(TEST_DB, 26, false)
+        }
+    }
+
+    @Test
+    fun testMigrate26to27() {
+        helper.apply {
+            createDatabase(TEST_DB, 26).close()
+            runMigrationsAndValidate(TEST_DB, 27, false)
+        }
+    }
+
+    @Test
+    fun testMigrate27to28() {
+        helper.apply {
+            createDatabase(TEST_DB, 27).close()
+            runMigrationsAndValidate(TEST_DB, 28, true, MIGRATION_27_28)
+        }
+    }
+
+    @Test
+    fun testMigration28to29() {
+        helper.apply {
+            createDatabase(TEST_DB, 28).close()
+            runMigrationsAndValidate(TEST_DB, 29, false)
+        }
+    }
+
+    @Test
+    fun testMigration29to30() {
+        helper.apply {
+            createDatabase(TEST_DB, 29).close()
+            runMigrationsAndValidate(TEST_DB, 30, false)
+        }
+    }
+
+    @Test
+    fun testMigration30to31() {
+        helper.apply {
+            createDatabase(TEST_DB, 30).close()
+            runMigrationsAndValidate(TEST_DB, 31, false, MIGRATION_30_31)
+        }
+    }
+
+    @Test
+    fun testMigration31to32() {
+        helper.apply {
+            createDatabase(TEST_DB, 31).close()
+            runMigrationsAndValidate(TEST_DB, 32, false, MIGRATION_31_32)
+        }
+    }
+
+    @Test
+    fun testMigration32to33() {
+        helper.apply {
+            createDatabase(TEST_DB, 32).close()
+            runMigrationsAndValidate(TEST_DB, 33, false)
+        }
+    }
+
+    @Test
+    fun testMigration33to34() {
+        helper.apply {
+            createDatabase(TEST_DB, 33).close()
+            runMigrationsAndValidate(TEST_DB, 34, false)
+        }
+    }
+
+    @Test
+    fun testMigration34to35() {
+        helper.apply {
+            createDatabase(TEST_DB, 34).close()
+            runMigrationsAndValidate(TEST_DB, 35, false)
+        }
+    }
+
+    @Test
+    fun testMigration35to36() {
+        helper.apply {
+            createDatabase(TEST_DB, 35).close()
+            runMigrationsAndValidate(TEST_DB, 36, false)
+        }
+    }
+
+    @Test
+    fun testMigration36to37() {
+        helper.apply {
+            createDatabase(TEST_DB, 35).close()
+            runMigrationsAndValidate(TEST_DB, 36, false)
+        }
+    }
+
+    companion object {
+        private const val TEST_DB = "migration-test"
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCOrderAction.java b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCOrderAction.java
new file mode 100644
index 00000000000..3ada0961719
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCOrderAction.java
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderListPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderListResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderStatusOptionsPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderStatusOptionsResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersByIdsPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersByIdsResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersCountPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersCountResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.SearchOrdersPayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.SearchOrdersResponsePayload;
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderStatusPayload;
+
+@ActionEnum
+public enum WCOrderAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchOrdersPayload.class)
+    FETCH_ORDERS,
+    @Action(payloadType = FetchOrderListPayload.class)
+    FETCH_ORDER_LIST,
+    @Action(payloadType = FetchOrdersByIdsPayload.class)
+    FETCH_ORDERS_BY_IDS,
+    @Action(payloadType = FetchOrdersCountPayload.class)
+    FETCH_ORDERS_COUNT,
+    @Action(payloadType = UpdateOrderStatusPayload.class)
+    @Deprecated // Use suspendable WCOrderStore.updateOrderStatus(..) directly.
+    UPDATE_ORDER_STATUS,
+    @Action(payloadType = SearchOrdersPayload.class)
+    SEARCH_ORDERS,
+    @Action(payloadType = FetchOrderStatusOptionsPayload.class)
+    FETCH_ORDER_STATUS_OPTIONS,
+
+    // Remote responses
+    @Action(payloadType = FetchOrdersResponsePayload.class)
+    FETCHED_ORDERS,
+    @Action(payloadType = FetchOrderListResponsePayload.class)
+    FETCHED_ORDER_LIST,
+    @Action(payloadType = FetchOrdersByIdsResponsePayload.class)
+    FETCHED_ORDERS_BY_IDS,
+    @Action(payloadType = FetchOrdersCountResponsePayload.class)
+    FETCHED_ORDERS_COUNT,
+    @Action(payloadType = SearchOrdersResponsePayload.class)
+    SEARCHED_ORDERS,
+    @Action(payloadType = FetchOrderStatusOptionsResponsePayload.class)
+    FETCHED_ORDER_STATUS_OPTIONS,
+}
diff --git a/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCProductAction.java b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCProductAction.java
new file mode 100644
index 00000000000..fbc2fc9391f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCProductAction.java
@@ -0,0 +1,102 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.WCProductStore.AddProductPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.AddProductTagsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.DeleteProductPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductCategoriesPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductPasswordPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductShippingClassListPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductSkuAvailabilityPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductTagsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.FetchSingleProductShippingClassPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductCategoryResponsePayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductTagsResponsePayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteDeleteProductPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductCategoriesPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductListPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductPasswordPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductShippingClassListPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductShippingClassPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductSkuAvailabilityPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductTagsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteSearchProductsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateProductImagesPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateProductPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdatedProductPasswordPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.SearchProductsByGlobalUniqueIdPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.SearchProductsPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.UpdateProductImagesPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.UpdateProductPasswordPayload;
+import org.wordpress.android.fluxc.store.WCProductStore.UpdateProductPayload;
+
+@ActionEnum
+public enum WCProductAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchProductsPayload.class)
+    FETCH_PRODUCTS,
+    @Action(payloadType = SearchProductsPayload.class)
+    SEARCH_PRODUCTS,
+    @Action(payloadType = SearchProductsByGlobalUniqueIdPayload.class)
+    SEARCH_PRODUCTS_BY_GLOBAL_UNIQUE_ID,
+    @Action(payloadType = FetchProductShippingClassListPayload.class)
+    FETCH_PRODUCT_SHIPPING_CLASS_LIST,
+    @Action(payloadType = FetchSingleProductShippingClassPayload.class)
+    FETCH_SINGLE_PRODUCT_SHIPPING_CLASS,
+    @Action(payloadType = UpdateProductImagesPayload.class)
+    UPDATE_PRODUCT_IMAGES,
+    @Action(payloadType = UpdateProductPayload.class)
+    UPDATE_PRODUCT,
+    @Action(payloadType = FetchProductSkuAvailabilityPayload.class)
+    FETCH_PRODUCT_SKU_AVAILABILITY,
+    @Action(payloadType = FetchProductPasswordPayload.class)
+    FETCH_PRODUCT_PASSWORD,
+    @Action(payloadType = UpdateProductPasswordPayload.class)
+    UPDATE_PRODUCT_PASSWORD,
+    @Action(payloadType = FetchProductCategoriesPayload.class)
+    FETCH_PRODUCT_CATEGORIES,
+    @Action(payloadType = FetchProductTagsPayload.class)
+    FETCH_PRODUCT_TAGS,
+    @Action(payloadType = AddProductTagsPayload.class)
+    ADD_PRODUCT_TAGS,
+    @Action(payloadType = AddProductPayload.class)
+    ADD_PRODUCT,
+    @Action(payloadType = DeleteProductPayload.class)
+    DELETE_PRODUCT,
+
+    // Remote responses
+    @Action(payloadType = RemoteProductListPayload.class)
+    FETCHED_PRODUCTS,
+    @Action(payloadType = RemoteSearchProductsPayload.class)
+    SEARCHED_PRODUCTS,
+    @Action(payloadType = RemoteProductShippingClassListPayload.class)
+    FETCHED_PRODUCT_SHIPPING_CLASS_LIST,
+    @Action(payloadType = RemoteProductShippingClassPayload.class)
+    FETCHED_SINGLE_PRODUCT_SHIPPING_CLASS,
+    @Action(payloadType = RemoteUpdateProductImagesPayload.class)
+    UPDATED_PRODUCT_IMAGES,
+    @Action(payloadType = RemoteUpdateProductPayload.class)
+    UPDATED_PRODUCT,
+    @Action(payloadType = RemoteProductSkuAvailabilityPayload.class)
+    FETCHED_PRODUCT_SKU_AVAILABILITY,
+    @Action(payloadType = RemoteProductPasswordPayload.class)
+    FETCHED_PRODUCT_PASSWORD,
+    @Action(payloadType = RemoteUpdatedProductPasswordPayload.class)
+    UPDATED_PRODUCT_PASSWORD,
+    @Action(payloadType = RemoteProductCategoriesPayload.class)
+    FETCHED_PRODUCT_CATEGORIES,
+    @Action(payloadType = RemoteAddProductCategoryResponsePayload.class)
+    ADDED_PRODUCT_CATEGORY,
+    @Action(payloadType = RemoteProductTagsPayload.class)
+    FETCHED_PRODUCT_TAGS,
+    @Action(payloadType = RemoteAddProductTagsResponsePayload.class)
+    ADDED_PRODUCT_TAGS,
+    @Action(payloadType = RemoteAddProductPayload.class)
+    ADDED_PRODUCT,
+    @Action(payloadType = RemoteDeleteProductPayload.class)
+    DELETED_PRODUCT
+}
diff --git a/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCStatsAction.java b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCStatsAction.java
new file mode 100644
index 00000000000..314376d2822
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/java/org/wordpress/android/fluxc/action/WCStatsAction.java
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchNewVisitorStatsPayload;
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsAvailabilityPayload;
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsAvailabilityResponsePayload;
+
+@ActionEnum
+public enum WCStatsAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchRevenueStatsAvailabilityPayload.class)
+    FETCH_REVENUE_STATS_AVAILABILITY,
+
+    @Action(payloadType = FetchNewVisitorStatsPayload.class)
+    FETCH_NEW_VISITOR_STATS,
+
+    // Remote responses
+    @Action(payloadType = FetchRevenueStatsAvailabilityResponsePayload.class)
+    FETCHED_REVENUE_STATS_AVAILABILITY
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/di/WCDatabaseModule.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/di/WCDatabaseModule.kt
new file mode 100644
index 00000000000..099720e0054
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/di/WCDatabaseModule.kt
@@ -0,0 +1,79 @@
+package org.wordpress.android.fluxc.di
+
+import android.content.Context
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import org.wordpress.android.fluxc.module.DatabaseModule
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils
+import org.wordpress.android.fluxc.persistence.TransactionExecutor
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.dao.AddonsDao
+import org.wordpress.android.fluxc.persistence.dao.CouponsDao
+import org.wordpress.android.fluxc.persistence.dao.CustomerFromAnalyticsDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDao
+import org.wordpress.android.fluxc.persistence.dao.ShippingMethodDao
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Module(
+    includes = [
+        DatabaseModule::class
+    ]
+)
+interface WCDatabaseModule {
+    companion object {
+        @Singleton @Provides fun provideDatabase(context: Context): WCAndroidDatabase {
+            return WCAndroidDatabase.buildDb(context)
+        }
+
+        @Provides internal fun provideAddonsDao(database: WCAndroidDatabase): AddonsDao {
+            return database.addonsDao
+        }
+
+        @Provides fun provideOrdersDao(database: WCAndroidDatabase): OrdersDao {
+            return database.ordersDao
+        }
+
+        @Provides fun provideCouponsDao(database: WCAndroidDatabase): CouponsDao {
+            return database.couponsDao
+        }
+
+        @Provides fun provideOrderNotesDao(database: WCAndroidDatabase) = database.orderNotesDao
+
+        @Provides fun provideMetaDataDao(database: WCAndroidDatabase) = database.metaDataDao
+
+        @Provides fun provideInboxNotesDao(database: WCAndroidDatabase) = database.inboxNotesDao
+
+        @Provides fun provideTopPerformerProductsDao(database: WCAndroidDatabase) = database.topPerformerProductsDao
+
+        @Provides fun provideTaxBasedOnDao(database: WCAndroidDatabase) = database.taxBasedOnSettingDao
+
+        @Provides fun provideTaxRateDao(database: WCAndroidDatabase) = database.taxRateDao
+
+        @Provides fun provideWooPaymentsDepositsOverviewDao(database: WCAndroidDatabase) =
+            database.wooPaymentsDepositsOverviewDao
+
+        /**
+         * OrderSqlUtils is a Kotlin object, we can't use [Inject] to inject it.
+         */
+        @Provides fun provideOrderSqlUtils() = OrderSqlUtils
+
+        /**
+         * ProductSqlUtils is a Kotlin object, we can't use [Inject] to inject it.
+         */
+        @Provides fun provideProductSqlUtils() = ProductSqlUtils
+
+        @Provides fun provideVisitorSummaryStatsDao(database: WCAndroidDatabase) = database.visitorSummaryStatsDao
+
+        @Provides internal fun provideShippingMethodsDao(database: WCAndroidDatabase): ShippingMethodDao {
+            return database.shippingMethodDao
+        }
+
+        @Provides internal fun provideCustomerFromAnalyticsDao(database: WCAndroidDatabase): CustomerFromAnalyticsDao {
+            return database.customerFromAnalyticsDao
+        }
+    }
+    @Binds fun bindTransactionExecutor(database: WCAndroidDatabase): TransactionExecutor
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/Addon.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/Addon.kt
new file mode 100644
index 00000000000..2786ed9fd8c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/Addon.kt
@@ -0,0 +1,134 @@
+package org.wordpress.android.fluxc.domain
+
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price
+import org.wordpress.android.fluxc.domain.Addon.HasOptions.Option
+
+sealed class Addon {
+    abstract val name: String
+    abstract val titleFormat: TitleFormat
+    abstract val description: String?
+    abstract val required: Boolean
+    abstract val position: Int
+
+    interface HasOptions {
+        val options: List<Option>
+
+        data class Option(
+            val price: Price.Adjusted,
+            val label: String?,
+            val image: String?
+        )
+    }
+
+    interface HasAdjustablePrice {
+        val price: Price
+
+        sealed class Price {
+            data class Adjusted(val priceType: PriceType, val value: String) : Price() {
+                enum class PriceType {
+                    FlatFee,
+                    QuantityBased,
+                    PercentageBased
+                }
+            }
+
+            object NotAdjusted : Price()
+        }
+    }
+
+    data class CustomText(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val price: Price,
+        val restrictions: Restrictions,
+        val characterLength: LongRange?
+    ) : Addon(), HasAdjustablePrice {
+        enum class Restrictions {
+            AnyText,
+            OnlyLetters,
+            OnlyNumbers,
+            OnlyLettersNumbers,
+            Email
+        }
+    }
+
+    data class CustomTextArea(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val price: Price,
+        val characterLength: LongRange?
+    ) : Addon(), HasAdjustablePrice
+
+    data class FileUpload(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val price: Price
+    ) : Addon(), HasAdjustablePrice
+
+    data class InputMultiplier(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val price: Price,
+        val quantityRange: LongRange?
+    ) : Addon(), HasAdjustablePrice
+
+    data class CustomPrice(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        val priceRange: LongRange?
+    ) : Addon()
+
+    data class MultipleChoice(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val options: List<Option>,
+        val display: Display
+    ) : Addon(), HasOptions {
+        enum class Display {
+            Select,
+            RadioButton,
+            Images
+        }
+    }
+
+    data class Checkbox(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int,
+        override val options: List<Option>
+    ) : Addon(), HasOptions
+
+    data class Heading(
+        override val name: String,
+        override val titleFormat: TitleFormat,
+        override val description: String?,
+        override val required: Boolean,
+        override val position: Int
+    ) : Addon()
+
+    enum class TitleFormat {
+        Label,
+        Heading,
+        Hide
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/GlobalAddonGroup.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/GlobalAddonGroup.kt
new file mode 100644
index 00000000000..db1e42edae9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/domain/GlobalAddonGroup.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.domain
+
+data class GlobalAddonGroup(
+    val name: String,
+    val restrictedCategoriesIds: CategoriesRestriction,
+    val addons: List<Addon>
+) {
+    sealed class CategoriesRestriction {
+        object AllProductsCategories : CategoriesRestriction()
+        data class SpecifiedProductCategories(val productCategories: List<Long>) : CategoriesRestriction()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt
new file mode 100644
index 00000000000..0c0ae19b9b7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderAttributionInfo.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+data class OrderAttributionInfo(
+    val sourceType: String? = null,
+    val campaign: String? = null,
+    val source: String? = null,
+    val medium: String? = null,
+    val deviceType: String? = null,
+    val sessionPageViews: String? = null
+) {
+    constructor(metadata: List<WCMetaData>) : this(
+        sourceType = metadata.find { it.key == WCMetaData.OrderAttributionInfoKeys.SOURCE_TYPE }?.valueAsString,
+        campaign = metadata.find { it.key == WCMetaData.OrderAttributionInfoKeys.CAMPAIGN }?.valueAsString,
+        source = metadata.find { it.key == WCMetaData.OrderAttributionInfoKeys.SOURCE }?.valueAsString,
+        medium = metadata.find { it.key == WCMetaData.OrderAttributionInfoKeys.MEDIUM }?.valueAsString,
+        deviceType = metadata.find { it.key == WCMetaData.OrderAttributionInfoKeys.DEVICE_TYPE }?.valueAsString,
+        sessionPageViews = metadata.find {
+            it.key == WCMetaData.OrderAttributionInfoKeys.SESSION_PAGE_VIEWS
+        }?.valueAsString
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt
new file mode 100644
index 00000000000..1bb26936af7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/OrderEntity.kt
@@ -0,0 +1,166 @@
+package org.wordpress.android.fluxc.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.TypeConverters
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.order.CouponLine
+import org.wordpress.android.fluxc.model.order.FeeLine
+import org.wordpress.android.fluxc.model.order.LineItem
+import org.wordpress.android.fluxc.model.order.OrderAddress
+import org.wordpress.android.fluxc.model.order.ShippingLine
+import org.wordpress.android.fluxc.model.order.TaxLine
+import org.wordpress.android.fluxc.persistence.converters.WCMetaDataConverter
+import java.math.BigDecimal
+
+@Entity(
+    tableName = "OrderEntity",
+    indices = [Index(
+        value = ["localSiteId", "orderId"]
+    )],
+    primaryKeys = ["localSiteId", "orderId"]
+)
+data class OrderEntity(
+    @ColumnInfo(name = "localSiteId")
+    val localSiteId: LocalId,
+    val orderId: Long,
+    val number: String = "", // The, order number to display to the user
+    val status: String = "",
+    val currency: String = "",
+    val orderKey: String = "",
+    val dateCreated: String = "", // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    val dateModified: String = "", // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    val total: String = "", // Complete total, including taxes
+    val totalTax: String = "", // The total amount of tax (from products, shipping, discounts, etc.)
+    val shippingTotal: String = "", // The total shipping cost (excluding tax)
+    val paymentMethod: String = "", // Payment method code e.g. 'cod' 'stripe'
+    val paymentMethodTitle: String = "", // Displayable payment method e.g. 'Cash on delivery' 'Credit Card (Stripe)'
+    val datePaid: String = "",
+    val pricesIncludeTax: Boolean = false,
+    val customerNote: String = "", // Note left by the customer during order submission
+    val discountTotal: String = "",
+    val discountCodes: String = "",
+    val refundTotal: BigDecimal = BigDecimal.ZERO, // The total refund value for this order (usually a negative number)
+    @ColumnInfo(name = "customerId", defaultValue = "0")
+    val customerId: Long = 0,
+    val billingFirstName: String = "",
+    val billingLastName: String = "",
+    val billingCompany: String = "",
+    val billingAddress1: String = "",
+    val billingAddress2: String = "",
+    val billingCity: String = "",
+    val billingState: String = "",
+    val billingPostcode: String = "",
+    val billingCountry: String = "",
+    val billingEmail: String = "",
+    val billingPhone: String = "",
+    val shippingFirstName: String = "",
+    val shippingLastName: String = "",
+    val shippingCompany: String = "",
+    val shippingAddress1: String = "",
+    val shippingAddress2: String = "",
+    val shippingCity: String = "",
+    val shippingState: String = "",
+    val shippingPostcode: String = "",
+    val shippingCountry: String = "",
+    val shippingPhone: String = "",
+    val lineItems: String = "",
+    val shippingLines: String = "",
+    val feeLines: String = "",
+    val taxLines: String = "",
+    @ColumnInfo(name = "couponLines", defaultValue = "")
+    val couponLines: String = "",
+    // this is a small subset of the metadata, see OrderMetaDataEntity for full metadata
+    @field:TypeConverters(WCMetaDataConverter::class)
+    val metaData: List<WCMetaData> = emptyList(),
+    @ColumnInfo(name = "paymentUrl", defaultValue = "")
+    val paymentUrl: String = "",
+    @ColumnInfo(name = "isEditable", defaultValue = "1")
+    val isEditable: Boolean = true,
+    @ColumnInfo(name = "needsPayment")
+    val needsPayment: Boolean? = null,
+    @ColumnInfo(name = "needsProcessing")
+    val needsProcessing: Boolean? = null,
+    @ColumnInfo(name = "giftCardCode", defaultValue = "")
+    val giftCardCode: String = "",
+    @ColumnInfo(name = "giftCardAmount", defaultValue = "")
+    val giftCardAmount: String = "",
+    @ColumnInfo(name = "shippingTax", defaultValue = "")
+    val shippingTax: String = "",
+) {
+    companion object {
+        private val gson by lazy { Gson() }
+    }
+
+    /**
+     * Returns true if there are shipping details defined for this order,
+     * which are different from the billing details.
+     *
+     * If no separate shipping details are defined, the billing details should be used instead,
+     * as the shippingX properties will be empty.
+     */
+    fun hasSeparateShippingDetails() = shippingCountry.isNotEmpty()
+
+    /**
+     * Returns the billing details wrapped in a [OrderAddress].
+     */
+    fun getBillingAddress() = OrderAddress.Billing(this)
+
+    /**
+     * Returns the shipping details wrapped in a [OrderAddress].
+     */
+    fun getShippingAddress() = OrderAddress.Shipping(this)
+
+    /**
+     * Deserializes the JSON contained in [lineItems] into a list of [LineItem] objects.
+     */
+    fun getLineItemList(): List<LineItem> {
+        val responseType = object : TypeToken<List<LineItem>>() {}.type
+        return gson.fromJson(lineItems, responseType) as? List<LineItem> ?: emptyList()
+    }
+
+    /**
+     * Returns the order subtotal (the sum of the subtotals of each line item in the order).
+     */
+    fun getOrderSubtotal(): Double {
+        return getLineItemList().sumByDouble { it.subtotal?.toDoubleOrNull() ?: 0.0 }
+    }
+
+    /**
+     * Deserializes the JSON contained in [shippingLines] into a list of [ShippingLine] objects.
+     */
+    fun getShippingLineList(): List<ShippingLine> {
+        val responseType = object : TypeToken<List<ShippingLine>>() {}.type
+        return gson.fromJson(shippingLines, responseType) as? List<ShippingLine> ?: emptyList()
+    }
+
+    /**
+     * Deserializes the JSON contained in [feeLines] into a list of [FeeLine] objects.
+     */
+    fun getFeeLineList(): List<FeeLine> {
+        val responseType = object : TypeToken<List<FeeLine>>() {}.type
+        return gson.fromJson(feeLines, responseType) as? List<FeeLine> ?: emptyList()
+    }
+
+    /**
+     * Deserializes the JSON contained in [couponLines] into a list of [CouponLine] objects.
+     */
+    fun getCouponLineList(): List<CouponLine> {
+        val responseType = object : TypeToken<List<CouponLine>>() {}.type
+        return gson.fromJson(couponLines, responseType) as? List<CouponLine> ?: emptyList()
+    }
+
+    /**
+     * Deserializes the JSON contained in [taxLines] into a list of [TaxLine] objects.
+     */
+    fun getTaxLineList(): List<TaxLine> {
+        val responseType = object : TypeToken<List<TaxLine>>() {}.type
+        return gson.fromJson(taxLines, responseType) as? List<TaxLine> ?: emptyList()
+    }
+
+    fun isMultiShippingLinesAvailable() = getShippingLineList().size > 1
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt
new file mode 100644
index 00000000000..ba3112ad78f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/ProductWithMetaData.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+data class ProductWithMetaData(
+    val product: WCProductModel,
+    val metaData: List<WCMetaData> = emptyList()
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
new file mode 100644
index 00000000000..fd371f9b28a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductMetaData.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.AddOnsMetadataKeys
+import org.wordpress.android.fluxc.model.WCProductModel.SubscriptionMetadataKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import javax.inject.Inject
+
+class StripProductMetaData @Inject internal constructor() {
+    operator fun invoke(metaData: List<WCMetaData>): List<WCMetaData> {
+        return metaData.filter { it.isDisplayable || SUPPORTED_KEYS.contains(it.key) }
+    }
+
+    companion object {
+        val SUPPORTED_KEYS: Set<String> = buildSet {
+            add(AddOnsMetadataKeys.ADDONS_METADATA_KEY)
+            addAll(SubscriptionMetadataKeys.ALL_KEYS)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt
new file mode 100644
index 00000000000..78204d49312
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/StripProductVariationMetaData.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.utils.isElementNullOrEmpty
+import javax.inject.Inject
+
+class StripProductVariationMetaData @Inject internal constructor(private val gson: Gson) {
+    operator fun invoke(metadata: String?): String? {
+        if (metadata.isNullOrEmpty()) return null
+
+        return gson.fromJson(metadata, JsonArray::class.java)
+            .mapNotNull { it as? JsonObject }
+            .asSequence()
+            .filter { jsonObject ->
+                val isNullOrEmpty = jsonObject[WCMetaData.VALUE].isElementNullOrEmpty()
+                jsonObject[WCMetaData.KEY]?.asString.orEmpty() in SUPPORTED_KEYS && isNullOrEmpty.not()
+            }.toList()
+            .takeIf { it.isNotEmpty() }
+            ?.let { gson.toJson(it) }
+    }
+
+    companion object {
+        val SUPPORTED_KEYS: Set<String> = buildSet {
+            addAll(WCProductModel.SubscriptionMetadataKeys.ALL_KEYS)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundleStats.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundleStats.kt
new file mode 100644
index 00000000000..4a116cf8e64
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundleStats.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model
+
+data class WCBundleStats(
+    val itemsSold: Int,
+    val netRevenue: Double
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundledProduct.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundledProduct.kt
new file mode 100644
index 00000000000..75eeb2dac90
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCBundledProduct.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.utils.JsonElementToFloatSerializerDeserializer
+
+@Suppress("LongParameterList")
+class WCBundledProduct(
+    @SerializedName("bundled_item_id") val id: Long,
+    @SerializedName("product_id") val bundledProductId: Long,
+    @SerializedName("menu_order") val menuOrder: Int,
+    @SerializedName("title") val title: String,
+    @SerializedName("stock_status") val stockStatus: String,
+    @JsonAdapter(JsonElementToFloatSerializerDeserializer::class)
+    @SerializedName("quantity_min") val quantityMin: Float?,
+    @JsonAdapter(JsonElementToFloatSerializerDeserializer::class)
+    @SerializedName("quantity_max") val quantityMax: Float?,
+    @JsonAdapter(JsonElementToFloatSerializerDeserializer::class)
+    @SerializedName("quantity_default") val quantityDefault: Float?,
+    @SerializedName("optional") val isOptional: Boolean,
+    @SerializedName("default_variation_attributes")
+    val attributesDefault: List<WCProductVariationModel.ProductVariantOption>?,
+    @SerializedName("allowed_variations") val variationIds: List<Long>?
+)
+
+fun WCBundledProduct.isConfigurable(): Boolean {
+    return (quantityMin != quantityMax)
+            || (quantityMin == null)
+            || isOptional
+            || (variationIds?.size == 1 && attributesDefault.isNullOrEmpty())
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCGiftCardStats.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCGiftCardStats.kt
new file mode 100644
index 00000000000..5c3ccf4ac95
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCGiftCardStats.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model
+
+data class WCGiftCardStats(
+    val usedValue: Long,
+    val netValue: Double,
+    val intervals: List<WCGiftCardStatsInterval>
+)
+
+data class WCGiftCardStatsInterval(
+    val usedValue: Long,
+    val netValue: Double,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCNewVisitorStatsModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCNewVisitorStatsModel.kt
new file mode 100644
index 00000000000..73cc8907e64
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCNewVisitorStatsModel.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCNewVisitorStatsModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var granularity = "" // The granularity ("days", "weeks", "months", "years")
+    @Column var date = "" // The formatted end date of the data
+    @Column var startDate = "" // The start date of the data
+    @Column var endDate = "" // The end date of the data
+    @Column var quantity = "" // The quantity based on unit. i.e. 30 days, 17 weeks, 12 months, 2 years
+    @Column var isCustomField = false // to check if the data is for custom stats or default stats
+        @JvmName("setIsCustomField")
+        set
+    @Column var fields = "" // JSON - A map of numerical index to stat name, used to lookup the stat in the data object
+    @Column var data = "" // JSON - A list of lists; each nested list contains the data for a time period
+
+    // The fields JSON deserialized into a list of strings
+    val fieldsList by lazy {
+        val responseType = object : TypeToken<List<String>>() {}.type
+        gson.fromJson(fields, responseType) as? List<String> ?: emptyList()
+    }
+
+    // The data JSON deserialized into a list of lists of arbitrary type
+    val dataList by lazy {
+        val responseType = object : TypeToken<List<List<Any>>>() {}.type
+        gson.fromJson(data, responseType) as? List<List<Any>> ?: emptyList()
+    }
+
+    enum class VisitorStatsField {
+        PERIOD,
+        VISITORS;
+
+        override fun toString() = name.toLowerCase()
+    }
+
+    companion object {
+        private val gson by lazy { Gson() }
+    }
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    fun getIndexForField(field: VisitorStatsField) = fieldsList.indexOf(field.toString())
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderListDescriptor.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderListDescriptor.kt
new file mode 100644
index 00000000000..0fdf4a6fa0a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderListDescriptor.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.list.ListConfig
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListDescriptorUniqueIdentifier
+
+data class WCOrderListDescriptor(
+    val site: SiteModel,
+    val statusFilter: String? = null,
+    val searchQuery: String? = null,
+    val excludeFutureOrders: Boolean = false,
+    val beforeFilter: String? = null,
+    val afterFilter: String? = null,
+    val productId: Long? = null,
+    val customerId: Long? = null,
+    val excludedIds: List<Long>? = null
+) : ListDescriptor {
+    override val config: ListConfig = ListConfig.default
+
+    override val uniqueIdentifier: ListDescriptorUniqueIdentifier by lazy {
+        ListDescriptorUniqueIdentifier(
+            ("woo-site-order-list-${site.id}" +
+                    "-sf${statusFilter.orEmpty()}" +
+                    "-sq${searchQuery.orEmpty()}" +
+                    "-bf${beforeFilter.orEmpty()}" +
+                    "-af${afterFilter.orEmpty()}" +
+                    "-p${productId ?: ""}" +
+                    "-c${customerId ?: ""}" +
+                    "-efo$excludeFutureOrders"
+                    ).hashCode()
+        )
+    }
+
+    override val typeIdentifier: ListDescriptorTypeIdentifier by lazy {
+        calculateTypeIdentifier(site.id)
+    }
+
+    companion object {
+        @JvmStatic
+        fun calculateTypeIdentifier(localSiteId: Int) =
+                ListDescriptorTypeIdentifier("woo-site-order-list$localSiteId".hashCode())
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || javaClass != other.javaClass) return false
+        val that = other as WCOrderListDescriptor
+        return uniqueIdentifier == that.uniqueIdentifier
+    }
+
+    override fun hashCode() = uniqueIdentifier.value
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentProviderModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentProviderModel.kt
new file mode 100644
index 00000000000..d538ebf3ba8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentProviderModel.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCOrderShipmentProviderModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var country = ""
+    @Column var carrierName = ""
+    @Column var carrierLink = ""
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = this.id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentTrackingModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentTrackingModel.kt
new file mode 100644
index 00000000000..c898534fb2a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderShipmentTrackingModel.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCOrderShipmentTrackingModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column(name = "LOCAL_ORDER_ID") var orderId = 0L // The local db unique identifier for the parent order object
+    @Column var remoteTrackingId = ""
+    @Column var trackingNumber = ""
+    @Column var trackingProvider = ""
+    @Column var trackingLink = ""
+    @Column var dateShipped = ""
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = this.id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderStatusModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderStatusModel.kt
new file mode 100644
index 00000000000..4dd2646b2c7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderStatusModel.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCOrderStatusModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    constructor(statusKey: String) : this() {
+        this.statusKey = statusKey
+    }
+
+    @Column var localSiteId = 0
+    @Column var statusKey = ""
+    @Column var label = ""
+    @Column var statusCount = 0
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderSummaryModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderSummaryModel.kt
new file mode 100644
index 00000000000..891f925c3e2
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderSummaryModel.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.list.datasource.ListItemDataSourceInterface
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+/**
+ * Class represents the bare minimum fields needed to determine if an order is outdated and
+ * needs to be fetched. It's also important to store this information in the database so it
+ * can be used by the order list's implementation of [ListItemDataSourceInterface] to create a list
+ * of existing orders in the [OrderEntity] table, as well as a list of orders being fetched by the
+ * API because they do not yet exist. Normally we wouldn't need this extra step to work with the
+ * [org.wordpress.android.fluxc.store.ListStore], but since we need the `dateCreated` field to group the
+ * orders into time-based groups, this extra table is necessary.
+ */
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (REMOTE_ORDER_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+data class WCOrderSummaryModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column(name = "REMOTE_ORDER_ID") var orderId = 0L // The unique identifier for this order on the server
+    @Column var dateCreated = "" // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    var dateModified = "" // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductBundleItemReport.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductBundleItemReport.kt
new file mode 100644
index 00000000000..020d4a81f83
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductBundleItemReport.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model
+
+data class WCProductBundleItemReport(
+    val name: String,
+    val image: String?,
+    val itemsSold: Int,
+    val netRevenue: Double
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductCategoryModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductCategoryModel.kt
new file mode 100644
index 00000000000..7ec075c0866
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductCategoryModel.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (REMOTE_CATEGORY_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+data class WCProductCategoryModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteCategoryId = 0L // The unique identifier for this category on the server
+    @Column var name = ""
+    @Column var slug = ""
+    @Column var parent = 0L
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductComponent.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductComponent.kt
new file mode 100644
index 00000000000..a010083103d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductComponent.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.annotations.SerializedName
+
+data class WCProductComponent(
+    @SerializedName("id") val id: Long,
+    @SerializedName("title") val title: String,
+    @SerializedName("description") val description: String,
+    @SerializedName("query_type") val queryType: String,
+    @SerializedName("query_ids") val queryIds: List<Long>,
+    @SerializedName("default_option_id") val defaultOptionId: String,
+    @SerializedName("thumbnail_src") val thumbnailUrl: String?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductFileModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductFileModel.kt
new file mode 100644
index 00000000000..2d444867dcc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductFileModel.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.JsonObject
+
+/**
+ * This class represents a downloadable file:
+ *      http://woocommerce.github.io/woocommerce-rest-api-docs/?shell#product-downloads-properties
+ *
+ * The id is nullable as during the creation of downloadable file, we send the payload without any id, and we get the
+ * created ID in the response.
+ */
+data class WCProductFileModel(val id: String? = null, val name: String = "", val url: String = "") {
+    fun toJson() = JsonObject().apply {
+        if (id != null) addProperty("id", id)
+        addProperty("name", name)
+        addProperty("file", url)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductImageModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductImageModel.kt
new file mode 100644
index 00000000000..30fa1a0dc21
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductImageModel.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.utils.DateUtils
+
+class WCProductImageModel(val id: Long) {
+    var dateCreated: String = ""
+    var src: String = ""
+    var alt: String = ""
+    var name: String = ""
+
+    companion object {
+        fun fromMediaModel(media: MediaModel): WCProductImageModel {
+            with(WCProductImageModel(media.mediaId)) {
+                dateCreated = media.uploadDate ?: DateUtils.getCurrentDateString()
+                src = media.url
+                alt = media.alt
+                name = media.fileName ?: ""
+                return this
+            }
+        }
+    }
+
+    fun toJson(): JsonObject {
+        return JsonObject().also { json ->
+            json.addProperty("id", id)
+            // If id == 0 then the variation image has been deleted. Don't include the other
+            // fields or this delete request will fail.
+            if (id > 0) {
+                json.addProperty("date_created", dateCreated)
+                json.addProperty("src", src)
+                json.addProperty("alt", alt)
+                json.addProperty("name", name)
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductModel.kt
new file mode 100644
index 00000000000..f5ff1fb990d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductModel.kt
@@ -0,0 +1,591 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.WCProductVariationModel.ProductVariantOption
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductType
+import org.wordpress.android.fluxc.network.utils.getBoolean
+import org.wordpress.android.fluxc.network.utils.getLong
+import org.wordpress.android.fluxc.network.utils.getString
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+
+/**
+ * Single Woo product - see http://woocommerce.github.io/woocommerce-rest-api-docs/#product-properties
+ * Note that products have more properties than we support below
+ */
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCProductModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteProductId = 0L // The unique identifier for this product on the server
+    val remoteId
+        get() = RemoteId(remoteProductId)
+    @Column var name = ""
+    @Column var slug = ""
+    @Column var permalink = ""
+
+    @Column var dateCreated = ""
+    @Column var dateModified = ""
+
+    @Column var type = "" // simple, grouped, external, variable
+    @Column var status = ""
+    @Column var featured = false
+    @Column var catalogVisibility = "" // visible, catalog, search, hidden
+    @Column var description = ""
+    @Column var shortDescription = ""
+    @Column var sku = ""
+    @Column var globalUniqueId = ""
+
+    @Column var price = ""
+    @Column var regularPrice = ""
+    @Column var salePrice = ""
+    @Column var onSale = false
+    @Column var totalSales = 0L
+    @Column var purchasable = false
+
+    @Column var dateOnSaleFrom = ""
+    @Column var dateOnSaleTo = ""
+    @Column var dateOnSaleFromGmt = ""
+    @Column var dateOnSaleToGmt = ""
+
+    @Column var virtual = false
+    @Column var downloadable = false
+    @Column var downloadLimit = -1L
+    @Column var downloadExpiry = -1
+    @Column var soldIndividually = false
+
+    @Column var externalUrl = ""
+    @Column var buttonText = ""
+
+    @Column var taxStatus = "" // taxable, shipping, none
+    @Column var taxClass = ""
+
+    @Column var manageStock = false
+    @Column var stockQuantity = 0.0
+    @Column var stockStatus = "" // instock, outofstock, onbackorder
+
+    @Column var backorders = "" // no, notify, yes
+    @Column var backordersAllowed = false
+    @Column var backordered = false
+
+    @Column var shippingRequired = false
+    @Column var shippingTaxable = false
+    @Column var shippingClass = ""
+    @Column var shippingClassId = 0
+
+    @Column var reviewsAllowed = true
+    @Column var averageRating = ""
+    @Column var ratingCount = 0
+
+    @Column var parentId = 0L
+    @Column var purchaseNote = ""
+    @Column var menuOrder = 0
+
+    @Column var categories = "" // array of categories
+    @Column var tags = "" // array of tags
+    @Column var images = "" // array of images
+    @Column var attributes = "" // array of attributes
+    @Column var variations = "" // array of variation IDs
+    @Column var downloads = "" // array of downloadable files
+    @Column var relatedIds = "" // array of related product IDs
+    @Column var crossSellIds = "" // array of cross-sell product IDs
+    @Column var upsellIds = "" // array of up-sell product IDs
+    @Column var groupedProductIds = "" // array of grouped product IDs
+
+    @Column var weight = ""
+    @Column var length = ""
+    @Column var width = ""
+    @Column var height = ""
+
+    @Column var bundledItems = ""
+    @Column var compositeComponents = ""
+    @Column var specialStockStatus = ""
+    @Column var bundleMinSize: Float? = null
+    @Column var bundleMaxSize: Float? = null
+    @Column var minAllowedQuantity = -1
+    @Column var maxAllowedQuantity = -1
+    @Column var groupOfQuantity = -1
+    @Column var combineVariationQuantities = false
+    @Column var password: String? = null
+
+    @Column var isSampleProduct = false
+        @JvmName("setIsSampleProduct")
+        set
+
+    val attributeList: Array<ProductAttribute>
+        get() = Gson().fromJson(attributes, Array<ProductAttribute>::class.java) ?: emptyArray()
+
+    val isConfigurable: Boolean
+        get() = when (type) {
+            CoreProductType.BUNDLE.value -> {
+                runCatching { Gson().fromJson(bundledItems, Array<WCBundledProduct>::class.java) }
+                    .takeIf { it.isSuccess }?.getOrNull()
+                    ?.let { products ->
+                        products.any { it.isConfigurable() }
+                    } ?: false
+            }
+            else -> false
+        }
+
+    class ProductTriplet(val id: Long, val name: String, val slug: String) {
+        fun toJson(): JsonObject {
+            return JsonObject().also { json ->
+                json.addProperty("id", id)
+                json.addProperty("name", name)
+                json.addProperty("slug", slug)
+            }
+        }
+    }
+
+    class ProductAttribute(
+        val id: Long,
+        val name: String,
+        val variation: Boolean,
+        val visible: Boolean,
+        options: List<String>
+    ) {
+        val options: MutableList<String> = options.toMutableList()
+
+        fun getCommaSeparatedOptions(): String {
+            if (options.isEmpty()) return ""
+            var commaSeparatedOptions = ""
+            options.forEach { option ->
+                if (commaSeparatedOptions.isEmpty()) {
+                    commaSeparatedOptions = option
+                } else {
+                    commaSeparatedOptions += ", $option"
+                }
+            }
+            return commaSeparatedOptions
+        }
+
+        fun isSameAttribute(other: ProductAttribute): Boolean {
+            return id == other.id &&
+                    name == other.name &&
+                    variation == other.variation &&
+                    visible == other.visible &&
+                    options == other.options
+        }
+
+        fun asGlobalAttribute(siteID: Int) =
+                WCGlobalAttributeSqlUtils.fetchSingleStoredAttribute(id.toInt(), siteID)
+
+        fun generateProductVariantOption(selectedOption: String) =
+                takeIf { options.contains(selectedOption) }?.let {
+                    ProductVariantOption(
+                            id = id,
+                            name = name,
+                            option = selectedOption
+                    )
+                }
+
+        fun toJson(): JsonObject {
+            val jsonOptions = JsonArray().also {
+                for (option in options) {
+                    it.add(option)
+                }
+            }
+            return JsonObject().also { json ->
+                json.addProperty("id", id)
+                json.addProperty("name", name)
+                json.addProperty("visible", visible)
+                json.addProperty("variation", variation)
+                json.add("options", jsonOptions)
+            }
+        }
+    }
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    fun addAttribute(newAttribute: ProductAttribute) {
+        mutableListOf<ProductAttribute>()
+                .apply {
+                    attributeList
+                            .takeIf {
+                                it.find { currentAttribute ->
+                                    currentAttribute.id == newAttribute.id
+                                } == null
+                            }?.let { currentAttributes ->
+                                add(newAttribute)
+                                currentAttributes
+                                        .takeIf { it.isNotEmpty() }
+                                        ?.let { addAll(it) }
+                            }
+                }.also { attributes = Gson().toJson(it) }
+    }
+
+    fun removeAttribute(attributeID: Int) =
+            mutableListOf<ProductAttribute>().apply {
+                attributeList
+                        .takeIf { it.isNotEmpty() }
+                        ?.filter { attributeID != it.id.toInt() }
+                        ?.let { addAll(it) }
+            }.also { attributes = Gson().toJson(it) }
+
+    fun getAttribute(attributeID: Int) =
+        attributeList.find { it.id == attributeID.toLong() }
+
+    fun updateAttribute(updatedAttribute: ProductAttribute) = apply {
+        getAttribute(updatedAttribute.id.toInt())
+                ?.let { removeAttribute(it.id.toInt()) }
+        addAttribute(updatedAttribute)
+    }
+
+    /**
+     * Returns true if this product has the same attributes as the passed product
+     */
+    @Suppress("ReturnCount")
+    fun hasSameAttributes(otherProduct: WCProductModel): Boolean {
+        // do a quick string comparison first so we can avoid parsing the attributes when possible
+        if (this.attributes == otherProduct.attributes) {
+            return true
+        }
+
+        val otherAttributes = otherProduct.attributeList
+        val thisAttributes = this.attributeList
+        if (thisAttributes.size != otherAttributes.size) {
+            return false
+        }
+
+        for (i in thisAttributes.indices) {
+            if (!thisAttributes[i].isSameAttribute(otherAttributes[i])) {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    /**
+     * Parses the images json array into a list of product images
+     */
+    fun getImageListOrEmpty(): List<WCProductImageModel> {
+        return if (images.isNotEmpty()) {
+            try {
+                val jsonElement = Gson().fromJson(images, JsonElement::class.java)
+                getImageList(jsonElement.asJsonArray)
+            } catch (e: JsonParseException) {
+                AppLog.e(T.API, e)
+                emptyList()
+            } catch (e: IllegalStateException) {
+                AppLog.e(T.API, e)
+                emptyList()
+            }
+        } else {
+            emptyList()
+        }
+    }
+
+    private fun getImageList(imagesAsJsonArray: JsonArray): List<WCProductImageModel> {
+        val imageList = arrayListOf<WCProductImageModel>()
+        imagesAsJsonArray.forEach { jsonElement ->
+            with(jsonElement.asJsonObject) {
+                WCProductImageModel(this.getLong("id")).also {
+                    it.name = this.getString("name") ?: ""
+                    it.src = this.getString("src") ?: ""
+                    it.alt = this.getString("alt") ?: ""
+                    imageList.add(it)
+                }
+            }
+        }
+        return imageList
+    }
+
+    /**
+     * Extract the first image url from the json array of images
+     */
+    fun getFirstImageUrl(): String? {
+        try {
+            if (images.isNotEmpty()) {
+                Gson().fromJson(images, JsonElement::class.java).asJsonArray.firstOrNull { jsonElement ->
+                    return (jsonElement.asJsonObject).getString("src")
+                }
+            }
+        } catch (e: JsonParseException) {
+            AppLog.e(T.API, e)
+        }
+        return null
+    }
+
+    /**
+     * Returns the list of products attributes. The function returns an empty list
+     * when the attributes json deserialization fails.
+     */
+    fun getAttributeList(): List<ProductAttribute> {
+        fun getAttributeOptions(jsonArray: JsonArray?): List<String> {
+            val options = ArrayList<String>()
+            try {
+                jsonArray?.forEach {
+                    options.add(it.asString)
+                }
+            } catch (e: ClassCastException) {
+                AppLog.e(T.API, e)
+            } catch (e: IllegalStateException) {
+                AppLog.e(T.API, e)
+            }
+            return options
+        }
+
+        return kotlin.runCatching {
+            Gson().fromJson(attributes, JsonElement::class.java)
+                .asJsonArray.asSequence()
+                .map { it.asJsonObject }
+                .map { json ->
+                    ProductAttribute(
+                        id = json.getLong("id"),
+                        name = json.getString("name") ?: "",
+                        variation = json.getBoolean("variation", true),
+                        visible = json.getBoolean("visible", true),
+                        options = getAttributeOptions(json.getAsJsonArray("options"))
+                    )
+                }.toList()
+        }.fold(
+            onSuccess = { it },
+            onFailure = { e ->
+                AppLog.e(T.API, e)
+                emptyList()
+            }
+        )
+    }
+
+    fun getDownloadableFiles(): List<WCProductFileModel> {
+        if (downloads.isEmpty()) return emptyList()
+        val fileList = ArrayList<WCProductFileModel>()
+        try {
+            Gson().fromJson(downloads, JsonElement::class.java).asJsonArray.forEach { jsonElement ->
+                with(jsonElement.asJsonObject) {
+                    fileList.add(
+                            WCProductFileModel(
+                                    id = this.getString("id"),
+                                    name = this.getString("name") ?: "",
+                                    url = this.getString("file") ?: ""
+                            )
+                    )
+                }
+            }
+        } catch (e: JsonParseException) {
+            AppLog.e(T.API, e)
+        }
+        return fileList
+    }
+
+    /**
+     * Returns a list of product IDs from the passed string, assumed to be a JSON array of IDs
+     *
+     * Deserializes the [jsonString] passed to the method. This can include:
+     * variations, groupedProductIds, upsellIds, crossSellIds
+     *
+     * There are some instances where the [jsonString] param can be a JsonArray or a JsonElement.
+     * https://github.com/woocommerce/woocommerce-android/issues/2374
+     *
+     * And there are some instances where the [jsonString] can be a JsonArray of JsonObjects
+     * https://github.com/woocommerce/woocommerce-android/issues/6737
+     *
+     * To address the above issues, we check if the [jsonString] param is a JsonArray or
+     * a JsonElement, then we check each item if it's a JsonPrimitive or JsonObject and return
+     * an appropriate response, if that's the case.
+     */
+    private fun parseJson(jsonString: String): List<Long> {
+        return if (jsonString.isNotEmpty()) {
+            try {
+                val jsonElement = Gson().fromJson(jsonString, JsonElement::class.java)
+                parseJsonIfNotEmpty(jsonElement)
+            } catch (e: JsonParseException) {
+                AppLog.e(T.API, e)
+                emptyList()
+            }
+        } else {
+            emptyList()
+        }
+    }
+
+    private fun parseJsonIfNotEmpty(jsonElement: JsonElement): List<Long> {
+        fun JsonElement.parseId() = when {
+            isJsonObject -> asJsonObject["id"]?.asLong
+                ?: throw JsonParseException("Can't extract element's ID")
+            isJsonPrimitive -> asLong
+            else -> throw JsonParseException("Can't extract element's ID")
+        }
+
+        val ids = arrayListOf<Long>()
+        return when {
+            jsonElement.isJsonNull -> emptyList()
+            jsonElement.isJsonArray -> {
+                jsonElement.asJsonArray.forEach { element -> element.parseId().let { ids.add(it) } }
+                ids
+            }
+            jsonElement.isJsonObject -> {
+                jsonElement.asJsonObject.entrySet().forEach { ids.add(it.value.parseId()) }
+                ids
+            }
+            else -> emptyList()
+        }
+    }
+
+    fun getNumVariations() = getVariationIdList().size
+
+    fun getVariationIdList() = parseJson(variations)
+
+    fun getGroupedProductIdList() = parseJson(groupedProductIds)
+
+    fun getUpsellProductIdList() = parseJson(upsellIds)
+
+    fun getCrossSellProductIdList() = parseJson(crossSellIds)
+
+    fun getCategoryList() = getTripletsOrEmpty(categories)
+
+    fun getCommaSeparatedCategoryNames() = getCommaSeparatedTripletNames(getCategoryList())
+
+    fun getTagList() = getTripletsOrEmpty(tags)
+
+    fun getCommaSeparatedTagNames() = getCommaSeparatedTripletNames(getTagList())
+
+    private fun getCommaSeparatedTripletNames(triplets: List<ProductTriplet>): String {
+        if (triplets.isEmpty()) return ""
+        var commaSeparatedNames = ""
+        triplets.forEach {
+            if (commaSeparatedNames.isEmpty()) {
+                commaSeparatedNames = it.name
+            } else {
+                commaSeparatedNames += ", ${it.name}"
+            }
+        }
+        return commaSeparatedNames
+    }
+
+    private fun getTripletsOrEmpty(jsonStr: String): List<ProductTriplet> {
+        return if (jsonStr.isNotEmpty()) {
+            try {
+                val jsonElement = Gson().fromJson(jsonStr, JsonElement::class.java)
+                getTriplets(jsonElement)
+            } catch (e: JsonParseException) {
+                AppLog.e(T.API, e)
+                emptyList()
+            }
+        } else {
+            emptyList()
+        }
+    }
+
+    private fun getTriplets(tripletsAsJsonElement: JsonElement): List<ProductTriplet> {
+        val triplets = arrayListOf<ProductTriplet>()
+        if (tripletsAsJsonElement.isJsonArray) {
+            tripletsAsJsonElement.asJsonArray.forEach { jsonArray ->
+                with(jsonArray.asJsonObject) {
+                    triplets.add(
+                        ProductTriplet(
+                            id = this.getLong("id"),
+                            name = this.getString("name") ?: "",
+                            slug = this.getString("slug") ?: ""
+                        )
+                    )
+                }
+            }
+        }
+        return triplets
+    }
+
+    /**
+     * Compares this product's images with the passed product's images, returns true only if both
+     * lists contain the same images in the same order
+     */
+    @Suppress("ReturnCount")
+    fun hasSameImages(updatedProduct: WCProductModel): Boolean {
+        val updatedImages = updatedProduct.getImageListOrEmpty()
+        val thisImages = getImageListOrEmpty()
+        if (thisImages.size != updatedImages.size) {
+            return false
+        }
+        for (i in thisImages.indices) {
+            if (thisImages[i].id != updatedImages[i].id) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Compares this product's categories with the passed product's categories, returns true only if both
+     * lists contain the same categories in the same order
+     */
+    @Suppress("ReturnCount")
+    fun hasSameCategories(updatedProduct: WCProductModel): Boolean {
+        val updatedCategories = updatedProduct.getCategoryList()
+        val storedCategories = getCategoryList()
+        if (storedCategories.size != updatedCategories.size) {
+            return false
+        }
+        for (i in storedCategories.indices) {
+            if (storedCategories[i].id != updatedCategories[i].id) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Compares this product's tags with the passed product's tags, returns true only if both
+     * lists contain the same tags in the same order
+     */
+    @Suppress("ReturnCount")
+    fun hasSameTags(updatedProduct: WCProductModel): Boolean {
+        val updatedTags = updatedProduct.getTagList()
+        val storedTags = getTagList()
+        if (storedTags.size != updatedTags.size) {
+            return false
+        }
+        for (i in storedTags.indices) {
+            if (storedTags[i].id != updatedTags[i].id) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Compares this product's downloadable files with the passed product's files, returns true only if both
+     * lists contain the same set of files in the same order
+     */
+    fun hasSameDownloadableFiles(updatedProduct: WCProductModel): Boolean {
+        val updatedFiles = updatedProduct.getDownloadableFiles()
+        val storedFiles = getDownloadableFiles()
+        return storedFiles == updatedFiles
+    }
+
+    object SubscriptionMetadataKeys {
+        const val SUBSCRIPTION_PRICE = "_subscription_price"
+        const val SUBSCRIPTION_PERIOD = "_subscription_period"
+        const val SUBSCRIPTION_PERIOD_INTERVAL = "_subscription_period_interval"
+        const val SUBSCRIPTION_LENGTH = "_subscription_length"
+        const val SUBSCRIPTION_SIGN_UP_FEE = "_subscription_sign_up_fee"
+        const val SUBSCRIPTION_TRIAL_PERIOD = "_subscription_trial_period"
+        const val SUBSCRIPTION_TRIAL_LENGTH = "_subscription_trial_length"
+        const val SUBSCRIPTION_ONE_TIME_SHIPPING = "_subscription_one_time_shipping"
+        const val SUBSCRIPTION_PAYMENT_SYNC_DATE = "_subscription_payment_sync_date"
+        val ALL_KEYS = setOf(
+            SUBSCRIPTION_PRICE,
+            SUBSCRIPTION_TRIAL_LENGTH,
+            SUBSCRIPTION_SIGN_UP_FEE,
+            SUBSCRIPTION_PERIOD,
+            SUBSCRIPTION_PERIOD_INTERVAL,
+            SUBSCRIPTION_LENGTH,
+            SUBSCRIPTION_TRIAL_PERIOD,
+            SUBSCRIPTION_ONE_TIME_SHIPPING,
+            SUBSCRIPTION_PAYMENT_SYNC_DATE
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductReviewModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductReviewModel.kt
new file mode 100644
index 00000000000..779f33a4386
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductReviewModel.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (REMOTE_PRODUCT_REVIEW_ID, REMOTE_PRODUCT_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+data class WCProductReviewModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    companion object {
+        private val json by lazy { Gson() }
+    }
+
+    @Column var localSiteId = 0
+
+    /**
+     * Remote unique identifier for this product review
+     */
+    @Column var remoteProductReviewId = 0L // The unique ID for this product review on the server
+
+    /**
+     * Unique identifier for the product this review belongs to
+     */
+    @Column var remoteProductId = 0L
+
+    /**
+     * The date the review was created, in UTC, ISO8601 formatted
+     */
+    @Column var dateCreated = ""
+
+    /**
+     * Status of the review. Options: approved, hold, spam, unspam, trash, and untrash.
+     */
+    @Column var status = ""
+
+    /**
+     * Name of the reviewer
+     */
+    @SerializedName("reviewer")
+    @Column var reviewerName = ""
+
+    /**
+     * Reviewer email address
+     */
+    @Column var reviewerEmail = ""
+
+    /**
+     * The content of the review
+     */
+    @Column var review = ""
+
+    /**
+     * Review rating (0 to 5)
+     */
+    @Column var rating = 0
+
+    /**
+     * True if the reviewer purchased the product being reviewed, else false
+     */
+    @Column var verified = false
+
+    @SerializedName("reviewer_avatar_urls")
+    @Column var reviewerAvatarsJson = ""
+
+    /**
+     * A mapping of reviewer avatar URL's by their size:
+     * <ul>
+     *     <li>SMALL = 24</li>
+     *     <li>MEDIUM = 48</li>
+     *     <li>LARGE = 95</li>
+     * </ul>
+     */
+    val reviewerAvatarUrlBySize: Map<AvatarSize, String> by lazy {
+        val result = mutableMapOf<AvatarSize, String>()
+        if (reviewerAvatarsJson.isNotEmpty()) {
+            json.fromJson(reviewerAvatarsJson, JsonElement::class.java).asJsonObject.entrySet().forEach {
+                result[AvatarSize.getAvatarSizeForValue(it.key.toInt())] = it.value.asString
+            }
+        }
+        result
+    }
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = this.id
+
+    enum class AvatarSize(val size: Int) {
+        SMALL(24), MEDIUM(48), LARGE(96);
+
+        companion object {
+            fun getAvatarSizeForValue(size: Int): AvatarSize {
+                return when (size) {
+                    SMALL.size -> SMALL
+                    MEDIUM.size -> MEDIUM
+                    LARGE.size -> LARGE
+                    else -> MEDIUM
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductSettingsModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductSettingsModel.kt
new file mode 100644
index 00000000000..6f03b5b559d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductSettingsModel.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCProductSettingsModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    // note that there are many more product settings than this, but for now these are all we need
+    @Column var localSiteId = 0
+    @Column var weightUnit = ""
+    @Column var dimensionUnit = ""
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductShippingClassModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductShippingClassModel.kt
new file mode 100644
index 00000000000..858e845f698
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductShippingClassModel.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (REMOTE_SHIPPING_CLASS_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+class WCProductShippingClassModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteShippingClassId = 0L // The unique identifier for this shipping class on the server
+    @Column var name = ""
+    @Column var slug = ""
+    @Column var description = ""
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductTagModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductTagModel.kt
new file mode 100644
index 00000000000..1b2c1480078
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductTagModel.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (REMOTE_TAG_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+class WCProductTagModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteTagId = 0L // The unique identifier for this tag on the server
+    @Column var name = ""
+    @Column var slug = ""
+    @Column var description = ""
+    @Column var count = 0
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductVariationModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductVariationModel.kt
new file mode 100644
index 00000000000..916ca797a39
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCProductVariationModel.kt
@@ -0,0 +1,158 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.reflect.TypeToken
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.WCProductVariationModel.ProductVariantOption
+import org.wordpress.android.fluxc.network.utils.getLong
+import org.wordpress.android.fluxc.network.utils.getString
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.lang.IllegalStateException
+
+typealias VariationAttributes = List<ProductVariantOption>
+
+/**
+ * Product variations - see http://woocommerce.github.io/woocommerce-rest-api-docs/#product-variations
+ * As with WCProductModel, the backend returns more properties than are supported below
+ */
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCProductVariationModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteProductId = 0L
+    @Column var remoteVariationId = 0L
+
+    @Column var dateCreated = ""
+    @Column var dateModified = ""
+
+    @Column var description = ""
+    @Column var permalink = ""
+    @Column var sku = ""
+    @Column var globalUniqueId = ""
+    @Column var status = ""
+
+    @Column var price = ""
+    @Column var regularPrice = ""
+    @Column var salePrice = ""
+
+    @Column var dateOnSaleFrom = ""
+    @Column var dateOnSaleTo = ""
+    @Column var dateOnSaleFromGmt = ""
+    @Column var dateOnSaleToGmt = ""
+
+    @Column var taxStatus = "" // taxable, shipping, none
+    @Column var taxClass = ""
+
+    @Column var onSale = false
+    @Column var purchasable = false
+    @Column var virtual = false
+    @Column var downloadable = false
+
+    @Column var downloadLimit = 0L
+    @Column var downloadExpiry = 0
+
+    @Column var downloads = "" // array of downloadable files
+    @Column var backorders = "" // no, notify, yes
+
+    @Column var backordersAllowed = false
+    @Column var backordered = false
+
+    @Column var shippingClass = ""
+    @Column var shippingClassId = 0
+
+    @Column var manageStock = false
+    @Column var stockQuantity = 0.0
+    @Column var stockStatus = ""
+
+    @Column var image = ""
+
+    @Column var weight = ""
+    @Column var length = ""
+    @Column var width = ""
+    @Column var height = ""
+
+    @Column var minAllowedQuantity = -1
+    @Column var maxAllowedQuantity = -1
+    @Column var groupOfQuantity = -1
+    @Column var overrideProductQuantities = false
+
+    @Column var menuOrder = 0
+
+    @Column var attributes = ""
+
+    @Column var metadata: String? = null
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    data class ProductVariantOption(
+        val id: Long? = null,
+        val name: String? = null,
+        val option: String? = null
+    )
+
+    private val gson by lazy { Gson() }
+
+    val attributeList
+        get() = gson.fromJson(attributes, Array<ProductVariantOption>::class.java)
+
+    fun addVariant(newAttribute: ProductVariantOption) =
+            mutableListOf<ProductVariantOption>()
+                    .apply {
+                        attributeList
+                                ?.takeIf { it.isNotEmpty() }
+                                ?.let { addAll(it) }
+                        add(newAttribute)
+                    }.also { attributes = gson.toJson(it) }
+
+    fun removeVariant(removableAttribute: ProductVariantOption) =
+            mutableListOf<ProductVariantOption>().apply {
+                attributeList
+                        ?.takeIf { it.isNotEmpty() }
+                        ?.filter { removableAttribute.id != it.id }
+                        ?.let { addAll(it) }
+            }.also { attributes = gson.toJson(it) }
+
+    /**
+     * Parses the images json array into a list of product images
+     */
+    @Suppress("ReturnCount")
+    fun getImageModel(): WCProductImageModel? {
+        if (image.isNotBlank()) {
+            try {
+                with(gson.fromJson(image, JsonElement::class.java).asJsonObject) {
+                    WCProductImageModel(this.getLong("id")).also {
+                        it.name = this.getString("name") ?: ""
+                        it.src = this.getString("src") ?: ""
+                        it.alt = this.getString("alt") ?: ""
+                        return it
+                    }
+                }
+            } catch (e: JsonParseException) {
+                AppLog.e(T.API, e)
+                return null
+            } catch (e: IllegalStateException) {
+                AppLog.e(T.API, e)
+                return null
+            }
+        }
+        return null
+    }
+
+    /**
+     * Deserializes the JSON contained in [attributes] into a list of [ProductVariantOption] objects.
+     */
+    fun getProductVariantOptions(): List<ProductVariantOption> {
+        val responseType = object : TypeToken<List<ProductVariantOption>>() {}.type
+        return gson.fromJson(attributes, responseType) as? List<ProductVariantOption> ?: emptyList()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCRevenueStatsModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCRevenueStatsModel.kt
new file mode 100644
index 00000000000..43f64fbbc20
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCRevenueStatsModel.kt
@@ -0,0 +1,96 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.Gson
+import com.google.gson.JsonParser
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.utils.NonNegativeIntJsonDeserializer
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCRevenueStatsModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var interval = "" // The unit ("hour", "day", "week", "month", "year")
+    @Column var startDate = "" // The start date of the data
+    @Column var endDate = "" // The end date of the data
+    @Column var data = "" // JSON - A list of lists; each nested list contains the data for a time period
+    @Column var total = "" // JSON - A map of total stats for a given time period
+    @Column var rangeId = "" // A ID for easily fetch the Revenue Stats for a given start and end date
+
+    companion object {
+        private val gson by lazy { Gson() }
+    }
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    @Suppress("MemberNameEqualsClassName")
+    class Interval {
+        val interval: String? = null
+        val subtotals: SubTotal? = null
+    }
+
+    class SubTotal {
+        @SerializedName("orders_count")
+        val ordersCount: Long? = null
+        @SerializedName("total_sales")
+        val totalSales: Double? = null
+        @SerializedName("net_revenue")
+        val netRevenue: Double? = null
+        @SerializedName("avg_order_value")
+        val avgOrderValue: Double? = null
+    }
+
+    /**
+     * Deserializes the JSON contained in [data] into a list of [Interval] objects.
+     */
+    fun getIntervalList(): List<Interval> {
+        val responseType = object : TypeToken<List<Interval>>() {}.type
+        return gson.fromJson(data, responseType) as? List<Interval> ?: emptyList()
+    }
+
+    class Total {
+        @SerializedName("orders_count")
+        val ordersCount: Int? = null
+        @SerializedName("total_sales")
+        val totalSales: Double? = null
+        @SerializedName("net_revenue")
+        val netRevenue: Double? = null
+        @SerializedName("avg_order_value")
+        val avgOrderValue: Double? = null
+        @JsonAdapter(NonNegativeIntJsonDeserializer::class)
+        @SerializedName("num_items_sold")
+        val itemsSold: Int? = null
+    }
+
+    /**
+     * Deserializes the JSON contained in [data] into a Total object.
+     * The [total] param by default is a map which is parsed into [Total].
+     *
+     * There are some instances where the [total] param can be an empty list
+     * https://github.com/woocommerce/woocommerce-android/issues/2154
+     *
+     * To address this issue, we check if the [total] param is a JsonArray
+     * and return a null response, if that's the case.
+     */
+    fun parseTotal(): Total? {
+        val jsonElement = JsonParser().parse(total)
+        return if (jsonElement.isJsonArray) {
+            if (jsonElement.asJsonArray.size() > 0) {
+                val responseType = object : TypeToken<Total>() {}.type
+                gson.fromJson(jsonElement.asJsonArray[0], responseType) as? Total
+            } else null
+        } else {
+            val responseType = object : TypeToken<Total>() {}.type
+            gson.fromJson(total, responseType) as? Total
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSSRModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSSRModel.kt
new file mode 100644
index 00000000000..cd63522c86d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSSRModel.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model
+
+data class WCSSRModel(
+    val remoteSiteId: Long,
+    val environment: String? = null,
+    val database: String? = null,
+    val activePlugins: String? = null,
+    val theme: String? = null,
+    val settings: String? = null,
+    val security: String? = null,
+    val pages: String? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSettingsModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSettingsModel.kt
new file mode 100644
index 00000000000..47e9d4ff3ca
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCSettingsModel.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.model
+
+import java.util.Locale
+
+data class WCSettingsModel(
+    val localSiteId: Int,
+    val currencyCode: String, // The currency code for the site in 3-letter ISO 4217 format
+    val currencyPosition: CurrencyPosition, // Where the currency symbol should be placed
+    val currencyThousandSeparator: String, // The thousands separator character (e.g. the comma in 3,000)
+    val currencyDecimalSeparator: String, // The decimal separator character (e.g. the dot in 41.12)
+    val currencyDecimalNumber: Int, // How many decimal points to display
+    val countryCode: String = "", // The country code for the site in 2-letter format i.e. US
+    val address: String = "",
+    val address2: String = "",
+    val city: String = "",
+    val postalCode: String = "",
+    val stateCode: String = "", // The state code for the site in 2-letter format i.e. NY
+    val couponsEnabled: Boolean = false
+) {
+    enum class CurrencyPosition {
+        LEFT, RIGHT, LEFT_SPACE, RIGHT_SPACE;
+
+        companion object {
+            private val reverseMap = values().associateBy(CurrencyPosition::name)
+            fun fromString(type: String?) = reverseMap[type?.toUpperCase(Locale.US)] ?: LEFT
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCShippingMethod.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCShippingMethod.kt
new file mode 100644
index 00000000000..2ef460bb57f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCShippingMethod.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.persistence.entity.ShippingMethodEntity
+
+data class WCShippingMethod (
+    val id: String,
+    val title: String
+)
+
+fun ShippingMethodEntity.toAppModel() = WCShippingMethod(this.id,this.title)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCVisitorStatsSummary.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCVisitorStatsSummary.kt
new file mode 100644
index 00000000000..116d19e3cb3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/WCVisitorStatsSummary.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+
+data class WCVisitorStatsSummary(
+    val granularity: StatsGranularity,
+    val date: String,
+    val views: Int,
+    val visitors: Int
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt
new file mode 100644
index 00000000000..1b19eacf0e2
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/addons/RemoteAddonDto.kt
@@ -0,0 +1,88 @@
+package org.wordpress.android.fluxc.model.addons
+
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+
+data class RemoteAddonDto(
+    @SerializedName("title_format")
+    val titleFormat: RemoteTitleFormat?,
+    @SerializedName("description_enable")
+    val descriptionEnabled: Int,
+    @SerializedName("restrictions_type")
+    val restrictionsType: RemoteRestrictionsType? = null,
+    @SerializedName("adjust_price")
+    val adjustPrice: Int,
+    @SerializedName("price_type")
+    val priceType: RemotePriceType? = null,
+
+    val type: RemoteType?,
+    val display: RemoteDisplay? = null,
+    val name: String,
+    val description: String,
+    val required: Int,
+    val position: Int,
+    val price: String? = null,
+    val min: Long,
+    val max: Long,
+    val options: List<RemoteOption>? = null
+) {
+    enum class RemoteType {
+        @SerializedName("multiple_choice") MultipleChoice,
+        @SerializedName("checkbox") Checkbox,
+        @SerializedName("custom_text") CustomText,
+        @SerializedName("custom_textarea") CustomTextArea,
+        @SerializedName("file_upload") FileUpload,
+        @SerializedName("custom_price") CustomPrice,
+        @SerializedName("input_multiplier") InputMultiplier,
+        @SerializedName("heading") Heading
+    }
+
+    enum class RemoteDisplay {
+        @SerializedName("select") Select,
+        @SerializedName("radiobutton") RadioButton,
+        @SerializedName("images") Images
+    }
+
+    enum class RemoteTitleFormat {
+        @SerializedName("label") Label,
+        @SerializedName("heading") Heading,
+        @SerializedName("hide") Hide
+    }
+
+    enum class RemoteRestrictionsType {
+        @SerializedName("any_text") AnyText,
+        @SerializedName("only_letters") OnlyLetters,
+        @SerializedName("only_numbers") OnlyNumbers,
+        @SerializedName("only_letters_numbers") OnlyLettersNumbers,
+        @SerializedName("email") Email
+    }
+
+    enum class RemotePriceType {
+        @SerializedName("flat_fee") FlatFee,
+        @SerializedName("quantity_based") QuantityBased,
+        @SerializedName("percentage_based") PercentageBased
+    }
+
+    data class RemoteOption(
+        @SerializedName("price_type")
+        val priceType: RemotePriceType,
+
+        val label: String? = null,
+        val price: String? = null,
+        val image: String? = null
+    )
+
+    companion object {
+        @Suppress("SwallowedException", "TooGenericExceptionCaught")
+        fun fromMetaDataValue(value: WCMetaDataValue): List<RemoteAddonDto>? {
+            return try {
+                Gson().run {
+                    fromJson(value.jsonValue, Array<RemoteAddonDto>::class.java)
+                }.toList()
+            } catch (ex: Exception) {
+                null
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeMapper.kt
new file mode 100644
index 00000000000..88bcb0424a9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeMapper.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.model.attribute
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.attribute.terms.WCAttributeTermModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.AttributeApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.terms.AttributeTermApiResponse
+import javax.inject.Inject
+
+class WCGlobalAttributeMapper @Inject constructor() {
+    fun responseToAttributeModel(
+        response: AttributeApiResponse,
+        site: SiteModel
+    ) = response.run {
+        WCGlobalAttributeModel(
+                remoteId = id?.toIntOrNull() ?: 0,
+                localSiteId = site.id,
+                name = name.orEmpty(),
+                slug = slug.orEmpty(),
+                type = type.orEmpty(),
+                orderBy = orderBy.orEmpty(),
+                hasArchives = hasArchives ?: false
+        )
+    }
+
+    fun responseToAttributeModelList(
+        response: Array<AttributeApiResponse>,
+        site: SiteModel
+    ) = response.map { responseToAttributeModel(it, site) }
+            .toList()
+
+    fun responseToAttributeTermModel(
+        response: AttributeTermApiResponse,
+        attributeID: Int,
+        site: SiteModel
+    ) = with(response) {
+        WCAttributeTermModel(
+                remoteId = id?.toIntOrNull() ?: 0,
+                localSiteId = site.id,
+                attributeId = attributeID,
+                name = name.orEmpty(),
+                slug = slug.orEmpty(),
+                description = description.orEmpty(),
+                count = count?.toIntOrNull() ?: 0,
+                menuOrder = menuOrder?.toIntOrNull() ?: 0
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeModel.kt
new file mode 100644
index 00000000000..a22b227df7a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/WCGlobalAttributeModel.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.model.attribute
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.attribute.terms.WCAttributeTermModel
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.getTerm
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCGlobalAttributeModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @Column var localSiteId: Int = 0,
+    @Column var name: String = "",
+    @Column var slug: String = "",
+    @Column var type: String = "",
+    @Column var orderBy: String = "",
+    @Column var hasArchives: Boolean = false,
+    @Column var termsId: String = "",
+    @Column var remoteId: Int = 0
+) : Identifiable {
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = id
+
+    val terms by lazy {
+        termsId.split(";")
+                .mapNotNull { it.toIntOrNull() }
+                .takeIf { it.isNotEmpty() }
+                ?.map { getTerm(localSiteId, it) }
+    }
+
+    fun asProductAttributeModel(vararg includedTermId: Int) =
+            WCProductModel.ProductAttribute(
+                    id = remoteId.toLong(),
+                    name = name,
+                    visible = true,
+                    variation = true,
+                    options = includedTermId.takeIf { it.isNotEmpty() }
+                            ?.let { terms?.filterFromIdList(it) }
+                            ?.map { it.name }
+                            ?.toMutableList()
+                            ?: mutableListOf()
+            )
+
+    fun asProductAttributeModel(includedTerms: List<String>) =
+            WCProductModel.ProductAttribute(
+                    id = remoteId.toLong(),
+                    name = name,
+                    visible = true,
+                    variation = true,
+                    options = includedTerms.takeIf { it.isNotEmpty() }
+                            ?.let { terms?.filterFromTermNameList(it) }
+                            ?.map { it.name }
+                            ?.toMutableList()
+                            ?: mutableListOf()
+            )
+
+    private fun List<WCAttributeTermModel?>.filterFromIdList(ids: IntArray) =
+                    filterNotNull().filter { term ->
+                        ids.contains(term.remoteId)
+                    }
+
+    private fun List<WCAttributeTermModel?>.filterFromTermNameList(termNames: List<String>) =
+                    filterNotNull().filter { term ->
+                        termNames.contains(term.name)
+                    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/terms/WCAttributeTermModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/terms/WCAttributeTermModel.kt
new file mode 100644
index 00000000000..2635fa40048
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/attribute/terms/WCAttributeTermModel.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.attribute.terms
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCAttributeTermModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @Column var remoteId: Int = 0,
+    @Column var localSiteId: Int = 0,
+    @Column var attributeId: Int = 0,
+    @Column var name: String = "",
+    @Column var slug: String = "",
+    @Column var description: String = "",
+    @Column var count: Int = 0,
+    @Column var menuOrder: Int = 0
+) : Identifiable {
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupon/UpdateCouponRequest.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupon/UpdateCouponRequest.kt
new file mode 100644
index 00000000000..fd6b7f8ca75
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupon/UpdateCouponRequest.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.model.coupon
+
+data class UpdateCouponRequest(
+    val code: String? = null,
+    val amount: String? = null,
+    val discountType: String? = null,
+    val description: String? = null,
+    val expiryDate: String? = null,
+    val minimumAmount: String? = null,
+    val maximumAmount: String? = null,
+    val productIds: List<Long>? = null,
+    val excludedProductIds: List<Long>? = null,
+    val productCategoryIds: List<Long>? = null,
+    val excludedProductCategoryIds: List<Long>? = null,
+    val isShippingFree: Boolean? = null,
+    val isForIndividualUse: Boolean? = null,
+    val areSaleItemsExcluded: Boolean? = null,
+    val usageLimit: Int? = null,
+    val usageLimitPerUser: Int? = null,
+    val limitUsageToXItems: Int? = null,
+    val restrictedEmails: List<String>? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupons/CouponReport.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupons/CouponReport.kt
new file mode 100644
index 00000000000..076b9ff061e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/coupons/CouponReport.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.model.coupons
+
+import java.math.BigDecimal
+
+data class CouponReport(
+    val couponId: Long,
+    val amount: BigDecimal,
+    val ordersCount: Int
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalytics.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalytics.kt
new file mode 100644
index 00000000000..06d3e014131
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalytics.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model.customer
+
+data class WCCustomerFromAnalytics(
+    val avgOrderValue: Double,
+    val city: String,
+    val country: String,
+    val dateLastActive: String,
+    val dateLastActiveGmt: String,
+    val dateLastOrder: String,
+    val dateRegistered: String,
+    val dateRegisteredGmt: String,
+    val email: String,
+    val id: Long,
+    val name: String,
+    val ordersCount: Int,
+    val postcode: String,
+    val state: String,
+    val totalSpend: Double,
+    val userId: Long,
+    val username: String
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalyticsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalyticsMapper.kt
new file mode 100644
index 00000000000..dec3ef871d6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerFromAnalyticsMapper.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.model.customer
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerFromAnalyticsDTO
+import org.wordpress.android.fluxc.persistence.entity.CustomerFromAnalyticsEntity
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCCustomerFromAnalyticsMapper @Inject constructor() {
+    fun mapDTOToEntity(site: SiteModel, dto: CustomerFromAnalyticsDTO): CustomerFromAnalyticsEntity {
+        return CustomerFromAnalyticsEntity(
+            localSiteId = site.localId(),
+            id = dto.id ?: 0L,
+            userId = dto.userId ?: 0L,
+            avgOrderValue = dto.avgOrderValue ?: 0.0,
+            city = dto.city.orEmpty(),
+            country = dto.country.orEmpty(),
+            dateLastActive = dto.dateLastActive.orEmpty(),
+            dateLastActiveGmt = dto.dateLastActiveGmt.orEmpty(),
+            dateLastOrder = dto.dateLastOrder.orEmpty(),
+            dateRegistered = dto.dateRegistered.orEmpty(),
+            dateRegisteredGmt = dto.dateRegisteredGmt.orEmpty(),
+            email = dto.email.orEmpty(),
+            name = dto.name.orEmpty(),
+            ordersCount = dto.ordersCount ?: 0,
+            postcode = dto.postcode.orEmpty(),
+            state = dto.state.orEmpty(),
+            totalSpend = dto.totalSpend ?: 0.0,
+            username = dto.username.orEmpty()
+        )
+    }
+
+    fun mapEntityToModel(entity: CustomerFromAnalyticsEntity): WCCustomerFromAnalytics {
+        return WCCustomerFromAnalytics(
+            avgOrderValue = entity.avgOrderValue,
+            city = entity.city,
+            country = entity.country,
+            dateLastActive = entity.dateLastActive,
+            dateLastActiveGmt = entity.dateLastActiveGmt,
+            dateLastOrder = entity.dateLastOrder,
+            dateRegistered = entity.dateRegistered,
+            dateRegisteredGmt = entity.dateRegisteredGmt,
+            email = entity.email,
+            id = entity.id,
+            name = entity.name,
+            ordersCount = entity.ordersCount,
+            postcode = entity.postcode,
+            state = entity.state,
+            totalSpend = entity.totalSpend,
+            userId = entity.userId,
+            username = entity.username
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerListDescriptor.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerListDescriptor.kt
new file mode 100644
index 00000000000..4dcedd6da70
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerListDescriptor.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.model.customer
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.ListConfig
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListDescriptorUniqueIdentifier
+
+open class WCCustomerListDescriptor(
+    val site: SiteModel,
+    val searchQuery: String? = null,
+    val email: String? = null,
+    val role: String? = null,
+    val remoteCustomerIds: List<Long>? = null,
+    val excludedCustomerIds: List<Long>? = null
+) : ListDescriptor {
+    override val config: ListConfig = ListConfig.default
+
+    override val uniqueIdentifier: ListDescriptorUniqueIdentifier by lazy {
+        ListDescriptorUniqueIdentifier(calculateListTypeHash(site.id))
+    }
+
+    override val typeIdentifier: ListDescriptorTypeIdentifier by lazy {
+        calculateTypeIdentifier(site.id)
+    }
+
+    companion object {
+        @JvmStatic
+        fun calculateTypeIdentifier(localSiteId: Int) =
+                ListDescriptorTypeIdentifier(calculateListTypeHash(localSiteId))
+
+        private fun calculateListTypeHash(localSiteId: Int) = "woo-site-customer-list$localSiteId".hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || javaClass != other.javaClass) return false
+        val that = other as WCCustomerListDescriptor
+        return uniqueIdentifier == that.uniqueIdentifier
+    }
+
+    override fun hashCode() = uniqueIdentifier.value
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerMapper.kt
new file mode 100644
index 00000000000..cf618f31976
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerMapper.kt
@@ -0,0 +1,126 @@
+package org.wordpress.android.fluxc.model.customer
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerFromAnalyticsDTO
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCCustomerMapper @Inject constructor() {
+    @Suppress("ComplexMethod")
+    fun mapToModel(site: SiteModel, dto: CustomerDTO): WCCustomerModel {
+        return WCCustomerModel().apply {
+            localSiteId = site.id
+            avatarUrl = dto.avatarUrl ?: ""
+            dateCreated = dto.dateCreated ?: ""
+            dateCreatedGmt = dto.dateCreatedGmt ?: ""
+            dateModified = dto.dateModified ?: ""
+            dateModifiedGmt = dto.dateModifiedGmt ?: ""
+            email = dto.email ?: ""
+            firstName = dto.firstName ?: ""
+            remoteCustomerId = dto.id ?: 0
+            isPayingCustomer = dto.isPayingCustomer
+            lastName = dto.lastName ?: ""
+            role = dto.role ?: ""
+            username = dto.username ?: ""
+
+            billingAddress1 = dto.billing?.address1 ?: ""
+            billingAddress2 = dto.billing?.address2 ?: ""
+            billingCompany = dto.billing?.company ?: ""
+            billingCountry = dto.billing?.country ?: ""
+            billingCity = dto.billing?.city ?: ""
+            billingEmail = dto.billing?.email ?: ""
+            billingFirstName = dto.billing?.firstName ?: ""
+            billingLastName = dto.billing?.lastName ?: ""
+            billingPhone = dto.billing?.phone ?: ""
+            billingPostcode = dto.billing?.postcode ?: ""
+            billingState = dto.billing?.state ?: ""
+
+            shippingAddress1 = dto.billing?.address1 ?: ""
+            shippingAddress2 = dto.billing?.address2 ?: ""
+            shippingCity = dto.billing?.city ?: ""
+            shippingCompany = dto.billing?.company ?: ""
+            shippingCountry = dto.billing?.country ?: ""
+            shippingFirstName = dto.billing?.firstName ?: ""
+            shippingLastName = dto.billing?.lastName ?: ""
+            shippingPostcode = dto.billing?.postcode ?: ""
+            shippingState = dto.billing?.state ?: ""
+        }
+    }
+
+    fun mapToDTO(model: WCCustomerModel): CustomerDTO {
+        val billing = CustomerDTO.Billing(
+            firstName = model.billingFirstName,
+            lastName = model.billingLastName,
+            company = model.billingCompany,
+            address1 = model.billingAddress1,
+            address2 = model.billingAddress2,
+            city = model.billingCity,
+            state = model.billingState,
+            postcode = model.billingPostcode,
+            country = model.billingCountry,
+            email = model.billingEmail,
+            phone = model.billingPhone
+        )
+        val shipping = CustomerDTO.Shipping(
+            firstName = model.billingFirstName,
+            lastName = model.billingLastName,
+            company = model.billingCompany,
+            address1 = model.billingAddress1,
+            address2 = model.billingAddress2,
+            city = model.billingCity,
+            state = model.billingState,
+            postcode = model.billingPostcode,
+            country = model.billingCountry
+        )
+        return CustomerDTO(
+            email = model.email,
+            firstName = model.firstName,
+            lastName = model.lastName,
+            username = model.username,
+            billing = billing,
+            shipping = shipping
+        )
+    }
+
+    @Suppress("ComplexMethod")
+    fun mapToModel(site: SiteModel, dto: CustomerFromAnalyticsDTO): WCCustomerModel {
+        return WCCustomerModel().apply {
+            localSiteId = site.id
+            remoteCustomerId = dto.userId ?: 0
+            email = dto.email ?: ""
+            firstName = dto.name.firstNameFromName()
+            lastName = dto.name.lastNameFromName()
+            username = dto.username ?: ""
+            dateCreated = dto.dateRegistered ?: ""
+            dateCreatedGmt = dto.dateRegisteredGmt ?: ""
+            dateModified = dto.dateLastActive ?: ""
+            dateModifiedGmt = dto.dateLastActiveGmt ?: ""
+            isPayingCustomer = (dto.totalSpend ?: 0.0) > 0
+
+            billingCountry = dto.country ?: ""
+            billingCity = dto.city ?: ""
+            billingEmail = dto.email ?: ""
+            billingFirstName = dto.name?.firstNameFromName() ?: ""
+            billingLastName = dto.name?.lastNameFromName() ?: ""
+            billingPostcode = dto.postcode ?: ""
+            billingState = dto.state ?: ""
+
+            shippingCountry = dto.country ?: ""
+            shippingCity = dto.city ?: ""
+            shippingFirstName = dto.name?.firstNameFromName() ?: ""
+            shippingLastName = dto.name?.lastNameFromName() ?: ""
+            shippingPostcode = dto.postcode ?: ""
+            shippingState = dto.state ?: ""
+            analyticsCustomerId = dto.id
+        }
+    }
+
+    // Please refer WCCustomerMapperTest file which serves as documentation of how this function behaves.
+    private fun String?.firstNameFromName(): String =
+        this?.trim()?.substringBefore(' ')?.trim().orEmpty()
+
+    private fun String?.lastNameFromName(): String =
+        this?.trim()?.substringAfter(' ', "")?.trim().orEmpty()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerModel.kt
new file mode 100644
index 00000000000..62c42d9e23e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerModel.kt
@@ -0,0 +1,98 @@
+package org.wordpress.android.fluxc.model.customer
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+/**
+ * Single Woo customer - see https://woocommerce.github.io/woocommerce-rest-api-docs/#customer-properties
+ */
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCCustomerModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var avatarUrl: String = ""
+    @Column var dateCreated: String = ""
+    @Column var dateCreatedGmt: String = ""
+    @Column var dateModified: String = ""
+    @Column var dateModifiedGmt: String = ""
+    @Column var email: String = ""
+    @Column var firstName: String = ""
+    @Column var remoteCustomerId: Long = 0L
+    @Column var isPayingCustomer: Boolean = false
+        @JvmName("setIsPayingCustomer")
+        set
+    @Column var lastName: String = ""
+    @Column var role: String = ""
+    @Column var username: String = ""
+
+    @Column var localSiteId = 0
+
+    @Column var billingAddress1: String = ""
+    @Column var billingAddress2: String = ""
+    @Column var billingCity: String = ""
+    @Column var billingCompany: String = ""
+    @Column var billingCountry: String = ""
+    @Column var billingEmail: String = ""
+    @Column var billingFirstName: String = ""
+    @Column var billingLastName: String = ""
+    @Column var billingPhone: String = ""
+    @Column var billingPostcode: String = ""
+    @Column var billingState: String = ""
+
+    @Column var shippingAddress1: String = ""
+    @Column var shippingAddress2: String = ""
+    @Column var shippingCity: String = ""
+    @Column var shippingCompany: String = ""
+    @Column var shippingCountry: String = ""
+    @Column var shippingFirstName: String = ""
+    @Column var shippingLastName: String = ""
+    @Column var shippingPostcode: String = ""
+    @Column var shippingState: String = ""
+    var analyticsCustomerId: Long? = null
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun toString(): String {
+        return "WCCustomerModel(" +
+                "id=$id, " +
+                "avatarUrl='$avatarUrl', " +
+                "dateCreated='$dateCreated', " +
+                "dateCreatedGmt='$dateCreatedGmt', " +
+                "dateModified='$dateModified', " +
+                "dateModifiedGmt='$dateModifiedGmt', " +
+                "email='$email', " +
+                "firstName='$firstName', " +
+                "remoteCustomerId=$remoteCustomerId, " +
+                "isPayingCustomer=$isPayingCustomer, " +
+                "lastName='$lastName', " +
+                "role='$role', " +
+                "username='$username', " +
+                "localSiteId=$localSiteId, " +
+                "billingAddress1='$billingAddress1', " +
+                "billingAddress2='$billingAddress2', " +
+                "billingCity='$billingCity', " +
+                "billingCompany='$billingCompany', " +
+                "billingCountry='$billingCountry', " +
+                "billingEmail='$billingEmail', " +
+                "billingFirstName='$billingFirstName', " +
+                "billingLastName='$billingLastName', " +
+                "billingPhone='$billingPhone', " +
+                "billingPostcode='$billingPostcode', " +
+                "billingState='$billingState', " +
+                "shippingAddress1='$shippingAddress1', " +
+                "shippingAddress2='$shippingAddress2', " +
+                "shippingCity='$shippingCity', " +
+                "shippingCompany='$shippingCompany', " +
+                "shippingCountry='$shippingCountry', " +
+                "shippingFirstName='$shippingFirstName', " +
+                "shippingLastName='$shippingLastName', " +
+                "shippingPostcode='$shippingPostcode', " +
+                "shippingState='$shippingState'" +
+                ")"
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCCountryMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCCountryMapper.kt
new file mode 100644
index 00000000000..7b121dc3618
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCCountryMapper.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.model.data
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.data.WCDataRestClient.CountryApiResponse
+import javax.inject.Inject
+
+class WCCountryMapper
+@Inject constructor() {
+    fun map(country: CountryApiResponse): List<WCLocationModel> {
+        return country.states.map { state ->
+            WCLocationModel().apply {
+                parentCode = country.code ?: ""
+                name = state.name ?: ""
+                code = state.code ?: ""
+            }
+        } + WCLocationModel().apply {
+            name = country.name ?: ""
+            code = country.code ?: ""
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCLocationModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCLocationModel.kt
new file mode 100644
index 00000000000..0c41a500b3f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/data/WCLocationModel.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.model.data
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(name = "WCLocations", addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCLocationModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var parentCode: String = ""
+    @Column var code = ""
+    @Column var name = ""
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/GatewayMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/GatewayMapper.kt
new file mode 100644
index 00000000000..b2d4739bd6f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/GatewayMapper.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.model.gateways
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient.GatewayResponse
+import javax.inject.Inject
+
+class GatewayMapper
+@Inject constructor() {
+    fun map(response: GatewayResponse): WCGatewayModel {
+        return WCGatewayModel(
+                response.gatewayId,
+                response.title ?: "",
+                response.description ?: "",
+                response.order?.toIntOrNull() ?: 0,
+                response.enabled ?: false,
+                response.methodTitle ?: "",
+                response.methodDescription ?: "",
+                response.features ?: emptyList()
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/WCGatewayModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/WCGatewayModel.kt
new file mode 100644
index 00000000000..d63bd392020
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/gateways/WCGatewayModel.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model.gateways
+
+data class WCGatewayModel(
+    val id: String,
+    val title: String,
+    val description: String,
+    val order: Int,
+    val isEnabled: Boolean,
+    val methodTitle: String,
+    val methodDescription: String,
+    val features: List<String>
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaign.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaign.kt
new file mode 100644
index 00000000000..1606f03f5f1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaign.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.model.google
+
+import org.wordpress.android.util.AppLog
+
+data class WCGoogleAdsCampaign(
+    val id: Long?,
+    val name: String?,
+    val status: Status?,
+    val type: String?,
+    val amount: Double?,
+    val countryISOCode: String?,
+    val targetedCountryISOCodes: List<String>?
+) {
+    enum class Status {
+        ENABLED,
+        DISABLED,
+        REMOVED;
+
+        companion object {
+            fun fromString(value: String): Status {
+                return try {
+                    Status.valueOf(value.uppercase())
+                } catch (e: IllegalArgumentException) {
+                    AppLog.w(
+                        AppLog.T.API,
+                        "Unknown campaign status returned: `$value`, defaulting to DISABLED " +
+                            e.message
+                    )
+                    DISABLED
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaignMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaignMapper.kt
new file mode 100644
index 00000000000..dcb2b3ac6e2
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsCampaignMapper.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.model.google
+
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCampaign.Status
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleAdsCampaignDTO
+import javax.inject.Inject
+
+class WCGoogleAdsCampaignMapper @Inject constructor() {
+    fun mapToModel(dto: WCGoogleAdsCampaignDTO): WCGoogleAdsCampaign {
+        return WCGoogleAdsCampaign(
+            id = dto.id,
+            name = dto.name,
+            status = dto.status?.let { Status.fromString(it) },
+            type = dto.rawType,
+            amount = dto.amount,
+            countryISOCode = dto.country,
+            targetedCountryISOCodes = dto.targetedLocations
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsPrograms.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsPrograms.kt
new file mode 100644
index 00000000000..36bf26e49d8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsPrograms.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.model.google
+
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCampaign.Status
+
+data class WCGoogleAdsPrograms(
+    val campaigns: List<WCGoogleAdsProgramCampaign>?,
+    val intervals: List<WCGoogleAdsProgramInterval>?,
+    val totals: WCGoogleAdsProgramTotals?
+)
+
+data class WCGoogleAdsProgramCampaign(
+    val id: Long?,
+    val name: String?,
+    val status: Status?,
+    val subtotal: WCGoogleAdsProgramTotals
+)
+
+data class WCGoogleAdsProgramInterval(
+    val interval: String?,
+    val subtotal: WCGoogleAdsProgramTotals
+)
+
+data class WCGoogleAdsProgramTotals(
+    val sales: Double?,
+    val spend: Double?,
+    val impressions: Double?,
+    val clicks: Double?,
+    val conversions: Double?
+)
+
+data class WCGoogleAdsCardStats(
+    val impressions: Double,
+    val clicks: Double
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsProgramsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsProgramsMapper.kt
new file mode 100644
index 00000000000..fa840a21e35
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/google/WCGoogleAdsProgramsMapper.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.model.google
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleAdsProgramsDTO
+import javax.inject.Inject
+
+class WCGoogleAdsProgramsMapper @Inject constructor() {
+    fun mapToModel(dto: WCGoogleAdsProgramsDTO): WCGoogleAdsPrograms {
+        return WCGoogleAdsPrograms(
+            campaigns = dto.campaigns?.map {
+                WCGoogleAdsProgramCampaign(
+                    id = it.id,
+                    name = it.name,
+                    status = it.status?.let { status ->
+                        WCGoogleAdsCampaign.Status.fromString(status)
+                    },
+                    subtotal = WCGoogleAdsProgramTotals(
+                        sales = it.subtotals?.sales,
+                        spend = it.subtotals?.spend,
+                        impressions = it.subtotals?.impressions,
+                        clicks = it.subtotals?.clicks,
+                        conversions = it.subtotals?.conversions
+                    )
+                )
+            },
+            intervals = dto.intervals?.map {
+                WCGoogleAdsProgramInterval(
+                    interval = it.interval,
+                    subtotal = WCGoogleAdsProgramTotals(
+                        sales = it.subtotals?.sales,
+                        spend = it.subtotals?.spend,
+                        impressions = it.subtotals?.impressions,
+                        clicks = it.subtotals?.clicks,
+                        conversions = it.subtotals?.conversions
+                    )
+                )
+            },
+            totals = dto.totals?.let {
+                WCGoogleAdsProgramTotals(
+                    sales = it.sales,
+                    spend = it.spend,
+                    impressions = it.impressions,
+                    clicks = it.clicks,
+                    conversions = it.conversions
+                )
+            }
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCProductLeaderboardsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCProductLeaderboardsMapper.kt
new file mode 100644
index 00000000000..51167ed4fec
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCProductLeaderboardsMapper.kt
@@ -0,0 +1,97 @@
+package org.wordpress.android.fluxc.model.leaderboards
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardProductItem
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsProductApiResponse
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils.geProductExistsByRemoteId
+import org.wordpress.android.fluxc.persistence.entity.TopPerformerProductEntity
+import org.wordpress.android.fluxc.store.WCProductStore
+import javax.inject.Inject
+
+class WCProductLeaderboardsMapper @Inject constructor() {
+    suspend fun mapTopPerformerProductsEntity(
+        response: LeaderboardsApiResponse,
+        site: SiteModel,
+        productStore: WCProductStore,
+        datePeriod: String
+    ): List<TopPerformerProductEntity> = response.products
+        ?.takeIf { it.isNotEmpty() }
+        ?.mapNotNull { it.productId }
+        ?.asProductList(site, productStore)
+        ?.mapNotNull { product ->
+            response.products
+                ?.find { it.productId == product.remoteProductId }
+                ?.let { product.toTopPerformerProductEntity(it, site, datePeriod) }
+        }.orEmpty()
+
+    /**
+     * This method fetch and request all Products from the IDs described by the
+     * List<Long>, but it only requests to the site products who doesn't exist
+     * inside the database to avoid unnecessary data traffic.
+     *
+     * Please note that we must request first the local products and second the
+     * remote products, if we invert this order the remotely fetched products will
+     * be inserted inside the database by the [WCProductStore] natural behavior, and
+     * when we fetch the local products after that we will end up unnecessarily duplicating
+     * data, since they will be both fetched remotely and locally.
+     */
+    private suspend fun List<Long>.asProductList(
+        site: SiteModel,
+        productStore: WCProductStore
+    ): List<WCProductModel> {
+        val locallyFetchedProducts = this
+                .filter { geProductExistsByRemoteId(site, it) }
+                .mapNotNull { ProductSqlUtils.getProductByRemoteId(site, it) }
+
+        val remotelyFetchedProducts = this
+                .filter { geProductExistsByRemoteId(site, it).not() }
+                .takeIf { it.isNotEmpty() }
+                ?.let { productStore.fetchProductListSynced(site, it) }
+                .orEmpty()
+
+        return mutableListOf<WCProductModel>().apply {
+            addAll(remotelyFetchedProducts)
+            addAll(locallyFetchedProducts)
+        }.toList()
+    }
+
+    private fun WCProductModel.toTopPerformerProductEntity(
+        productItem: LeaderboardProductItem,
+        site: SiteModel,
+        datePeriod: String
+    ) = TopPerformerProductEntity(
+        localSiteId = site.localId(),
+        datePeriod = datePeriod,
+        productId = remoteId,
+        name = name,
+        imageUrl = getFirstImageUrl(),
+        quantity = productItem.quantity?.toIntOrNull() ?: 0,
+        currency = productItem.currency.toString(),
+        total = productItem.total?.toDoubleOrNull() ?: 0.0,
+        millisSinceLastUpdated = System.currentTimeMillis()
+    )
+
+    fun mapTopPerformerProductsEntity(
+        response: ReportsProductApiResponse,
+        site: SiteModel,
+        datePeriod: String,
+        currencyCode: String
+    ): TopPerformerProductEntity {
+        val imageURL = response.product?.imageUrl
+        return TopPerformerProductEntity(
+            localSiteId = site.localId(),
+            datePeriod = datePeriod,
+            productId = RemoteId(response.productId ?: 0L),
+            name = response.product?.name ?: "",
+            imageUrl = imageURL,
+            quantity = response.itemsSold ?: 0,
+            currency = currencyCode,
+            total = response.netRevenue ?: 0.0,
+            millisSinceLastUpdated = System.currentTimeMillis()
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCTopPerformerProductModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCTopPerformerProductModel.kt
new file mode 100644
index 00000000000..2dabaed2444
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/leaderboards/WCTopPerformerProductModel.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.model.leaderboards
+
+import com.google.gson.Gson
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+data class WCTopPerformerProductModel(
+    @Column var productInfo: String = "",
+    @Column var currency: String = "",
+    @Column var quantity: Int = 0,
+    @Column var total: Double = 0.0,
+    @Column var localSiteId: Int = 0,
+    @Column var unit: String = "",
+    @PrimaryKey @Column private var id: Int = 0
+) : Identifiable {
+    val product
+        get() = Gson().fromJson(productInfo, WCProductModel::class.java)
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId() = id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt
new file mode 100644
index 00000000000..daa30be0961
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetaDataParentItemType.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.metadata
+
+enum class MetaDataParentItemType {
+    ORDER,
+    PRODUCT
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetadataChanges.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetadataChanges.kt
new file mode 100644
index 00000000000..c44226c11ea
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/MetadataChanges.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.fluxc.model.metadata
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonNull
+import com.google.gson.JsonObject
+
+data class MetadataChanges(
+    val insertedMetadata: List<WCMetaData> = emptyList(),
+    val updatedMetadata: List<WCMetaData> = emptyList(),
+    val deletedMetadataIds: List<Long> = emptyList(),
+) {
+    init {
+        // The ID of inserted metadata is ignored, so to ensure that there is no data loss here,
+        // we require that all inserted metadata have an ID of 0.
+        require(insertedMetadata.all { it.id == 0L }) {
+            "Inserted metadata must have an ID of 0"
+        }
+    }
+
+    internal fun toJsonArray() = JsonArray().apply {
+        insertedMetadata.forEach {
+            add(
+                JsonObject().apply {
+                    addProperty(WCMetaData.KEY, it.key)
+                    add(WCMetaData.VALUE, it.value.jsonValue)
+                }
+            )
+        }
+        updatedMetadata.forEach {
+            add(it.toJson())
+        }
+        deletedMetadataIds.forEach {
+            add(
+                JsonObject().apply {
+                    addProperty(WCMetaData.ID, it)
+                    add(WCMetaData.VALUE, JsonNull.INSTANCE)
+                }
+            )
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt
new file mode 100644
index 00000000000..49465af3d08
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/UpdateMetadataRequest.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.model.metadata
+
+data class UpdateMetadataRequest(
+    val parentItemId: Long,
+    val parentItemType: MetaDataParentItemType,
+    val metadataChanges: MetadataChanges,
+) {
+    val insertedMetadata: List<WCMetaData> get() = metadataChanges.insertedMetadata
+    val updatedMetadata: List<WCMetaData> get() = metadataChanges.updatedMetadata
+    val deletedMetadataIds: List<Long> get() = metadataChanges.deletedMetadataIds
+
+    constructor(
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType,
+        insertedMetadata: List<WCMetaData> = emptyList(),
+        updatedMetadata: List<WCMetaData> = emptyList(),
+        deletedMetadataIds: List<Long> = emptyList(),
+    ) : this(
+        parentItemId,
+        parentItemType,
+        MetadataChanges(
+            insertedMetadata,
+            updatedMetadata,
+            deletedMetadataIds,
+        )
+    )
+}
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt
new file mode 100644
index 00000000000..9981281db94
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaData.kt
@@ -0,0 +1,115 @@
+package org.wordpress.android.fluxc.model.metadata
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.JsonArrayValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.JsonObjectValue
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue.WCMetaDataValueJsonAdapter
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.HtmlUtils
+
+data class WCMetaData(
+    @SerializedName(ID)
+    val id: Long,
+    @SerializedName(KEY)
+    val key: String,
+    @JsonAdapter(WCMetaDataValueJsonAdapter::class)
+    @SerializedName(VALUE)
+    val value: WCMetaDataValue,
+    @SerializedName(DISPLAY_KEY)
+    val displayKey: String? = null,
+    @JsonAdapter(WCMetaDataValueJsonAdapter::class)
+    @SerializedName(DISPLAY_VALUE)
+    val displayValue: WCMetaDataValue? = null
+) {
+    constructor(id: Long, key: String, value: String) : this(id, key,
+        WCMetaDataValue(value)
+    )
+
+    /**
+     * Verify if the Metadata key is not null or a internal store attribute
+     * @return false if the `key` starts with the `_` character
+     * @return true otherwise
+     */
+    val isDisplayable
+        get() = key.startsWith('_').not()
+
+    val valueAsString: String
+        get() = value.stringValue.orEmpty()
+
+    val valueStrippedHtml: String
+        get() = HtmlUtils.fastStripHtml(valueAsString)
+
+    val isHtml: Boolean
+        get() = valueAsString != valueStrippedHtml
+
+    val isJson: Boolean
+        get() = value is JsonObjectValue || value is JsonArrayValue
+
+    internal fun toJson(): JsonObject {
+        return JsonObject().also {
+            it.addProperty(ID, id)
+            it.addProperty(KEY, key)
+            it.add(VALUE, value.jsonValue)
+            displayKey?.let { key -> it.addProperty(DISPLAY_KEY, key) }
+            displayValue?.let { value -> it.add(DISPLAY_VALUE, value.jsonValue) }
+        }
+    }
+
+    companion object {
+        const val ID = "id"
+        const val KEY = "key"
+        const val VALUE = "value"
+        private const val DISPLAY_KEY = "display_key"
+        private const val DISPLAY_VALUE = "display_value"
+
+        internal fun fromJson(json: JsonElement): WCMetaData? = runCatching {
+            val jsonObject = json.asJsonObject
+            WCMetaData(
+                id = jsonObject[ID].asLong,
+                key = jsonObject[KEY].asString,
+                value = WCMetaDataValue.fromJsonElement(jsonObject[VALUE]),
+                displayKey = jsonObject[DISPLAY_KEY]?.asString,
+                displayValue = jsonObject[DISPLAY_VALUE]?.let { WCMetaDataValue.fromJsonElement(it) }
+            )
+        }.onFailure {
+            AppLog.w(AppLog.T.UTILS, "Error parsing WCMetaData from JSON $json, cause: ${it.stackTraceToString()}")
+        }.getOrNull()
+    }
+
+    object SubscriptionMetadataKeys {
+        const val SUBSCRIPTION_RENEWAL = "_subscription_renewal"
+    }
+
+    object BundleMetadataKeys {
+        const val BUNDLED_ITEM_ID = "_bundled_item_id"
+    }
+
+    object OrderAttributionInfoKeys {
+        const val SOURCE_TYPE = "_wc_order_attribution_source_type"
+        const val CAMPAIGN = "_wc_order_attribution_utm_campaign"
+        const val SOURCE = "_wc_order_attribution_utm_source"
+        const val MEDIUM = "_wc_order_attribution_utm_medium"
+        const val DEVICE_TYPE = "_wc_order_attribution_device_type"
+        const val SESSION_PAGE_VIEWS = "_wc_order_attribution_session_pages"
+
+        val ALL_KEYS
+            get() = setOf(
+                SOURCE_TYPE,
+                CAMPAIGN,
+                SOURCE,
+                MEDIUM,
+                DEVICE_TYPE,
+                SESSION_PAGE_VIEWS
+            )
+    }
+
+    object AddOnsMetadataKeys {
+        const val ADDONS_METADATA_KEY = "_product_addons"
+    }
+}
+
+operator fun List<WCMetaData>.get(key: String) = firstOrNull { it.key == key }
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt
new file mode 100644
index 00000000000..e51354fd01a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/metadata/WCMetaDataValue.kt
@@ -0,0 +1,109 @@
+package org.wordpress.android.fluxc.model.metadata
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonNull
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+
+sealed class WCMetaDataValue {
+    abstract val isPrimitive: Boolean
+    abstract val stringValue: String?
+    internal abstract val jsonValue: JsonElement
+
+    override fun toString(): String = stringValue.toString()
+
+    data class StringValue(override val stringValue: String?) : WCMetaDataValue() {
+        override val isPrimitive: Boolean
+            get() = true
+        override val jsonValue: JsonElement
+            get() = stringValue?.let { JsonPrimitive(it) } ?: JsonNull.INSTANCE
+    }
+
+    data class NumberValue(val number: Number) : WCMetaDataValue() {
+        override val isPrimitive: Boolean
+            get() = true
+        override val stringValue: String
+            get() = number.toString()
+        override val jsonValue: JsonElement
+            get() = JsonPrimitive(number)
+    }
+
+    data class BooleanValue(val boolean: Boolean) : WCMetaDataValue() {
+        override val isPrimitive: Boolean
+            get() = true
+        override val stringValue: String
+            get() = boolean.toString()
+        override val jsonValue: JsonElement
+            get() = JsonPrimitive(boolean)
+    }
+
+    data class JsonObjectValue(override val jsonValue: JsonObject) : WCMetaDataValue() {
+        override val isPrimitive: Boolean
+            get() = false
+        override val stringValue: String
+            get() = jsonValue.toString()
+    }
+
+    data class JsonArrayValue(override val jsonValue: JsonArray) : WCMetaDataValue() {
+        override val isPrimitive: Boolean
+            get() = false
+        override val stringValue: String
+            get() = jsonValue.toString()
+    }
+
+    internal class WCMetaDataValueJsonAdapter : JsonDeserializer<WCMetaDataValue>,
+        JsonSerializer<WCMetaDataValue> {
+        override fun deserialize(
+            json: JsonElement?,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): WCMetaDataValue? {
+            return json?.let { fromJsonElement(it) }
+        }
+
+        override fun serialize(
+            src: WCMetaDataValue?,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return src?.jsonValue ?: JsonNull.INSTANCE
+        }
+    }
+
+    companion object {
+        operator fun invoke(value: String?): WCMetaDataValue {
+            if (value == null) return StringValue(null)
+
+            return runCatching { JsonParser().parse(value) }
+                .getOrElse { JsonPrimitive(value) }
+                .let { fromJsonElement(it) }
+        }
+        operator fun invoke(value: Number): WCMetaDataValue = NumberValue(value)
+        operator fun invoke(value: Boolean): WCMetaDataValue = BooleanValue(value)
+
+        internal fun fromJsonElement(element: JsonElement): WCMetaDataValue {
+            return when {
+                element.isJsonPrimitive -> {
+                    val primitive = element.asJsonPrimitive
+                    when {
+                        primitive.isBoolean -> BooleanValue(primitive.asBoolean)
+                        primitive.isNumber -> NumberValue(primitive.asNumber)
+                        else -> StringValue(primitive.asString)
+                    }
+                }
+
+                element.isJsonObject -> JsonObjectValue(element.asJsonObject)
+                element.isJsonArray -> JsonArrayValue(element.asJsonArray)
+                element.isJsonNull -> StringValue(null)
+                else -> StringValue(element.toString())
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/CouponLine.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/CouponLine.kt
new file mode 100644
index 00000000000..e30fbb871fb
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/CouponLine.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.order
+
+import com.google.gson.annotations.SerializedName
+
+data class CouponLine(
+    val id: Long?,
+    val code: String,
+    val discount: String?,
+    @SerializedName("discount_tax")
+    val discountTax: String?,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/FeeLine.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/FeeLine.kt
new file mode 100644
index 00000000000..4806ee32325
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/FeeLine.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.model.order
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.utils.NullStringJsonAdapter
+
+/**
+ * Represents a fee line.
+ */
+class FeeLine {
+    @SerializedName("id")
+    var id: Long? = null
+
+    @SerializedName("name")
+    @JsonAdapter(NullStringJsonAdapter::class, nullSafe = false)
+    var name: String? = null
+
+    @SerializedName("total")
+    var total: String? = null
+
+    @SerializedName("total_tax")
+    var totalTax: String? = null
+
+    @SerializedName("tax_status")
+    var taxStatus: FeeLineTaxStatus? = null
+}
+
+enum class FeeLineTaxStatus(val value: String) {
+    @SerializedName("taxable")
+    Taxable("taxable"),
+    @SerializedName("none")
+    None("none")
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt
new file mode 100644
index 00000000000..4f4cd333415
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/LineItem.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.model.order
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.get
+import org.wordpress.android.fluxc.utils.JsonElementToLongSerializerDeserializer
+
+data class LineItem(
+    @JsonAdapter(JsonElementToLongSerializerDeserializer::class)
+    val id: Long? = null,
+    val name: String? = null,
+    @SerializedName("parent_name")
+    val parentName: String? = null,
+    @SerializedName("product_id")
+    val productId: Long? = null,
+    @SerializedName("variation_id")
+    val variationId: Long? = null,
+    val quantity: Float? = null,
+    val subtotal: String? = null,
+    val total: String? = null, // Price x quantity
+    @SerializedName("total_tax")
+    val totalTax: String? = null,
+    val sku: String? = null,
+    val price: String? = null, // The per-item price
+    @SerializedName("meta_data")
+    val metaData: List<WCMetaData>? = null,
+    @SerializedName("bundled_by")
+    val bundledBy: String? = null,
+    @SerializedName("composite_parent")
+    val compositeParent: String? = null
+) {
+    class Attribute(val key: String?, val value: String?)
+
+    fun getAttributeList(): List<Attribute> {
+        return metaData?.filter {
+            it.displayKey is String && it.displayValue?.isPrimitive == true
+        }?.map {
+            Attribute(it.displayKey, it.displayValue?.stringValue)
+        } ?: emptyList()
+    }
+
+    val configurationKey
+        get() = bundledBy.takeIf { it.isNullOrBlank().not() }
+            ?.let { metaData?.get(WCMetaData.BundleMetadataKeys.BUNDLED_ITEM_ID) }
+            ?.valueAsString
+            ?.toLongOrNull()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/OrderAddress.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/OrderAddress.kt
new file mode 100644
index 00000000000..d28f7c88e43
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/OrderAddress.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.model.order
+
+import org.wordpress.android.fluxc.model.OrderEntity
+
+sealed class OrderAddress {
+    abstract val firstName: String
+    abstract val lastName: String
+    abstract val company: String
+    abstract val address1: String
+    abstract val address2: String
+    abstract val city: String
+    abstract val state: String
+    abstract val postcode: String
+    abstract val country: String
+    abstract val phone: String
+
+    data class Shipping(
+        override val firstName: String,
+        override val lastName: String,
+        override val company: String,
+        override val address1: String,
+        override val address2: String,
+        override val city: String,
+        override val state: String,
+        override val postcode: String,
+        override val country: String,
+        override val phone: String
+    ) : OrderAddress() {
+        constructor(orderEntity: OrderEntity) : this(
+                firstName = orderEntity.shippingFirstName,
+                lastName = orderEntity.shippingLastName,
+                company = orderEntity.shippingCompany,
+                address1 = orderEntity.shippingAddress1,
+                address2 = orderEntity.shippingAddress2,
+                city = orderEntity.shippingCity,
+                state = orderEntity.shippingState,
+                postcode = orderEntity.shippingPostcode,
+                country = orderEntity.shippingCountry,
+                phone = orderEntity.shippingPhone
+        )
+    }
+
+    data class Billing(
+        val email: String,
+        override val firstName: String,
+        override val lastName: String,
+        override val company: String,
+        override val address1: String,
+        override val address2: String,
+        override val city: String,
+        override val state: String,
+        override val postcode: String,
+        override val country: String,
+        override val phone: String
+    ) : OrderAddress() {
+        constructor(orderEntity: OrderEntity) : this(
+                email = orderEntity.billingEmail,
+                firstName = orderEntity.billingFirstName,
+                lastName = orderEntity.billingLastName,
+                company = orderEntity.billingCompany,
+                address1 = orderEntity.billingAddress1,
+                address2 = orderEntity.billingAddress2,
+                city = orderEntity.billingCity,
+                state = orderEntity.billingState,
+                postcode = orderEntity.billingPostcode,
+                country = orderEntity.billingCountry,
+                phone = orderEntity.billingPhone
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/ShippingLine.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/ShippingLine.kt
new file mode 100644
index 00000000000..260b79b36eb
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/ShippingLine.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.order
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.utils.NullStringJsonAdapter
+
+data class ShippingLine(
+    val id: Long? = null,
+    val total: String? = null,
+    @SerializedName("total_tax")
+    val totalTax: String? = null,
+    @SerializedName("method_id")
+    @JsonAdapter(NullStringJsonAdapter::class, nullSafe = false)
+    val methodId: String? = null,
+    @SerializedName("method_title")
+    val methodTitle: String? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/TaxLine.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/TaxLine.kt
new file mode 100644
index 00000000000..a11cbef3a8f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/TaxLine.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.model.order
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Represents a tax line
+ */
+class TaxLine {
+    @SerializedName("id")
+    val id: Long? = null
+
+    @SerializedName("rate_id")
+    val rateId: Long? = null
+
+    @SerializedName("rate_code")
+    val rateCode: String? = null
+
+    @SerializedName("rate_percent")
+    val ratePercent: Float? = null
+
+    @SerializedName("label")
+    val label: String? = null
+
+    @SerializedName("compound")
+    val compound: Boolean? = null
+
+    @SerializedName("tax_total")
+    val taxTotal: String? = null
+
+    @SerializedName("shipping_tax_total")
+    val shippingTaxTotal: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/UpdateOrderRequest.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/UpdateOrderRequest.kt
new file mode 100644
index 00000000000..c077eb08961
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/order/UpdateOrderRequest.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model.order
+
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+
+data class UpdateOrderRequest(
+    val customerId: Long? = null,
+    val status: WCOrderStatusModel? = null,
+    val lineItems: List<Map<String, Any>>? = null,
+    val shippingAddress: OrderAddress.Shipping? = null,
+    val billingAddress: OrderAddress.Billing? = null,
+    val feeLines: List<FeeLine>? = null,
+    val couponLines: List<CouponLine>? = null,
+    val shippingLines: List<ShippingLine>? = null,
+    val customerNote: String? = null,
+    val giftCard: String? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCCapturePaymentResponsePayload.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCCapturePaymentResponsePayload.kt
new file mode 100644
index 00000000000..3ef672faf0f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCCapturePaymentResponsePayload.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+
+class WCCapturePaymentResponsePayload(
+    val site: SiteModel,
+    val paymentId: String,
+    val orderId: Long,
+    val status: String?
+) : Payload<WCCapturePaymentError?>() {
+    constructor(
+        error: WCCapturePaymentError,
+        site: SiteModel,
+        paymentId: String,
+        orderId: Long
+    ) : this(site, paymentId, orderId, null) {
+        this.error = error
+    }
+}
+
+class WCCapturePaymentError(
+    val type: WCCapturePaymentErrorType = GENERIC_ERROR,
+    val message: String = ""
+) : OnChangedError
+
+enum class WCCapturePaymentErrorType {
+    GENERIC_ERROR,
+    PAYMENT_ALREADY_CAPTURED,
+    MISSING_ORDER,
+    CAPTURE_ERROR,
+    SERVER_ERROR,
+    NETWORK_ERROR
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCConnectionTokenResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCConnectionTokenResult.kt
new file mode 100644
index 00000000000..89e156499f1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCConnectionTokenResult.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+data class WCConnectionTokenResult(val token: String, val isTestMode: Boolean)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentAccountResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentAccountResult.kt
new file mode 100644
index 00000000000..6a7c26bc2f7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentAccountResult.kt
@@ -0,0 +1,158 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentAccountResult.WCPaymentAccountStatus.Deserializer
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentAccountResult.WCPaymentAccountStatus.StoreCurrencies
+import java.lang.reflect.Type
+
+data class WCPaymentAccountResult(
+    @SerializedName("status")
+    val status: WCPaymentAccountStatus,
+    @SerializedName("has_pending_requirements")
+    val hasPendingRequirements: Boolean,
+    @SerializedName("has_overdue_requirements")
+    val hasOverdueRequirements: Boolean,
+    @SerializedName("current_deadline")
+    val currentDeadline: Long?,
+    /**
+     * An alphanumeric string set by the merchant, e.g. `MYSTORE.COM`
+     * See https://stripe.com/docs/statement-descriptors
+     */
+    @SerializedName("statement_descriptor")
+    val statementDescriptor: String?,
+    @SerializedName("store_currencies")
+    val storeCurrencies: StoreCurrencies,
+
+    /**
+     * A two character country code, e.g. `US`
+     * See https://stripe.com/docs/api/accounts/object#account_object-country
+     */
+    @SerializedName("country")
+    val country: String,
+    /**
+     * A boolean flag indicating if this Account is test/live.
+     */
+    @SerializedName("is_live")
+    val isLive: Boolean,
+
+    /**
+     * A boolean flag indicating if the test mode on the site is enabled. When "null" the state is unknown (the most
+     * probable reason is that the site is using outdated version of WCPay or Stripe Extension plugin).
+     */
+    @SerializedName("test_mode")
+    val testMode: Boolean?
+) {
+    /**
+     * Represents all of the possible Site Plugin Statuses in enum form
+     */
+    @JsonAdapter(Deserializer::class)
+    enum class WCPaymentAccountStatus {
+        /**
+         * This is the normal state for a fully functioning WCPay or Stripe Extension account. The merchant should be
+         * able to collect card present payments.
+         */
+        COMPLETE,
+
+        /**
+         * This account has provided enough information to process payments and receive payouts.
+         * More information will eventually be required when they process enough volume.
+         */
+        ENABLED,
+
+        /**
+         * This state occurs when there is required business information missing from the account.
+         * If `hasOverdueRequirements` is also true, then the deadline for providing that information HAS PASSED and
+         * the merchant will probably NOT be able to collect card present payments.
+         * Otherwise, if `hasPendingRequirements` is true, then the deadline for providing that information has not yet
+         * passed.
+         * The deadline is available in `currentDeadline` and the merchant will probably be able to collect card present
+         * payments until the deadline.
+         * Otherwise, if neither `hasOverdueRequirements` nor `hasPendingRequirements` is true, then the account is
+         * under review by Stripe and the merchant will probably not be able to collect card present payments.
+         */
+        RESTRICTED,
+
+        /**
+         * This state occurs when there is required business information missing from the account but the
+         * currentDeadline hasn't passed yet (aka there are no overdueRequirements). The merchant will probably be able
+         * to collect card present payments.
+         */
+        RESTRICTED_SOON,
+
+        /**
+         * This state occurs when our payment processor rejects the merchant account due to suspected fraudulent
+         * activity. The merchant will NOT be able to collect card present payments.
+         */
+        REJECTED_FRAUD,
+
+        /** This state occurs when our payment processor rejects the merchant account due to terms of
+         * service violation(s). The merchant will NOT be able to collect card present payments.
+         */
+        REJECTED_TERMS_OF_SERVICE,
+
+        /**
+         * This state occurs when our payment processor rejects the merchant account due to sanctions/being
+        on a watch list. The merchant will NOT be able to collect card present payments.
+         */
+        REJECTED_LISTED,
+
+        /**
+         * This state occurs when our payment processor rejects the merchant account due to any other reason.
+         * The merchant will NOT be able to collect card present payments.
+         */
+        REJECTED_OTHER,
+
+        /**
+         * This state occurs when the merchant hasn't  on-boarded yet. The merchant will NOT be able to
+         * collect card present payments.
+         */
+        NO_ACCOUNT,
+
+        /**
+         * This state occurs when the self-hosted site responded in a way we don't recognize.
+         */
+        UNKNOWN,
+
+        /**
+         * This state occurs when the account is early in an account's lifetime.
+         */
+        PENDING_VERIFICATION;
+
+        class Deserializer : JsonDeserializer<WCPaymentAccountStatus> {
+            override fun deserialize(
+                json: JsonElement,
+                typeOfT: Type?,
+                context: JsonDeserializationContext?
+            ): WCPaymentAccountStatus =
+                    when (json.asString) {
+                        "complete" -> COMPLETE
+                        "enabled" -> ENABLED
+                        "restricted" -> RESTRICTED
+                        "restricted_soon" -> RESTRICTED_SOON
+                        "rejected.fraud" -> REJECTED_FRAUD
+                        "rejected.terms_of_service" -> REJECTED_TERMS_OF_SERVICE
+                        "rejected.listed" -> REJECTED_LISTED
+                        "rejected.other" -> REJECTED_OTHER
+                        "NOACCOUNT", "" -> NO_ACCOUNT
+                        "pending_verification" -> PENDING_VERIFICATION
+                        else -> UNKNOWN
+                    }
+        }
+
+        data class StoreCurrencies(
+            /**
+             * A three character lowercase currency code, e.g. `usd`
+             * See https://stripe.com/docs/api/accounts/object#account_object-default_currency
+             */
+
+            @SerializedName("default")
+            val default: String,
+            @SerializedName("supported")
+            val supportedCurrencies: List<String>
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentChargeApiResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentChargeApiResult.kt
new file mode 100644
index 00000000000..8ce5b95eb6c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentChargeApiResult.kt
@@ -0,0 +1,320 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+import com.google.gson.annotations.SerializedName
+
+data class WCPaymentChargeApiResult(
+    @SerializedName("amount")
+    val amount: Int?,
+    @SerializedName("amount_captured")
+    val amountCaptured: Int?,
+    @SerializedName("amount_refunded")
+    val amountRefunded: Int?,
+    @SerializedName("application")
+    val application: String?,
+    @SerializedName("application_fee")
+    val applicationFee: String?,
+    @SerializedName("application_fee_amount")
+    val applicationFeeAmount: Int?,
+    @SerializedName("authorization_code")
+    val authorizationCode: String?,
+    @SerializedName("balance_transaction")
+    val balanceTransaction: BalanceTransaction?,
+    @SerializedName("billing_details")
+    val billingDetails: BillingDetails?,
+    @SerializedName("calculated_statement_descriptor")
+    val calculatedStatementDescriptor: String?,
+    @SerializedName("captured")
+    val captured: Boolean?,
+    @SerializedName("created")
+    val created: Int?,
+    @SerializedName("currency")
+    val currency: String?,
+    @SerializedName("customer")
+    val customer: String?,
+    @SerializedName("description")
+    val description: String?,
+    @SerializedName("destination")
+    val destination: Any?,
+    @SerializedName("dispute")
+    val dispute: Any?,
+    @SerializedName("disputed")
+    val disputed: Boolean?,
+    @SerializedName("failure_code")
+    val failureCode: Any?,
+    @SerializedName("failure_message")
+    val failureMessage: Any?,
+    @SerializedName("fraud_details")
+    val fraudDetails: List<Any?>?,
+    @SerializedName("id")
+    val id: String?,
+    @SerializedName("invoice")
+    val invoice: Any?,
+    @SerializedName("level3")
+    val level3: Level3?,
+    @SerializedName("livemode")
+    val livemode: Boolean?,
+    @SerializedName("metadata")
+    val metadata: Metadata?,
+    @SerializedName("object")
+    val objectX: String?,
+    @SerializedName("on_behalf_of")
+    val onBehalfOf: Any?,
+    @SerializedName("order")
+    val order: Order?,
+    @SerializedName("outcome")
+    val outcome: Outcome?,
+    @SerializedName("paid")
+    val paid: Boolean?,
+    @SerializedName("payment_intent")
+    val paymentIntent: String?,
+    @SerializedName("payment_method")
+    val paymentMethod: String?,
+    @SerializedName("payment_method_details")
+    val paymentMethodDetails: PaymentMethodDetails?,
+    @SerializedName("receipt_email")
+    val receiptEmail: Any?,
+    @SerializedName("receipt_number")
+    val receiptNumber: Any?,
+    @SerializedName("receipt_url")
+    val receiptUrl: String?,
+    @SerializedName("refunded")
+    val refunded: Boolean?,
+    @SerializedName("refunds")
+    val refunds: Refunds?,
+    @SerializedName("review")
+    val review: Any?,
+    @SerializedName("shipping")
+    val shipping: Any?,
+    @SerializedName("source")
+    val source: Any?,
+    @SerializedName("source_transfer")
+    val sourceTransfer: Any?,
+    @SerializedName("statement_descriptor")
+    val statementDescriptor: String?,
+    @SerializedName("statement_descriptor_suffix")
+    val statementDescriptorSuffix: Any?,
+    @SerializedName("status")
+    val status: String?,
+    @SerializedName("transfer_data")
+    val transferData: Any?,
+    @SerializedName("transfer_group")
+    val transferGroup: Any?
+) {
+    data class BalanceTransaction(
+        @SerializedName("amount")
+        val amount: Int?,
+        @SerializedName("available_on")
+        val availableOn: Int?,
+        @SerializedName("created")
+        val created: Int?,
+        @SerializedName("currency")
+        val currency: String?,
+        @SerializedName("description")
+        val description: String?,
+        @SerializedName("exchange_rate")
+        val exchangeRate: Any?,
+        @SerializedName("fee")
+        val fee: Int?,
+        @SerializedName("fee_details")
+        val feeDetails: List<FeeDetail?>?,
+        @SerializedName("id")
+        val id: String?,
+        @SerializedName("net")
+        val net: Int?,
+        @SerializedName("object")
+        val objectX: String?,
+        @SerializedName("reporting_category")
+        val reportingCategory: String?,
+        @SerializedName("source")
+        val source: String?,
+        @SerializedName("status")
+        val status: String?,
+        @SerializedName("type")
+        val type: String?
+    ) {
+        data class FeeDetail(
+            @SerializedName("amount")
+            val amount: Int?,
+            @SerializedName("application")
+            val application: String?,
+            @SerializedName("currency")
+            val currency: String?,
+            @SerializedName("description")
+            val description: String?,
+            @SerializedName("type")
+            val type: String?
+        )
+    }
+
+    data class BillingDetails(
+        @SerializedName("address")
+        val address: Address?,
+        @SerializedName("email")
+        val email: Any?,
+        @SerializedName("formatted_address")
+        val formattedAddress: String?,
+        @SerializedName("name")
+        val name: Any?,
+        @SerializedName("phone")
+        val phone: Any?
+    ) {
+        data class Address(
+            @SerializedName("city")
+            val city: Any?,
+            @SerializedName("country")
+            val country: Any?,
+            @SerializedName("line1")
+            val line1: Any?,
+            @SerializedName("line2")
+            val line2: Any?,
+            @SerializedName("postal_code")
+            val postalCode: Any?,
+            @SerializedName("state")
+            val state: Any?
+        )
+    }
+
+    data class Level3(
+        @SerializedName("customer_reference")
+        val customerReference: String?,
+        @SerializedName("line_items")
+        val lineItems: List<LineItem?>?,
+        @SerializedName("merchant_reference")
+        val merchantReference: String?,
+        @SerializedName("shipping_amount")
+        val shippingAmount: Int?,
+        @SerializedName("shipping_from_zip")
+        val shippingFromZip: String?
+    ) {
+        data class LineItem(
+            @SerializedName("discount_amount")
+            val discountAmount: Int?,
+            @SerializedName("product_code")
+            val productCode: String?,
+            @SerializedName("product_description")
+            val productDescription: String?,
+            @SerializedName("quantity")
+            val quantity: Int?,
+            @SerializedName("tax_amount")
+            val taxAmount: Int?,
+            @SerializedName("unit_cost")
+            val unitCost: Int?
+        )
+    }
+
+    data class Metadata(
+        @SerializedName("order_id")
+        val orderId: String?,
+        @SerializedName("payment_type")
+        val paymentType: String?,
+        @SerializedName("paymentintent.storename")
+        val paymentintentStorename: String?,
+        @SerializedName("reader_ID")
+        val readerID: String?,
+        @SerializedName("reader_model")
+        val readerModel: String?,
+        @SerializedName("site_url")
+        val siteUrl: String?
+    )
+
+    data class Order(
+        @SerializedName("customer_url")
+        val customerUrl: String?,
+        @SerializedName("number")
+        val number: String?,
+        @SerializedName("subscriptions")
+        val subscriptions: List<Any?>?,
+        @SerializedName("url")
+        val url: String?
+    )
+
+    data class Outcome(
+        @SerializedName("network_status")
+        val networkStatus: String?,
+        @SerializedName("reason")
+        val reason: Any?,
+        @SerializedName("risk_level")
+        val riskLevel: String?,
+        @SerializedName("seller_message")
+        val sellerMessage: String?,
+        @SerializedName("type")
+        val type: String?
+    )
+
+    data class PaymentMethodDetails(
+        @SerializedName("card_present")
+        val cardDetails: CardDetails?,
+        @SerializedName("interac_present")
+        val interacCardDetails: CardDetails?,
+        @SerializedName("type")
+        val type: String?
+    ) {
+        data class CardDetails(
+            @SerializedName("amount_authorized")
+            val amountAuthorized: Int?,
+            @SerializedName("brand")
+            val brand: String?,
+            @SerializedName("cardholder_name")
+            val cardholderName: String?,
+            @SerializedName("country")
+            val country: String?,
+            @SerializedName("emv_auth_data")
+            val emvAuthData: String?,
+            @SerializedName("exp_month")
+            val expMonth: Int?,
+            @SerializedName("exp_year")
+            val expYear: Int?,
+            @SerializedName("fingerprint")
+            val fingerprint: String?,
+            @SerializedName("funding")
+            val funding: String?,
+            @SerializedName("generated_card")
+            val generatedCard: String?,
+            @SerializedName("last4")
+            val last4: String?,
+            @SerializedName("network")
+            val network: String?,
+            @SerializedName("overcapture_supported")
+            val overcaptureSupported: Boolean?,
+            @SerializedName("read_method")
+            val readMethod: String?,
+            @SerializedName("receipt")
+            val receipt: Receipt?
+        ) {
+            data class Receipt(
+                @SerializedName("account_type")
+                val accountType: String?,
+                @SerializedName("application_cryptogram")
+                val applicationCryptogram: String?,
+                @SerializedName("application_preferred_name")
+                val applicationPreferredName: String?,
+                @SerializedName("authorization_code")
+                val authorizationCode: Any?,
+                @SerializedName("authorization_response_code")
+                val authorizationResponseCode: String?,
+                @SerializedName("cardholder_verification_method")
+                val cardholderVerificationMethod: String?,
+                @SerializedName("dedicated_file_name")
+                val dedicatedFileName: String?,
+                @SerializedName("terminal_verification_results")
+                val terminalVerificationResults: String?,
+                @SerializedName("transaction_status_information")
+                val transactionStatusInformation: String?
+            )
+        }
+    }
+
+    @Suppress("ConstructorParameterNaming")
+    data class Refunds(
+        @SerializedName("data")
+        val `data`: List<Any?>?,
+        @SerializedName("has_more")
+        val hasMore: Boolean?,
+        @SerializedName("object")
+        val objectX: String?,
+        @SerializedName("total_count")
+        val totalCount: Int?,
+        @SerializedName("url")
+        val url: String?
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentTransactionsSummaryResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentTransactionsSummaryResult.kt
new file mode 100644
index 00000000000..84f43ae5b38
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCPaymentTransactionsSummaryResult.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+import com.google.gson.annotations.SerializedName
+
+data class WCPaymentTransactionsSummaryResult(
+    @SerializedName("count") val transactionsCount: Int,
+    val currency: String,
+    val total: Int,
+    val fees: Int,
+    val net: Int,
+    @SerializedName("store_currencies") val storeCurrencies: List<String>?,
+    @SerializedName("customer_currencies") val customerCurrencies: List<String>?,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCTerminalStoreLocationResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCTerminalStoreLocationResult.kt
new file mode 100644
index 00000000000..ce90c48438e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/inperson/WCTerminalStoreLocationResult.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.model.payments.inperson
+
+import org.wordpress.android.fluxc.FluxCError
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationErrorType.GenericError
+
+data class WCTerminalStoreLocationResult(
+    val locationId: String?,
+    val displayName: String?,
+    val liveMode: Boolean?,
+    val address: StoreAddress?
+) : Payload<WCTerminalStoreLocationError?>() {
+    constructor(
+        error: WCTerminalStoreLocationError
+    ) : this(null, null, null, null) {
+        this.error = error
+    }
+
+    data class StoreAddress(
+        val city: String?,
+        val country: String?,
+        val line1: String?,
+        val line2: String?,
+        val postalCode: String?,
+        val state: String?
+    )
+}
+
+data class WCTerminalStoreLocationError(
+    val type: WCTerminalStoreLocationErrorType = GenericError,
+    val message: String = ""
+) : FluxCError
+
+sealed class WCTerminalStoreLocationErrorType {
+    object GenericError : WCTerminalStoreLocationErrorType()
+    data class MissingAddress(val addressEditingUrl: String) : WCTerminalStoreLocationErrorType()
+    object InvalidPostalCode : WCTerminalStoreLocationErrorType()
+    object ServerError : WCTerminalStoreLocationErrorType()
+    object NetworkError : WCTerminalStoreLocationErrorType()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverview.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverview.kt
new file mode 100644
index 00000000000..3a310cc7864
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverview.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.model.payments.woo
+
+data class WooPaymentsDepositsOverview(
+    val account: Account?,
+    val balance: Balance?,
+    val deposit: Deposit?
+) {
+    data class Account(
+        val defaultCurrency: String?,
+        val depositsBlocked: Boolean?,
+        val depositsEnabled: Boolean?,
+        val depositsSchedule: DepositsSchedule?
+    ) {
+        data class DepositsSchedule(
+            val delayDays: Int?,
+            val weeklyAnchor: String?,
+            val monthlyAnchor: Int?,
+            val interval: String?
+        )
+    }
+
+    data class Balance(
+        val available: List<Info>?,
+        val instant: List<Info>?,
+        val pending: List<Info>?
+    ) {
+        data class Info(
+            val amount: Long?,
+            val currency: String?,
+            val fee: Long?,
+            val feePercentage: Double?,
+            val net: Long?,
+            val sourceTypes: SourceTypes?,
+        )
+
+        data class SourceTypes(
+            val card: Int?
+        )
+    }
+
+    data class Deposit(
+        val lastManualDeposits: List<ManualDeposit>?,
+        val lastPaid: List<Info>?,
+    ) {
+        data class Info(
+            val amount: Long?,
+            val automatic: Boolean?,
+            val bankAccount: String?,
+            val created: Long?,
+            val currency: String?,
+            val date: Long?,
+            val fee: Long?,
+            val feePercentage: Double?,
+            val depositId: String?,
+            val status: String?,
+            val type: String?
+        )
+
+        data class ManualDeposit(
+            val currency: String?,
+            val date: Long?
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverviewComposedEntities.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverviewComposedEntities.kt
new file mode 100644
index 00000000000..0044290137c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/payments/woo/WooPaymentsDepositsOverviewComposedEntities.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.payments.woo
+
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsBalanceEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsOverviewEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEntity
+
+data class WooPaymentsDepositsOverviewComposedEntities(
+    val overview: WooPaymentsDepositsOverviewEntity,
+
+    val lastPaidDeposits: List<WooPaymentsDepositEntity>?,
+    val lastManualDeposits: List<WooPaymentsManualDepositEntity>?,
+
+    val pendingBalances: List<WooPaymentsBalanceEntity>?,
+    val availableBalances: List<WooPaymentsBalanceEntity>?,
+    val instantBalances: List<WooPaymentsBalanceEntity>?,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/RefundMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/RefundMapper.kt
new file mode 100644
index 00000000000..75b476c4858
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/RefundMapper.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.model.refunds
+
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel.WCRefundItem
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.DATE_FORMAT_DAY
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds.RefundRestClient.RefundResponse
+import java.math.BigDecimal
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+
+class RefundMapper @Inject constructor() {
+    fun map(response: RefundResponse): WCRefundModel {
+        return WCRefundModel(
+                id = response.refundId,
+                dateCreated = response.dateCreated?.let { fromFormattedDate(it) } ?: Date(),
+                amount = response.amount?.toBigDecimalOrNull() ?: BigDecimal.ZERO,
+                reason = response.reason,
+                automaticGatewayRefund = response.refundedPayment ?: false,
+                items = response.items?.map {
+                    WCRefundItem(
+                            itemId = it.id ?: -1,
+                            quantity = it.quantity?.toInt() ?: 0,
+                            subtotal = it.subtotal?.toBigDecimalOrNull() ?: BigDecimal.ZERO,
+                            totalTax = it.totalTax?.toBigDecimalOrNull() ?: BigDecimal.ZERO,
+                            name = it.name,
+                            productId = it.productId,
+                            variationId = it.variationId,
+                            total = it.total?.toBigDecimalOrNull(),
+                            sku = it.sku,
+                            price = it.price?.toBigDecimalOrNull(),
+                            metaData = it.metaData
+                    )
+                } ?: emptyList(),
+                shippingLineItems = response.shippingLineItems ?: emptyList(),
+                feeLineItems = response.feeLineItems ?: emptyList()
+        )
+    }
+
+    private fun fromFormattedDate(date: String): Date? {
+        if (date.isEmpty()) {
+            return null
+        }
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT)
+        return dateFormat.parse(date)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt
new file mode 100644
index 00000000000..45a3475ebcf
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/refunds/WCRefundModel.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.model.refunds
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import java.math.BigDecimal
+import java.util.Date
+
+/**
+ * Note:
+ * For the purpose of creating a refund through API, only a list of `WCRefundItem` is accepted. To be able to refund
+ * shipping lines, they will need to be converted into a list of `WCRefundItem` before being sent to the API.
+ *
+ * On the other hand, for the purpose of fetching a refund through API and persisting the data, product items and
+ * shipping lines are listed separately in the API response. To mimic that, here we also add `shippingLineItems` as
+ * one of the class properties.
+ */
+data class WCRefundModel(
+    val id: Long,
+    val dateCreated: Date,
+    val amount: BigDecimal,
+    val reason: String?,
+    val automaticGatewayRefund: Boolean,
+    val items: List<WCRefundItem>,
+    val shippingLineItems: List<WCRefundShippingLine>,
+    val feeLineItems: List<WCRefundFeeLine>
+) {
+    data class WCRefundItem(
+        val itemId: Long,
+        @SerializedName("qty")
+        val quantity: Int,
+        @SerializedName("refund_total")
+        val subtotal: BigDecimal,
+        @SerializedName("refund_tax")
+        val totalTax: BigDecimal,
+        val name: String? = null,
+        val productId: Long? = null,
+        val variationId: Long? = null,
+        val total: BigDecimal? = null,
+        val sku: String? = null,
+        val price: BigDecimal? = null,
+        @SerializedName("meta_data")
+        val metaData: List<WCMetaData>? = null
+    )
+
+    data class WCRefundShippingLine(
+        val id: Long,
+        val total: BigDecimal,
+        @SerializedName("total_tax")
+        val totalTax: BigDecimal,
+        @SerializedName("method_id")
+        val methodId: String? = null,
+        @SerializedName("method_title")
+        val methodTitle: String? = null,
+        @SerializedName("meta_data")
+        val metaData: List<WCMetaData>? = null
+    )
+
+    data class WCRefundFeeLine(
+        @SerializedName("id")
+        val id: Long,
+        @SerializedName("name")
+        val name: String,
+        @SerializedName("total")
+        val total: BigDecimal,
+        @SerializedName("total_tax")
+        val totalTax: BigDecimal,
+        @SerializedName("meta_data")
+        val metaData: List<WCMetaData>? = null
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/settings/WCSettingsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/settings/WCSettingsMapper.kt
new file mode 100644
index 00000000000..5a559b638e5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/settings/WCSettingsMapper.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.model.settings
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition
+import org.wordpress.android.fluxc.model.taxes.TaxBasedOnSettingEntity
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.SiteSettingOptionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.SiteSettingsResponse
+import javax.inject.Inject
+
+class WCSettingsMapper
+@Inject constructor() {
+    fun mapSiteSettings(response: List<SiteSettingsResponse>, site: SiteModel): WCSettingsModel {
+        val currencyCode = getValueForSettingsField(response, "woocommerce_currency")
+        val currencyPosition = getValueForSettingsField(response, "woocommerce_currency_pos")
+        val currencyThousandSep = getValueForSettingsField(response, "woocommerce_price_thousand_sep")
+        val currencyDecimalSep = getValueForSettingsField(response, "woocommerce_price_decimal_sep")
+        val currencyNumDecimals = getValueForSettingsField(response, "woocommerce_price_num_decimals")
+        val address = getValueForSettingsField(response, "woocommerce_store_address")
+        val address2 = getValueForSettingsField(response, "woocommerce_store_address_2")
+        val city = getValueForSettingsField(response, "woocommerce_store_city")
+        val postalCode = getValueForSettingsField(response, "woocommerce_store_postcode")
+        val countryAndState = getValueForSettingsField(response, "woocommerce_default_country")
+            ?.split(":")
+        val country = countryAndState?.firstOrNull()
+        val state = countryAndState?.getOrNull(1)
+        val couponsEnabled = getValueForSettingsField(response, "woocommerce_enable_coupons")
+
+        return WCSettingsModel(
+            localSiteId = site.id,
+            currencyCode = currencyCode ?: "",
+            currencyPosition = CurrencyPosition.fromString(currencyPosition),
+            currencyThousandSeparator = currencyThousandSep ?: "",
+            currencyDecimalSeparator = currencyDecimalSep ?: "",
+            currencyDecimalNumber = currencyNumDecimals?.toIntOrNull() ?: 2,
+            countryCode = country ?: "",
+            stateCode = state ?: "",
+            address = address ?: "",
+            address2 = address2 ?: "",
+            city = city ?: "",
+            postalCode = postalCode ?: "",
+            couponsEnabled = couponsEnabled?.let { it == "yes" } ?: false
+        )
+    }
+
+    fun mapProductSettings(response: List<SiteSettingsResponse>, site: SiteModel): WCProductSettingsModel {
+        val weightUnit = getValueForSettingsField(response, "woocommerce_weight_unit")
+        val dimensionUnit = getValueForSettingsField(response, "woocommerce_dimension_unit")
+
+        return WCProductSettingsModel().apply {
+            localSiteId = site.id
+            this.dimensionUnit = dimensionUnit ?: ""
+            this.weightUnit = weightUnit ?: ""
+        }
+    }
+
+    fun mapTaxBasedOnSettings(
+        response: SiteSettingOptionResponse,
+        localSiteId: LocalId
+    ): TaxBasedOnSettingEntity {
+        return TaxBasedOnSettingEntity(
+            localSiteId = localSiteId,
+            selectedOption = response.value ?: "",
+        )
+    }
+
+    private fun getValueForSettingsField(settingsResponse: List<SiteSettingsResponse>, field: String): String? {
+        return settingsResponse.find { it.id != null && it.id == field }?.value?.asString
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCAddressVerificationResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCAddressVerificationResult.kt
new file mode 100644
index 00000000000..cc07298250f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCAddressVerificationResult.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+
+sealed class WCAddressVerificationResult {
+    data class Valid(
+        val suggestedAddress: ShippingLabelAddress,
+        val isTrivialNormalization: Boolean
+    ) : WCAddressVerificationResult()
+    data class InvalidAddress(val message: String) : WCAddressVerificationResult()
+    data class InvalidRequest(val message: String) : WCAddressVerificationResult()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCPackagesResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCPackagesResult.kt
new file mode 100644
index 00000000000..f046d2dfdf6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCPackagesResult.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+data class WCPackagesResult(
+    val customPackages: List<CustomPackage>,
+    val predefinedOptions: List<PredefinedOption>
+) {
+    data class CustomPackage(
+        val title: String,
+        val isLetter: Boolean,
+        val dimensions: String,
+        val boxWeight: Float
+    )
+
+    data class PredefinedOption(
+        val title: String,
+        val carrier: String,
+        val predefinedPackages: List<PredefinedPackage>
+    ) {
+        data class PredefinedPackage(
+            val id: String,
+            val title: String,
+            val isLetter: Boolean,
+            val dimensions: String,
+            val boxWeight: Float
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingAccountSettings.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingAccountSettings.kt
new file mode 100644
index 00000000000..d50940fdce0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingAccountSettings.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+
+data class WCShippingAccountSettings(
+    val isCreatingLabelsEnabled: Boolean,
+    val isEmailReceiptEnabled: Boolean,
+    val paperSize: WCShippingLabelPaperSize,
+    val canEditSettings: Boolean,
+    val canManagePayments: Boolean,
+    val storeOwnerName: String,
+    val storeOwnerUserName: String,
+    val storeOwnerWpcomUserName: String,
+    val storeOwnerWpcomEmail: String,
+    val selectedPaymentMethodId: Int?,
+    val paymentMethods: List<WCPaymentMethod>,
+    val lastUsedBoxId: String?
+)
+
+data class WCPaymentMethod(
+    @SerializedName("payment_method_id")
+    val paymentMethodId: Int,
+    @SerializedName("name")
+    val name: String,
+    @SerializedName("card_type")
+    val cardType: String,
+    @SerializedName("card_digits")
+    val cardDigits: String,
+    @SerializedName("expiry")
+    val expiry: String
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelCreationEligibility.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelCreationEligibility.kt
new file mode 100644
index 00000000000..829ac6e5be9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelCreationEligibility.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+class WCShippingLabelCreationEligibility(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteOrderId = 0L
+    @Column var canCreatePackage = false
+    @Column var canCreatePaymentMethod = false
+    @Column var canCreateCustomsForm = false
+    @Column var isEligible = false
+        @JvmName("setIsEligible")
+        set
+    @Column var reason: String? = null
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId(): Int = id
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelMapper.kt
new file mode 100644
index 00000000000..c1b02c9ca84
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelMapper.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.google.gson.Gson
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.FormData
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelStatusApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelApiResponse
+import javax.inject.Inject
+
+class WCShippingLabelMapper
+@Inject constructor() {
+    fun map(response: ShippingLabelApiResponse, site: SiteModel): List<WCShippingLabelModel> {
+        return response.labelsData?.map { labelItem ->
+            WCShippingLabelModel().apply {
+                remoteShippingLabelId = labelItem.labelId ?: 0L
+                trackingNumber = labelItem.trackingNumber ?: ""
+                carrierId = labelItem.carrierId ?: ""
+                serviceName = labelItem.serviceName ?: ""
+                status = labelItem.status ?: ""
+                packageName = labelItem.packageName ?: ""
+                rate = labelItem.rate?.toFloat() ?: 0F
+                refundableAmount = labelItem.refundableAmount?.toFloat() ?: 0F
+                currency = labelItem.currency ?: ""
+                productNames = labelItem.productNames.toString()
+                productIds = labelItem.productIds.toString()
+                refund = labelItem.refund.toString()
+                commercialInvoiceUrl = labelItem.commercialInvoiceUrl
+                dateCreated = labelItem.dateCreated
+                expiryDate = labelItem.expiryDate
+                remoteOrderId = response.orderId ?: 0L
+                formData = response.formData.toString()
+
+                localSiteId = site.id
+            }
+        } ?: emptyList()
+    }
+
+    fun map(
+        response: ShippingLabelStatusApiResponse,
+        orderId: Long,
+        origin: ShippingLabelAddress,
+        destination: ShippingLabelAddress,
+        site: SiteModel
+    ): List<WCShippingLabelModel> {
+        val gson = Gson()
+        return response.labels?.map { labelItem ->
+            WCShippingLabelModel().apply {
+                remoteShippingLabelId = labelItem.labelId ?: 0L
+                trackingNumber = labelItem.trackingNumber ?: ""
+                carrierId = labelItem.carrierId ?: ""
+                serviceName = labelItem.serviceName ?: ""
+                status = labelItem.status ?: ""
+                packageName = labelItem.packageName ?: ""
+                rate = labelItem.rate?.toFloat() ?: labelItem.refundableAmount?.toFloat() ?: 0F
+                refundableAmount = labelItem.refundableAmount?.toFloat() ?: 0F
+                currency = labelItem.currency ?: ""
+                productNames = labelItem.productNames.toString()
+                productIds = labelItem.productIds.toString()
+                refund = labelItem.refund.toString()
+                commercialInvoiceUrl = labelItem.commercialInvoiceUrl
+                dateCreated = labelItem.dateCreated
+                expiryDate = labelItem.expiryDate
+
+                remoteOrderId = orderId
+                formData = gson.toJson(FormData(origin = origin, destination = destination))
+
+                localSiteId = site.id
+            }
+        } ?: emptyList()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelModel.kt
new file mode 100644
index 00000000000..7a486107e40
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelModel.kt
@@ -0,0 +1,206 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import java.math.BigDecimal
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+class WCShippingLabelModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteOrderId = 0L // The remote identifier for the parent order object
+    @Column var remoteShippingLabelId = 0L // The unique identifier for this note on the server
+    @Column var trackingNumber = ""
+    @Column var carrierId = ""
+    @Column var dateCreated: Long? = null
+    @Column var expiryDate: Long? = null
+    @Column var serviceName = ""
+    @Column var status = ""
+    @Column var packageName = ""
+    @Column var rate = 0F
+    @Column var refundableAmount = 0F
+    @Column var currency = ""
+    @Column var productNames = "" // list of product names the shipping label was purchased for
+    @Column var productIds = "" // list of product ids the shipping label was purchased for
+    @Column var formData = "" // map containing package and product details related to that shipping label
+    @Column var refund = "" // map containing refund information for a shipping label
+    @Column var commercialInvoiceUrl: String? = null // URL pointing to the international commercial URL
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    companion object {
+        private val gson by lazy { Gson() }
+    }
+
+    /**
+     * Returns the destination details wrapped in a [ShippingLabelAddress].
+     */
+    fun getDestinationAddress() = getFormData()?.destination
+
+    /**
+     * Returns the shipping details wrapped in a [ShippingLabelAddress].
+     */
+    fun getOriginAddress() = getFormData()?.origin
+
+    /**
+     * Returns the product details for the order wrapped in a list of [ProductItem]
+     */
+    fun getProductItems() = getFormData()?.selectedPackage?.defaultBox?.productItems ?: emptyList()
+
+    /**
+     * Returns default data related to the order such as the origin address,
+     * destination address and product items associated with the order.
+     */
+    private fun getFormData(): FormData? {
+        val responseType = object : TypeToken<FormData>() {}.type
+        return gson.fromJson(formData, responseType) as? FormData
+    }
+
+    /**
+     * Returns the list of products the shipping labels were purchased for
+     *
+     * For instance: "[Belt, Cap, Herman Miller Chair Embody]" would be split into a list
+     * ["Belt", "Cap", "Herman Miller Chair Embody"]
+     */
+    fun getProductNameList(): List<String> {
+        return productNames
+                .trim() // remove extra spaces between commas
+                .removePrefix("[") // remove the String prefix
+                .removeSuffix("]") // remove the String suffix
+                .split(",") // split the string into list using comma spearators
+    }
+
+    /**
+     * Returns the list of products the shipping labels were purchased for
+     *
+     * For instance: "[60, 61, 62]" would be split into a list
+     * [60, 61, 62]
+     */
+    fun getProductIdsList(): List<Long> {
+        return productIds
+                .trim() // remove extra spaces between the brackets
+                .removePrefix("[") // remove the String prefix
+                .removeSuffix("]") // remove the String suffix
+                .split(",") // split the string into list using comma separators
+                .filter { it.isNotEmpty() }
+                .map { it.trim().toLong() }
+    }
+
+    /**
+     * Returns data related to the refund of a shipping label.
+     * Will only be available in the API if a refund has been initiated
+     */
+    fun getRefundModel(): WCShippingLabelRefundModel? {
+        val responseType = object : TypeToken<WCShippingLabelRefundModel>() {}.type
+        return gson.fromJson(refund, responseType) as? WCShippingLabelRefundModel
+    }
+
+    /**
+     * Model class corresponding to the [formData] map from the API response.
+     * The [formData] contains the [origin] and [destination] address and the
+     * product details associated with the order.
+     * (nested under [selectedPackage] -> [DefaultBox] -> List of [ProductItem]).
+     */
+    class FormData(
+        val origin: ShippingLabelAddress? = null,
+        val destination: ShippingLabelAddress? = null,
+        @SerializedName("selected_packages") val selectedPackage: SelectedPackage? = null
+    )
+
+    data class ShippingLabelAddress(
+        val company: String? = null,
+        val name: String? = null,
+        val phone: String? = null,
+        val country: String? = null,
+        val state: String? = null,
+        val address: String? = null,
+        @SerializedName("address_2") val address2: String? = null,
+        val city: String? = null,
+        val postcode: String? = null
+    ) {
+        enum class Type {
+            ORIGIN,
+            DESTINATION
+        }
+    }
+
+    data class ShippingLabelPackage(
+        val id: String,
+        @SerializedName("box_id") val boxId: String,
+        val height: Float,
+        val length: Float,
+        val width: Float,
+        val weight: Float,
+        @SerializedName("is_letter") val isLetter: Boolean = false,
+        val hazmat: HazmatCategory? = null
+    )
+
+    class SelectedPackage {
+        @SerializedName("default_box") val defaultBox: DefaultBox? = null
+    }
+
+    class DefaultBox {
+        @SerializedName("items") val productItems: List<ProductItem>? = null
+    }
+
+    class ProductItem {
+        val height: BigDecimal? = null
+        val length: BigDecimal? = null
+        val quantity: Int? = null
+        val width: BigDecimal? = null
+        val name: String? = null
+        val url: String? = null
+        val value: BigDecimal? = null
+        @SerializedName("product_id") val productId: Long? = null
+    }
+
+    class WCShippingLabelRefundModel {
+        val status: String? = null
+        @SerializedName("request_date") val requestDate: Long? = null
+    }
+    enum class HazmatCategory {
+        PRIMARY_CONTAINED,
+        PRIMARY_PACKED,
+        PRIMARY,
+        SECONDARY_CONTAINED,
+        SECONDARY_PACKED,
+        SECONDARY,
+        ORMD,
+        LITHIUM,
+        LIMITED_QUANTITY,
+        AIR_ELIGIBLE_ETHANOL,
+        CLASS_1,
+        CLASS_3,
+        CLASS_4,
+        CLASS_5,
+        CLASS_6,
+        CLASS_7,
+        CLASS_8_CORROSIVE,
+        CLASS_8_WET_BATTERY,
+        CLASS_9_NEW_LITHIUM_INDIVIDUAL,
+        CLASS_9_USED_LITHIUM,
+        CLASS_9_NEW_LITHIUM_DEVICE,
+        CLASS_9_DRY_ICE,
+        CLASS_9_UNMARKED_LITHIUM,
+        CLASS_9_MAGNETIZED,
+        DIVISION_4_1,
+        DIVISION_5_1,
+        DIVISION_5_2,
+        DIVISION_6_1,
+        DIVISION_6_2,
+        EXCEPTED_QUANTITY_PROVISION,
+        GROUND_ONLY,
+        ID8000,
+        LIGHTERS,
+        SMALL_QUANTITY_PROVISION
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPackageData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPackageData.kt
new file mode 100644
index 00000000000..9e7ab27f64d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPackageData.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+
+data class WCShippingLabelPackageData(
+    val id: String,
+    @SerializedName("box_id") val boxId: String,
+    @SerializedName("is_letter") val isLetter: Boolean,
+    val length: Float,
+    val width: Float,
+    val height: Float,
+    val weight: Float,
+    val hazmat: String? = null,
+    @SerializedName("shipment_id") val shipmentId: String,
+    @SerializedName("rate_id") val rateId: String,
+    @SerializedName("service_id") val serviceId: String,
+    @SerializedName("service_name") val serviceName: String,
+    @SerializedName("carrier_id") val carrierId: String,
+    val products: List<Long>
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPaperSize.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPaperSize.kt
new file mode 100644
index 00000000000..837145d410b
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingLabelPaperSize.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+enum class WCShippingLabelPaperSize(val stringValue: String) {
+    A4("a4"),
+    LABEL("label"),
+    LEGAL("legal"),
+    LETTER("letter");
+
+    companion object {
+        fun fromString(value: String): WCShippingLabelPaperSize {
+            // When the value is unknown, WCS in wp-admin uses Label by default
+            return WCShippingLabelPaperSize.values().find { it.stringValue == value } ?: LABEL
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingPackageCustoms.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingPackageCustoms.kt
new file mode 100644
index 00000000000..c0b66cbce2c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingPackageCustoms.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.shippinglabels.WCContentType.Other
+import java.math.BigDecimal
+
+data class WCShippingPackageCustoms(
+    @Expose(serialize = false) val id: String,
+    @SerializedName("contents_type") val contentsType: WCContentType?,
+    @SerializedName("contents_explanation") val contentsExplanation: String? = null,
+    @SerializedName("restriction_type") val restrictionType: WCRestrictionType?,
+    @SerializedName("restriction_comments") val restrictionComments: String? = null,
+    @SerializedName("non_delivery_option") val nonDeliveryOption: WCNonDeliveryOption?,
+    @SerializedName("itn") val itn: String?,
+    @SerializedName("items") val customsItems: List<WCCustomsItem>?
+) {
+    init {
+        require(!(contentsType == Other && contentsExplanation.isNullOrEmpty())) {
+            "you have to specify contentsExplanation when the contentsType is Other"
+        }
+        require(!(restrictionType == WCRestrictionType.Other && restrictionComments.isNullOrEmpty())) {
+            "you have to specify restrictionComments when the restrictionType is Other"
+        }
+    }
+}
+
+data class WCCustomsItem(
+    @SerializedName("product_id") val productId: Long,
+    val description: String,
+    val quantity: Int,
+    val value: BigDecimal,
+    val weight: Float,
+    @SerializedName("hs_tariff_number") val hsTariffNumber: String?,
+    @SerializedName("origin_country") val originCountry: String
+)
+
+enum class WCContentType {
+    @SerializedName("merchandise")
+    Merchandise,
+    @SerializedName("documents")
+    Documents,
+    @SerializedName("gift")
+    Gift,
+    @SerializedName("sample")
+    Sample,
+    @SerializedName("other")
+    Other
+}
+
+enum class WCRestrictionType {
+    @SerializedName("none")
+    None,
+    @SerializedName("quarantine")
+    Quarantine,
+    @SerializedName("sanitary_phytosanitary_inspection")
+    SanitaryInspection,
+    @SerializedName("other")
+    Other
+}
+
+enum class WCNonDeliveryOption {
+    @SerializedName("abandon")
+    Abandon,
+    @SerializedName("return")
+    Return
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingRatesResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingRatesResult.kt
new file mode 100644
index 00000000000..50186a569b1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/shippinglabels/WCShippingRatesResult.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.shippinglabels
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.ShippingRatesApiResponse.ShippingOption.Rate
+
+data class WCShippingRatesResult(
+    val packageRates: List<ShippingPackage>
+) {
+    data class ShippingOption(
+        val optionId: String,
+        val rates: List<Rate>
+    )
+
+    data class ShippingPackage(
+        val boxId: String,
+        val shippingOptions: List<ShippingOption>
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxBasedOnSettingEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxBasedOnSettingEntity.kt
new file mode 100644
index 00000000000..0331d4e487c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxBasedOnSettingEntity.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.taxes
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+
+@Entity(tableName = "TaxBasedOnSetting")
+data class TaxBasedOnSettingEntity(
+    @PrimaryKey val localSiteId: LocalId,
+    val selectedOption: String,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxRateEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxRateEntity.kt
new file mode 100644
index 00000000000..54dc8ae5ce4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/TaxRateEntity.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model.taxes
+
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+@Entity(
+    tableName = "TaxRate",
+    primaryKeys = ["id", "localSiteId"],
+)
+data class TaxRateEntity (
+    val id: RemoteId,
+    val localSiteId: LocalId,
+    val country: String? = null,
+    val state: String? = null,
+    val postcode: String? = null,
+    val city: String? = null,
+    val rate: String? = null,
+    val name: String? = null,
+    val taxClass: String? = null,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassMapper.kt
new file mode 100644
index 00000000000..e4d61ddbb8d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassMapper.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.model.taxes
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.WCTaxRestClient.TaxClassApiResponse
+import javax.inject.Inject
+
+class WCTaxClassMapper
+@Inject constructor() {
+    fun map(response: TaxClassApiResponse): WCTaxClassModel {
+        return WCTaxClassModel().apply {
+            name = response.name ?: ""
+            slug = response.slug ?: ""
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassModel.kt
new file mode 100644
index 00000000000..3b27a019e86
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/taxes/WCTaxClassModel.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.model.taxes
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (SLUG, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+data class WCTaxClassModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var name = ""
+    @Column var slug = "" // The unique identifier for the tax class on the server
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserMapper.kt
new file mode 100644
index 00000000000..41e04ef3d77
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserMapper.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model.user
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.user.WCUserRestClient.UserApiResponse
+import javax.inject.Inject
+
+class WCUserMapper
+@Inject constructor() {
+    fun map(user: UserApiResponse, siteModel: SiteModel): WCUserModel {
+        return WCUserModel().apply {
+            remoteUserId = user.id
+            username = user.username ?: ""
+            firstName = user.firstName ?: ""
+            lastName = user.lastName ?: ""
+            email = user.email ?: ""
+            roles = user.roles.toString()
+
+            localSiteId = siteModel.id
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserModel.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserModel.kt
new file mode 100644
index 00000000000..5e3ef0128af
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserModel.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.model.user
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+
+@Table(addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+@RawConstraints(
+        "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "UNIQUE (EMAIL, LOCAL_SITE_ID) ON CONFLICT REPLACE"
+)
+data class WCUserModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var localSiteId = 0
+    @Column var remoteUserId: Long = 0L
+    @Column var firstName: String = ""
+    @Column var lastName: String = ""
+    @Column var username: String = ""
+    @Column var email: String = ""
+    @Column var roles: String = ""
+
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    fun getUserRoles(): ArrayList<WCUserRole> {
+        val userRoles = ArrayList<WCUserRole>()
+        if (roles.isNotEmpty()) {
+            Gson().fromJson(roles, JsonElement::class.java).asJsonArray.forEach {
+                userRoles.add(WCUserRole.fromValue(it.asString))
+            }
+        }
+        return userRoles
+    }
+
+    fun isUserEligible() = getUserRoles().any { it.isSupported() }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserRole.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserRole.kt
new file mode 100644
index 00000000000..6cb2472f5d4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/model/user/WCUserRole.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.user
+
+enum class WCUserRole(val value: String = "") {
+    OWNER("owner"),
+    ADMINISTRATOR("administrator"),
+    EDITOR("editor"),
+    AUTHOR("author"),
+    CUSTOMER("customer"),
+    SUBSCRIBER("subscriber"),
+    SHOP_MANAGER("shop_manager"),
+    OTHER;
+
+    companion object {
+        private val valueMap = values().associateBy(WCUserRole::value)
+
+        /**
+         * Convert the base value into the associated UserRole object.
+         * There are plugins available that can add custom roles.
+         * So if we are unable to find a matching [WCUserRole] object, [OTHER] is returned.
+         * This is not currently supported by our app.
+         */
+        fun fromValue(value: String) = valueMap[value] ?: OTHER
+    }
+
+    fun isSupported() = this == ADMINISTRATOR || this == SHOP_MANAGER
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingOptionResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingOptionResponse.kt
new file mode 100644
index 00000000000..952eee3149d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingOptionResponse.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class SiteSettingOptionResponse : Response {
+    @SerializedName("id") val id: String? = null
+    @SerializedName("label") val label: String? = null
+    @SerializedName("description") val description: String? = null
+    @SerializedName("type") val type: String? = null
+    @SerializedName("default") val default: String? = null
+    @SerializedName("options") val options: JsonElement? = null
+    @SerializedName("tip") val tip: String? = null
+    @SerializedName("value") val value: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingsResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingsResponse.kt
new file mode 100644
index 00000000000..fb7d86faa7c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/SiteSettingsResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+class SiteSettingsResponse : Response {
+    val id: String? = null
+    val value: JsonElement? = null // JsonElement because this field can be a string or an array (at least)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooCommerceRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooCommerceRestClient.kt
new file mode 100644
index 00000000000..d97c17b5035
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooCommerceRestClient.kt
@@ -0,0 +1,96 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.discovery.RootWPAPIRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequest
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WooCommerceRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    companion object {
+        const val COUPONS_SETTING_GROUP = "general"
+        const val COUPONS_SETTING_ID = "woocommerce_enable_coupons"
+        const val TAX_SETTING_GROUP = "tax"
+        const val TAX_SETTING_ID = "woocommerce_tax_based_on"
+
+        private const val ROOT_ENDPOINT_TIMEOUT_MS = 15000
+    }
+
+    /**
+     * Makes a GET call to the root wp-json endpoint (`/`) via the Jetpack tunnel (see [JetpackTunnelGsonRequest])
+     * for the given [SiteModel], and parses through the `namespaces` field in the result for supported versions
+     * of the Woo API.
+     *
+     */
+    suspend fun fetchSupportedWooApiVersion(
+        site: SiteModel,
+        overrideRetryPolicy: Boolean = false
+    ): WooPayload<RootWPAPIRestResponse> {
+        val url = "/"
+        val timeout = when (overrideRetryPolicy) {
+            true -> ROOT_ENDPOINT_TIMEOUT_MS
+            false -> BaseRequest.DEFAULT_REQUEST_TIMEOUT
+        }
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf("_fields" to "authentication,namespaces"),
+            clazz = RootWPAPIRestResponse::class.java,
+            requestTimeout = timeout
+        )
+        return response.toWooPayload()
+    }
+
+    /**
+     * Makes a GET call to `/wc/v3/settings/general` via the Jetpack tunnel (see [JetpackTunnelGsonRequest]),
+     * retrieving site settings for the given WooCommerce [SiteModel].
+     *
+     */
+    suspend fun fetchSiteSettingsGeneral(site: SiteModel): WooPayload<List<SiteSettingsResponse>> {
+        val url = WOOCOMMERCE.settings.general.pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<SiteSettingsResponse>::class.java
+        )
+        return response.toWooPayload { it.toList() }
+    }
+
+    suspend fun fetchSiteSettingsProducts(site: SiteModel): WooPayload<List<SiteSettingsResponse>> {
+        val url = WOOCOMMERCE.settings.products.pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<SiteSettingsResponse>::class.java
+        )
+        return response.toWooPayload { it.toList() }
+    }
+
+    suspend fun enableCoupons(site: SiteModel): WooPayload<Boolean> {
+        val url = WOOCOMMERCE.settings.group(COUPONS_SETTING_GROUP).id(COUPONS_SETTING_ID).pathV3
+        val param = mapOf("value" to "yes")
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            clazz = SiteSettingOptionResponse::class.java,
+            body = param
+        )
+
+        return response.toWooPayload { it.let { it.value == "yes" } }
+    }
+
+    suspend fun fetchSiteSettingsTaxBasedOn(site: SiteModel): WooPayload<SiteSettingOptionResponse> {
+        val url = WOOCOMMERCE.settings.group(TAX_SETTING_GROUP).id(TAX_SETTING_ID).pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = SiteSettingOptionResponse::class.java
+        )
+        return response.toWooPayload { it }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooError.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooError.kt
new file mode 100644
index 00000000000..046be932fed
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooError.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.CENSORED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.HTTP_AUTH_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_SSL_CERTIFICATE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_AUTHENTICATED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NO_CONNECTION
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+
+class WooError(
+    var type: WooErrorType,
+    var original: GenericErrorType,
+    var message: String? = null
+) : OnChangedError
+
+enum class WooErrorType {
+    TIMEOUT,
+    API_ERROR,
+    INVALID_ID,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    AUTHORIZATION_REQUIRED,
+    INVALID_PARAM,
+    API_NOT_FOUND,
+    EMPTY_RESPONSE,
+    INVALID_COUPON,
+    RESOURCE_ALREADY_EXISTS
+}
+
+fun WPComGsonNetworkError.toWooError() = WooError(
+    type = type.getWooErrorType(apiError),
+    original = type,
+    message = message
+)
+
+fun WPAPINetworkError.toWooError() = WooError(
+    type = type.getWooErrorType(errorCode),
+    original = type,
+    message = message
+)
+
+private fun GenericErrorType?.getWooErrorType(apiError: String?) = when (this) {
+    TIMEOUT -> WooErrorType.TIMEOUT
+    NO_CONNECTION,
+    SERVER_ERROR,
+    INVALID_SSL_CERTIFICATE,
+    NETWORK_ERROR -> WooErrorType.API_ERROR
+
+    PARSE_ERROR,
+    CENSORED,
+    INVALID_RESPONSE -> WooErrorType.INVALID_RESPONSE
+
+    HTTP_AUTH_ERROR,
+    AUTHORIZATION_REQUIRED,
+    NOT_AUTHENTICATED -> WooErrorType.AUTHORIZATION_REQUIRED
+
+    NOT_FOUND -> {
+        when (apiError) {
+            "rest_no_route" -> WooErrorType.API_NOT_FOUND
+            else -> WooErrorType.INVALID_ID
+        }
+    }
+
+    UNKNOWN, null -> {
+        when (apiError) {
+            "rest_invalid_param" -> WooErrorType.INVALID_PARAM
+            "rest_no_route" -> WooErrorType.API_NOT_FOUND
+            "woocommerce_rest_invalid_coupon" -> WooErrorType.INVALID_COUPON
+            else -> WooErrorType.GENERIC_ERROR
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetwork.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetwork.kt
new file mode 100644
index 00000000000..293c00ef1a0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetwork.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.JetpackTunnelWPAPINetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackSuccess
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * The Woo app supports connecting to sites using either Jetpack or the site credentials (technically application
+ * passwords). This class allows this by supporting multiple networking implementations depending on the type of site:
+ * - Jetpack Sites: the API call will use Jetpack Tunnel using [JetpackTunnelWPAPINetwork]
+ * - Non-Jetpack Sites: the API call will use Application Passwords using [ApplicationPasswordsNetwork]
+ *
+ * The [SiteModel.ORIGIN_XMLRPC] support is kept for backward compatibility
+ */
+@Singleton
+class WooNetwork @Inject constructor(
+    private val jetpackTunnelWPAPINetwork: JetpackTunnelWPAPINetwork,
+    private val applicationPasswordsNetwork: ApplicationPasswordsNetwork
+) {
+    suspend fun <T : Any> executeGetGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        requestTimeout: Int = BaseRequest.DEFAULT_REQUEST_TIMEOUT,
+        retries: Int = BaseRequest.DEFAULT_MAX_RETRIES
+    ): WPAPIResponse<T> {
+        return when (site.origin) {
+            SiteModel.ORIGIN_WPCOM_REST -> jetpackTunnelWPAPINetwork.executeGetGsonRequest(
+                site, path, clazz, params, enableCaching, cacheTimeToLive, forced, requestTimeout, retries
+            ).toWPAPIResponse()
+            SiteModel.ORIGIN_XMLRPC, SiteModel.ORIGIN_WPAPI -> applicationPasswordsNetwork.executeGetGsonRequest(
+                site, path, clazz, params, enableCaching, cacheTimeToLive, forced, requestTimeout, retries
+            )
+            else -> error("Site with unsupported origin")
+        }
+    }
+
+    suspend fun <T : Any> executePostGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap()
+    ): WPAPIResponse<T> {
+        return when (site.origin) {
+            SiteModel.ORIGIN_WPCOM_REST -> jetpackTunnelWPAPINetwork.executePostGsonRequest(site, path, clazz, body)
+                .toWPAPIResponse()
+            SiteModel.ORIGIN_XMLRPC, SiteModel.ORIGIN_WPAPI -> applicationPasswordsNetwork.executePostGsonRequest(
+                site, path, clazz, body
+            )
+            else -> error("Site with unsupported origin")
+        }
+    }
+
+    suspend fun <T : Any> executePutGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap()
+    ): WPAPIResponse<T> {
+        return when (site.origin) {
+            SiteModel.ORIGIN_WPCOM_REST -> jetpackTunnelWPAPINetwork.executePutGsonRequest(site, path, clazz, body)
+                .toWPAPIResponse()
+            SiteModel.ORIGIN_XMLRPC, SiteModel.ORIGIN_WPAPI -> applicationPasswordsNetwork.executePutGsonRequest(
+                site, path, clazz, body
+            )
+            else -> error("Site with unsupported origin")
+        }
+    }
+
+    suspend fun <T : Any> executeDeleteGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap()
+    ): WPAPIResponse<T> {
+        return when (site.origin) {
+            SiteModel.ORIGIN_WPCOM_REST -> jetpackTunnelWPAPINetwork.executeDeleteGsonRequest(site, path, clazz, params)
+                .toWPAPIResponse()
+            SiteModel.ORIGIN_XMLRPC, SiteModel.ORIGIN_WPAPI -> applicationPasswordsNetwork.executeDeleteGsonRequest(
+                site, path, clazz, params
+            )
+            else -> error("Site with unsupported origin")
+        }
+    }
+}
+
+private fun <T> JetpackResponse<T>.toWPAPIResponse(): WPAPIResponse<T> {
+    return when (this) {
+        is JetpackSuccess -> WPAPIResponse.Success(data)
+        is JetpackError -> WPAPIResponse.Error(WPAPINetworkError(error, errorCode = error.apiError))
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooResult.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooResult.kt
new file mode 100644
index 00000000000..7ea894dcc5f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooResult.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.Store
+
+data class WooPayload<T>(val result: T? = null) : Payload<WooError>() {
+    constructor(error: WooError) : this() {
+        this.error = error
+    }
+
+    fun asWooResult() = asWooResult { it }
+
+    fun <R> asWooResult(mapper: (T) -> R): WooResult<R> = when {
+        isError -> WooResult(error)
+        result != null -> WooResult(mapper(result))
+        else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+    }
+}
+
+data class WooResult<T>(val model: T? = null) : Store.OnChanged<WooError>() {
+    constructor(error: WooError) : this() {
+        this.error = error
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/AddOnsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/AddOnsRestClient.kt
new file mode 100644
index 00000000000..33a9a4d2dae
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/AddOnsRestClient.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.dto.AddOnGroupDto
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class AddOnsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchGlobalAddOnGroups(site: SiteModel): WooPayload<List<AddOnGroupDto>> {
+        val url = WOOCOMMERCE.product_add_ons.pathV1Addons
+
+        val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                clazz = Array<AddOnGroupDto>::class.java
+        )
+
+        return response.toWooPayload { it.toList() }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/dto/AddOnGroupDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/dto/AddOnGroupDto.kt
new file mode 100644
index 00000000000..24f9c845c17
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/dto/AddOnGroupDto.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.dto
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+
+data class AddOnGroupDto(
+    @SerializedName("id") val id: Long,
+    @SerializedName("name") val name: String,
+    @SerializedName("restrict_to_category_ids") val categoryIds: List<Long>?,
+    @SerializedName("fields") val addons: List<RemoteAddonDto>
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/MappingRemoteException.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/MappingRemoteException.kt
new file mode 100644
index 00000000000..e68b4603417
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/MappingRemoteException.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers
+
+internal class MappingRemoteException(override val message: String) : Exception()
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapper.kt
new file mode 100644
index 00000000000..2c969d20b06
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapper.kt
@@ -0,0 +1,185 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers
+
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteDisplay
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteRestrictionsType
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat.Hide
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat.Label
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.Checkbox
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomPrice
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomText
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomTextArea
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.FileUpload
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.Heading
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.InputMultiplier
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.MultipleChoice
+
+object RemoteAddonMapper {
+    fun toDomain(dto: RemoteAddonDto): Addon {
+        return when (dto.type) {
+            MultipleChoice -> multipleChoice(dto)
+            Checkbox -> checkbox(dto)
+            CustomText -> customText(dto)
+            CustomTextArea -> customTextArea(dto)
+            FileUpload -> fileUpload(dto)
+            CustomPrice -> customPrice(dto)
+            InputMultiplier -> inputMultiplier(dto)
+            Heading -> heading(dto)
+            else -> throw MappingRemoteException("Add-on has to have type")
+        }
+    }
+
+    private fun multipleChoice(dto: RemoteAddonDto) = Addon.MultipleChoice(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        options = dto.mapOptions(),
+        display = dto.display?.toDomainModel() ?: throw MappingRemoteException(
+            "MultipleChoice add-on type has to have `display` defined."
+        )
+    )
+
+    private fun checkbox(dto: RemoteAddonDto) = Addon.Checkbox(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        options = dto.mapOptions()
+    )
+
+    private fun customText(dto: RemoteAddonDto) = Addon.CustomText(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        restrictions = dto.mapRestrictions(),
+        price = dto.mapPrice(),
+        characterLength = prepareRange(dto.min, dto.max)
+    )
+
+    private fun customTextArea(dto: RemoteAddonDto) = Addon.CustomTextArea(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        price = dto.mapPrice(),
+        characterLength = prepareRange(dto.min, dto.max)
+    )
+
+    private fun fileUpload(dto: RemoteAddonDto) = Addon.FileUpload(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        price = dto.mapPrice()
+    )
+
+    private fun customPrice(dto: RemoteAddonDto) = Addon.CustomPrice(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        priceRange = prepareRange(dto.min, dto.max)
+    )
+
+    private fun inputMultiplier(dto: RemoteAddonDto) = Addon.InputMultiplier(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position,
+        price = dto.mapPrice(),
+        quantityRange = prepareRange(dto.min, dto.max)
+    )
+
+    private fun heading(dto: RemoteAddonDto) = Addon.Heading(
+        name = dto.name,
+        titleFormat = dto.titleFormat.toDomainModel(),
+        description = dto.mapDescription(),
+        required = dto.required.asBoolean(),
+        position = dto.position
+    )
+
+    private fun RemoteAddonDto.mapDescription(): String? {
+        return if (descriptionEnabled.asBoolean()) {
+            this.description
+        } else {
+            null
+        }
+    }
+
+    private fun RemoteAddonDto.mapOptions(): List<Addon.HasOptions.Option> {
+        return this.options?.map { optionDto ->
+            RemoteAddonOptionDtoMapper.toDomainModel(optionDto)
+        }.orEmpty()
+    }
+
+    private fun RemoteTitleFormat?.toDomainModel(): Addon.TitleFormat {
+        return when (this) {
+            Label -> Addon.TitleFormat.Label
+            RemoteTitleFormat.Heading -> Addon.TitleFormat.Heading
+            Hide -> Addon.TitleFormat.Hide
+            null -> throw MappingRemoteException("Add-on has to have title")
+        }
+    }
+
+    private fun RemoteDisplay.toDomainModel(): Addon.MultipleChoice.Display {
+        return when (this) {
+            RemoteDisplay.Select -> Addon.MultipleChoice.Display.Select
+            RemoteDisplay.RadioButton -> Addon.MultipleChoice.Display.RadioButton
+            RemoteDisplay.Images -> Addon.MultipleChoice.Display.Images
+        }
+    }
+
+    private fun RemoteAddonDto.mapRestrictions(): Addon.CustomText.Restrictions {
+        return if (restrictionsType != null) {
+            when (this.restrictionsType) {
+                RemoteRestrictionsType.AnyText -> Addon.CustomText.Restrictions.AnyText
+                RemoteRestrictionsType.OnlyLetters -> Addon.CustomText.Restrictions.OnlyLetters
+                RemoteRestrictionsType.OnlyNumbers -> Addon.CustomText.Restrictions.OnlyNumbers
+                RemoteRestrictionsType.OnlyLettersNumbers -> Addon.CustomText.Restrictions.OnlyLettersNumbers
+                RemoteRestrictionsType.Email -> Addon.CustomText.Restrictions.Email
+            }
+        } else {
+            throw MappingRemoteException("CustomText Add-on has to have restrictions defined.")
+        }
+    }
+
+    private fun RemoteAddonDto.mapPrice(): Addon.HasAdjustablePrice.Price {
+        return if (this.priceType != null) {
+            Addon.HasAdjustablePrice.Price.Adjusted(
+                priceType = this.priceType.mapToDomain(),
+                value = this.price.orEmpty()
+            )
+        } else {
+            Addon.HasAdjustablePrice.Price.NotAdjusted
+        }
+    }
+
+    private fun RemotePriceType.mapToDomain(): PriceType {
+        return when (this) {
+            RemotePriceType.FlatFee -> PriceType.FlatFee
+            RemotePriceType.QuantityBased -> PriceType.QuantityBased
+            RemotePriceType.PercentageBased -> PriceType.PercentageBased
+        }
+    }
+
+    private fun Int?.asBoolean(): Boolean {
+        return this == 1
+    }
+
+    private fun prepareRange(min: Long, max: Long): LongRange? {
+        return if (max == 0L) null else (min..max)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonOptionDtoMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonOptionDtoMapper.kt
new file mode 100644
index 00000000000..d92c0679581
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonOptionDtoMapper.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers
+
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.FlatFee
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.PercentageBased
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.QuantityBased
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteOption
+
+object RemoteAddonOptionDtoMapper {
+    fun toDomainModel(dto: RemoteOption): Addon.HasOptions.Option {
+        return Addon.HasOptions.Option(
+                label = dto.label,
+                image = dto.image,
+                price = dto.mapPrice()
+        )
+    }
+
+    private fun RemoteOption.mapPrice(): Addon.HasAdjustablePrice.Price.Adjusted {
+        return Addon.HasAdjustablePrice.Price.Adjusted(
+                priceType = when (this.priceType) {
+                    FlatFee -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.FlatFee
+                    QuantityBased -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.QuantityBased
+                    PercentageBased -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.PercentageBased
+                },
+                value = this.price.orEmpty()
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteGlobalAddonGroupMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteGlobalAddonGroupMapper.kt
new file mode 100644
index 00000000000..db495f048df
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteGlobalAddonGroupMapper.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers
+
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.dto.AddOnGroupDto
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+
+internal class RemoteGlobalAddonGroupMapper @Inject constructor(private val appLogWrapper: AppLogWrapper) {
+    fun toDomain(dto: AddOnGroupDto): GlobalAddonGroup {
+        return GlobalAddonGroup(
+                name = dto.name,
+                restrictedCategoriesIds = if (dto.categoryIds.isNullOrEmpty()) {
+                    GlobalAddonGroup.CategoriesRestriction.AllProductsCategories
+                } else {
+                    GlobalAddonGroup.CategoriesRestriction.SpecifiedProductCategories(dto.categoryIds)
+                },
+                addons = dto.addons.mapNotNull { dtoAddon ->
+                    try {
+                        RemoteAddonMapper.toDomain(dtoAddon)
+                    } catch (exception: MappingRemoteException) {
+                        appLogWrapper.e(API, "Exception while parsing $dtoAddon: ${exception.message}")
+                        null
+                    }
+                }
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminRestClient.kt
new file mode 100644
index 00000000000..17aba721739
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminRestClient.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.admin
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.utils.toMap
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class WooAdminRestClient @Inject constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun getOptions(
+        site: SiteModel,
+        keys: List<String>
+    ): WooPayload<Map<String, Any>> {
+        val params = mapOf("options" to keys.joinToString(","))
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = WOOCOMMERCE.options.pathWcAdmin,
+            params = params,
+            clazz = JsonElement::class.java
+        ).toWooPayload { jsonElement -> jsonElement.toMap() }
+    }
+
+    suspend fun updateOptions(
+        site: SiteModel,
+        options: Map<String, Any>
+    ): WooPayload<Unit> {
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = WOOCOMMERCE.options.pathWcAdmin,
+            body = options,
+            clazz = Unit::class.java
+        ).toWooPayload()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminStore.kt
new file mode 100644
index 00000000000..6f5fd14f8b6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/admin/WooAdminStore.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.admin
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WooAdminStore @Inject constructor(
+    private val restClient: WooAdminRestClient
+) {
+    suspend fun getOptions(
+        site: SiteModel,
+        keys: List<String>
+    ): WooResult<Map<String, Any>> =
+        restClient.getOptions(site, keys).asWooResult()
+
+    suspend fun updateOptions(
+        site: SiteModel,
+        options: Map<String, Any>
+    ): WooResult<Unit> = restClient.updateOptions(site, options).asWooResult()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsApiResponse.kt
new file mode 100644
index 00000000000..d367a1a49cc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsApiResponse.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats
+
+import com.google.gson.annotations.SerializedName
+
+data class BundleStatsApiResponse(val totals: BundleStatsTotals)
+
+data class BundleStatsTotals(
+    @SerializedName("items_sold")
+    val itemsSold: Int? = null,
+    @SerializedName("net_revenue")
+    val netRevenue: Double? = null,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsRestClient.kt
new file mode 100644
index 00000000000..877dfeb352d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundleStatsRestClient.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class BundleStatsRestClient @Inject constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun fetchBundleStats(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        interval: String = "",
+    ): WooPayload<BundleStatsApiResponse> {
+        val url = WOOCOMMERCE.reports.bundles.stats.pathV4Analytics
+        val parameters = mapOf(
+            "before" to endDate,
+            "after" to startDate,
+            "interval" to interval
+        ).filter { it.value.isNotEmpty() }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = BundleStatsApiResponse::class.java,
+            params = parameters
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchBundleReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int = 5
+    ): WooPayload<Array<BundlesReportApiResponse>> {
+        val url = WOOCOMMERCE.reports.bundles.pathV4Analytics
+        val parameters = mapOf(
+            "before" to endDate,
+            "after" to startDate,
+            "orderby" to "items_sold",
+            "order" to "desc",
+            "page" to "1",
+            "per_page" to quantity.toString(),
+            "extended_info" to "true"
+        ).filter { it.value.isNotEmpty() }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<BundlesReportApiResponse>::class.java,
+            params = parameters
+        )
+        return response.toWooPayload()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundlesReportApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundlesReportApiResponse.kt
new file mode 100644
index 00000000000..3e13b712558
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bundlestats/BundlesReportApiResponse.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats
+
+import com.google.gson.annotations.SerializedName
+
+data class BundlesReportApiResponse(
+    @SerializedName("items_sold")
+    val itemsSold: Int? = null,
+    @SerializedName("net_revenue")
+    val netRevenue: Double? = null,
+    @SerializedName("extended_info")
+    val extendedInfo: ExtendedInfo
+)
+
+data class ExtendedInfo(
+    val name: String? = null,
+    val image: String? = null,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponDto.kt
new file mode 100644
index 00000000000..e52f8fc442d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponDto.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity.DiscountType
+
+data class CouponDto(
+    @SerializedName("id") val id: Long,
+    @SerializedName("code") val code: String?,
+    @SerializedName("amount") val amount: String?,
+    @SerializedName("date_created") val dateCreated: String?,
+    @SerializedName("date_created_gmt") val dateCreatedGmt: String?,
+    @SerializedName("date_modified") val dateModified: String?,
+    @SerializedName("date_modified_gmt") val dateModifiedGmt: String?,
+    @SerializedName("discount_type") val discountType: String?,
+    @SerializedName("description") val description: String?,
+    @SerializedName("date_expires") val dateExpires: String?,
+    @SerializedName("date_expires_gmt") val dateExpiresGmt: String?,
+    @SerializedName("usage_count") val usageCount: Int?,
+    @SerializedName("individual_use") val isForIndividualUse: Boolean?,
+    @SerializedName("product_ids") val productIds: List<Long>?,
+    @SerializedName("excluded_product_ids") val excludedProductIds: List<Long>?,
+    @SerializedName("usage_limit") val usageLimit: Int?,
+    @SerializedName("usage_limit_per_user") val usageLimitPerUser: Int?,
+    @SerializedName("limit_usage_to_x_items") val limitUsageToXItems: Int?,
+    @SerializedName("free_shipping") val isShippingFree: Boolean?,
+    @SerializedName("product_categories") val productCategoryIds: List<Long>?,
+    @SerializedName("excluded_product_categories") val excludedProductCategoryIds: List<Long>?,
+    @SerializedName("exclude_sale_items") val areSaleItemsExcluded: Boolean?,
+    @SerializedName("minimum_amount") val minimumAmount: String?,
+    @SerializedName("maximum_amount") val maximumAmount: String?,
+    @SerializedName("email_restrictions") val restrictedEmails: List<String>?,
+    @SerializedName("used_by") val usedBy: List<String>?
+) {
+    fun toDataModel(localSiteId: LocalId): CouponEntity =
+        CouponEntity(
+            id = RemoteId(id),
+            localSiteId = localSiteId,
+            code = code,
+            amount = amount?.toBigDecimalOrNull(),
+            dateCreated = dateCreated,
+            dateCreatedGmt = dateCreatedGmt,
+            dateModified = dateModified,
+            dateModifiedGmt = dateModifiedGmt,
+            discountType = discountType?.let { DiscountType.fromString(it) },
+            description = description,
+            dateExpires = dateExpires,
+            dateExpiresGmt = dateExpiresGmt,
+            usageCount = usageCount,
+            isForIndividualUse = isForIndividualUse,
+            usageLimit = usageLimit,
+            usageLimitPerUser = usageLimitPerUser,
+            limitUsageToXItems = limitUsageToXItems,
+            isShippingFree = isShippingFree,
+            areSaleItemsExcluded = areSaleItemsExcluded,
+            minimumAmount = minimumAmount?.toBigDecimalOrNull(),
+            maximumAmount = maximumAmount?.toBigDecimalOrNull(),
+            includedProductIds = productIds,
+            excludedProductIds = excludedProductIds,
+            includedCategoryIds = productCategoryIds,
+            excludedCategoryIds = excludedProductCategoryIds
+        )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponReportDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponReportDto.kt
new file mode 100644
index 00000000000..d78daae8a18
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponReportDto.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.coupons.CouponReport
+import java.math.BigDecimal
+
+data class CouponReportDto(
+    @SerializedName("coupon_id") val couponId: Long,
+    @SerializedName("amount") val amount: String?,
+    @SerializedName("orders_count") val ordersCount: Int?
+)
+
+fun CouponReportDto.toDataModel() = CouponReport(
+    couponId = couponId,
+    amount = amount?.toBigDecimalOrNull() ?: BigDecimal.ZERO,
+    ordersCount = ordersCount ?: 0
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponRestClient.kt
new file mode 100644
index 00000000000..4a747a02ff0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/coupons/CouponRestClient.kt
@@ -0,0 +1,235 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.coupon.UpdateCouponRequest
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.API_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.utils.extensions.filterNotNull
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+
+class CouponRestClient @Inject constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun fetchCoupons(
+        site: SiteModel,
+        page: Int,
+        pageSize: Int,
+        searchQuery: String? = null,
+        couponIds: List<Long> = emptyList()
+    ): WooPayload<Array<CouponDto>> {
+        val url = WOOCOMMERCE.coupons.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mutableMapOf<String, String>().apply {
+                put("page", page.toString())
+                put("per_page", pageSize.toString())
+                searchQuery?.let {
+                    put("search", searchQuery)
+                }
+                couponIds.takeIf { it.isNotEmpty() }?.let {
+                    put("include", it.joinToString(","))
+                }
+            },
+            clazz = Array<CouponDto>::class.java
+        )
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(response.data)
+            }
+            is WPAPIResponse.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    suspend fun fetchCoupon(
+        site: SiteModel,
+        couponId: Long
+    ): WooPayload<CouponDto> {
+        val url = WOOCOMMERCE.coupons.id(couponId).pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = CouponDto::class.java
+        )
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(response.data)
+            }
+            is WPAPIResponse.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    suspend fun createCoupon(
+        site: SiteModel,
+        request: UpdateCouponRequest
+    ): WooPayload<CouponDto> {
+        val url = WOOCOMMERCE.coupons.pathV3
+        val params = request.toNetworkRequest()
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = CouponDto::class.java,
+            body = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(response.data)
+            }
+            is WPAPIResponse.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    suspend fun updateCoupon(
+        site: SiteModel,
+        couponId: Long,
+        request: UpdateCouponRequest
+    ): WooPayload<CouponDto> {
+        val url = WOOCOMMERCE.coupons.id(couponId).pathV3
+        val params = request.toNetworkRequest()
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            clazz = CouponDto::class.java,
+            body = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(response.data)
+            }
+            is WPAPIResponse.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    suspend fun deleteCoupon(
+        site: SiteModel,
+        couponId: Long,
+        trash: Boolean
+    ): WooPayload<Unit> {
+        val url = WOOCOMMERCE.coupons.id(couponId).pathV3
+
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = url,
+            clazz = Unit::class.java,
+            params = mapOf("force" to trash.not().toString())
+        )
+
+        return when (response) {
+            is WPAPIResponse.Error -> WooPayload(response.error.toWooError())
+            is WPAPIResponse.Success -> WooPayload(Unit)
+        }
+    }
+
+    suspend fun fetchCouponsReports(
+        site: SiteModel,
+        couponsIds: LongArray = longArrayOf(),
+        orderBy: CouponsReportOrderBy = CouponsReportOrderBy.CouponId,
+        orderDescending: Boolean = true,
+        page: Int = 1,
+        perPage: Int? = null,
+        before: Date? = null,
+        after: Date? = null
+    ): WooPayload<List<CouponReportDto>> {
+        val url = WOOCOMMERCE.reports.coupons.pathV4Analytics
+        val dateFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT)
+
+        val params = mapOf(
+            "orderby" to orderBy.value,
+            "order" to if (orderDescending) "desc" else "asc",
+            "page" to page.toString(),
+            "per_page" to perPage?.toString(),
+            "before" to before?.let { dateFormatter.format(it) },
+            "after" to after?.let { dateFormatter.format(it) },
+            "coupons" to couponsIds.joinToString(",")
+        ).filterNotNull()
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<CouponReportDto>::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Error -> WooPayload(response.error.toWooError())
+            is WPAPIResponse.Success -> WooPayload(response.data?.toList())
+        }
+    }
+
+    suspend fun fetchCouponReport(
+        site: SiteModel,
+        couponId: Long,
+        after: Date
+    ): WooPayload<CouponReportDto> {
+        return fetchCouponsReports(
+            site = site,
+            couponsIds = longArrayOf(couponId),
+            after = after
+        ).let {
+            when {
+                it.isError -> WooPayload(it.error)
+                it.result.isNullOrEmpty() -> WooPayload(
+                    WooError(API_ERROR, UNKNOWN, "Empty coupons report response")
+                )
+                else -> WooPayload(it.result.first())
+            }
+        }
+    }
+
+    enum class CouponsReportOrderBy(val value: String) {
+        CouponId("coupon_id"),
+        Code("code"),
+        Amount("amount"),
+        OrdersCount("orders_count")
+    }
+
+    @Suppress("ComplexMethod")
+    private fun UpdateCouponRequest.toNetworkRequest(): Map<String, Any> {
+        return mutableMapOf<String, Any>().apply {
+            code?.let { put("code", it) }
+            amount?.let { put("amount", it) }
+            discountType?.let { put("discount_type", it) }
+            description?.let { put("description", it) }
+            expiryDate?.let { put("date_expires", it) }
+            minimumAmount?.let { put("minimum_amount", it) }
+            maximumAmount?.let { put("maximum_amount", it) }
+            productIds?.let { put("product_ids", it) }
+            excludedProductIds?.let { put("excluded_product_ids", it) }
+            isShippingFree?.let { put("free_shipping", it) }
+            productCategoryIds?.let { put("product_categories", it) }
+            excludedProductCategoryIds?.let { put("excluded_product_categories", it) }
+            restrictedEmails?.let { put("email_restrictions", it) }
+            isForIndividualUse?.let { put("individual_use", it) }
+            areSaleItemsExcluded?.let { put("exclude_sale_items", it) }
+
+            // The following fields can have empty value. When updating a Coupon,
+            // the REST API accepts and treats `0` as empty for these fields.
+            put("usage_limit", usageLimit ?: 0)
+            put("usage_limit_per_user", usageLimitPerUser ?: 0)
+            put("limit_usage_to_x_items", limitUsageToXItems ?: 0)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClient.kt
new file mode 100644
index 00000000000..6a208c3fc23
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClient.kt
@@ -0,0 +1,207 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.customer
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.DATE_LAST_ACTIVE_ASC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.DATE_LAST_ACTIVE_DESC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.INCLUDE_ASC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.INCLUDE_DESC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.NAME_ASC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.NAME_DESC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.REGISTERED_DATE_ASC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.REGISTERED_DATE_DESC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerFromAnalyticsDTO
+import org.wordpress.android.fluxc.network.utils.toMap
+import org.wordpress.android.fluxc.utils.putIfNotEmpty
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class CustomerRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    /**
+     * Makes a GET call to `/wc/v3/customers/[remoteCustomerId]` to fetch a single customer
+     *
+     * @param [remoteCustomerId] Unique server id of the customer to fetch
+     */
+    suspend fun fetchSingleCustomer(
+        site: SiteModel,
+        remoteCustomerId: Long
+    ): WooPayload<CustomerDTO> {
+        val url = WOOCOMMERCE.customers.id(remoteCustomerId).pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = CustomerDTO::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    /**
+     * Makes a GET call to `/wc/v3/customers/` to fetch customers
+     *
+     */
+    suspend fun fetchCustomers(
+        site: SiteModel,
+        pageSize: Int,
+        sortType: CustomerSorting = NAME_ASC,
+        offset: Long = 0,
+        searchQuery: String? = null,
+        email: String? = null,
+        role: String? = null,
+        context: String? = null,
+        remoteCustomerIds: List<Long>? = null,
+        excludedCustomerIds: List<Long>? = null
+    ): WooPayload<Array<CustomerDTO>> {
+        val url = WOOCOMMERCE.customers.pathV3
+
+        val orderBy = when (sortType) {
+            NAME_ASC, NAME_DESC -> "name"
+            INCLUDE_ASC, INCLUDE_DESC -> "include"
+            REGISTERED_DATE_ASC, REGISTERED_DATE_DESC -> "registered_date"
+            DATE_LAST_ACTIVE_ASC, DATE_LAST_ACTIVE_DESC -> "date_last_active"
+        }
+        val sortOrder = when (sortType) {
+            NAME_ASC, INCLUDE_ASC, REGISTERED_DATE_ASC, DATE_LAST_ACTIVE_ASC -> "asc"
+            INCLUDE_DESC, NAME_DESC, REGISTERED_DATE_DESC, DATE_LAST_ACTIVE_DESC -> "desc"
+        }
+
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "orderby" to orderBy,
+            "order" to sortOrder,
+            "offset" to offset.toString()
+        ).run {
+            putIfNotEmpty("search" to searchQuery)
+            putIfNotEmpty("email" to email)
+            putIfNotEmpty("role" to role)
+            putIfNotEmpty("context" to context)
+        }
+
+        if (!remoteCustomerIds.isNullOrEmpty()) {
+            params["include"] = remoteCustomerIds.map { it }.joinToString()
+        }
+
+        if (!excludedCustomerIds.isNullOrEmpty()) {
+            params["exclude"] = excludedCustomerIds.map { it }.joinToString()
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<CustomerDTO>::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    /**
+     * Makes a POST call to `/wc/v3/customers/` to create a customer
+     */
+    suspend fun createCustomer(site: SiteModel, customer: CustomerDTO): WooPayload<CustomerDTO> {
+        val url = WOOCOMMERCE.customers.pathV3
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            body = customer.toMap(),
+            clazz = CustomerDTO::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    /**
+     * Makes a GET call to `wc-analytics/reports/customers` to fetch customers
+     *
+     */
+    suspend fun fetchCustomersFromAnalytics(
+        site: SiteModel,
+        pageSize: Int,
+        page: Int,
+        sortType: CustomerSorting = NAME_ASC,
+        searchQuery: String? = null,
+        searchBy: String? = null,
+        filterEmpty: List<String>? = null,
+    ): WooPayload<Array<CustomerFromAnalyticsDTO>> {
+        val url = WOOCOMMERCE.reports.customers.pathV4Analytics
+
+        val orderBy = when (sortType) {
+            NAME_ASC, NAME_DESC -> "name"
+            INCLUDE_ASC, INCLUDE_DESC -> "include"
+            REGISTERED_DATE_ASC, REGISTERED_DATE_DESC -> "registered_date"
+            DATE_LAST_ACTIVE_ASC, DATE_LAST_ACTIVE_DESC -> "date_last_active"
+        }
+        val sortOrder = when (sortType) {
+            NAME_ASC, INCLUDE_ASC, REGISTERED_DATE_ASC, DATE_LAST_ACTIVE_ASC -> "asc"
+            INCLUDE_DESC, NAME_DESC, REGISTERED_DATE_DESC, DATE_LAST_ACTIVE_DESC -> "desc"
+        }
+
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "orderby" to orderBy,
+            "order" to sortOrder,
+            "page" to page.toString(),
+        ).run {
+            putIfNotEmpty("search" to searchQuery)
+            putIfNotEmpty("searchby" to searchBy)
+        }
+
+        if (!filterEmpty.isNullOrEmpty()) {
+            params["filter_empty"] = filterEmpty.joinToString(",")
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<CustomerFromAnalyticsDTO>::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchSingleCustomerFromAnalyticsByUserId(
+        site: SiteModel,
+        remoteCustomerId: Long
+    ): WooPayload<CustomerFromAnalyticsDTO?> {
+        val url = WOOCOMMERCE.reports.customers.pathV4Analytics
+
+        val params = mapOf(
+            "filter" to "single_customer",
+            "users" to remoteCustomerId.toString()
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<CustomerFromAnalyticsDTO>::class.java
+        )
+        return response.toWooPayload { items -> items.firstOrNull() }
+    }
+
+    suspend fun fetchSingleCustomerFromAnalyticsByCustomerId(
+        site: SiteModel,
+        analyticsCustomerId: Long
+    ): WooPayload<CustomerFromAnalyticsDTO?> {
+        val url = WOOCOMMERCE.reports.customers.pathV4Analytics
+
+        val params = mapOf(
+            "filter" to "single_customer",
+            "customers" to analyticsCustomerId.toString()
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<CustomerFromAnalyticsDTO>::class.java
+        )
+        return response.toWooPayload { items -> items.firstOrNull() }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerSorting.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerSorting.kt
new file mode 100644
index 00000000000..e9659ec2ff0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerSorting.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.customer
+
+enum class CustomerSorting {
+    NAME_ASC,
+    NAME_DESC,
+    INCLUDE_ASC,
+    INCLUDE_DESC,
+    REGISTERED_DATE_ASC,
+    REGISTERED_DATE_DESC,
+    DATE_LAST_ACTIVE_ASC,
+    DATE_LAST_ACTIVE_DESC,
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerDTO.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerDTO.kt
new file mode 100644
index 00000000000..e63d98410c6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerDTO.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class CustomerDTO(
+    @SerializedName("avatar_url") val avatarUrl: String? = null,
+    @SerializedName("billing") val billing: Billing? = null,
+    @SerializedName("date_created") val dateCreated: String? = null,
+    @SerializedName("date_created_gmt") val dateCreatedGmt: String? = null,
+    @SerializedName("date_modified") val dateModified: String? = null,
+    @SerializedName("date_modified_gmt") val dateModifiedGmt: String? = null,
+    @SerializedName("email") val email: String? = null,
+    @SerializedName("first_name") val firstName: String? = null,
+    @SerializedName("id") val id: Long? = null,
+    @SerializedName("is_paying_customer") val isPayingCustomer: Boolean = false,
+    @SerializedName("last_name") val lastName: String? = null,
+    @SerializedName("role") val role: String? = null,
+    @SerializedName("shipping") val shipping: Shipping? = null,
+    @SerializedName("username") val username: String? = null
+) : Response {
+    data class Billing(
+        @SerializedName("address_1") val address1: String? = null,
+        @SerializedName("address_2") val address2: String? = null,
+        @SerializedName("city") val city: String? = null,
+        @SerializedName("company") val company: String? = null,
+        @SerializedName("country") val country: String? = null,
+        @SerializedName("email") val email: String? = null,
+        @SerializedName("first_name") val firstName: String? = null,
+        @SerializedName("last_name") val lastName: String? = null,
+        @SerializedName("phone") val phone: String? = null,
+        @SerializedName("postcode") val postcode: String? = null,
+        @SerializedName("state") val state: String? = null
+    )
+
+    data class Shipping(
+        @SerializedName("address_1") val address1: String? = null,
+        @SerializedName("address_2") val address2: String? = null,
+        @SerializedName("city") val city: String? = null,
+        @SerializedName("company") val company: String? = null,
+        @SerializedName("country") val country: String? = null,
+        @SerializedName("first_name") val firstName: String? = null,
+        @SerializedName("last_name") val lastName: String? = null,
+        @SerializedName("postcode") val postcode: String? = null,
+        @SerializedName("state") val state: String? = null
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerFromAnalyticsDTO.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerFromAnalyticsDTO.kt
new file mode 100644
index 00000000000..d3eeabbfdf0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/dto/CustomerFromAnalyticsDTO.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class CustomerFromAnalyticsDTO(
+    @SerializedName("avg_order_value")
+    val avgOrderValue: Double? = null,
+    @SerializedName("city")
+    val city: String? = null,
+    @SerializedName("country")
+    val country: String? = null,
+    @SerializedName("date_last_active")
+    val dateLastActive: String? = null,
+    @SerializedName("date_last_active_gmt")
+    val dateLastActiveGmt: String? = null,
+    @SerializedName("date_last_order")
+    val dateLastOrder: String? = null,
+    @SerializedName("date_registered")
+    val dateRegistered: String? = null,
+    @SerializedName("date_registered_gmt")
+    val dateRegisteredGmt: String? = null,
+    @SerializedName("email")
+    val email: String? = null,
+    @SerializedName("id")
+    val id: Long? = null,
+    @SerializedName("name")
+    val name: String? = null,
+    @SerializedName("orders_count")
+    val ordersCount: Int? = null,
+    @SerializedName("postcode")
+    val postcode: String? = null,
+    @SerializedName("state")
+    val state: String? = null,
+    @SerializedName("total_spend")
+    val totalSpend: Double? = null,
+    @SerializedName("user_id")
+    val userId: Long? = null,
+    @SerializedName("username")
+    val username: String? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/data/WCDataRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/data/WCDataRestClient.kt
new file mode 100644
index 00000000000..8ca4b5e0506
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/data/WCDataRestClient.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.data
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class WCDataRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchCountries(
+        site: SiteModel
+    ): WooPayload<Array<CountryApiResponse>> {
+        val url = WOOCOMMERCE.data.countries.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<CountryApiResponse>::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    data class CountryApiResponse(
+        val code: String? = null,
+        val name: String? = null,
+        val states: List<State>
+    ) {
+        data class State(
+            val code: String? = null,
+            val name: String? = null
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/gateways/GatewayRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/gateways/GatewayRestClient.kt
new file mode 100644
index 00000000000..437f93a128c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/gateways/GatewayRestClient.kt
@@ -0,0 +1,79 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.store.Settings
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class GatewayRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchGateway(
+        site: SiteModel,
+        gatewayId: String
+    ): WooPayload<GatewayResponse> {
+        val url = WOOCOMMERCE.payment_gateways.gateway(gatewayId).pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = GatewayResponse::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun updatePaymentGateway(
+        site: SiteModel,
+        gatewayId: GatewayId,
+        enabled: Boolean? = null,
+        title: String? = null,
+        description: String? = null,
+        settings: Settings? = null
+    ): WooPayload<GatewayResponse> {
+        val url = WOOCOMMERCE.payment_gateways.gateway(gatewayId.apiKey).pathV3
+        val body = mutableMapOf<String, Any>().apply {
+            enabled?.let { put("enabled", enabled) }
+            title?.let { put("title", title) }
+            description?.let { put("description", description) }
+            settings?.let { put("settings", settings) }
+        }
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = GatewayResponse::class.java,
+            body = body
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchAllGateways(
+        site: SiteModel
+    ): WooPayload<Array<GatewayResponse>> {
+        val url = WOOCOMMERCE.payment_gateways.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<GatewayResponse>::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    data class GatewayResponse(
+        @SerializedName("id") val gatewayId: String,
+        @SerializedName("title") val title: String?,
+        @SerializedName("description") val description: String?,
+        @SerializedName("order") val order: String?,
+        @SerializedName("enabled") val enabled: Boolean?,
+        @SerializedName("method_title") val methodTitle: String?,
+        @SerializedName("method_description") val methodDescription: String?,
+        @SerializedName("method_supports") val features: List<String>?
+    )
+
+    enum class GatewayId(val apiKey: String) {
+        CASH_ON_DELIVERY("cod")
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsCampaignDTO.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsCampaignDTO.kt
new file mode 100644
index 00000000000..fb39436179a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsCampaignDTO.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.google
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class WCGoogleAdsCampaignDTO(
+    @SerializedName("id") val id: Long? = null,
+    @SerializedName("name") val name: String? = null,
+    @SerializedName("status") val status: String? = null,
+    @SerializedName("type") val rawType: String? = null,
+    @SerializedName("amount") val amount: Double? = null,
+    @SerializedName("country") val country: String? = null,
+    @SerializedName("targeted_locations") val targetedLocations: List<String>? = null
+) : Response
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsProgramsDTO.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsProgramsDTO.kt
new file mode 100644
index 00000000000..6fc527aa008
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleAdsProgramsDTO.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.google
+
+import com.google.gson.annotations.SerializedName
+
+data class WCGoogleAdsProgramsDTO(
+    @SerializedName("campaigns") val campaigns: List<GoogleAdsCampaignDTO>?,
+    @SerializedName("intervals") val intervals: List<GoogleAdsIntervalDTO>?,
+    @SerializedName("totals") val totals: GoogleAdsTotalsDTO?,
+    @SerializedName("next_page") val nextPageToken: String?
+)
+
+data class GoogleAdsCampaignDTO(
+    @SerializedName("id") val id: Long?,
+    @SerializedName("name") val name: String?,
+    @SerializedName("status") val status: String?,
+    @SerializedName("subtotals") val subtotals: GoogleAdsTotalsDTO?
+)
+
+data class GoogleAdsIntervalDTO(
+    @SerializedName("interval") val interval: String?,
+    @SerializedName("subtotals") val subtotals: GoogleAdsTotalsDTO?
+)
+
+data class GoogleAdsTotalsDTO(
+    @SerializedName("sales") val sales: Double?,
+    @SerializedName("spend") val spend: Double?,
+    @SerializedName("impressions") val impressions: Double?,
+    @SerializedName("clicks") val clicks: Double?,
+    @SerializedName("conversions") val conversions: Double?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleRestClient.kt
new file mode 100644
index 00000000000..51325c33fae
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/google/WCGoogleRestClient.kt
@@ -0,0 +1,117 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.google
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.putIfNotNull
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCGoogleRestClient  @Inject constructor(private val wooNetwork: WooNetwork) {
+    companion object {
+        const val GOOGLE_ADS_CONNECTED_STATUS = "connected"
+    }
+
+    suspend fun fetchGoogleAdsConnectionStatus(
+        site: SiteModel
+    ): WooPayload<Boolean> {
+        val url = WOOCOMMERCE.gla.ads.connection.pathNoVersion
+        val result = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = GoogleAdsConnectionStatusResponse::class.java
+        ).toWooPayload()
+
+        return when {
+            result.isError -> WooPayload(result.error)
+            result.result != null -> WooPayload(result.result.status == GOOGLE_ADS_CONNECTED_STATUS)
+            else -> WooPayload(false)
+        }
+    }
+
+    suspend fun fetchGoogleAdsCampaigns(
+        site: SiteModel,
+        excludeRemovedCampaigns: Boolean = true
+    ): WooPayload<List<WCGoogleAdsCampaignDTO>> {
+        val url = WOOCOMMERCE.gla.ads.campaigns.pathNoVersion
+        val params = mapOf("exclude_removed" to excludeRemovedCampaigns.toString())
+        val result = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<WCGoogleAdsCampaignDTO>::class.java
+        ).toWooPayload()
+
+        return when {
+            result.isError -> WooPayload(result.error)
+            result.result != null -> WooPayload(result.result.toList())
+            else -> WooPayload(emptyList())
+        }
+    }
+
+    suspend fun fetchAllPrograms(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        fields: String,
+        orderBy: String,
+        nextPageToken: String? = null
+    ): WooPayload<WCGoogleAdsProgramsDTO> {
+        val url = WOOCOMMERCE.gla.ads.reports.programs.pathNoVersion
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mutableMapOf(
+                "after" to startDate,
+                "before" to endDate,
+                "fields" to fields,
+                "orderby" to orderBy
+            ).apply {
+                putIfNotNull("page_token" to nextPageToken)
+            },
+            clazz = WCGoogleAdsProgramsDTO::class.java
+        ).toWooPayload()
+
+        return when {
+            response.isError || response.result == null -> WooPayload(response.error)
+            else -> WooPayload(response.result)
+        }
+    }
+
+    suspend fun fetchImpressionsAndClicks(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+    ): WooPayload<WCGoogleAdsProgramsDTO> {
+        val url = WOOCOMMERCE.gla.ads.reports.programs.pathNoVersion
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf(
+                "after" to startDate,
+                "before" to endDate,
+                "fields" to "impressions, clicks",
+            ),
+            clazz = WCGoogleAdsProgramsDTO::class.java
+        ).toWooPayload()
+
+        return when {
+            response.isError || response.result == null -> WooPayload(response.error)
+            else -> WooPayload(response.result)
+        }
+    }
+}
+
+/**
+ * Response model for the Google Ads connection status.
+ * The full response has more fields, but for now we only care about the status.
+ */
+data class GoogleAdsConnectionStatusResponse(
+    @SerializedName("status")
+    val status: String
+)
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxNoteDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxNoteDto.kt
new file mode 100644
index 00000000000..029613d744f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxNoteDto.kt
@@ -0,0 +1,87 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteActionEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity.LocalInboxNoteStatus
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity.LocalInboxNoteStatus.Actioned
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity.LocalInboxNoteStatus.Snoozed
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity.LocalInboxNoteStatus.Unactioned
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteWithActions
+
+data class InboxNoteDto(
+    @SerializedName("id") val id: Long,
+    @SerializedName("name") val name: String,
+    @SerializedName("type") val type: String?,
+    @SerializedName("status") val status: String,
+    @SerializedName("source") val source: String?,
+    @SerializedName("actions") val actions: List<InboxNoteActionDto> = emptyList(),
+    @SerializedName("locale") val locale: String?,
+    @SerializedName("title") val title: String,
+    @SerializedName("content") val content: String,
+    @SerializedName("layout") val layout: String?,
+    @SerializedName("date_created") val dateCreated: String,
+    @SerializedName("date_reminder") val dateReminder: String?
+) {
+    fun toInboxNoteWithActionsEntity(localSiteId: LocalId) =
+        InboxNoteWithActions(
+            inboxNote = toInboxNoteEntity(localSiteId),
+            noteActions = actions.map { it.toDataModel(localSiteId) }
+        )
+
+    fun toInboxNoteEntity(localSiteId: LocalId) =
+        InboxNoteEntity(
+            remoteId = id,
+            localSiteId = localSiteId,
+            name = name,
+            title = title,
+            content = content,
+            dateCreated = dateCreated,
+            status = status.toInboxNoteStatus(),
+            source = source,
+            type = type,
+            dateReminder = dateReminder
+        )
+
+    private fun String.toInboxNoteStatus() =
+        when {
+            this == STATUS_UNACTIONED -> Unactioned
+            this == STATUS_ACTIONED -> Actioned
+            this == STATUS_SNOOZED -> Snoozed
+            else -> LocalInboxNoteStatus.Unknown
+        }
+
+    private companion object {
+        const val STATUS_UNACTIONED = "unactioned"
+        const val STATUS_ACTIONED = "actioned"
+        const val STATUS_SNOOZED = "snoozed"
+    }
+}
+
+data class InboxNoteActionDto(
+    @SerializedName("id") val id: Long,
+    @SerializedName("name") val name: String,
+    @SerializedName("label") val label: String,
+    @SerializedName("query") val query: String?,
+    @SerializedName("status") val status: String?,
+    @SerializedName("primary") val primary: Boolean = false,
+    @SerializedName("actioned_text") val actionedText: String?,
+    @SerializedName("nonce_action") val nonceAction: String?,
+    @SerializedName("nonce_name") val nonceName: String?,
+    @SerializedName("url") val url: String
+) {
+    fun toDataModel(localSiteId: LocalId) =
+        InboxNoteActionEntity(
+            remoteId = id,
+            inboxNoteLocalId = 0,
+            localSiteId = localSiteId,
+            name = name,
+            label = label,
+            url = url,
+            query = query,
+            status = status,
+            primary = primary,
+            actionedText = actionedText
+        )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxRestClient.kt
new file mode 100644
index 00000000000..52ca105deb9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/inbox/InboxRestClient.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class InboxRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchInboxNotes(
+        site: SiteModel,
+        page: Int,
+        pageSize: Int,
+        inboxNoteTypes: Array<String>
+    ): WooPayload<Array<InboxNoteDto>> {
+        val url = WOOCOMMERCE.admin.notes.pathV4Analytics
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf(
+                "page" to page.toString(),
+                "per_page" to pageSize.toString(),
+                "type" to inboxNoteTypes.joinToString(separator = ",")
+            ),
+            clazz = Array<InboxNoteDto>::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun markInboxNoteAsActioned(
+        site: SiteModel,
+        inboxNoteId: Long,
+        inboxNoteActionId: Long
+    ): WooPayload<InboxNoteDto> {
+        val url = WOOCOMMERCE.admin.notes.note(inboxNoteId).action.item(inboxNoteActionId).pathV4Analytics
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = InboxNoteDto::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun deleteNote(
+        site: SiteModel,
+        inboxNoteId: Long
+    ): WooPayload<Unit> {
+        val url = WOOCOMMERCE.admin.notes.delete.note(inboxNoteId).pathV4Analytics
+
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = url,
+            clazz = Unit::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun deleteAllNotesForSite(
+        site: SiteModel,
+        page: Int,
+        pageSize: Int,
+        inboxNoteTypes: Array<String>
+    ): WooPayload<Unit> {
+        val url = WOOCOMMERCE.admin.notes.delete.all.pathV4Analytics
+
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<InboxNoteDto>::class.java,
+            params = mapOf(
+                "page" to page.toString(),
+                "per_page" to pageSize.toString(),
+                "type" to inboxNoteTypes.joinToString(separator = ",")
+            )
+        )
+        return response.toWooPayload { }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JITMApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JITMApiResponse.kt
new file mode 100644
index 00000000000..2b4aa0b36eb
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JITMApiResponse.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm
+
+import com.google.gson.annotations.SerializedName
+
+data class JITMApiResponse(
+    @SerializedName("template") val template: String,
+    @SerializedName("content") val content: JITMContent,
+    @SerializedName("CTA") val cta: JITMCta,
+    @SerializedName("ttl") val timeToLive: Int,
+    @SerializedName("id") val id: String,
+    @SerializedName("feature_class") val featureClass: String,
+    @SerializedName("expires") val expires: Long,
+    @SerializedName("max_dismissal") val maxDismissal: Int,
+    @SerializedName("is_dismissible") val isDismissible: Boolean,
+    @SerializedName("url") val url: String,
+    @SerializedName("jitm_stats_url") val jitmStatsUrl: String,
+    @SerializedName("assets") val assets: Map<String, String>?,
+)
+
+data class JITMContent(
+    @SerializedName("message") val message: String,
+    @SerializedName("icon") val icon: String,
+    @SerializedName("icon_path") val iconPath: String?,
+    @SerializedName("description") val description: String,
+    @SerializedName("title") val title: String,
+)
+
+data class JITMCta(
+    @SerializedName("message") val message: String,
+    @SerializedName("link") val link: String,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JitmRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JitmRestClient.kt
new file mode 100644
index 00000000000..2b7864123b0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/jitm/JitmRestClient.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm
+
+import org.wordpress.android.fluxc.generated.endpoint.JPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class JitmRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchJitmMessage(
+        site: SiteModel,
+        messagePath: String,
+        query: String,
+    ): WooPayload<Array<JITMApiResponse>> {
+        val url = JPAPI.jitm.pathV4
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf(
+                "message_path" to messagePath,
+                "query" to query,
+            ),
+            clazz = Array<JITMApiResponse>::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun dismissJitmMessage(
+        site: SiteModel,
+        jitmId: String,
+        featureClass: String,
+    ): WooPayload<Boolean> {
+        val url = JPAPI.jitm.pathV4
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            body = mapOf(
+                "id" to jitmId,
+                "feature_class" to featureClass
+            ),
+            clazz = Any::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(true)
+            }
+            is WPAPIResponse.Error -> {
+                if (response.error.type == BaseRequest.GenericErrorType.NOT_FOUND) {
+                    WooPayload(false)
+                } else {
+                    WooPayload(response.error.toWooError())
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardProductItem.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardProductItem.kt
new file mode 100644
index 00000000000..c886f64b412
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardProductItem.kt
@@ -0,0 +1,189 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards
+
+import android.text.Html
+import android.text.SpannableStringBuilder
+import android.text.style.URLSpan
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.LeaderboardItemRow
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.PRODUCTS
+
+/**
+ * The API response from the V4 Leaderboards endpoint returns the Top Performers Products list as an array of arrays,
+ * each inner array represents a Top Performer Product itself, so in the end it's an array of Top Performers items.
+ *
+ * Each Top Performer item is an array containing three objects with the following properties: display and value.
+ *
+ * Single Top Performer item response example:
+[
+    {
+        "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/products&filter=single_product&products=14'>Beanie<\/a>",
+        "value": "Beanie"
+    },
+    {
+        "display": "2.000",
+        "value": 2000
+    },
+    {
+        "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>36.000,00<\/span>",
+        "value": 36000
+    }
+]
+
+ This class represents one Single Top Performer item response as a Product type one
+ */
+@Suppress("MaxLineLength")
+class LeaderboardProductItem(
+    private val itemRows: Array<LeaderboardItemRow>? = null
+) {
+    val quantity
+        get() = itemRows
+                ?.second()
+                ?.value
+
+    val total
+        get() = itemRows
+                ?.third()
+                ?.value
+
+    /**
+     * This property will operate and transform a HTML tag in order to retrieve the currency symbol out of it.
+     *
+     * Example:
+     *  HTML tag -> <span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>36.000,00<\/span>
+     *
+     *  split from ">" delimiter
+     *      Output: string list containing
+     *              <span class=\"woocommerce-Price-amount amount\"
+     *              <span class=\"woocommerce-Price-currencySymbol\"
+     *              &#82;&#36;<\/span
+     *              36.000,00<\/span
+     *
+     *  first who contains "&#"
+     *      Output: &#82;&#36;<\/span>
+     *
+     *  split from ";" delimiter
+     *      Output: string list containing
+     *              &#82
+     *              &#36
+     *              <\/span>
+     *
+     *  filter what contains "&#"
+     *      Output: string list containing
+     *              &#82
+     *              &#36
+     *
+     *  reduce string list
+     *      Output: &#82&#36
+     *
+     *  fromHtmlWithSafeApiCall
+     *      Output: R$
+     */
+    @Suppress("MaxLineLength") val currency by lazy {
+        priceAmountHtmlTag
+                ?.split(">")
+                ?.firstOrNull { it.contains("&#") }
+                ?.split(";")
+                ?.filter { it.contains("&#") }
+                ?.reduce { total, new -> "$total$new" }
+                ?.run { Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY) }
+                ?: plainTextCurrency
+    }
+
+    /**
+     * This property will serve as a fallback for cases where the currency is represented in plain text instead of
+     * HTML currency code.
+     *
+     * It will extract the raw content between tags and leave only the currency information
+     *
+     * Example:
+     *
+     *  HTML tag -> <span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">DKK<\/span>36.000,00<\/span>
+     *
+     *  parse HTML tag to string
+     *      Output: DKK36.000,00
+     *
+     *  regex filter with replace
+     *      Output: DKK
+     */
+    @Suppress("MaxLineLength") private val plainTextCurrency by lazy {
+        Html.fromHtml(priceAmountHtmlTag, Html.FROM_HTML_MODE_LEGACY)
+                .toString()
+                .replace(Regex("[0-9.,]"), "")
+    }
+
+    /**
+     * This property will operate and transform a URL string in order to retrieve the product id parameter out of it.
+     *
+     * Example:
+     *  URL string -> https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/products&filter=single_product&products=14
+     *
+     *  split from "&" delimiter
+     *      Output: string list containing
+     *              https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin
+     *              filter=single_product
+     *              products=14
+     *
+     *  first who contains "products="
+     *      Output: products=14
+     *
+     *  split from "=" delimiter
+     *      Output: string list containing
+     *              products
+     *              14
+     *
+     *  extract last string from the list
+     *      Output: 14 as String
+     *
+     *  try to convert to long
+     *      Output: 14 as Long
+     */
+    @Suppress("MaxLineLength") val productId by lazy {
+        link
+                ?.split("&")
+                ?.firstOrNull { it.contains("${PRODUCTS.value}=", true) }
+                ?.split("=")
+                ?.last()
+                ?.toLongOrNull()
+    }
+
+    /**
+     * This property will operate and transform a HTML tag in order to retrieve the inner URL out of the <a href/> tag
+     * using the [SpannableStringBuilder] implementation in order to parse it
+     */
+    private val link by lazy {
+        Html.fromHtml(itemHtmlTag, Html.FROM_HTML_MODE_LEGACY)
+                .run { this as? SpannableStringBuilder }
+                ?.spansAsList()
+                ?.firstOrNull()
+                ?.url
+    }
+
+    private val itemHtmlTag by lazy {
+        itemRows
+                ?.first()
+                ?.display
+    }
+
+    private val priceAmountHtmlTag by lazy {
+        itemRows
+                ?.third()
+                ?.display
+    }
+
+    private fun SpannableStringBuilder.spansAsList() =
+            getSpans(0, length, URLSpan::class.java)
+                    .toList()
+
+    /**
+     * Returns the second object of the Top Performer Item Array if exists
+     */
+    private fun Array<LeaderboardItemRow>.second() =
+            takeIf { isNotEmpty() && size > 1 }
+                    ?.let { this[1] }
+
+    /**
+     * Returns the third object of the Top Performer Item Array if exists
+     */
+    private fun Array<LeaderboardItemRow>.third() =
+            takeIf { isNotEmpty() && size > 2 }
+                    ?.let { this[2] }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsApiResponse.kt
new file mode 100644
index 00000000000..16631e61585
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsApiResponse.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards
+
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.PRODUCTS
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.UNKNOWN
+
+class LeaderboardsApiResponse : Response {
+    private val rows: Array<Array<LeaderboardItemRow>>? = null
+    val id: String? = null
+    val label: String? = null
+    val type: Type
+        get() = Type.values()
+                .firstOrNull { it.value == id }
+                ?: UNKNOWN
+
+    val products by lazy {
+        rows
+                ?.takeIf { type == PRODUCTS }
+                ?.map { LeaderboardProductItem(it) }
+                ?.toList()
+    }
+
+    class LeaderboardItemRow {
+        val display: String? = null
+        val value: String? = null
+    }
+
+    enum class Type(val value: String) {
+        CUSTOMERS("customers"),
+        COUPONS("coupons"),
+        CATEGORIES("categories"),
+        PRODUCTS("products"),
+        UNKNOWN("unknown")
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsRestClient.kt
new file mode 100644
index 00000000000..45ccfcd4906
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/leaderboards/LeaderboardsRestClient.kt
@@ -0,0 +1,54 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LeaderboardsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    @Suppress("LongParameterList")
+    suspend fun fetchLeaderboards(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int?,
+        forceRefresh: Boolean,
+        interval: String = "",
+        addProductsPath: Boolean = false,
+    ): WooPayload<Array<LeaderboardsApiResponse>> {
+        val url = when (addProductsPath) {
+            true -> WOOCOMMERCE.leaderboards.products.pathV4Analytics
+            else -> WOOCOMMERCE.leaderboards.pathV4Analytics
+        }
+
+        val parameters = createParameters(startDate, endDate, quantity, forceRefresh, interval)
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<LeaderboardsApiResponse>::class.java,
+            params = parameters
+        )
+
+        return response.toWooPayload()
+    }
+
+    @Suppress("LongParameterList")
+    private fun createParameters(
+        startDate: String,
+        endDate: String,
+        quantity: Int?,
+        forceRefresh: Boolean,
+        interval: String = ""
+    ) = mapOf(
+        "before" to endDate,
+        "after" to startDate,
+        "per_page" to quantity?.toString().orEmpty(),
+        "interval" to interval,
+        "force_cache_refresh" to forceRefresh.toString()
+    ).filter { it.value.isNotEmpty() }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt
new file mode 100644
index 00000000000..831fe68b9a0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/metadata/MetaDataRestClient.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata
+
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+internal class MetaDataRestClient @Inject internal constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun fetchMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType
+    ): WooPayload<List<WCMetaData>> {
+        val path = when (parentItemType) {
+            MetaDataParentItemType.ORDER -> WOOCOMMERCE.orders.id(parentItemId).pathV3
+            MetaDataParentItemType.PRODUCT -> WOOCOMMERCE.products.id(parentItemId).pathV3
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = path,
+            params = mapOf("_fields" to "meta_data"),
+            clazz = JsonObject::class.java
+        )
+
+        return response.toWooPayload {
+            it.extractMetaData()
+        }
+    }
+
+    suspend fun updateMetaData(
+        site: SiteModel,
+        request: UpdateMetadataRequest
+    ): WooPayload<List<WCMetaData>> {
+        val path = when (request.parentItemType) {
+            MetaDataParentItemType.ORDER -> WOOCOMMERCE.orders.id(request.parentItemId).pathV3
+            MetaDataParentItemType.PRODUCT -> WOOCOMMERCE.products.id(request.parentItemId).pathV3
+        }
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = path,
+            body = mapOf(
+                "meta_data" to request.metadataChanges.toJsonArray(),
+                "_fields" to "meta_data"
+            ),
+            clazz = JsonObject::class.java
+        )
+
+        return response.toWooPayload {
+            it.extractMetaData()
+        }
+    }
+
+    private fun JsonObject.extractMetaData() = getAsJsonArray("meta_data").mapNotNull {
+        WCMetaData.fromJson(it)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingRestClient.kt
new file mode 100644
index 00000000000..220cb404513
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingRestClient.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.onboarding
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class OnboardingRestClient @Inject constructor(
+    private val wooNetwork: WooNetwork
+) {
+    suspend fun fetchOnboardingTasks(site: SiteModel): WooPayload<Array<TaskGroupDto>> {
+        val url = WOOCOMMERCE.onboarding.tasks.pathWcAdmin
+        return wooNetwork.executeGetGsonRequest(
+            site,
+            url,
+            Array<TaskGroupDto>::class.java
+        ).toWooPayload()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingTasksResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingTasksResponse.kt
new file mode 100644
index 00000000000..101002384b5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/onboarding/OnboardingTasksResponse.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.onboarding
+
+data class TaskGroupDto(
+    val id: String,
+    val tasks: List<TaskDto>
+)
+
+data class TaskDto(
+    val id: String,
+    val isComplete: Boolean = false,
+    val isVisited: Boolean = false,
+    val isActioned: Boolean = false,
+    val canView: Boolean = false,
+    val actionUrl: String?
+)
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponse.kt
new file mode 100644
index 00000000000..346fd245cee
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponse.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.annotations.JsonAdapter
+import java.lang.reflect.Type
+import org.wordpress.android.fluxc.network.Response
+
+/**
+ * Represents the response from WooCommerce's Batch Order Update API endpoint.
+ * https://woocommerce.github.io/woocommerce-rest-api-docs/?shell#batch-update-orders
+ *
+ * While the WooCommerce REST API orders batch endpoint supports three operations at once
+ * (create, update, delete), this class specifically handles only the "update" operation
+ * responses, because we don't yet support the other operations.
+ *
+ * The response contains a list of order updates, where each update can be
+ * either successful or failed.
+ * 1. Success: Contains the complete updated order data (OrderDto)
+ * 2. Error: Contains the failed order ID and error details
+ *
+ *  Also refer to the orders-batch.json file in test resources.
+ *
+ * Example successful response:
+ * {
+ *   "update": [{
+ *     "id": 1032,
+ *     "status": "completed",
+ *     // ... other order fields
+ *   }]
+ * }
+ *
+ * Example error response:
+ * {
+ *   "update": [{
+ *     "id": "525",
+ *     "error": {
+ *       "code": "woocommerce_rest_shop_order_invalid_id",
+ *       "message": "Invalid ID.",
+ *       "data": { "status": 400 }
+ *     }
+ *   }]
+ * }
+ *
+ */
+data class BatchOrderApiResponse(
+    val update: List<OrderResponse>
+) : Response {
+    @JsonAdapter(OrderResponseDeserializer::class)
+    sealed class OrderResponse {
+        data class Success(
+            val order: OrderDto
+        ) : OrderResponse()
+
+        data class Error(
+            val id: Long,
+            val error: ErrorResponse
+        ) : OrderResponse()
+    }
+
+    data class ErrorResponse(
+        val code: String,
+        val message: String,
+        val data: ErrorData
+    )
+
+    data class ErrorData(
+        val status: Int
+    )
+
+    private class OrderResponseDeserializer : JsonDeserializer<OrderResponse> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type,
+            context: JsonDeserializationContext
+        ): OrderResponse {
+            val jsonObject = json.asJsonObject
+
+            return if (jsonObject.has("error")) {
+                OrderResponse.Error(
+                    id = jsonObject.get("id").asLong,
+                    error = context.deserialize(jsonObject.get("error"), ErrorResponse::class.java)
+                )
+            } else {
+                OrderResponse.Success(
+                    context.deserialize(jsonObject, OrderDto::class.java)
+                )
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/CoreOrderStatus.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/CoreOrderStatus.kt
new file mode 100644
index 00000000000..8a2967bbff0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/CoreOrderStatus.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+/**
+ * Standard Core WooCommerce order statuses
+ */
+enum class CoreOrderStatus(val value: String) {
+    PENDING("pending"),
+    PROCESSING("processing"),
+    ON_HOLD("on-hold"),
+    COMPLETED("completed"),
+    CANCELLED("cancelled"),
+    REFUNDED("refunded"),
+    FAILED("failed");
+
+    companion object {
+        private val valueMap = CoreOrderStatus.values().associateBy(CoreOrderStatus::value)
+
+        /**
+         * Convert the base value into the associated CoreOrderStatus object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderCountApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderCountApiResponse.kt
new file mode 100644
index 00000000000..8affbaa25b5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderCountApiResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import org.wordpress.android.fluxc.network.Response
+
+class OrderCountApiResponse : Response {
+    val slug: String? = null
+    val total: Int = 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDto.kt
new file mode 100644
index 00000000000..2fd364b46bc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDto.kt
@@ -0,0 +1,78 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.model.order.CouponLine
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("PropertyName", "VariableNaming")
+class OrderDto : Response {
+    @Suppress("ConstructorParameterNaming")
+    data class Billing(
+        val first_name: String? = null,
+        val last_name: String? = null,
+        val company: String? = null,
+        val address_1: String? = null,
+        val address_2: String? = null,
+        val city: String? = null,
+        val state: String? = null,
+        val postcode: String? = null,
+        val country: String? = null,
+        val email: String? = null,
+        val phone: String? = null
+    )
+
+    @Suppress("ConstructorParameterNaming")
+    data class Shipping(
+        val first_name: String? = null,
+        val last_name: String? = null,
+        val company: String? = null,
+        val address_1: String? = null,
+        val address_2: String? = null,
+        val city: String? = null,
+        val state: String? = null,
+        val postcode: String? = null,
+        val country: String? = null,
+        val phone: String? = null
+    )
+
+    class Refund {
+        val total: String? = null
+    }
+
+    val customer_id: Long? = null
+    val billing: Billing? = null
+    val coupon_lines: List<CouponLine>? = null
+    val currency: String? = null
+    val order_key: String? = null
+    val customer_note: String? = null
+    val date_created_gmt: String? = null
+    val date_modified_gmt: String? = null
+    val date_paid_gmt: String? = null
+    val discount_total: String? = null
+    // Same as shipping_lines, it's a list of objects
+    val fee_lines: JsonElement? = null
+    val id: Long? = null
+    // This is actually a list of objects. We're storing this as JSON initially, and it will be deserialized on demand.
+    // See OrderEntity.LineItem
+    val line_items: JsonElement? = null
+    val number: String? = null
+    val payment_method: String? = null
+    val payment_method_title: String? = null
+    val prices_include_tax: Boolean = false
+    val refunds: List<Refund>? = null
+    val shipping: Shipping? = null
+    // This is actually a list of objects. We're storing this as JSON initially, and it will be deserialized on demand.
+    // See OrderEntity.ShippingLines
+    val shipping_lines: JsonElement? = null
+    val shipping_total: String? = null
+    val status: String? = null
+    val total: String? = null
+    val total_tax: String? = null
+    val meta_data: JsonElement? = null
+    val tax_lines: JsonElement? = null
+    val payment_url: String? = null
+    val is_editable: Boolean? = null
+    val needs_payment: Boolean? = null
+    val needs_processing: Boolean? = null
+    val shipping_tax: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt
new file mode 100644
index 00000000000..a944c9ebfcd
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapper.kt
@@ -0,0 +1,128 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.order.OrderAddress
+import org.wordpress.android.fluxc.utils.DateUtils
+import java.math.BigDecimal
+import javax.inject.Inject
+
+class OrderDtoMapper @Inject internal constructor(
+    private val stripOrder: StripOrder,
+    private val stripOrderMetaData: StripOrderMetaData
+) {
+    @Suppress("LongMethod", "ComplexMethod")
+    fun toDatabaseEntity(orderDto: OrderDto, localSiteId: LocalId): Pair<OrderEntity, List<WCMetaData>> {
+        fun convertDateToUTCString(date: String?): String =
+                date?.let { DateUtils.formatGmtAsUtcDateString(it) } ?: "" // Store the date in UTC format
+
+        val rawRemoteDataEntity = with(orderDto) {
+            OrderEntity(
+                    orderId = this.id ?: 0,
+                    localSiteId = localSiteId,
+                    number = this.number ?: (this.id ?: 0).toString(),
+                    status = this.status ?: "",
+                    currency = this.currency ?: "",
+                    orderKey = this.order_key ?: "",
+                    dateCreated = convertDateToUTCString(this.date_created_gmt),
+                    dateModified = convertDateToUTCString(this.date_modified_gmt),
+                    total = this.total ?: "",
+                    totalTax = this.total_tax ?: "",
+                    shippingTotal = this.shipping_total ?: "",
+                    paymentMethod = this.payment_method ?: "",
+                    paymentMethodTitle = this.payment_method_title ?: "",
+                    datePaid = this.date_paid_gmt?.let { "${it}Z" } ?: "",
+                    pricesIncludeTax = this.prices_include_tax,
+                    customerNote = this.customer_note ?: "",
+                    discountTotal = this.discount_total ?: "",
+                    discountCodes = this.coupon_lines?.let { couponLines ->
+                        // Extract the discount codes from the coupon lines list and
+                        // store them as a comma-delimited 'String'.
+                        couponLines
+                                .filter { !it.code.isNullOrEmpty() }
+                                .joinToString { it.code!! }
+                    }.orEmpty(),
+                    refundTotal = this.refunds?.let { refunds ->
+                        // Extract the individual refund totals from the refunds list and
+                        // store their sum as a 'Double'.
+                        refunds.sumOf { it.total?.toBigDecimalOrNull() ?: BigDecimal.ZERO }
+                    } ?: BigDecimal.ZERO,
+                    customerId = this.customer_id ?: 0,
+                    billingFirstName = this.billing?.first_name ?: "",
+                    billingLastName = this.billing?.last_name ?: "",
+                    billingCompany = this.billing?.company ?: "",
+                    billingAddress1 = this.billing?.address_1 ?: "",
+                    billingAddress2 = this.billing?.address_2 ?: "",
+                    billingCity = this.billing?.city ?: "",
+                    billingState = this.billing?.state ?: "",
+                    billingPostcode = this.billing?.postcode ?: "",
+                    billingCountry = this.billing?.country ?: "",
+                    billingEmail = this.billing?.email ?: "",
+                    billingPhone = this.billing?.phone ?: "",
+                    shippingFirstName = this.shipping?.first_name ?: "",
+                    shippingLastName = this.shipping?.last_name ?: "",
+                    shippingCompany = this.shipping?.company ?: "",
+                    shippingAddress1 = this.shipping?.address_1 ?: "",
+                    shippingAddress2 = this.shipping?.address_2 ?: "",
+                    shippingCity = this.shipping?.city ?: "",
+                    shippingState = this.shipping?.state ?: "",
+                    shippingPostcode = this.shipping?.postcode ?: "",
+                    shippingCountry = this.shipping?.country ?: "",
+                    shippingPhone = this.shipping?.phone ?: "",
+                    lineItems = this.line_items.toString(),
+                    shippingLines = this.shipping_lines.toString(),
+                    feeLines = this.fee_lines.toString(),
+                    taxLines = this.tax_lines.toString(),
+                    couponLines = Gson().toJson(this.coupon_lines),
+                    metaData = (this.meta_data as? JsonArray)?.mapNotNull { element ->
+                        (element as? JsonObject)?.let { WCMetaData.fromJson(it) }
+                    } ?: emptyList(),
+                    paymentUrl = this.payment_url ?: "",
+                    isEditable = this.is_editable ?: (this.status in EDITABLE_STATUSES),
+                    needsPayment = this.needs_payment,
+                    needsProcessing = this.needs_processing,
+                    shippingTax = this.shipping_tax ?: ""
+            )
+        }
+
+        val strippedMetaData = stripOrderMetaData.invoke(rawRemoteDataEntity.metaData)
+
+        return stripOrder(rawRemoteDataEntity) to strippedMetaData
+    }
+
+    companion object {
+        val EDITABLE_STATUSES = listOf("pending", "on-hold", "auto-draft")
+        fun OrderAddress.Billing.toDto() = OrderDto.Billing(
+                first_name = this.firstName,
+                last_name = this.lastName,
+                company = this.company,
+                address_1 = this.address1,
+                address_2 = this.address2,
+                city = this.city,
+                state = this.state,
+                postcode = this.postcode,
+                country = this.country,
+                // the backend will fail to create the order if the billing email is an empty string,
+                // so we use null to avoid this situation
+                email = this.email.ifEmpty { null },
+                phone = this.phone
+        )
+
+        fun OrderAddress.Shipping.toDto() = OrderDto.Shipping(
+                first_name = this.firstName,
+                last_name = this.lastName,
+                company = this.company,
+                address_1 = this.address1,
+                address_2 = this.address2,
+                city = this.city,
+                state = this.state,
+                postcode = this.postcode,
+                country = this.country,
+                phone = this.phone
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderMappingConst.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderMappingConst.kt
new file mode 100644
index 00000000000..013114c67b0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderMappingConst.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+object OrderMappingConst {
+    const val CHARGE_ID_KEY = "_charge_id"
+    const val SHIPPING_PHONE_KEY = "_shipping_phone"
+    const val RECEIPT_URL_KEY = "receipt_url"
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderNoteApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderNoteApiResponse.kt
new file mode 100644
index 00000000000..dd2a3b68c77
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderNoteApiResponse.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+import org.wordpress.android.util.DateTimeUtils
+
+@Suppress("PropertyName", "VariableNaming")
+class OrderNoteApiResponse : Response {
+    val id: Long? = null
+    val date_created_gmt: String? = null
+    val note: String? = null
+    val author: String? = null
+    // If true, the note will be shown to customers and they will be notified. If false, the note will be for admin
+    // reference only. Default is false.
+    val customer_note: Boolean = false
+}
+
+fun OrderNoteApiResponse.toDataModel(localSiteId: LocalId, orderId: RemoteId) = OrderNoteEntity(
+    localSiteId = localSiteId,
+    noteId = RemoteId(id ?: 0),
+    orderId = orderId,
+    dateCreated = date_created_gmt?.let { DateTimeUtils.dateUTCFromIso8601("${it}Z") },
+    note = note,
+    isSystemNote = author == "system" || author == "WooCommerce",
+    author = author ?: "",
+    isCustomerNote = customer_note
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderReceiptResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderReceiptResponse.kt
new file mode 100644
index 00000000000..837a8b5d965
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderReceiptResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.annotations.SerializedName
+
+data class OrderReceiptResponse(
+    @SerializedName("receipt_url") val receiptUrl: String,
+    @SerializedName("expiration_date") val expirationDate: String,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
new file mode 100644
index 00000000000..a481ee20ef3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
@@ -0,0 +1,1279 @@
+@file:Suppress("DEPRECATION_ERROR")
+
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.WCOrderAction
+import org.wordpress.android.fluxc.generated.WCOrderActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.OrderAttributionInfoKeys
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+import org.wordpress.android.fluxc.model.order.UpdateOrderRequest
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Billing
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Shipping
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDtoMapper.Companion.toDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+import org.wordpress.android.fluxc.store.WCOrderStore
+import org.wordpress.android.fluxc.store.WCOrderStore.AddOrderShipmentTrackingResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.BulkUpdateOrderStatusResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.DeleteOrderShipmentTrackingResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchHasOrdersResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderListResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderShipmentProvidersResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderShipmentTrackingsResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderStatusOptionsResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersByIdsResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersCountResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderError
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.TIMEOUT_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.RemoteOrderPayload
+import org.wordpress.android.fluxc.store.WCOrderStore.SearchOrdersResponsePayload
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.DateUtils
+import org.wordpress.android.fluxc.utils.putIfNotEmpty
+import org.wordpress.android.fluxc.utils.toWooPayload
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.util.Calendar
+import javax.inject.Inject
+import kotlin.collections.MutableMap.MutableEntry
+
+@Suppress("LargeClass", "TooManyFunctions")
+class OrderRestClient @Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val orderDtoMapper: OrderDtoMapper,
+    private val wooNetwork: WooNetwork,
+    private val coroutineEngine: CoroutineEngine
+) {
+    /**
+     * Makes a GET call to `/wp-json/wc/v3/orders` retrieving a list of orders for the given
+     * WooCommerce [SiteModel].
+     *
+     * The number of orders fetched is defined in [WCOrderStore.NUM_ORDERS_PER_FETCH], and retrieving older
+     * orders is done by passing an [offset].
+     *
+     * Dispatches a [WCOrderAction.FETCHED_ORDERS] action with the resulting list of orders.
+     *
+     * @param [filterByStatus] Nullable. If not null, fetch only orders with a matching order status.
+     */
+    fun fetchOrders(site: SiteModel, offset: Int, filterByStatus: String? = null) {
+        coroutineEngine.launch(T.API, this, "fetchOrders") {
+            val url = WOOCOMMERCE.orders.pathV3
+            val params = mutableMapOf(
+                "per_page" to WCOrderStore.NUM_ORDERS_PER_FETCH.toString(),
+                "offset" to offset.toString(),
+                "_fields" to ORDER_FIELDS
+            ).putIfNotEmpty(
+                "status" to filterByStatus
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = Array<OrderDto>::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val orderModels = response.data?.map { orderDto ->
+                        orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                    }.orEmpty()
+
+                    val canLoadMore = orderModels.size == WCOrderStore.NUM_ORDERS_PER_FETCH
+                    val payload = FetchOrdersResponsePayload(
+                        site, orderModels, filterByStatus, offset > 0, canLoadMore
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrdersAction(payload))
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = wpAPINetworkErrorToOrderError(response.error)
+                    val payload = FetchOrdersResponsePayload(orderError, site)
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrdersAction(payload))
+                }
+            }
+        }
+    }
+
+    suspend fun fetchOrdersSync(
+        site: SiteModel,
+        offset: Int,
+        filterByStatus: String? = null
+    ): FetchOrdersResponsePayload {
+        val url = WOOCOMMERCE.orders.pathV3
+        val params = mutableMapOf(
+            "per_page" to WCOrderStore.NUM_ORDERS_PER_FETCH.toString(),
+            "offset" to offset.toString(),
+            "_fields" to ORDER_FIELDS
+        ).putIfNotEmpty(
+            "status" to filterByStatus
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<OrderDto>::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val orderModels = response.data?.map { orderDto ->
+                    orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                }.orEmpty()
+
+                val canLoadMore = orderModels.size == WCOrderStore.NUM_ORDERS_PER_FETCH
+                FetchOrdersResponsePayload(
+                    site, orderModels, filterByStatus, offset > 0, canLoadMore
+                )
+            }
+
+            is WPAPIResponse.Error -> FetchOrdersResponsePayload(
+                error = wpAPINetworkErrorToOrderError(response.error),
+                site = site
+            )
+        }
+    }
+
+    /**
+     * Fetches orders from the API.
+     *
+     * Makes a GET call to `/wp-json/wc/v3/orders` retrieving a list of orders for the given site and parameters.
+     *
+     * @param site The WooCommerce [SiteModel] the orders belong to
+     * @param count The number of orders to fetch
+     * @param page The page number to fetch
+     * @param orderBy The field to order the results by
+     * @param sortOrder The order to sort the results by
+     * @param statusFilter The status to filter the results by
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchOrders(
+        site: SiteModel,
+        count: Int,
+        page: Int,
+        orderBy: OrderBy,
+        sortOrder: SortOrder,
+        statusFilter: String?
+    ): FetchOrdersResponsePayload {
+        val url = WOOCOMMERCE.orders.pathV3
+        val params = mutableMapOf(
+            "per_page" to count.toString(),
+            "page" to page.toString(),
+            "orderby" to orderBy.value,
+            "order" to sortOrder.value,
+            "_fields" to ORDER_FIELDS
+        ).putIfNotEmpty(
+            "status" to statusFilter
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<OrderDto>::class.java
+        )
+
+        when (response) {
+            is WPAPIResponse.Success -> {
+                val orderModels = response.data?.map { orderDto ->
+                    orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                }.orEmpty()
+
+                val canLoadMore = orderModels.size == WCOrderStore.NUM_ORDERS_PER_FETCH
+                return FetchOrdersResponsePayload(
+                    site = site,
+                    ordersWithMeta = orderModels,
+                    loadedMore = page > 1,
+                    canLoadMore = canLoadMore
+                )
+            }
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                return FetchOrdersResponsePayload(orderError, site)
+            }
+        }
+    }
+
+    /**
+     * Fetches orders from the API, but only requests `id` and `date_created_gmt` fields be returned. This is
+     * used to determine what orders should be fetched (either existing orders that have since changed or new
+     * orders not yet downloaded).
+     *
+     * Makes a GET call to `/wp-json/wc/v3/orders` retrieving a list of orders for the given
+     * WooCommerce [SiteModel].
+     *
+     * Dispatches a [WCOrderAction.FETCHED_ORDER_LIST] action with the resulting list of order summaries.
+     *
+     * @param listDescriptor The [WCOrderListDescriptor] that describes the type of list being fetched and
+     * the optional parameters in effect.
+     * @param offset Used to retrieve older orders
+     */
+    fun fetchOrderListSummaries(
+        listDescriptor: WCOrderListDescriptor,
+        offset: Long,
+        requestStartTime: Calendar
+    ) {
+        coroutineEngine.launch(T.API, this, "fetchOrderListSummaries") {
+            val url = WOOCOMMERCE.orders.pathV3
+            val networkPageSize = listDescriptor.config.networkPageSize
+            val params = mutableMapOf(
+                "per_page" to networkPageSize.toString(),
+                "offset" to offset.toString(),
+                "_fields" to "id,date_created_gmt,date_modified_gmt"
+            ).putIfNotEmpty(
+                "search" to listDescriptor.searchQuery,
+                "before" to listDescriptor.beforeFilter,
+                "after" to listDescriptor.afterFilter,
+                "customer" to listDescriptor.customerId?.toString(),
+                "product" to listDescriptor.productId?.toString(),
+                "exclude" to listDescriptor.excludedIds?.joinToString(),
+                "status" to listDescriptor.statusFilter.takeUnless { it.isNullOrBlank() }
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = listDescriptor.site,
+                path = url,
+                clazz = Array<OrderSummaryApiResponse>::class.java,
+                params = params
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val orderSummaries = response.data?.map {
+                        orderResponseToOrderSummaryModel(it).apply {
+                            localSiteId = listDescriptor.site.id
+                        }
+                    }.orEmpty()
+
+                    val canLoadMore = orderSummaries.size == networkPageSize
+
+                    val payload = FetchOrderListResponsePayload(
+                        listDescriptor = listDescriptor,
+                        orderSummaries = orderSummaries,
+                        loadedMore = offset > 0,
+                        canLoadMore = canLoadMore,
+                        requestStartTime = requestStartTime
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrderListAction(payload))
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = wpAPINetworkErrorToOrderError(response.error)
+                    val payload = FetchOrderListResponsePayload(
+                        error = orderError,
+                        listDescriptor = listDescriptor,
+                        requestStartTime = requestStartTime
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrderListAction(payload))
+                }
+            }
+        }
+    }
+
+    suspend fun fetchOrdersListFirstPage(
+        listDescriptor: WCOrderListDescriptor
+    ): WooPayload<List<Pair<OrderEntity, List<WCMetaData>>>> {
+        val url = WOOCOMMERCE.orders.pathV3
+        val networkPageSize = listDescriptor.config.networkPageSize
+        val params = mutableMapOf(
+            "per_page" to networkPageSize.toString(),
+            "offset" to "0",
+            "_fields" to ORDER_FIELDS
+        ).putIfNotEmpty(
+            "search" to listDescriptor.searchQuery,
+            "before" to listDescriptor.beforeFilter,
+            "after" to listDescriptor.afterFilter,
+            "customer" to listDescriptor.customerId?.toString(),
+            "product" to listDescriptor.productId?.toString(),
+            "exclude" to listDescriptor.excludedIds?.joinToString(),
+            "status" to listDescriptor.statusFilter.takeUnless { it.isNullOrBlank() }
+        )
+
+        return wooNetwork.executeGetGsonRequest(
+            site = listDescriptor.site,
+            path = url,
+            clazz = Array<OrderDto>::class.java,
+            params = params
+        ).toWooPayload {
+            it.map { orderDto ->
+                orderDtoMapper.toDatabaseEntity(orderDto, listDescriptor.site.localId())
+            }
+        }
+    }
+
+    /**
+     * Requests orders from the API that match the provided list of [orderIds] by making a GET call to
+     * `/wp-json/wc/v3/orders`
+     *
+     * Dispatches a [WCOrderAction.FETCHED_ORDERS_BY_IDS] action with the resulting list of orders.
+     *
+     * @param site The WooCommerce [SiteModel] the orders belong to
+     * @param orderIds A list of remote order identifiers to fetch from the API
+     */
+    fun fetchOrdersByIds(site: SiteModel, orderIds: List<Long>) {
+        coroutineEngine.launch(T.API, this, "fetchOrdersByIds") {
+            val url = WOOCOMMERCE.orders.pathV3
+            val params = mapOf(
+                "per_page" to orderIds.size.toString(),
+                "include" to orderIds.map { it }.joinToString(),
+                "_fields" to ORDER_FIELDS
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                clazz = Array<OrderDto>::class.java,
+                params = params
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val orderModels = response.data?.map { orderDto ->
+                        orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                    }.orEmpty()
+
+                    val payload = FetchOrdersByIdsResponsePayload(
+                        site = site,
+                        orderIds = orderIds,
+                        fetchedOrders = orderModels
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrdersByIdsAction(payload))
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = wpAPINetworkErrorToOrderError(response.error)
+                    val payload = FetchOrdersByIdsResponsePayload(
+                        error = orderError, site = site, orderIds = orderIds
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrdersByIdsAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET call to `/wp-json/wc/v3/reports/orders/totals` retrieving a list of available
+     * order status options for the given WooCommerce [SiteModel].
+     *
+     * Dispatches a [WCOrderAction.FETCHED_ORDER_STATUS_OPTIONS] action with the resulting list of order status labels.
+     */
+    fun fetchOrderStatusOptions(site: SiteModel) {
+        coroutineEngine.launch(T.API, this, "fetchOrderStatusOptions") {
+            val url = WOOCOMMERCE.reports.orders.totals.pathV3
+            val params = emptyMap<String, String>()
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                clazz = Array<OrderStatusApiResponse>::class.java,
+                params = params
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val orderStatusOptions = response.data?.map {
+                        orderStatusResponseToOrderStatusModel(it, site)
+                    }.orEmpty()
+
+                    val payload = FetchOrderStatusOptionsResponsePayload(site, orderStatusOptions)
+                    dispatcher.dispatch(
+                        WCOrderActionBuilder.newFetchedOrderStatusOptionsAction(payload)
+                    )
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = wpAPINetworkErrorToOrderError(response.error)
+                    val payload = FetchOrderStatusOptionsResponsePayload(orderError, site)
+                    dispatcher.dispatch(
+                        WCOrderActionBuilder.newFetchedOrderStatusOptionsAction(payload)
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET call to `/wp-json/wc/v3/orders` retrieving a list of orders for the given
+     * WooCommerce [SiteModel] matching [searchQuery]
+     *
+     * The number of orders fetched is defined in [WCOrderStore.NUM_ORDERS_PER_FETCH]
+     *
+     * Dispatches a [WCOrderAction.SEARCHED_ORDERS] action with the resulting list of orders.
+     *
+     * @param [searchQuery] the keyword or phrase to match orders with
+     */
+    fun searchOrders(site: SiteModel, searchQuery: String, offset: Int) {
+        coroutineEngine.launch(T.API, this, "searchOrders") {
+            val url = WOOCOMMERCE.orders.pathV3
+            val params = mutableMapOf(
+                "per_page" to WCOrderStore.NUM_ORDERS_PER_FETCH.toString(),
+                "offset" to offset.toString(),
+                "_fields" to ORDER_FIELDS
+            ).putIfNotEmpty("search" to searchQuery)
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                clazz = Array<OrderDto>::class.java,
+                params = params
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val orderModels = response.data?.map { orderDto ->
+                        orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                    }.orEmpty()
+
+                    val canLoadMore = orderModels.size == WCOrderStore.NUM_ORDERS_PER_FETCH
+                    val nextOffset = offset + orderModels.size
+
+                    val payload = SearchOrdersResponsePayload(
+                        site,
+                        searchQuery,
+                        canLoadMore,
+                        nextOffset,
+                        orderModels.map { it.first }
+                    )
+                    dispatcher.dispatch(WCOrderActionBuilder.newSearchedOrdersAction(payload))
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = wpAPINetworkErrorToOrderError(response.error)
+                    val payload = SearchOrdersResponsePayload(orderError, site, searchQuery)
+                    dispatcher.dispatch(WCOrderActionBuilder.newSearchedOrdersAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/orders/{remoteOrderId}` to fetch a single order by the remoteOrderId.
+     *
+     * @param [orderId] Unique server id of the order to fetch
+     */
+    suspend fun fetchSingleOrder(site: SiteModel, orderId: Long): RemoteOrderPayload.Fetching {
+        val url = WOOCOMMERCE.orders.id(orderId).pathV3
+        val params = mapOf("_fields" to ORDER_FIELDS)
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderDto::class.java,
+            params = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let { orderDto ->
+                    val newModel = orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                    RemoteOrderPayload.Fetching(newModel, site)
+                } ?: RemoteOrderPayload.Fetching(
+                    OrderError(GENERIC_ERROR, "Success response with empty data"),
+                    OrderEntity(
+                        orderId = orderId,
+                        localSiteId = site.localId()
+                    ) to emptyList(),
+                    site
+                )
+            }
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                RemoteOrderPayload.Fetching(
+                    orderError,
+                    OrderEntity(
+                        orderId = orderId,
+                        localSiteId = site.localId()
+                    ) to emptyList(),
+                    site
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a GET call to `/wp-json/wc/v3/reports/orders/totals` retrieving count of orders for
+     * the given WooCommerce [SiteModel], broken down by order status.
+     *
+     * Dispatches a [WCOrderAction.FETCHED_ORDERS_COUNT] action with the resulting count.
+     *
+     * @param [filterByStatus] The order status to return a count for
+     */
+    fun fetchOrderCountSync(site: SiteModel, filterByStatus: String) {
+        coroutineEngine.launch(T.API, this, "fetchOrderCount") {
+            dispatcher.dispatch(WCOrderActionBuilder.newFetchedOrdersCountAction(
+                doFetchOrderCount(site, filterByStatus))
+            )
+        }
+    }
+
+    suspend fun fetchOrderCountSync(site: SiteModel, filterByStatus: String?) =
+        doFetchOrderCount(site, filterByStatus)
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/orders` for a single order of a specific type (or any type) in order to
+     * determine if there are any orders in the store.
+     *
+     *
+     * @param [filterByStatus] Nullable. If not null, consider only orders with a matching order status.
+     */
+    suspend fun fetchHasOrders(
+        site: SiteModel,
+        filterByStatus: String? = null
+    ): FetchHasOrdersResponsePayload {
+        val statusFilter = if (filterByStatus.isNullOrBlank()) {
+            "any"
+        } else {
+            filterByStatus
+        }
+
+        val url = WOOCOMMERCE.orders.pathV3
+        val params = mapOf(
+            "per_page" to "1",
+            "offset" to "0",
+            "status" to statusFilter
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<OrderDto>::class.java,
+            params = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    FetchHasOrdersResponsePayload(
+                        site,
+                        filterByStatus,
+                        it.isNotEmpty()
+                    )
+                } ?: FetchHasOrdersResponsePayload(
+                    OrderError(type = GENERIC_ERROR, message = "Success response with empty data"),
+                    site
+                )
+            }
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                FetchHasOrdersResponsePayload(
+                    orderError,
+                    site
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a PUT call to `/wp-json/wc/v3/orders/<id>` updating the order.
+     */
+    private suspend fun updateOrder(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        updatePayload: Map<String, Any>
+    ): RemoteOrderPayload.Updating {
+        val url = WOOCOMMERCE.orders.id(orderToUpdate.orderId).pathV3
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderDto::class.java,
+            body = updatePayload.plus("_fields" to ORDER_FIELDS)
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let { orderDto ->
+                    val newModel = orderDtoMapper.toDatabaseEntity(orderDto, site.localId())
+                        .first
+                        .copy(
+                            orderId = orderToUpdate.orderId
+                        )
+                    RemoteOrderPayload.Updating(newModel, site)
+                } ?: RemoteOrderPayload.Updating(
+                    OrderError(type = GENERIC_ERROR, message = "Success response with empty data"),
+                    orderToUpdate,
+                    site
+                )
+            }
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                RemoteOrderPayload.Updating(
+                    orderError,
+                    orderToUpdate,
+                    site
+                )
+            }
+        }
+    }
+
+    suspend fun updateOrderStatusAndPaymentMethod(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        status: String,
+        paymentMethodId: String? = null,
+        paymentMethodTitle: String? = null,
+    ): RemoteOrderPayload.Updating {
+        val updatePayload = mutableMapOf<String, Any>()
+        updatePayload["status"] = status
+        paymentMethodId?.let {
+            updatePayload["payment_method"] = paymentMethodId
+        }
+        paymentMethodTitle?.let {
+            updatePayload["payment_method_title"] = paymentMethodTitle
+        }
+        return updateOrder(orderToUpdate, site, updatePayload)
+    }
+
+    suspend fun updateCustomerOrderNote(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        newNotes: String
+    ) =
+        updateOrder(orderToUpdate, site, mapOf("customer_note" to newNotes))
+
+    suspend fun updateBillingAddress(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        billing: Billing
+    ) =
+        updateOrder(orderToUpdate, site, mapOf("billing" to billing))
+
+    suspend fun updateShippingAddress(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        shipping: Shipping
+    ) =
+        updateOrder(orderToUpdate, site, mapOf("shipping" to shipping))
+
+    suspend fun updateBothOrderAddresses(
+        orderToUpdate: OrderEntity,
+        site: SiteModel,
+        shipping: Shipping,
+        billing: Billing
+    ) = updateOrder(
+        orderToUpdate, site,
+        mapOf("shipping" to shipping, "billing" to billing)
+    )
+
+    /**
+     * Makes a GET call to `/wp-json/wc/v3/orders/<id>/notes` retrieving a list of notes for the
+     * given WooCommerce [SiteModel] and [OrderEntity].
+     */
+    suspend fun fetchOrderNotes(
+        orderId: Long,
+        site: SiteModel
+    ): WooPayload<List<OrderNoteEntity>> {
+        val url = WOOCOMMERCE.orders.id(orderId).notes.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<OrderNoteApiResponse>::class.java
+        )
+
+        return response.toWooPayload { orderNotesResponse ->
+            orderNotesResponse.map {
+                it.toDataModel(site.localId(), RemoteId(orderId))
+            }
+        }
+    }
+
+    /**
+     * Makes a POST call to `/wp-json.wc/v3/orders/<id>/notes` saving the provided note for the
+     * given WooCommerce [SiteModel] and [OrderEntity].
+     */
+    suspend fun postOrderNote(
+        orderId: Long,
+        site: SiteModel,
+        note: String,
+        isCustomerNote: Boolean
+    ): WooPayload<OrderNoteEntity> {
+        val url = WOOCOMMERCE.orders.id(orderId).notes.pathV3
+
+        val body = mutableMapOf(
+            "note" to note,
+            "customer_note" to isCustomerNote,
+            "added_by_user" to true
+        )
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderNoteApiResponse::class.java,
+            body = body
+        )
+
+        return response.toWooPayload { orderNoteResponse ->
+            orderNoteResponse.toDataModel(site.localId(), RemoteId(orderId))
+        }
+    }
+
+    /**
+     * Makes a GET call to `/wp-json/wc/v2/orders/<order_id>/shipment-trackings/`, retrieving
+     * a list of shipment tracking objects for a single [OrderEntity].
+     *
+     * Note: This is not currently supported in v3, but will be in the short future.
+     *
+     */
+    suspend fun fetchOrderShipmentTrackings(
+        site: SiteModel,
+        orderId: Long
+    ): FetchOrderShipmentTrackingsResponsePayload {
+        val url = WOOCOMMERCE.orders.id(orderId).shipment_trackings.pathV2
+        val params = mapOf("_fields" to TRACKING_FIELDS)
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<OrderShipmentTrackingApiResponse>::class.java,
+            params = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val trackings = response.data?.map {
+                    orderShipmentTrackingResponseToModel(it).apply {
+                        localSiteId = site.id
+                        this.orderId = orderId
+                    }
+                }.orEmpty()
+
+                FetchOrderShipmentTrackingsResponsePayload(site, orderId, trackings)
+            }
+            is WPAPIResponse.Error -> {
+                val trackingsError = wpAPINetworkErrorToOrderError(response.error)
+                FetchOrderShipmentTrackingsResponsePayload(trackingsError, site, orderId)
+            }
+        }
+    }
+
+    /**
+     * Posts a new Order Shipment Tracking record to the API for an order.
+     *
+     * Makes a POST call to save a Shipment Tracking record.
+     * The API calls for different fields depending on if the new record uses a custom provider or not, so this is
+     * why there is an if-statement. Either way, the same standard [WCOrderShipmentTrackingModel] is returned.
+     *
+     * Note: This API does not currently support v3.
+     */
+    suspend fun addOrderShipmentTrackingForOrder(
+        site: SiteModel,
+        orderId: Long,
+        tracking: WCOrderShipmentTrackingModel,
+        isCustomProvider: Boolean
+    ): AddOrderShipmentTrackingResponsePayload {
+        val url = WOOCOMMERCE.orders.id(orderId).shipment_trackings.pathV2
+        val body = if (isCustomProvider) {
+            mutableMapOf(
+                "custom_tracking_provider" to tracking.trackingProvider,
+                "custom_tracking_link" to tracking.trackingLink
+            )
+        } else {
+            mutableMapOf("tracking_provider" to tracking.trackingProvider)
+        }
+        body["tracking_number"] = tracking.trackingNumber
+        body["date_shipped"] = tracking.dateShipped
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderShipmentTrackingApiResponse::class.java,
+            body = body
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    val trackingModel = orderShipmentTrackingResponseToModel(it).apply {
+                        this.orderId = orderId
+                        localSiteId = site.id
+                    }
+                    AddOrderShipmentTrackingResponsePayload(site, orderId, trackingModel)
+                } ?: AddOrderShipmentTrackingResponsePayload(
+                    OrderError(type = GENERIC_ERROR, message = "Success response with empty data"),
+                    site,
+                    orderId,
+                    tracking
+                )
+            }
+            is WPAPIResponse.Error -> {
+                val trackingsError = wpAPINetworkErrorToOrderError(response.error)
+                AddOrderShipmentTrackingResponsePayload(trackingsError, site, orderId, tracking)
+            }
+        }
+    }
+
+    /**
+     * Deletes a single shipment tracking record for an order.
+     *
+     * Makes a POST call requesting a DELETE method on
+     * `/wp-json/wc/v2/orders/<order_id>/shipment_trackings/<tracking_id>/`
+     *
+     * Note this is currently not supported in v3, but will be in the future.
+     */
+    suspend fun deleteShipmentTrackingForOrder(
+        site: SiteModel,
+        orderId: Long,
+        tracking: WCOrderShipmentTrackingModel
+    ): DeleteOrderShipmentTrackingResponsePayload {
+        val url = WOOCOMMERCE.orders.id(orderId)
+            .shipment_trackings.tracking(tracking.remoteTrackingId).pathV2
+
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderShipmentTrackingApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    val model = orderShipmentTrackingResponseToModel(it).apply {
+                        localSiteId = site.id
+                        this.orderId = orderId
+                        id = tracking.id
+                    }
+                    DeleteOrderShipmentTrackingResponsePayload(
+                        site,
+                        orderId,
+                        model
+                    )
+                } ?: DeleteOrderShipmentTrackingResponsePayload(
+                    OrderError(type = GENERIC_ERROR, message = "Success response with empty data"),
+                    site,
+                    orderId,
+                    tracking
+                )
+            }
+            is WPAPIResponse.Error -> DeleteOrderShipmentTrackingResponsePayload(
+                wpAPINetworkErrorToOrderError(response.error),
+                site,
+                orderId,
+                tracking
+            )
+        }
+    }
+
+    /**
+     * Fetches a list of shipment providers from the WooCommerce Shipment Tracking plugin.
+     *
+     * Makes a GET call to `/wp-json/wc/v2/orders/<order_id>/shipment-trackings/providers/`,
+     * retrieving a list of shipment tracking provider objects. The `<order_id>`
+     * argument is only needed because it is a requirement of the plugins API even though this data is not directly
+     * related to shipment providers.
+     */
+    suspend fun fetchOrderShipmentProviders(
+        site: SiteModel,
+        order: OrderEntity
+    ): FetchOrderShipmentProvidersResponsePayload {
+        val url = WOOCOMMERCE.orders.id(order.orderId).shipment_trackings.providers.pathV2
+        val params = emptyMap<String, String>()
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = JsonElement::class.java,
+            params = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    try {
+                        val providers = jsonResponseToShipmentProviderList(site, it)
+                        FetchOrderShipmentProvidersResponsePayload(site, order, providers)
+                    } catch (e: IllegalStateException) {
+                        // we have at least once instance of the response being invalid json so we catch the exception
+                        // https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/1331
+                        AppLog.e(
+                            T.UTILS,
+                            "IllegalStateException parsing shipment provider list, response = $it"
+                        )
+                        FetchOrderShipmentProvidersResponsePayload(
+                            OrderError(INVALID_RESPONSE, it.toString()),
+                            site,
+                            order
+                        )
+                    }
+                } ?: FetchOrderShipmentProvidersResponsePayload(
+                    OrderError(GENERIC_ERROR, "Success response with empty data"),
+                    site,
+                    order
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val trackingError = wpAPINetworkErrorToOrderError(response.error)
+                FetchOrderShipmentProvidersResponsePayload(trackingError, site, order)
+            }
+        }
+    }
+
+    suspend fun createOrder(
+        site: SiteModel,
+        request: UpdateOrderRequest,
+        attributionSourceType: String?
+    ): WooPayload<OrderEntity> {
+        val url = WOOCOMMERCE.orders.pathV3
+        val metaData = mapOf(
+            "meta_data" to listOfNotNull(
+                attributionSourceType?.let {
+                    mapOf(
+                        "key" to OrderAttributionInfoKeys.SOURCE_TYPE,
+                        "value" to attributionSourceType
+                    )
+                }
+            )
+        )
+
+        val body = request.toNetworkRequest() + metaData
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderDto::class.java,
+            body = body
+        )
+
+        return response.toWooPayload { orderDto ->
+            orderDtoMapper.toDatabaseEntity(orderDto, site.localId()).first
+        }
+    }
+
+    suspend fun updateOrder(
+        site: SiteModel,
+        orderId: Long,
+        request: UpdateOrderRequest
+    ): WooPayload<OrderEntity> {
+        val url = WOOCOMMERCE.orders.id(orderId).pathV3
+        val body = request.toNetworkRequest()
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            clazz = OrderDto::class.java,
+            body = body
+        )
+
+        return response.toWooPayload { orderDto ->
+            orderDtoMapper.toDatabaseEntity(orderDto, site.localId()).first
+        }
+    }
+
+    suspend fun deleteOrder(
+        site: SiteModel,
+        orderId: Long,
+        trash: Boolean
+    ): WooPayload<Unit> {
+        val url = WOOCOMMERCE.orders.id(orderId).pathV3
+
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = url,
+            clazz = Unit::class.java,
+            params = mapOf("force" to trash.not().toString())
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> WooPayload(Unit)
+            is WPAPIResponse.Error -> WooPayload(response.error.toWooError())
+        }
+    }
+
+    /**
+     * expirationDate: Formatted as yyyy-mm-dd.
+     * expirationDays: A number, 0 is today, 1 is tomorrow, etc.
+     * forceNew: Defaults to false, if true, creates a new receipt even if one already exists for the order.
+     */
+    suspend fun fetchOrdersReceipt(
+        site: SiteModel,
+        orderId: Long,
+        expirationDate: String? = null,
+        expirationDays: Int? = null,
+        forceNew: Boolean? = null
+    ): WooPayload<OrderReceiptResponse> {
+        val params = mutableMapOf<String, String>().apply {
+            expirationDate?.let { put("expiration_date", it) }
+            expirationDays?.let { put("expiration_days", it.toString()) }
+            forceNew?.let { put("force_new", it.toString()) }
+        }
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = WOOCOMMERCE.orders.id(orderId).receipt.pathV3,
+            clazz = OrderReceiptResponse::class.java,
+            body = params
+        )
+
+        return response.toWooPayload { it }
+    }
+
+    suspend fun sendOrderReceipt(
+        site: SiteModel,
+        orderId: Long,
+    ): WooPayload<Unit> {
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = WOOCOMMERCE.orders.id(orderId).actions.send_order_details.pathV3,
+            clazz = Unit::class.java,
+        )
+
+        return response.toWooPayload { it }
+    }
+
+    private suspend fun doFetchOrderCount(site: SiteModel, filterByStatus: String?): FetchOrdersCountResponsePayload {
+        val url = WOOCOMMERCE.reports.orders.totals.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<OrderCountApiResponse>::class.java,
+            params = if (filterByStatus != null) mapOf("status" to filterByStatus) else emptyMap()
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val total = if (filterByStatus == null) {
+                    response.data?.sumOf { it.total }
+                } else {
+                    response.data?.find { it.slug == filterByStatus }?.total
+                }
+
+                total?.let {
+                    FetchOrdersCountResponsePayload(site, filterByStatus, it)
+                } ?: run {
+                    val orderError = OrderError(OrderErrorType.ORDER_STATUS_NOT_FOUND)
+                    FetchOrdersCountResponsePayload(
+                        orderError,
+                        site,
+                        filterByStatus
+                    )
+                }
+            }
+
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                FetchOrdersCountResponsePayload(orderError, site, filterByStatus)
+            }
+        }
+    }
+
+    /**
+    * Performs a batch update of order statuses via the WooCommerce REST API.
+    *
+    * This endpoint enables updating multiple orders to the same status in a single network request.
+    * The WooCommerce API has a limit of 100 orders per batch update.
+    *
+    * @param site The site to perform the update on
+    * @param orderIds List of order IDs to update. Error if exceeds [BATCH_UPDATE_LIMIT]
+    * @param newStatus The new status to set for all specified orders
+    * @return [BulkUpdateOrderStatusResponsePayload] containing either the update results or an error
+    */
+    suspend fun batchUpdateOrdersStatus(
+        site: SiteModel,
+        orderIds: List<Long>,
+        newStatus: String
+    ): BulkUpdateOrderStatusResponsePayload {
+        // Check batch update limit
+        if (orderIds.size > BATCH_UPDATE_LIMIT) {
+            return BulkUpdateOrderStatusResponsePayload(
+                error = OrderError(
+                    type = OrderErrorType.BULK_UPDATE_LIMIT_EXCEEDED,
+                    message = "Cannot update more than 100 orders at once"
+                )
+            )
+        }
+
+        val url = WOOCOMMERCE.orders.batch.pathV3
+        val updateRequests = orderIds.map { orderId ->
+            mapOf(
+                "id" to orderId,
+                "status" to newStatus
+            )
+        }
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = BatchOrderApiResponse::class.java,
+            body = mapOf("update" to updateRequests)
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    BulkUpdateOrderStatusResponsePayload(it.update)
+                } ?: BulkUpdateOrderStatusResponsePayload(
+                    OrderError(GENERIC_ERROR, "Success response with empty data")
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val orderError = wpAPINetworkErrorToOrderError(response.error)
+                BulkUpdateOrderStatusResponsePayload(orderError)
+            }
+        }
+    }
+
+    private fun UpdateOrderRequest.toNetworkRequest(): Map<String, Any> {
+        return mutableMapOf<String, Any>().apply {
+            customerId?.let { put("customer_id", it) }
+            status?.let { put("status", it.statusKey) }
+            lineItems?.let { put("line_items", it) }
+            shippingAddress?.toDto()?.let { put("shipping", it) }
+            billingAddress?.toDto()?.let { put("billing", it) }
+            feeLines?.let { put("fee_lines", it) }
+            shippingLines?.let { put("shipping_lines", it) }
+            customerNote?.let { put("customer_note", it) }
+            couponLines?.let { put("coupon_lines", it) }
+            giftCard
+                ?.takeIf { it.isNotEmpty() }
+                ?.let { mapOf("code" to it) }
+                ?.let { put("gift_cards", listOf(it)) }
+        }
+    }
+
+    private fun orderResponseToOrderSummaryModel(response: OrderSummaryApiResponse): WCOrderSummaryModel {
+        return WCOrderSummaryModel().apply {
+            orderId = response.id ?: 0
+            dateCreated = convertDateToUTCString(response.dateCreatedGmt)
+            dateModified = convertDateToUTCString(response.dateModifiedGmt)
+        }
+    }
+
+    private fun wpAPINetworkErrorToOrderError(wpAPINetworkError: WPAPINetworkError): OrderError {
+        val orderErrorType = when {
+            wpAPINetworkError.errorCode == "rest_invalid_param" -> OrderErrorType.INVALID_PARAM
+            wpAPINetworkError.errorCode == "woocommerce_rest_shop_order_invalid_id" -> OrderErrorType.INVALID_ID
+            wpAPINetworkError.errorCode == "rest_no_route" -> OrderErrorType.PLUGIN_NOT_ACTIVE
+            wpAPINetworkError.type == BaseRequest.GenericErrorType.PARSE_ERROR -> OrderErrorType.PARSE_ERROR
+            wpAPINetworkError.type == BaseRequest.GenericErrorType.TIMEOUT -> TIMEOUT_ERROR
+            else -> OrderErrorType.fromString(wpAPINetworkError.errorCode.orEmpty())
+        }
+        return OrderError(orderErrorType, wpAPINetworkError.combinedErrorMessage)
+    }
+
+    private fun orderStatusResponseToOrderStatusModel(
+        response: OrderStatusApiResponse,
+        site: SiteModel
+    ): WCOrderStatusModel {
+        return WCOrderStatusModel().apply {
+            localSiteId = site.id
+            statusKey = response.slug ?: ""
+            label = response.name ?: ""
+            statusCount = response.total
+        }
+    }
+
+    private fun orderShipmentTrackingResponseToModel(
+        response: OrderShipmentTrackingApiResponse
+    ): WCOrderShipmentTrackingModel {
+        return WCOrderShipmentTrackingModel().apply {
+            remoteTrackingId = response.tracking_id ?: ""
+            trackingNumber = response.tracking_number ?: ""
+            trackingProvider = response.tracking_provider ?: ""
+            trackingLink = response.tracking_link ?: ""
+            dateShipped = response.date_shipped ?: ""
+        }
+    }
+
+    private fun convertDateToUTCString(date: String?): String =
+        date?.let { DateUtils.formatGmtAsUtcDateString(it) } ?: "" // Store the date in UTC format
+
+    private fun jsonResponseToShipmentProviderList(
+        site: SiteModel,
+        response: JsonElement
+    ): List<WCOrderShipmentProviderModel> {
+        val providers = mutableListOf<WCOrderShipmentProviderModel>()
+        response.asJsonObject.entrySet()
+            .forEach { countryEntry: MutableEntry<String, JsonElement> ->
+                countryEntry.value.asJsonObject.entrySet().map { carrierEntry ->
+                    carrierEntry?.let { carrier ->
+                        val provider = WCOrderShipmentProviderModel().apply {
+                            localSiteId = site.id
+                            this.country = countryEntry.key
+                            this.carrierName = carrier.key
+                            this.carrierLink = carrier.value.asString
+                        }
+                        providers.add(provider)
+                    }
+                }
+            }
+
+        return providers
+    }
+
+    companion object {
+        private val ORDER_FIELDS = arrayOf(
+            "billing",
+            "coupon_lines",
+            "currency",
+            "order_key",
+            "customer_note",
+            "date_created_gmt",
+            "date_modified_gmt",
+            "date_paid_gmt",
+            "discount_total",
+            "fee_lines",
+            "tax_lines",
+            "id",
+            "line_items",
+            "number",
+            "payment_method",
+            "payment_method_title",
+            "prices_include_tax",
+            "refunds",
+            "shipping",
+            "shipping_lines",
+            "shipping_total",
+            "status",
+            "total",
+            "total_tax",
+            "meta_data",
+            "payment_url",
+            "is_editable",
+            "needs_payment",
+            "needs_processing",
+            "shipping_tax"
+        ).joinToString(separator = ",")
+
+        private val TRACKING_FIELDS = arrayOf(
+            "date_shipped",
+            "tracking_id",
+            "tracking_link",
+            "tracking_number",
+            "tracking_provider"
+        ).joinToString(separator = ",")
+
+        private const val BATCH_UPDATE_LIMIT = 100
+    }
+
+    enum class SortOrder(val value: String) {
+        ASCENDING("asc"),
+        DESCENDING("desc");
+    }
+
+    enum class OrderBy(val value: String) {
+        DATE("date"),
+        ID("id"),
+        INCLUDE("include"),
+        TITLE("title"),
+        SLUG("slug");
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderShipmentTrackingApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderShipmentTrackingApiResponse.kt
new file mode 100644
index 00000000000..caa3abbce13
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderShipmentTrackingApiResponse.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("PropertyName", "VariableNaming")
+class OrderShipmentTrackingApiResponse : Response {
+    val tracking_id: String? = null
+    val tracking_provider: String? = null
+    val tracking_link: String? = null
+    val tracking_number: String? = null
+    val date_shipped: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderStatusApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderStatusApiResponse.kt
new file mode 100644
index 00000000000..f0d6e7ad5a8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderStatusApiResponse.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+class OrderStatusApiResponse {
+    val slug: String? = null
+    val name: String? = null
+    val total: Int = 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderSummaryApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderSummaryApiResponse.kt
new file mode 100644
index 00000000000..975a954ff9e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderSummaryApiResponse.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class OrderSummaryApiResponse : Response {
+    val id: Long? = null
+
+    @SerializedName("date_created_gmt")
+    val dateCreatedGmt: String? = null
+
+    @SerializedName("date_modified_gmt")
+    val dateModifiedGmt: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt
new file mode 100644
index 00000000000..d981bc53765
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrder.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.Gson
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.order.LineItem
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.CHARGE_ID_KEY
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.RECEIPT_URL_KEY
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.SHIPPING_PHONE_KEY
+import javax.inject.Inject
+
+internal class StripOrder @Inject constructor(private val gson: Gson) {
+    operator fun invoke(fatModel: OrderEntity): OrderEntity {
+        return fatModel.copy(
+                lineItems = gson.toJson(fatModel.getLineItemList().map { lineItemDto: LineItem ->
+                    lineItemDto.copy(
+                        metaData = lineItemDto.metaData
+                            ?.filter {
+                                it.isDisplayable
+                                    || it.key == WCMetaData.BundleMetadataKeys.BUNDLED_ITEM_ID
+                            }
+                    )
+                }),
+                shippingLines = gson.toJson(fatModel.getShippingLineList()),
+                feeLines = gson.toJson(fatModel.getFeeLineList()),
+                taxLines = gson.toJson(fatModel.getTaxLineList()),
+                metaData = fatModel.metaData
+                        .filter {
+                            it.key == CHARGE_ID_KEY ||
+                                    it.key == SHIPPING_PHONE_KEY ||
+                                    it.key == RECEIPT_URL_KEY
+                        }
+                )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt
new file mode 100644
index 00000000000..f84d86bd60f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaData.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.OrderAttributionInfoKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.SubscriptionMetadataKeys
+import javax.inject.Inject
+
+class StripOrderMetaData @Inject internal constructor() {
+    companion object {
+        private val SUPPORTED_KEYS: Set<String> = buildSet {
+            add(SubscriptionMetadataKeys.SUBSCRIPTION_RENEWAL)
+            addAll(OrderAttributionInfoKeys.ALL_KEYS)
+        }
+    }
+
+    operator fun invoke(metaData: List<WCMetaData>): List<WCMetaData> {
+        return metaData
+            .filter {
+                it.isDisplayable || it.key in SUPPORTED_KEYS
+            }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsApiResponse.kt
new file mode 100644
index 00000000000..4665826a448
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsApiResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+class OrderStatsApiResponse : Response {
+    val fields: JsonElement? = null
+    val data: JsonElement? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsRestClient.kt
new file mode 100644
index 00000000000..69ad62e2113
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/OrderStatsRestClient.kt
@@ -0,0 +1,264 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats
+
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.WCStatsActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCNewVisitorStatsModel
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchNewVisitorStatsResponsePayload
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsAvailabilityResponsePayload
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsResponsePayload
+import org.wordpress.android.fluxc.store.WCStatsStore.OrderStatsError
+import org.wordpress.android.fluxc.store.WCStatsStore.OrderStatsErrorType
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+
+class OrderStatsRestClient @Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val wooNetwork: WooNetwork,
+    private val wpComNetwork: WPComNetwork,
+    private val coroutineEngine: CoroutineEngine
+) {
+    enum class OrderStatsApiUnit {
+        HOUR, DAY, WEEK, MONTH, YEAR;
+
+        companion object {
+            fun fromStatsGranularity(granularity: StatsGranularity): OrderStatsApiUnit {
+                return when (granularity) {
+                    StatsGranularity.HOURS -> HOUR
+                    StatsGranularity.DAYS -> DAY
+                    StatsGranularity.WEEKS -> WEEK
+                    StatsGranularity.MONTHS -> MONTH
+                    StatsGranularity.YEARS -> YEAR
+                }
+            }
+        }
+
+        override fun toString() = name.toLowerCase()
+    }
+
+    /**
+     * Makes a GET call to `/wc/v4/reports/revenue/stats`, retrieving data for the given
+     * WooCommerce [SiteModel].
+     *
+     * @param[site] the site to fetch stats data for
+     * @param[granularity] one of 'hour', 'day', 'week', 'month', or 'year'
+     * @param[startDate] the start date to include in ISO format (YYYY-MM-dd'T'HH:mm:ss)
+     * @param[endDate] the end date to include in ISO format (YYYY-MM-dd'T'HH:mm:ss)
+     * @param[perPage] the number of items to return in a paginated response
+     * @param[forceRefresh] a boolean value indicating whether we should avoid cached data
+     * @param[revenueRangeId] a unique id for this request. We will use this id to save the response in the local db.
+     * @param[dateType] override the "woocommerce_date_type" option that is used for revenue reports.
+     * Product stats are based on the order creation date, while the order/revenue
+     * stats are based on a store option in the analytics settings with the order paid date as the default.
+     * In WC version 8.6+, a new parameter `date_type` is available to override the date type so that we can
+     * show the order/revenue and product stats based on the same date column, order creation date.
+     *
+     * Possible non-generic errors:
+     * [OrderStatsErrorType.INVALID_PARAM] if [granularity], [startDate], or [endDate] are invalid or incompatible
+     */
+    suspend fun fetchRevenueStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String,
+        perPage: Int,
+        forceRefresh: Boolean = false,
+        revenueRangeId: String = "",
+        dateType: String = "date_created",
+    ): FetchRevenueStatsResponsePayload {
+        val url = WOOCOMMERCE.reports.revenue.stats.pathV4Analytics
+        val params = mapOf(
+            "interval" to OrderStatsApiUnit.fromStatsGranularity(granularity).toString(),
+            "after" to startDate,
+            "before" to endDate,
+            "per_page" to perPage.toString(),
+            "order" to "asc",
+            "force_cache_refresh" to forceRefresh.toString(),
+            "date_type" to dateType
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = RevenueStatsApiResponse::class.java,
+            enableCaching = true,
+            forced = forceRefresh
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                        val model = WCRevenueStatsModel().apply {
+                            this.localSiteId = site.id
+                            this.interval = granularity.toString()
+                            this.data = it.intervals.toString()
+                            this.total = it.totals.toString()
+                            this.startDate = startDate
+                            this.endDate = endDate
+                            this.rangeId = revenueRangeId
+                        }
+
+                    FetchRevenueStatsResponsePayload(site, granularity, model)
+                } ?: FetchRevenueStatsResponsePayload(
+                        OrderStatsError(type = OrderStatsErrorType.GENERIC_ERROR,
+                                message = "Success response with empty data"
+                        ),
+                        site,
+                        granularity
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val orderError = response.error.toOrderError()
+                FetchRevenueStatsResponsePayload(orderError, site, granularity)
+            }
+        }
+    }
+
+    /**
+     * Makes a GET call to `/wc/v4/reports/revenue/stats`, to check if the site supports the v4 stats api.
+     * If v4 stats is not available for the site, returns [OrderStatsErrorType.PLUGIN_NOT_ACTIVE]
+     *
+     * @param[site] the site to fetch stats data for
+     * @param[startDate] the current date to include in ISO format (YYYY-MM-dd'T'HH:mm:ss)
+     *
+     * Since only the response code is needed to verify if the v4 stats is supported or not,
+     * this method has been optimised:
+     * The interval param is set to [OrderStatsApiUnit.YEAR] by default
+     * The after param is set to the current date by default
+     * The _fields param is added to retrieve only the `Totals` field from the api
+     */
+    fun fetchRevenueStatsAvailability(site: SiteModel, startDate: String) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchRevenueStatsAvailability") {
+            val url = WOOCOMMERCE.reports.revenue.stats.pathV4Analytics
+            val params = mapOf(
+                "interval" to OrderStatsApiUnit.YEAR.toString(),
+                "after" to startDate,
+                "_fields" to "totals"
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = RevenueStatsApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val payload = FetchRevenueStatsAvailabilityResponsePayload(site, true)
+                    dispatcher.dispatch(WCStatsActionBuilder.newFetchedRevenueStatsAvailabilityAction(payload))
+                }
+                is WPAPIResponse.Error -> {
+                    val orderError = response.error.toOrderError()
+                    val payload = FetchRevenueStatsAvailabilityResponsePayload(orderError, site, false)
+                    dispatcher.dispatch(WCStatsActionBuilder.newFetchedRevenueStatsAvailabilityAction(payload))
+                }
+            }
+        }
+    }
+
+    suspend fun fetchNewVisitorStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String,
+        quantity: Int,
+        force: Boolean = false,
+        startDate: String? = null,
+        endDate: String? = null
+    ): FetchNewVisitorStatsResponsePayload {
+        val url = WPCOMREST.sites.site(site.siteId).stats.visits.urlV1_1
+        val params = mapOf(
+            "unit" to OrderStatsApiUnit.fromStatsGranularity(granularity).toString(),
+            "date" to date,
+            "quantity" to quantity.toString(),
+            "stat_fields" to "visitors"
+        )
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = params,
+            clazz = VisitorStatsApiResponse::class.java,
+            enableCaching = true,
+            forced = force
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> {
+                val statsData = response.data
+                val model = WCNewVisitorStatsModel().apply {
+                    this.localSiteId = site.id
+                    this.granularity = granularity.toString()
+                    this.fields = statsData.fields.toString()
+                    this.data = statsData.data.toString()
+                    this.quantity = quantity.toString()
+                    this.date = date
+                    endDate?.let { this.endDate = it }
+                    startDate?.let {
+                        this.startDate = startDate
+                        this.isCustomField = true
+                    }
+                }
+
+                FetchNewVisitorStatsResponsePayload(site, granularity, model)
+            }
+
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val orderError = response.error.toOrderError()
+                FetchNewVisitorStatsResponsePayload(orderError, site, granularity)
+            }
+        }
+    }
+
+    suspend fun fetchVisitorStatsSummary(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String,
+        force: Boolean
+    ): WooPayload<VisitorStatsSummaryApiResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.summary.urlV1_1
+        val params = mapOf(
+            "period" to OrderStatsApiUnit.fromStatsGranularity(granularity).toString(),
+            "date" to date
+        )
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = params,
+            clazz = VisitorStatsSummaryApiResponse::class.java,
+            enableCaching = true,
+            forced = force
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> WooPayload(response.data)
+            is WPComGsonRequestBuilder.Response.Error -> WooPayload(response.error.toWooError())
+        }
+    }
+
+    private fun WPAPINetworkError.toOrderError() = networkErrorToOrderError(errorCode, message)
+    private fun WPComGsonNetworkError.toOrderError() = networkErrorToOrderError(apiError, message)
+    
+    private fun networkErrorToOrderError(errorCode: String?, message: String?): OrderStatsError {
+        val orderStatsErrorType = when (errorCode) {
+            "rest_invalid_param" -> OrderStatsErrorType.INVALID_PARAM
+            "rest_no_route" -> OrderStatsErrorType.PLUGIN_NOT_ACTIVE
+            else -> OrderStatsErrorType.fromString(errorCode.orEmpty())
+        }
+        return OrderStatsError(orderStatsErrorType, message.orEmpty())
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/RevenueStatsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/RevenueStatsApiResponse.kt
new file mode 100644
index 00000000000..eec7a8fcacb
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/RevenueStatsApiResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+class RevenueStatsApiResponse : Response {
+    val totals: JsonElement? = null
+    val intervals: JsonElement? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsApiResponse.kt
new file mode 100644
index 00000000000..c3fae8cc4b5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsApiResponse.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+class VisitorStatsApiResponse : Response {
+    val date: String? = null
+    val unit: String? = null
+    val fields: JsonElement? = null
+    val data: JsonElement? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsSummaryApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsSummaryApiResponse.kt
new file mode 100644
index 00000000000..e2ad2533a44
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/orderstats/VisitorStatsSummaryApiResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats
+
+import org.wordpress.android.fluxc.network.Response
+
+data class VisitorStatsSummaryApiResponse(
+    val date: String? = null,
+    val period: String? = null,
+    val views: Int = 0,
+    val visitors: Int = 0
+) : Response
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/CapturePaymentApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/CapturePaymentApiResponse.kt
new file mode 100644
index 00000000000..6987d10a27b
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/CapturePaymentApiResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson
+
+import com.google.gson.annotations.SerializedName
+
+data class CapturePaymentApiResponse(
+    @SerializedName("status") val status: String,
+    @SerializedName("id") val paymentId: String
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/ConnectionTokenApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/ConnectionTokenApiResponse.kt
new file mode 100644
index 00000000000..aa5472989ff
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/ConnectionTokenApiResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson
+
+import com.google.gson.annotations.SerializedName
+
+data class ConnectionTokenApiResponse(
+    @SerializedName("secret") val token: String,
+    @SerializedName("test_mode") val isTestMode: Boolean
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/InPersonPaymentsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/InPersonPaymentsRestClient.kt
new file mode 100644
index 00000000000..d9e97988033
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/InPersonPaymentsRestClient.kt
@@ -0,0 +1,234 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentError
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.CAPTURE_ERROR
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.MISSING_ORDER
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.PAYMENT_ALREADY_CAPTURED
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentResponsePayload
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentAccountResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentChargeApiResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationError
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationErrorType
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentTransactionsSummaryResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationResult.StoreAddress
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.store.WCInPersonPaymentsStore.InPersonPaymentsPluginType
+import org.wordpress.android.fluxc.store.WCInPersonPaymentsStore.InPersonPaymentsPluginType.STRIPE
+import org.wordpress.android.fluxc.store.WCInPersonPaymentsStore.InPersonPaymentsPluginType.WOOCOMMERCE_PAYMENTS
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class InPersonPaymentsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchConnectionToken(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WooPayload<ConnectionTokenApiResponse> {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.connection_tokens.pathV3
+            STRIPE -> WOOCOMMERCE.wc_stripe.connection_tokens.pathV3
+        }
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = ConnectionTokenApiResponse::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun capturePayment(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel,
+        paymentId: String,
+        orderId: Long
+    ): WCCapturePaymentResponsePayload {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.orders.id(orderId).capture_terminal_payment.pathV3
+            STRIPE -> WOOCOMMERCE.wc_stripe.orders.order(orderId).capture_terminal_payment.pathV3
+        }
+        val body = mapOf(
+            "payment_intent_id" to paymentId
+        )
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            body = body,
+            clazz = CapturePaymentApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let { data ->
+                    WCCapturePaymentResponsePayload(site, paymentId, orderId, data.status)
+                } ?: WCCapturePaymentResponsePayload(
+                    mapToCapturePaymentError(error = null, message = "status field is null, but isError == false"),
+                    site,
+                    paymentId,
+                    orderId
+                )
+            }
+            is WPAPIResponse.Error -> {
+                WCCapturePaymentResponsePayload(
+                    mapToCapturePaymentError(response.error, response.error.message ?: "Unexpected error"),
+                    site,
+                    paymentId,
+                    orderId
+                )
+            }
+        }
+    }
+
+    suspend fun loadAccount(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WooPayload<WCPaymentAccountResult> {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.accounts.pathV3
+            STRIPE -> WOOCOMMERCE.wc_stripe.account.summary.pathV3
+        }
+        val params = mapOf("_fields" to ACCOUNT_REQUESTED_FIELDS)
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = WCPaymentAccountResult::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun getStoreLocationForSite(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WCTerminalStoreLocationResult {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.terminal.locations.store.pathV3
+            STRIPE -> WOOCOMMERCE.wc_stripe.terminal.locations.store.pathV3
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = StoreLocationApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let { data ->
+                    WCTerminalStoreLocationResult(
+                        locationId = data.id,
+                        displayName = data.displayName,
+                        liveMode = data.liveMode,
+                        address = StoreAddress(
+                            city = data.address?.city,
+                            country = data.address?.country,
+                            line1 = data.address?.line1,
+                            line2 = data.address?.line2,
+                            postalCode = data.address?.postalCode,
+                            state = data.address?.state
+                        )
+                    )
+                } ?: WCTerminalStoreLocationResult(
+                    mapToStoreLocationForSiteError(
+                        error = null,
+                        message = "status field is null, but isError == false"
+                    )
+                )
+            }
+            is WPAPIResponse.Error -> {
+                WCTerminalStoreLocationResult(
+                    mapToStoreLocationForSiteError(response.error, response.error.message ?: "Unexpected error")
+                )
+            }
+        }
+    }
+
+    suspend fun fetchPaymentCharge(
+        activePlugin: InPersonPaymentsPluginType,
+        chargeId: String,
+        site: SiteModel
+    ): WooPayload<WCPaymentChargeApiResult> {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.charges.charge(chargeId).pathV3
+            STRIPE -> WOOCOMMERCE.wc_stripe.charges.charge(chargeId).pathV3
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = WCPaymentChargeApiResult::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchTransactionsSummary(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel,
+        dateAfter: String? = null,
+    ): WooPayload<WCPaymentTransactionsSummaryResult> {
+        val url = when (activePlugin) {
+            WOOCOMMERCE_PAYMENTS -> WOOCOMMERCE.payments.transactions.summary.pathV3
+            STRIPE -> error("Stripe does not support fetching transactions summary")
+        }
+        val params = mutableMapOf<String, String>()
+        dateAfter?.let { params["date_after"] = it }
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = WCPaymentTransactionsSummaryResult::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    private fun mapToCapturePaymentError(error: WPAPINetworkError?, message: String): WCCapturePaymentError {
+        val type = when {
+            error == null -> GENERIC_ERROR
+            error.errorCode == "wcpay_missing_order" -> MISSING_ORDER
+            error.errorCode == "wcpay_payment_uncapturable" -> PAYMENT_ALREADY_CAPTURED
+            error.errorCode == "wcpay_capture_error" -> CAPTURE_ERROR
+            error.errorCode == "wcpay_server_error" -> SERVER_ERROR
+            error.type == GenericErrorType.TIMEOUT -> NETWORK_ERROR
+            error.type == GenericErrorType.NO_CONNECTION -> NETWORK_ERROR
+            error.type == GenericErrorType.NETWORK_ERROR -> NETWORK_ERROR
+            else -> GENERIC_ERROR
+        }
+        return WCCapturePaymentError(type, message)
+    }
+
+    private fun mapToStoreLocationForSiteError(error: WPAPINetworkError?, message: String):
+        WCTerminalStoreLocationError {
+        val type = when {
+            error == null -> WCTerminalStoreLocationErrorType.GenericError
+            error.errorCode == "store_address_is_incomplete" -> {
+                if (error.message.isNullOrBlank()) WCTerminalStoreLocationErrorType.GenericError
+                else WCTerminalStoreLocationErrorType.MissingAddress(error.message)
+            }
+            error.errorCode == "postal_code_invalid" -> WCTerminalStoreLocationErrorType.InvalidPostalCode
+            error.type == GenericErrorType.TIMEOUT -> WCTerminalStoreLocationErrorType.NetworkError
+            error.type == GenericErrorType.NO_CONNECTION -> WCTerminalStoreLocationErrorType.NetworkError
+            error.type == GenericErrorType.NETWORK_ERROR -> WCTerminalStoreLocationErrorType.NetworkError
+            else -> WCTerminalStoreLocationErrorType.GenericError
+        }
+        return WCTerminalStoreLocationError(type, message)
+    }
+
+    companion object {
+        private const val ACCOUNT_REQUESTED_FIELDS: String =
+            "status,has_pending_requirements,has_overdue_requirements,current_deadline,statement_descriptor," +
+                "store_currencies,country,is_live,test_mode"
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/StoreLocationApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/StoreLocationApiResponse.kt
new file mode 100644
index 00000000000..dba9c0f9c49
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/inperson/StoreLocationApiResponse.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson
+
+import com.google.gson.annotations.SerializedName
+
+data class StoreLocationApiResponse(
+    @SerializedName("id") val id: String,
+    @SerializedName("display_name") val displayName: String?,
+    @SerializedName("livemode") val liveMode: Boolean?,
+    @SerializedName("address") val address: StoreAddress?
+) {
+    data class StoreAddress(
+        @SerializedName("city") val city: String?,
+        @SerializedName("country") val country: String?,
+        @SerializedName("line1") val line1: String?,
+        @SerializedName("line2") val line2: String?,
+        @SerializedName("postal_code") val postalCode: String?,
+        @SerializedName("state") val state: String?
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsDepositsOverviewApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsDepositsOverviewApiResponse.kt
new file mode 100644
index 00000000000..58165521df9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsDepositsOverviewApiResponse.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo
+
+import com.google.gson.annotations.SerializedName
+
+data class WooPaymentsDepositsOverviewApiResponse(
+    val deposit: WooPaymentsCurrencyDeposits?,
+    val balance: WooPaymentsCurrencyBalances?,
+    val account: WooPaymentsAccountDepositSummary?
+)
+
+data class WooPaymentsCurrencyDeposits(
+    @SerializedName("last_paid") val lastPaid: List<WooPaymentsDeposit>?,
+    @SerializedName("last_manual_deposits") val lastManualDeposits: List<WooPaymentsManualDeposit>?
+)
+
+data class WooPaymentsDeposit(
+    val id: String?,
+    val date: Long?,
+    val type: String?,
+    val amount: Long?,
+    val status: String?,
+    val bankAccount: String?,
+    val currency: String,
+    val automatic: Boolean?,
+    val fee: Long?,
+    @SerializedName("fee_percentage") val feePercentage: Double?,
+    val created: Long?
+)
+
+data class WooPaymentsManualDeposit(
+    val currency: String?,
+    val date: Long?
+)
+
+data class WooPaymentsCurrencyBalances(
+    val pending: List<WooPaymentsBalance>?,
+    val available: List<WooPaymentsBalance>?,
+    val instant: List<WooPaymentsBalance>?
+)
+
+data class WooPaymentsBalance(
+    val amount: Long?,
+    val currency: String?,
+    @SerializedName("source_types") val sourceTypes: WooPaymentsSourceTypes?,
+    @SerializedName("fee_percentage") val feePercentage: Double?,
+    @SerializedName("net") val net: Long?,
+    val fee: Long?,
+)
+
+data class WooPaymentsSourceTypes(
+    val card: Int?
+)
+
+data class WooPaymentsAccountDepositSummary(
+    @SerializedName("deposits_enabled") val depositsEnabled: Boolean?,
+    @SerializedName("deposits_blocked") val depositsBlocked: Boolean?,
+    @SerializedName("deposits_schedule") val depositsSchedule: WooPaymentsDepositsSchedule?,
+    @SerializedName("default_currency") val defaultCurrency: String?
+)
+
+data class WooPaymentsDepositsSchedule(
+    @SerializedName("delay_days") val delayDays: Int?,
+    @SerializedName("weekly_anchor") val weeklyAnchor: String?,
+    @SerializedName("monthly_anchor") val monthlyAnchor: Int?,
+    val interval: String?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsRestClient.kt
new file mode 100644
index 00000000000..deb1424ca92
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/payments/woo/WooPaymentsRestClient.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class WooPaymentsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchDepositsOverview(site: SiteModel): WooPayload<WooPaymentsDepositsOverviewApiResponse> {
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = WOOCOMMERCE.payments.deposits.overview_all.pathV3,
+            clazz = WooPaymentsDepositsOverviewApiResponse::class.java
+        )
+
+        return response.toWooPayload()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchAddProductTagApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchAddProductTagApiResponse.kt
new file mode 100644
index 00000000000..9255f079a08
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchAddProductTagApiResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class BatchAddProductTagApiResponse : Response {
+    @SerializedName("create")
+    val addedTags: List<ProductTagApiResponse>? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductApiResponse.kt
new file mode 100644
index 00000000000..8241df519e2
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductApiResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class BatchProductApiResponse(
+    @SerializedName("update") val updatedProducts: List<ProductDto>? = null,
+) : Response
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductVariationsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductVariationsApiResponse.kt
new file mode 100644
index 00000000000..e3fe2d761b8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/BatchProductVariationsApiResponse.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+/**
+ * Representation of Batch Update Product Variations API response.
+ */
+data class BatchProductVariationsApiResponse(
+    @SerializedName("create") val createdVariations: List<ProductVariationApiResponse>? = null,
+    @SerializedName("update") val updatedVariations: List<ProductVariationApiResponse>? = null,
+    @SerializedName("delete") val deletedVariations: List<Long>? = null
+) : Response
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductBackOrders.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductBackOrders.kt
new file mode 100644
index 00000000000..0691643ba31
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductBackOrders.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+/**
+ * Standard Core WooCommerce product back order options
+ */
+enum class CoreProductBackOrders(val value: String) {
+    NO("no"),
+    NOTIFY("notify"),
+    YES("yes");
+
+    companion object {
+        private val valueMap = values().associateBy(CoreProductBackOrders::value)
+
+        /**
+         * Convert the base value into the associated CoreProductBackOrders object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStatus.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStatus.kt
new file mode 100644
index 00000000000..45adec31879
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStatus.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+enum class CoreProductStatus(val value: String) {
+    DRAFT("draft"),
+    PENDING("pending"),
+    PRIVATE("private"),
+    PUBLISH("publish"),
+    TRASH("trash");
+
+    companion object {
+        private val valueMap = values().associateBy(CoreProductStatus::value)
+
+        /**
+         * Convert the base value into the associated CoreProductStatus object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStockStatus.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStockStatus.kt
new file mode 100644
index 00000000000..b7b3774fc70
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductStockStatus.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+/**
+ * Standard Core WooCommerce product stock statuses
+ */
+enum class CoreProductStockStatus(val value: String) {
+    IN_STOCK("instock"),
+    LOW_STOCK("lowstock"),
+    OUT_OF_STOCK("outofstock"),
+    ON_BACK_ORDER("onbackorder");
+
+    companion object {
+        private val valueMap = entries.associateBy(CoreProductStockStatus::value)
+        val ALL_VALUES = valueMap.keys
+
+        val FILTERABLE_VALUES = setOf(IN_STOCK, OUT_OF_STOCK, ON_BACK_ORDER)
+        /**
+         * Convert the base value into the associated CoreProductStockStatus object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductTaxStatus.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductTaxStatus.kt
new file mode 100644
index 00000000000..d0c7afc35d4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductTaxStatus.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+/**
+ * Standard Core WooCommerce product tax statuses
+ */
+enum class CoreProductTaxStatus(val value: String) {
+    TAXABLE("taxable"),
+    SHIPPING("shipping"),
+    NONE("none");
+
+    companion object {
+        private val valueMap = values().associateBy(CoreProductTaxStatus::value)
+
+        /**
+         * Convert the base value into the associated CoreProductTaxStatus object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductType.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductType.kt
new file mode 100644
index 00000000000..2c6009836fd
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductType.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+enum class CoreProductType(val value: String) {
+    SIMPLE("simple"),
+    GROUPED("grouped"),
+    EXTERNAL("external"),
+    VARIABLE("variable"),
+    BUNDLE("bundle");
+
+    companion object {
+        private val valueMap = values().associateBy(CoreProductType::value)
+
+        /**
+         * Convert the base value into the associated CoreProductType object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductVisibility.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductVisibility.kt
new file mode 100644
index 00000000000..c78797cd684
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/CoreProductVisibility.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+enum class CoreProductVisibility(val value: String) {
+    VISIBLE("visible"),
+    CATALOG("catalog"),
+    SEARCH("search"),
+    HIDDEN("hidden");
+
+    companion object {
+        private val valueMap = values().associateBy(CoreProductVisibility::value)
+
+        /**
+         * Convert the base value into the associated CoreProductVisibility object
+         */
+        fun fromValue(value: String) = valueMap[value]
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductApiResponse.kt
new file mode 100644
index 00000000000..06b043508c5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductApiResponse.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.utils.NonNegativeDoubleJsonDeserializer
+import org.wordpress.android.fluxc.utils.PrimitiveBooleanJsonDeserializer
+
+typealias ProductDto = ProductApiResponse
+
+@Suppress("ConstructorParameterNaming")
+data class ProductApiResponse(
+    val id: Long? = null,
+    val localSiteId: Int = 0,
+    val name: String? = null,
+    val slug: String? = null,
+    val permalink: String? = null,
+    val date_created: String? = null,
+    val date_modified: String? = null,
+    val type: String? = null,
+    val status: String? = null,
+    val featured: Boolean = false,
+    val catalog_visibility: String? = null,
+    val description: String? = null,
+    val short_description: String? = null,
+    val sku: String? = null,
+    val global_unique_id: String? = null,
+    val price: String? = null,
+    val regular_price: String? = null,
+    val sale_price: String? = null,
+    val on_sale: Boolean = false,
+    val total_sales: Long = 0L,
+    @JsonAdapter(PrimitiveBooleanJsonDeserializer::class)
+    val purchasable: Boolean = false,
+    val virtual: Boolean = false,
+    val downloadable: Boolean = false,
+    val download_limit: Long = 0L,
+    val download_expiry: Int = 0,
+    val external_url: String? = null,
+    val button_text: String? = null,
+    val tax_status: String? = null,
+    val tax_class: String? = null,
+    val manage_stock: String? = null,
+    @JsonAdapter(NonNegativeDoubleJsonDeserializer::class)
+    val stock_quantity: Double? = 0.0,
+    val stock_status: String? = null,
+    val date_on_sale_from: String? = null,
+    val date_on_sale_to: String? = null,
+    val date_on_sale_from_gmt: String? = null,
+    val date_on_sale_to_gmt: String? = null,
+    val backorders: String? = null,
+    val backorders_allowed: Boolean = false,
+    val backordered: Boolean = false,
+    @JsonAdapter(PrimitiveBooleanJsonDeserializer::class)
+    val sold_individually: Boolean = false,
+    val weight: String? = null,
+    val dimensions: JsonElement? = null,
+    val shipping_required: Boolean = false,
+    val shipping_taxable: Boolean = false,
+    val shipping_class: String? = null,
+    val shipping_class_id: Int = 0,
+    val reviews_allowed: Boolean = true,
+    val average_rating: String? = null,
+    val rating_count: Int = 0,
+    val parent_id: Long = 0L,
+    val menu_order: Int = 0,
+    val purchase_note: String? = null,
+    val categories: JsonElement? = null,
+    val tags: JsonElement? = null,
+    val images: JsonElement? = null,
+    val attributes: JsonElement? = null,
+    val variations: JsonElement? = null,
+    val downloads: JsonElement? = null,
+    val related_ids: JsonElement? = null,
+    val cross_sell_ids: JsonElement? = null,
+    val upsell_ids: JsonElement? = null,
+    val grouped_products: JsonElement? = null,
+    @SerializedName("meta_data")
+    val metadata: JsonArray? = null,
+    val bundle_stock_quantity: String? = null,
+    val bundle_stock_status: String? = null,
+    val bundled_items: JsonArray? = null,
+    val composite_components: JsonArray? = null,
+    val bundle_min_size: String? = null,
+    val bundle_max_size: String? = null,
+    val min_quantity: String? = null,
+    val max_quantity: String? = null,
+    val group_of_quantity: String? = null,
+    val combine_variations: String? = null,
+    @SerializedName("post_password")
+    val password: String? = null,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCategoryApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCategoryApiResponse.kt
new file mode 100644
index 00000000000..29064bd21c5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCategoryApiResponse.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.network.Response
+
+class ProductCategoryApiResponse : Response {
+    val id: Long = 0L
+    var name: String? = null
+    var slug: String? = null
+    var parent: Long? = null
+    val error: JsonObject? = null
+
+    fun asProductCategoryModel(): WCProductCategoryModel {
+        val response = this
+        return WCProductCategoryModel().apply {
+            remoteCategoryId = response.id
+            name = response.name ?: ""
+            slug = response.slug ?: ""
+            parent = response.parent ?: 0L
+        }
+    }
+}
+
+data class ProductCategoryBatchApiResponse(
+    @SerializedName("create")
+    val createdCategories: List<ProductCategoryApiResponse> = emptyList()
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCountApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCountApiResponse.kt
new file mode 100644
index 00000000000..80edaf4374d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductCountApiResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import org.wordpress.android.fluxc.network.Response
+
+class ProductCountApiResponse : Response {
+    val slug: String? = null
+    val name: String? = null
+    val total: Long = 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt
new file mode 100644
index 00000000000..5098d596b36
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapper.kt
@@ -0,0 +1,143 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.ProductWithMetaData
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.utils.getString
+import javax.inject.Inject
+
+class ProductDtoMapper @Inject constructor(
+    private val stripProductMetaData: StripProductMetaData
+) {
+    @Suppress("LongMethod", "ComplexMethod")
+    fun mapToModel(localSiteId: LocalOrRemoteId.LocalId, dto: ProductDto): ProductWithMetaData {
+        val fatMetaDataList = dto.metadata?.mapNotNull {
+            runCatching { WCMetaData.fromJson(it.asJsonObject) }.getOrNull()
+        } ?: emptyList()
+        val metaData = stripProductMetaData(fatMetaDataList)
+
+        val model = WCProductModel().apply {
+            this.localSiteId = localSiteId.value
+            remoteProductId = dto.id ?: 0
+            name = dto.name ?: ""
+            slug = dto.slug ?: ""
+            permalink = dto.permalink ?: ""
+
+            dateCreated = dto.date_created ?: ""
+            dateModified = dto.date_modified ?: ""
+
+            dateOnSaleFrom = dto.date_on_sale_from ?: ""
+            dateOnSaleTo = dto.date_on_sale_to ?: ""
+            dateOnSaleFromGmt = dto.date_on_sale_from_gmt ?: ""
+            dateOnSaleToGmt = dto.date_on_sale_to_gmt ?: ""
+
+            type = dto.type ?: ""
+            status = dto.status ?: ""
+            featured = dto.featured
+            catalogVisibility = dto.catalog_visibility ?: ""
+            description = dto.description ?: ""
+            shortDescription = dto.short_description ?: ""
+            sku = dto.sku ?: ""
+            globalUniqueId = dto.global_unique_id ?: ""
+
+            price = dto.price ?: ""
+            regularPrice = dto.regular_price ?: ""
+            salePrice = dto.sale_price ?: ""
+            onSale = dto.on_sale
+            totalSales = dto.total_sales
+            purchasable = dto.purchasable
+
+            virtual = dto.virtual
+            downloadable = dto.downloadable
+            downloadLimit = dto.download_limit
+            downloadExpiry = dto.download_expiry
+
+            externalUrl = dto.external_url ?: ""
+            buttonText = dto.button_text ?: ""
+
+            taxStatus = dto.tax_status ?: ""
+            taxClass = dto.tax_class ?: ""
+
+            // variations may have "parent" here if inventory is enabled for the parent but not the variation
+            manageStock = dto.manage_stock?.let {
+                it == "true" || it == "parent"
+            } ?: false
+
+            stockQuantity = dto.stock_quantity ?: 0.0
+
+            stockStatus = dto.stock_status ?: ""
+
+            backorders = dto.backorders ?: ""
+            backordersAllowed = dto.backorders_allowed
+            backordered = dto.backordered
+            soldIndividually = dto.sold_individually
+            weight = dto.weight ?: ""
+
+            shippingRequired = dto.shipping_required
+            shippingTaxable = dto.shipping_taxable
+            shippingClass = dto.shipping_class ?: ""
+            shippingClassId = dto.shipping_class_id
+
+            reviewsAllowed = dto.reviews_allowed
+            averageRating = dto.average_rating ?: ""
+            ratingCount = dto.rating_count
+
+            parentId = dto.parent_id
+            menuOrder = dto.menu_order
+            purchaseNote = dto.purchase_note ?: ""
+
+            categories = dto.categories?.toString() ?: ""
+            tags = dto.tags?.toString() ?: ""
+            images = dto.images?.toString() ?: ""
+            attributes = dto.attributes?.toString() ?: ""
+            variations = dto.variations?.toString() ?: ""
+            downloads = dto.downloads?.toString() ?: ""
+            relatedIds = dto.related_ids?.toString() ?: ""
+            crossSellIds = dto.cross_sell_ids?.toString() ?: ""
+            upsellIds = dto.upsell_ids?.toString() ?: ""
+            groupedProductIds = dto.grouped_products?.toString() ?: ""
+            bundledItems = dto.bundled_items?.toString() ?: ""
+            compositeComponents = dto.composite_components?.toString() ?: ""
+            minAllowedQuantity = dto.min_quantity?.toInt() ?: -1
+            maxAllowedQuantity = dto.max_quantity?.let { it.ifEmpty { "0" } }?.toInt() ?: -1
+            groupOfQuantity = dto.group_of_quantity?.toInt() ?: -1
+
+            combineVariationQuantities = dto.combine_variations?.let {
+                it == "yes"
+            } ?: false
+
+            password = dto.password
+
+            isSampleProduct = dto.metadata?.any {
+                val metaDataEntry = WCMetaData.fromJson(it.asJsonObject)
+                metaDataEntry?.let { json ->
+                    json.key == "_headstart_post" && json.valueAsString == "_hs_extra"
+                } ?: false
+            } ?: false
+
+            dto.dimensions?.asJsonObject?.let { json ->
+                length = json.getString("length") ?: ""
+                width = json.getString("width") ?: ""
+                height = json.getString("height") ?: ""
+            }
+        }
+
+        return ProductWithMetaData(
+            product = model.applyBundledProductChanges(dto),
+            metaData = metaData
+        )
+    }
+
+    private fun WCProductModel.applyBundledProductChanges(dto: ProductApiResponse) = apply {
+        if (this.type == CoreProductType.BUNDLE.value) {
+            if (dto.bundle_stock_status !in CoreProductStockStatus.ALL_VALUES) {
+                specialStockStatus = dto.bundle_stock_status ?: ""
+            }
+
+            bundleMaxSize = dto.bundle_max_size?.toFloatOrNull()
+            bundleMinSize = dto.bundle_min_size?.toFloatOrNull()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClient.kt
new file mode 100644
index 00000000000..420579682d3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClient.kt
@@ -0,0 +1,2169 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.WCProductAction
+import org.wordpress.android.fluxc.generated.WCProductActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.ProductWithMetaData
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StripProductVariationMetaData
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductImageModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductShippingClassModel
+import org.wordpress.android.fluxc.model.WCProductTagModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.model.metadata.MetadataChanges
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductVariationMapper.variantModelToProductJsonBody
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.store.WCProductStore
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_CATEGORY_SORTING
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_SHIPPING_CLASS_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_SORTING
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_TAGS_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_VARIATIONS_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCProductStore.FetchProductReviewsResponsePayload
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting.NAME_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductError
+import org.wordpress.android.fluxc.store.WCProductStore.ProductErrorType
+import org.wordpress.android.fluxc.store.WCProductStore.ProductErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.WCProductStore.ProductErrorType.TERM_EXISTS
+import org.wordpress.android.fluxc.store.WCProductStore.ProductFilterOption
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.DATE_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.DATE_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductTagsResponsePayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteDeleteProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductCategoriesPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductListPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductPasswordPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductReviewPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductShippingClassListPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductShippingClassPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductSkuAvailabilityPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductTagsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductVariationsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteSearchProductsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateProductImagesPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateVariationPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdatedProductPasswordPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteVariationPayload
+import org.wordpress.android.fluxc.store.WCProductStore.SkuSearchOptions
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.putIfNotEmpty
+import org.wordpress.android.fluxc.utils.putIfNotNull
+import org.wordpress.android.fluxc.utils.toWooPayload
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+
+@Suppress("LargeClass")
+class ProductRestClient @Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val wooNetwork: WooNetwork,
+    private val wpComNetwork: WPComNetwork,
+    private val coroutineEngine: CoroutineEngine,
+    private val stripProductVariationMetaData: StripProductVariationMetaData,
+    private val productDtoMapper: ProductDtoMapper
+) {
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/shipping_classes/[remoteShippingClassId]`
+     * to fetch a single product shipping class
+     *
+     * Dispatches a WCProductAction.FETCHED_SINGLE_PRODUCT_SHIPPING_CLASS action with the result
+     *
+     * @param [remoteShippingClassId] Unique server id of the shipping class to fetch
+     */
+    fun fetchSingleProductShippingClass(site: SiteModel, remoteShippingClassId: Long) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchSingleProductShippingClass") {
+            val url = WOOCOMMERCE.products.shipping_classes.id(remoteShippingClassId).pathV3
+            val params = emptyMap<String, String>()
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = ProductShippingClassApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let {
+                        val newModel = productShippingClassResponseToProductShippingClassModel(
+                            it, site
+                        ).apply { localSiteId = site.id }
+                        val payload = RemoteProductShippingClassPayload(newModel, site)
+                        dispatcher.dispatch(
+                            WCProductActionBuilder.newFetchedSingleProductShippingClassAction(
+                                payload
+                            )
+                        )
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteProductShippingClassPayload(
+                        productError,
+                        WCProductShippingClassModel().apply { this.remoteShippingClassId = remoteShippingClassId },
+                        site
+                    )
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedSingleProductShippingClassAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `GET /wp-json/wc/v3/products/shipping_classes` to fetch
+     * product shipping classes for a site
+     *
+     * Dispatches a WCProductAction.FETCHED_PRODUCT_SHIPPING_CLASS_LIST action with the result
+     *
+     * @param [site] The site to fetch product shipping class list for
+     */
+    fun fetchProductShippingClassList(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_PRODUCT_SHIPPING_CLASS_PAGE_SIZE,
+        offset: Int = 0
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProductShippingClassList") {
+            val url = WOOCOMMERCE.products.shipping_classes.pathV3
+            val params = mutableMapOf(
+                "per_page" to pageSize.toString(),
+                "offset" to offset.toString()
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = Array<ProductShippingClassApiResponse>::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val shippingClassList = response.data?.map {
+                        productShippingClassResponseToProductShippingClassModel(it, site)
+                    }.orEmpty()
+
+                    val loadedMore = offset > 0
+                    val canLoadMore = shippingClassList.size == pageSize
+                    val payload = RemoteProductShippingClassListPayload(
+                        site, shippingClassList, offset, loadedMore, canLoadMore
+                    )
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductShippingClassListAction(
+                            payload
+                        )
+                    )
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteProductShippingClassListPayload(productError, site)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductShippingClassListAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `GET /wp-json/wc/v3/products/tags` to fetch
+     * product tags for a site
+     *
+     * Dispatches a WCProductAction.FETCHED_PRODUCT_TAGS action with the result
+     *
+     * @param [site] The site to fetch product shipping class list for
+     * @param [pageSize] The size of the tags needed from the API response
+     * @param [offset] The page number passed to the API
+     */
+    fun fetchProductTags(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_PRODUCT_TAGS_PAGE_SIZE,
+        offset: Int = 0,
+        searchQuery: String? = null
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProductTags") {
+            val url = WOOCOMMERCE.products.tags.pathV3
+            val params = mutableMapOf(
+                "per_page" to pageSize.toString(),
+                "offset" to offset.toString()
+            ).putIfNotEmpty("search" to searchQuery)
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                clazz = Array<ProductTagApiResponse>::class.java,
+                params = params
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val tags = response.data?.map {
+                        productTagApiResponseToProductTagModel(it, site)
+                    }.orEmpty()
+
+                    val loadedMore = offset > 0
+                    val canLoadMore = tags.size == pageSize
+                    val payload = RemoteProductTagsPayload(
+                        site,
+                        tags,
+                        offset,
+                        loadedMore,
+                        canLoadMore,
+                        searchQuery
+                    )
+                    dispatcher.dispatch(WCProductActionBuilder.newFetchedProductTagsAction(payload))
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteProductTagsPayload(productError, site)
+                    dispatcher.dispatch(WCProductActionBuilder.newFetchedProductTagsAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a POST request to `POST /wp-json/wc/v3/products/tags/batch` to add
+     * product tags for a site
+     *
+     * Dispatches a [WCProductAction.ADDED_PRODUCT_TAGS] action with the result
+     *
+     * @param [site] The site to fetch product shipping class list for
+     * @param [tags] The list of tag names that needed to be added to the site
+     */
+    fun addProductTags(
+        site: SiteModel,
+        tags: List<String>
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "addProductTags") {
+            val url = WOOCOMMERCE.products.tags.batch.pathV3
+            val body = mutableMapOf(
+                "create" to tags.map { mapOf("name" to it) }
+            )
+
+            val response = wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                body = body,
+                clazz = BatchAddProductTagApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val addedTags = response.data?.addedTags?.map {
+                        productTagApiResponseToProductTagModel(it, site)
+                    }.orEmpty()
+
+                    val payload = RemoteAddProductTagsResponsePayload(site, addedTags)
+                    dispatcher.dispatch(WCProductActionBuilder.newAddedProductTagsAction(payload))
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteAddProductTagsResponsePayload(productError, site)
+                    dispatcher.dispatch(WCProductActionBuilder.newAddedProductTagsAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/[remoteProductId]` to fetch a single product
+     *
+     * Dispatches a WCProductAction.FETCHED_SINGLE_PRODUCT action with the result
+     *
+     * @param [remoteProductId] Unique server id of the product to fetch
+     */
+    suspend fun fetchSingleProduct(site: SiteModel, remoteProductId: Long): RemoteProductPayload {
+        val url = WOOCOMMERCE.products.id(remoteProductId).pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = emptyMap(),
+            clazz = ProductApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    val newModel = productDtoMapper.mapToModel(site.localId(), it)
+                    RemoteProductPayload(newModel, site)
+                } ?: RemoteProductPayload(
+                    ProductError(GENERIC_ERROR, "Success response with empty data"),
+                    ProductWithMetaData(WCProductModel().apply { this.remoteProductId = remoteProductId }),
+                    site
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val productError = wpAPINetworkErrorToProductError(response.error)
+                RemoteProductPayload(
+                    productError,
+                    ProductWithMetaData(WCProductModel().apply { this.remoteProductId = remoteProductId }),
+                    site
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/[remoteProductId]/variations/[remoteVariationId]` to fetch
+     * a single product variation
+     *
+     *
+     * @param [remoteProductId] Unique server id of the product to fetch
+     * @param [remoteVariationId] Unique server id of the variation to fetch
+     */
+    suspend fun fetchSingleVariation(
+        site: SiteModel,
+        remoteProductId: Long,
+        remoteVariationId: Long
+    ): RemoteVariationPayload {
+        val url = WOOCOMMERCE.products.id(remoteProductId).variations.variation(remoteVariationId).pathV3
+        val params = emptyMap<String, String>()
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = ProductVariationApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val productData = response.data
+                if (productData != null) {
+                    RemoteVariationPayload(
+                        productData.asProductVariationModel().apply {
+                            this.remoteProductId = remoteProductId
+                            localSiteId = site.id
+                            metadata = stripProductVariationMetaData(metadata)
+                        },
+                        site
+                    )
+                } else {
+                    RemoteVariationPayload(
+                        ProductError(GENERIC_ERROR, "Success response with empty data"),
+                        WCProductVariationModel().apply {
+                            this.remoteProductId = remoteProductId
+                            this.remoteVariationId = remoteVariationId
+                        },
+                        site
+                    )
+                }
+            }
+
+            is WPAPIResponse.Error -> {
+                RemoteVariationPayload(
+                    wpAPINetworkErrorToProductError(response.error),
+                    WCProductVariationModel().apply {
+                        this.remoteProductId = remoteProductId
+                        this.remoteVariationId = remoteVariationId
+                    },
+                    site
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products` retrieving a list of products for the given
+     * WooCommerce [SiteModel].
+     *
+     * Dispatches a [WCProductAction.FETCHED_PRODUCTS] action with the resulting list of products.
+     */
+    @Suppress("LongMethod")
+    fun fetchProducts(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        offset: Int = 0,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        searchQuery: String? = null,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        globalUniqueIdSearchQuery: String? = null,
+        includedProductIds: List<Long>? = null,
+        filterOptions: Map<ProductFilterOption, String>? = null,
+        excludedProductIds: List<Long>? = null
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProducts") {
+            val url = WOOCOMMERCE.products.pathV3
+            val params = buildProductParametersMap(
+                pageSize = pageSize,
+                sortType = sortType,
+                offset = offset,
+                searchQuery = searchQuery,
+                skuSearchOptions = skuSearchOptions,
+                globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
+                includedProductIds = includedProductIds,
+                excludedProductIds = excludedProductIds,
+                filterOptions = filterOptions
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = Array<ProductApiResponse>::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val productModels = response.data?.map {
+                        productDtoMapper.mapToModel(site.localId(), it)
+                    }.orEmpty()
+
+                    val loadedMore = offset > 0
+                    val canLoadMore = productModels.size == pageSize
+                    if (searchQuery == null && globalUniqueIdSearchQuery == null) {
+                        val payload = RemoteProductListPayload(
+                            site,
+                            productModels,
+                            offset,
+                            loadedMore,
+                            canLoadMore,
+                            includedProductIds,
+                            excludedProductIds
+                        )
+                        dispatcher.dispatch(WCProductActionBuilder.newFetchedProductsAction(payload))
+                    } else {
+                        val payload = RemoteSearchProductsPayload(
+                            site = site,
+                            searchQuery = searchQuery,
+                            globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
+                            skuSearchOptions = skuSearchOptions,
+                            productsWithMetaData = productModels,
+                            offset = offset,
+                            loadedMore = loadedMore,
+                            canLoadMore = canLoadMore
+                        )
+                        dispatcher.dispatch(WCProductActionBuilder.newSearchedProductsAction(payload))
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    if (searchQuery == null) {
+                        val payload = RemoteProductListPayload(productError, site)
+                        dispatcher.dispatch(WCProductActionBuilder.newFetchedProductsAction(payload))
+                    } else {
+                        val payload = RemoteSearchProductsPayload(
+                            error = productError,
+                            site = site,
+                            query = searchQuery,
+                            skuSearchOptions = skuSearchOptions,
+                            globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
+                            filterOptions = filterOptions
+                        )
+                        dispatcher.dispatch(WCProductActionBuilder.newSearchedProductsAction(payload))
+                    }
+                }
+            }
+        }
+    }
+
+    fun searchProductsByGlobalUniqueId(
+        site: SiteModel,
+        globalUniqueIdSearchQuery: String? = null,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        offset: Int = 0,
+        sorting: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        excludedProductIds: List<Long>? = null,
+        filterOptions: Map<ProductFilterOption, String>? = null
+    ) {
+        fetchProducts(
+            site = site,
+            pageSize = pageSize,
+            offset = offset,
+            sortType = sorting,
+            globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
+            excludedProductIds = excludedProductIds,
+            filterOptions = filterOptions
+        )
+    }
+
+    fun searchProducts(
+        site: SiteModel,
+        searchQuery: String,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        offset: Int = 0,
+        sorting: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        excludedProductIds: List<Long>? = null,
+        filterOptions: Map<ProductFilterOption, String>? = null
+    ) {
+        fetchProducts(
+            site = site,
+            pageSize = pageSize,
+            offset = offset,
+            sortType = sorting,
+            searchQuery = searchQuery,
+            skuSearchOptions = skuSearchOptions,
+            excludedProductIds = excludedProductIds,
+            filterOptions = filterOptions
+        )
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products` retrieving a list of products for the given
+     * WooCommerce [SiteModel].
+     *
+     * but requiring this call to be suspended so the return call be synced within the coroutine job
+     */
+    suspend fun fetchProductsWithSyncRequest(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        offset: Int = 0,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        includedProductIds: List<Long>? = null,
+        excludedProductIds: List<Long>? = null,
+        searchQuery: String? = null,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        filterOptions: Map<ProductFilterOption, String>? = null,
+        includeTypes: List<WCProductStore.IncludeType> = emptyList()
+    ): WooPayload<List<ProductWithMetaData>> {
+        val params = buildProductParametersMap(
+            pageSize = pageSize,
+            sortType = sortType,
+            offset = offset,
+            searchQuery = searchQuery,
+            skuSearchOptions = skuSearchOptions,
+            includedProductIds = includedProductIds,
+            excludedProductIds = excludedProductIds,
+            filterOptions = filterOptions,
+            includeTypes = includeTypes,
+        )
+
+        val url = WOOCOMMERCE.products.pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<ProductApiResponse>::class.java
+        )
+
+        return response.toWooPayload { products ->
+            products.map {
+                productDtoMapper.mapToModel(site.localId(), it)
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/reports/products/totals/` retrieving count of products for the given sute
+     */
+    suspend fun fetchProductsTotals(site: SiteModel): WooPayload<List<ProductCountApiResponse>> {
+        val url = WOOCOMMERCE.reports.products.totals.pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = emptyMap(),
+            clazz = Array<ProductCountApiResponse>::class.java
+        )
+
+        return response.toWooPayload { it.toList() }
+    }
+
+    private fun buildProductParametersMap(
+        pageSize: Int,
+        sortType: ProductSorting,
+        offset: Int,
+        searchQuery: String?,
+        skuSearchOptions: SkuSearchOptions,
+        globalUniqueIdSearchQuery: String? = null,
+        includedProductIds: List<Long>? = null,
+        excludedProductIds: List<Long>? = null,
+        filterOptions: Map<ProductFilterOption, String>? = null,
+        includeTypes: List<WCProductStore.IncludeType> = emptyList()
+    ): MutableMap<String, String> {
+        fun ProductSorting.asOrderByParameter() = when (this) {
+            TITLE_ASC, TITLE_DESC -> "title"
+            DATE_ASC, DATE_DESC -> "date"
+        }
+
+        fun ProductSorting.asSortOrderParameter() = when (this) {
+            TITLE_ASC, DATE_ASC -> "asc"
+            TITLE_DESC, DATE_DESC -> "desc"
+        }
+
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "orderby" to sortType.asOrderByParameter(),
+            "order" to sortType.asSortOrderParameter(),
+            "offset" to offset.toString(),
+            "include_types" to includeTypes.joinToString(",") { it.value }
+        )
+
+        includedProductIds?.let { includedIds ->
+            params.putIfNotEmpty("include" to includedIds.map { it }.joinToString())
+        }
+        excludedProductIds?.let { excludedIds ->
+            params.putIfNotEmpty("exclude" to excludedIds.map { it }.joinToString())
+        }
+        filterOptions?.let { options ->
+            params.putAll(options.map { it.key.toString() to it.value })
+        }
+
+        if (searchQuery.isNullOrEmpty().not()) {
+            when (skuSearchOptions) {
+                SkuSearchOptions.Disabled -> {
+                    params["search"] = searchQuery!!
+                }
+
+                SkuSearchOptions.ExactSearch -> {
+                    params["sku"] = searchQuery!! // full SKU match
+                }
+
+                SkuSearchOptions.PartialMatch -> {
+                    params["sku"] = searchQuery!! // full SKU match
+                    params["search_sku"] = searchQuery // partial SKU match, added in core v6.6
+                }
+            }
+        }
+
+        addGlobalUniqueIdSearchQuery(params, globalUniqueIdSearchQuery)
+
+        return params
+    }
+
+    private fun addGlobalUniqueIdSearchQuery(
+        params: MutableMap<String, String>,
+        globalUniqueIdSearchQuery: String?
+    ) {
+        if (!globalUniqueIdSearchQuery.isNullOrEmpty()) {
+            params["global_unique_id"] = globalUniqueIdSearchQuery
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/categories` retrieving a list of product
+     * categories for the given WooCommerce [SiteModel].
+     *
+     * but requiring this call to be suspended so the return call be synced within the coroutine job
+     */
+    suspend fun fetchProductsCategoriesWithSyncRequest(
+        site: SiteModel,
+        includedCategoryIds: List<Long> = emptyList(),
+        excludedCategoryIds: List<Long> = emptyList(),
+        searchQuery: String? = null,
+        pageSize: Int = DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE,
+        productCategorySorting: ProductCategorySorting = DEFAULT_CATEGORY_SORTING,
+        offset: Int = 0
+    ): WooPayload<List<WCProductCategoryModel>> {
+        val sortOrder = when (productCategorySorting) {
+            NAME_DESC -> "desc"
+            else -> "asc"
+        }
+
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "offset" to offset.toString(),
+            "order" to sortOrder,
+            "orderby" to "name"
+        ).putIfNotEmpty("search" to searchQuery)
+        if (includedCategoryIds.isNotEmpty()) {
+            params["include"] = includedCategoryIds.map { it }.joinToString()
+        }
+        if (excludedCategoryIds.isNotEmpty()) {
+            params["exclude"] = excludedCategoryIds.map { it }.joinToString()
+        }
+
+        val url = WOOCOMMERCE.products.categories.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<ProductCategoryApiResponse>::class.java
+        )
+
+        return response.toWooPayload { categories ->
+            categories.map {
+                it.asProductCategoryModel()
+                    .apply { localSiteId = site.id }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products` for a given [SiteModel] and [sku] to check
+     * if this [sku] already exists on the site
+     *
+     * Dispatches a [WCProductAction.FETCHED_PRODUCT_SKU_AVAILABILITY] action with the availability for the [sku].
+     */
+    fun fetchProductSkuAvailability(
+        site: SiteModel,
+        sku: String
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProductSkuAvailability") {
+            val url = WOOCOMMERCE.products.pathV3
+            val params = mutableMapOf("sku" to sku, "_fields" to "sku")
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = Array<ProductApiResponse>::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    val available = response.data?.isEmpty() ?: false
+                    val payload = RemoteProductSkuAvailabilityPayload(site, sku, available)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductSkuAvailabilityAction(
+                            payload
+                        )
+                    )
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    // If there is a network error of some sort that prevents us from knowing if a sku is available
+                    // then just consider sku as available
+                    val payload = RemoteProductSkuAvailabilityPayload(productError, site, sku, true)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductSkuAvailabilityAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a WP.COM GET request to `/sites/$site/posts/$post_ID` to fetch just the password for a product
+     */
+    fun fetchProductPassword(site: SiteModel, remoteProductId: Long) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProductPassword") {
+            val url = WPCOMREST.sites.site(site.siteId).posts.post(remoteProductId).urlV1_1
+            val params = mutableMapOf("fields" to "password")
+
+            val response = wpComNetwork.executeGetGsonRequest(
+                url = url,
+                params = params,
+                clazz = PostWPComRestResponse::class.java
+            )
+
+            when (response) {
+                is WPComGsonRequestBuilder.Response.Success -> {
+                    val payload = RemoteProductPasswordPayload(
+                        remoteProductId,
+                        site,
+                        response.data.password ?: ""
+                    )
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductPasswordAction(
+                            payload
+                        )
+                    )
+                }
+
+                is WPComGsonRequestBuilder.Response.Error -> {
+                    val payload = RemoteProductPasswordPayload(remoteProductId, site, "")
+                    payload.error = networkErrorToProductError(response.error)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductPasswordAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a WP.COM POST request to `/sites/$site/posts/$post_ID` to update just the password for a product
+     */
+    fun updateProductPassword(site: SiteModel, remoteProductId: Long, password: String) {
+        coroutineEngine.launch(AppLog.T.API, this, "updateProductPassword") {
+            val url = WPCOMREST.sites.site(site.siteId).posts.post(remoteProductId).urlV1_2
+            val params = mapOf(
+                "context" to "edit",
+                "fields" to "password"
+            )
+            val body = mapOf(
+                "password" to password
+            )
+
+            val response = wpComNetwork.executePostGsonRequest(
+                url = url,
+                params = params,
+                body = body,
+                clazz = PostWPComRestResponse::class.java
+            )
+
+            when (response) {
+                is WPComGsonRequestBuilder.Response.Success -> {
+                    val payload = RemoteUpdatedProductPasswordPayload(
+                        remoteProductId,
+                        site,
+                        response.data.password ?: ""
+                    )
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newUpdatedProductPasswordAction(
+                            payload
+                        )
+                    )
+                }
+
+                is WPComGsonRequestBuilder.Response.Error -> {
+                    val payload = RemoteUpdatedProductPasswordPayload(remoteProductId, site, "")
+                    payload.error = networkErrorToProductError(response.error)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newUpdatedProductPasswordAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `POST /wp-json/wc/v3/products/[productId]/variations` to fetch
+     * variations for a product
+     *
+     * @param [productId] Unique server id of the product
+     *
+     * Variations by default are sorted by `menu_order` with sorting order = desc.
+     * i.e. `orderby` = `menu_order` and `order` = `desc`
+     *
+     * We do not pass `orderby` field in the request here because the API does not support `orderby`
+     * with `menu_order` as value. But we still need to pass `order` field to the API request in order to
+     * preserve the sorting order when fetching multiple pages of variations.
+     *
+     */
+    suspend fun fetchProductVariations(
+        site: SiteModel,
+        productId: Long,
+        pageSize: Int = DEFAULT_PRODUCT_VARIATIONS_PAGE_SIZE,
+        offset: Int = 0
+    ): RemoteProductVariationsPayload {
+        val url = WOOCOMMERCE.products.id(productId).variations.pathV3
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "offset" to offset.toString(),
+            "order" to "asc",
+            "orderby" to "date"
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<ProductVariationApiResponse>::class.java
+        )
+
+        when (response) {
+            is WPAPIResponse.Success -> {
+                val variationModels = response.data?.map {
+                    it.asProductVariationModel().apply {
+                        localSiteId = site.id
+                        remoteProductId = productId
+                        metadata = stripProductVariationMetaData(metadata)
+                    }
+                }.orEmpty()
+
+                val loadedMore = offset > 0
+                val canLoadMore = variationModels.size == pageSize
+                return RemoteProductVariationsPayload(
+                    site, productId, variationModels, offset, loadedMore, canLoadMore
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val productError = wpAPINetworkErrorToProductError(response.error)
+                return RemoteProductVariationsPayload(
+                    productError,
+                    site,
+                    productId
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/[productId]/variations` retrieving a list of
+     * variations for the given WooCommerce [SiteModel] and product.
+     *
+     * @param [productId] Unique server id of the product
+     *
+     * but requiring this call to be suspended so the return call be synced within the coroutine job
+     *
+     */
+    suspend fun fetchProductVariationsWithSyncRequest(
+        site: SiteModel,
+        productId: Long,
+        pageSize: Int,
+        offset: Int,
+        includedVariationIds: List<Long> = emptyList(),
+        searchQuery: String? = null,
+        excludedVariationIds: List<Long> = emptyList(),
+        filterOptions: Map<WCProductStore.VariationFilterOption, String>? = null,
+    ): WooPayload<List<WCProductVariationModel>> {
+        val params = mutableMapOf(
+            "per_page" to pageSize.toString(),
+            "orderby" to "date",
+            "order" to "asc",
+            "offset" to offset.toString()
+        ).putIfNotEmpty("search" to searchQuery)
+            .putIfNotEmpty("include" to includedVariationIds.map { it }.joinToString())
+            .putIfNotEmpty("exclude" to excludedVariationIds.map { it }.joinToString())
+
+        filterOptions?.let { options ->
+            params.putAll(options.map { it.key.toString() to it.value })
+        }
+
+        val url = WOOCOMMERCE.products.id(productId).variations.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = Array<ProductVariationApiResponse>::class.java
+        )
+
+        return response.toWooPayload { variations ->
+            variations.map {
+                it.asProductVariationModel()
+                    .apply {
+                        localSiteId = site.id
+                        remoteProductId = productId
+                        metadata = stripProductVariationMetaData(metadata)
+                    }
+            }
+        }
+    }
+
+    /**
+     * Makes a PUT request to `/wp-json/wc/v3/products/remoteProductId` to update a product
+     *
+     * Dispatches a WCProductAction.UPDATED_PRODUCT action with the result
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [storedWCProductModel] the stored model to compare with the [updatedProductModel]
+     * @param [updatedProductModel] the product model that contains the update
+     * @param [metadataChanges] the metadata changes to be updated
+     */
+    fun updateProduct(
+        site: SiteModel,
+        storedWCProductModel: WCProductModel?,
+        updatedProductModel: WCProductModel,
+        metadataChanges: MetadataChanges? = null
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "updateProduct") {
+            val remoteProductId = updatedProductModel.remoteProductId
+            val url = WOOCOMMERCE.products.id(remoteProductId).pathV3
+            val body = productModelToProductJsonBody(
+                productModel = storedWCProductModel,
+                updatedProductModel = updatedProductModel,
+                metadata = metadataChanges?.toJsonArray()
+            )
+
+            val response = wooNetwork.executePutGsonRequest(
+                site = site,
+                path = url,
+                body = body,
+                clazz = ProductApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let {
+                        val newModel = productDtoMapper.mapToModel(site.localId(), it)
+                        val payload = RemoteUpdateProductPayload(site, newModel)
+                        dispatcher.dispatch(WCProductActionBuilder.newUpdatedProductAction(payload))
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteUpdateProductPayload(
+                        productError,
+                        site,
+                        ProductWithMetaData(WCProductModel().apply { this.remoteProductId = remoteProductId })
+                    )
+                    dispatcher.dispatch(WCProductActionBuilder.newUpdatedProductAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a PUT request to `/wp-json/wc/v3/products/remoteProductId` to update a product
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [storedWCProductVariationModel] the stored model to compare with the [updatedProductVariationModel]
+     * @param [updatedProductVariationModel] the product model that contains the update
+     */
+    suspend fun updateVariation(
+        site: SiteModel,
+        storedWCProductVariationModel: WCProductVariationModel?,
+        updatedProductVariationModel: WCProductVariationModel
+    ): RemoteUpdateVariationPayload {
+        val remoteProductId = updatedProductVariationModel.remoteProductId
+        val remoteVariationId = updatedProductVariationModel.remoteVariationId
+        val url = WOOCOMMERCE.products.id(remoteProductId).variations.variation(remoteVariationId).pathV3
+        val body = variantModelToProductJsonBody(
+            storedWCProductVariationModel,
+            updatedProductVariationModel
+        )
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            body = body,
+            clazz = ProductVariationApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    val newModel = it.asProductVariationModel().apply {
+                        this.remoteProductId = remoteProductId
+                        localSiteId = site.id
+                        metadata = stripProductVariationMetaData(metadata)
+                    }
+                    RemoteUpdateVariationPayload(site, newModel)
+                } ?: RemoteUpdateVariationPayload(
+                    ProductError(GENERIC_ERROR, "Success response with empty data"),
+                    site,
+                    WCProductVariationModel().apply {
+                        this.remoteProductId = remoteProductId
+                        this.remoteVariationId = remoteVariationId
+                    }
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val productError = wpAPINetworkErrorToProductError(response.error)
+                RemoteUpdateVariationPayload(
+                    productError,
+                    site,
+                    WCProductVariationModel().apply {
+                        this.remoteProductId = remoteProductId
+                        this.remoteVariationId = remoteVariationId
+                    }
+                )
+            }
+        }
+    }
+
+    suspend fun batchUpdateProducts(
+        site: SiteModel,
+        existingToUpdatedProducts: Map<WCProductModel, WCProductModel>,
+    ): WooPayload<List<ProductWithMetaData>?> = WOOCOMMERCE.products.batch.pathV3
+        .let { url ->
+            val body = buildMap {
+                putIfNotNull("update" to existingToUpdatedProducts
+                    .mapNotNull { (existing, updated) ->
+                        productModelToProductJsonBody(
+                            productModel = existing, updatedProductModel = updated
+                        ).let { updateProperties ->
+                            if (updateProperties.isNotEmpty()) {
+                                updateProperties.plus("id" to updated.remoteProductId)
+                            } else {
+                                null
+                            }
+                        }
+                    }
+                    .takeIf { map -> map.isNotEmpty() }
+                )
+            }
+
+            // No changes need to be executed, no need to call the API
+            if (body.isEmpty()) return@let WooPayload()
+
+            wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                clazz = BatchProductApiResponse::class.java,
+                body = body
+            ).toWooPayload { response ->
+                response.updatedProducts?.map { productDtoMapper.mapToModel(site.localId(), it) }
+            }
+        }
+
+    suspend fun replyToReview(
+        site: SiteModel,
+        productId: RemoteId,
+        reviewId: RemoteId,
+        replyContent: String?
+    ): WooPayload<Unit> {
+        val body = mapOf(
+            "post" to productId.value,
+            "parent" to reviewId.value,
+            "content" to replyContent.orEmpty()
+        )
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = WPAPI.comments.urlV2,
+            clazz = Unit::class.java,
+            body = body
+        ).toWooPayload()
+    }
+
+    /**
+     * Makes a POST request to `/wp-json/wc/v3/products/[WCProductModel.remoteProductId]/variations/batch`
+     * This API helps you to batch create, update and delete multiple product variations.
+     *
+     * @param [site] The site containing the product
+     * @param productId Id of the product.
+     * @param createVariations list of product variations to create.
+     * The Map keys correspond to the names of variation properties.
+     * The Map values are the variation properties values.
+     * @param updateVariations list of product variations to update.
+     * The Map keys correspond to the names of variation properties.
+     * The Map values are the variation properties values.
+     * @param deleteVariations list of product variations ids to delete.
+     *
+     * @return Instance of [BatchProductVariationsApiResponse].
+     */
+    suspend fun batchUpdateVariations(
+        site: SiteModel,
+        productId: Long,
+        createVariations: List<Map<String, Any>>? = null,
+        updateVariations: List<Map<String, Any>>? = null,
+        deleteVariations: List<Long>? = null
+    ): WooPayload<BatchProductVariationsApiResponse> =
+        WOOCOMMERCE.products.id(productId).variations.batch.pathV3
+            .let { url ->
+                val body = buildMap {
+                    putIfNotNull("create" to createVariations)
+                    putIfNotNull("update" to updateVariations)
+                    putIfNotNull("delete" to deleteVariations)
+                }
+
+                require(body.isNotEmpty())
+
+                wooNetwork.executePostGsonRequest(
+                    site = site,
+                    path = url,
+                    clazz = BatchProductVariationsApiResponse::class.java,
+                    body = body
+                ).toWooPayload()
+            }
+
+    suspend fun createVariations(
+        site: SiteModel,
+        variations: List<Map<String, Any>>,
+        productId: RemoteId
+    ): WooPayload<BatchProductVariationsApiResponse> =
+        WOOCOMMERCE.products.id(productId.value).variations.batch.pathV3.let { url ->
+            val body = buildMap {
+                putIfNotNull("create" to variations)
+            }
+
+            wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                clazz = BatchProductVariationsApiResponse::class.java,
+                body = body
+            ).toWooPayload()
+        }
+
+    /**
+     * Makes a POST request to `/wp-json/wc/v3/products` to create
+     * a empty variation to a given variable product
+     *
+     * @param [site] The site containing the product
+     * @param [productId] the ID of the variable product to create the empty variation
+     */
+    suspend fun generateEmptyVariation(
+        site: SiteModel,
+        productId: Long,
+        attributesJson: String
+    ) = WOOCOMMERCE.products.id(productId).variations.pathV3
+        .let { url ->
+            wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                clazz = ProductVariationApiResponse::class.java,
+                body = mapOf("attributes" to JsonParser().parse(attributesJson).asJsonArray)
+            ).toWooPayload()
+        }
+
+    /**
+     * Makes a DELETE request to `/wp-json/wc/v3/products/<id>` to delete a product
+     *
+     * @param [site] The site containing the product
+     * @param [productId] the ID of the variable product who holds the variation to be deleted
+     * @param [variationId] the ID of the variation model to delete
+     *
+     * Force delete option is not available as Variation doesn't support trashing
+     */
+    suspend fun deleteVariation(
+        site: SiteModel,
+        productId: Long,
+        variationId: Long
+    ) = WOOCOMMERCE.products.id(productId).variations.variation(variationId).pathV3
+        .let { url ->
+            wooNetwork.executeDeleteGsonRequest(
+                site = site,
+                path = url,
+                clazz = ProductVariationApiResponse::class.java
+            ).toWooPayload()
+        }
+
+    /**
+     * Makes a PUT request to
+     * `/wp-json/wc/v3/products/[WCProductModel.remoteProductId]/variations/[WCProductVariationModel.remoteVariationId]`
+     * to replace a variation's attributes with [WCProductVariationModel.attributes]
+     *
+     * Returns a WooPayload with the Api response as result
+     *
+     * @param [site] The site to update the given variation attributes
+     * @param [attributesJson] Locally updated product variation to be sent
+     */
+
+    suspend fun updateVariationAttributes(
+        site: SiteModel,
+        productId: Long,
+        variationId: Long,
+        attributesJson: String
+    ) = WOOCOMMERCE.products.id(productId).variations.variation(variationId).pathV3
+        .let { url ->
+            wooNetwork.executePutGsonRequest(
+                site = site,
+                path = url,
+                clazz = ProductVariationApiResponse::class.java,
+                body = mapOf("attributes" to JsonParser().parse(attributesJson).asJsonArray)
+            ).toWooPayload()
+        }
+
+    /**
+     * Makes a PUT request to `/wp-json/wc/v3/products/[WCProductModel.remoteProductId]`
+     * to replace a product's attributes with [WCProductModel.attributes]
+     *
+     * Returns a WooPayload with the Api response as result
+     *
+     * @param [site] The site to update the given product attributes
+     */
+
+    suspend fun updateProductAttributes(
+        site: SiteModel,
+        productId: Long,
+        attributesJson: String
+    ): WooPayload<ProductWithMetaData> = WOOCOMMERCE.products.id(productId).pathV3
+        .let { url ->
+            wooNetwork.executePutGsonRequest(
+                site = site,
+                path = url,
+                clazz = ProductApiResponse::class.java,
+                body = mapOf("attributes" to JsonParser().parse(attributesJson).asJsonArray)
+            ).toWooPayload { dto ->
+                productDtoMapper.mapToModel(site.localId(), dto)
+            }
+        }
+
+    /**
+     * Makes a PUT request to `/wp-json/wc/v3/products/[remoteProductId]` to replace a product's images
+     * with the passed media list
+     *
+     * Dispatches a WCProductAction.UPDATED_PRODUCT_IMAGES action with the result
+     *
+     * @param [site] The site to update product images for
+     * @param [remoteProductId] Unique server id of the product to update
+     * @param [imageList] list of product images to assign to the product
+     */
+    fun updateProductImages(
+        site: SiteModel,
+        remoteProductId: Long,
+        imageList: List<WCProductImageModel>
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "updateProductImages") {
+            val url = WOOCOMMERCE.products.id(remoteProductId).pathV3
+
+            // build json list of images
+            val jsonBody = JsonArray()
+            for (image in imageList) {
+                jsonBody.add(image.toJson())
+            }
+            val body = HashMap<String, Any>()
+            body["id"] = remoteProductId
+            body["images"] = jsonBody
+
+            val response = wooNetwork.executePutGsonRequest(
+                site = site,
+                path = url,
+                body = body,
+                clazz = ProductApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let {
+                        val newModel = productDtoMapper.mapToModel(site.localId(), it)
+                        val payload = RemoteUpdateProductImagesPayload(site, newModel)
+                        dispatcher.dispatch(
+                            WCProductActionBuilder.newUpdatedProductImagesAction(
+                                payload
+                            )
+                        )
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteUpdateProductImagesPayload(
+                        productError,
+                        site,
+                        ProductWithMetaData(WCProductModel().apply { this.remoteProductId = remoteProductId })
+                    )
+                    dispatcher.dispatch(WCProductActionBuilder.newUpdatedProductImagesAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/categories` retrieving a list of product
+     * categories for a given WooCommerce [SiteModel].
+     *
+     * The number of categories to fetch is defined in [WCProductStore.DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE],
+     * and retrieving older categories is done by passing an [offset].
+     *
+     * Dispatches a [WCProductAction.FETCHED_PRODUCT_CATEGORIES]
+     *
+     * @param [site] The site to fetch product categories for
+     * @param [offset] The offset to use for the fetch
+     * @param [productCategorySorting] Optional. The sorting type of the categories
+     */
+    fun fetchProductCategories(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE,
+        offset: Int = 0,
+        productCategorySorting: ProductCategorySorting? = DEFAULT_CATEGORY_SORTING
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchProductCategories") {
+            val sortOrder = when (productCategorySorting) {
+                NAME_DESC -> "desc"
+                else -> "asc"
+            }
+
+            val url = WOOCOMMERCE.products.categories.pathV3
+            val params = mutableMapOf(
+                "per_page" to pageSize.toString(),
+                "offset" to offset.toString(),
+                "order" to sortOrder,
+                "orderby" to "name"
+            )
+
+            val response = wooNetwork.executeGetGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = Array<ProductCategoryApiResponse>::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let {
+                        val categories = it.map { category ->
+                            category.asProductCategoryModel().apply { localSiteId = site.id }
+                        }
+                        val canLoadMore = categories.size == pageSize
+                        val loadedMore = offset > 0
+                        val payload = RemoteProductCategoriesPayload(
+                            site, categories, offset, loadedMore, canLoadMore
+                        )
+                        dispatcher.dispatch(
+                            WCProductActionBuilder.newFetchedProductCategoriesAction(
+                                payload
+                            )
+                        )
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productCategoryError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteProductCategoriesPayload(productCategoryError, site)
+                    dispatcher.dispatch(
+                        WCProductActionBuilder.newFetchedProductCategoriesAction(
+                            payload
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    suspend fun addProductCategories(
+        site: SiteModel,
+        categories: List<WCProductCategoryModel>
+    ): WooPayload<List<WCProductCategoryModel>> {
+        val path = WOOCOMMERCE.products.categories.batch.pathV3
+
+        val body = mutableMapOf(
+            "create" to categories.map { category ->
+                mapOf(
+                    "name" to category.name,
+                    "parent" to category.parent.toString()
+                )
+            }
+        )
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = path,
+            body = body,
+            clazz = ProductCategoryBatchApiResponse::class.java
+        )
+
+        return when {
+            response is WPAPIResponse.Success && response.data == null -> WooPayload(
+                WooError(
+                    type = WooErrorType.EMPTY_RESPONSE,
+                    original = GenericErrorType.UNKNOWN,
+                    message = "Success response with empty data"
+                )
+            )
+
+            response is WPAPIResponse.Success -> {
+                WooPayload(
+                    response.data!!.createdCategories
+                        .filter { it.error == null }
+                        .map {
+                            it.asProductCategoryModel().apply {
+                                localSiteId = site.id
+                            }
+                        }
+                )
+            }
+
+            else -> return WooPayload(
+                error = (response as WPAPIResponse.Error).error.toWooError()
+            )
+        }
+    }
+
+    /**
+     * Posts a new Add Category record to the API for a category.
+     *
+     * Makes a POST request to `/wp-json/wc/v3/products/categories/id` to save a Category record.
+     * Returns a [WCProductCategoryModel] on successful response.
+     */
+    suspend fun addProductCategory(
+        site: SiteModel,
+        category: WCProductCategoryModel
+    ): WooPayload<WCProductCategoryModel> {
+        val url = WOOCOMMERCE.products.categories.pathV3
+
+        val body = mutableMapOf(
+            "name" to category.name,
+            "parent" to category.parent
+        )
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            body = body,
+            clazz = ProductCategoryApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val updatedCategory = response.data?.let {
+                    it.asProductCategoryModel().apply {
+                        localSiteId = site.id
+                    }
+                }
+                WooPayload(updatedCategory)
+            }
+
+            is WPAPIResponse.Error -> {
+                val productCategorySaveError = wpAPINetworkErrorToProductError(response.error)
+                when (productCategorySaveError.type) {
+                    TERM_EXISTS -> {
+                        WooPayload(
+                            error = WooError(
+                                type = WooErrorType.RESOURCE_ALREADY_EXISTS,
+                                original = GenericErrorType.UNKNOWN,
+                                message = "Product category already exists."
+                            )
+                        )
+                    }
+
+                    else -> {
+                        WooPayload(
+                            error = WooError(
+                                type = WooErrorType.GENERIC_ERROR,
+                                original = GenericErrorType.UNKNOWN,
+                                message = "Unknown server error while adding a new product category."
+                            )
+                        )
+                    }
+                }
+            }
+
+            else -> {
+                WooPayload(
+                    error = WooError(
+                        type = WooErrorType.EMPTY_RESPONSE,
+                        original = GenericErrorType.UNKNOWN,
+                        message = "Invalid response for adding a new product category."
+                    )
+                )
+            }
+        }
+    }
+
+    suspend fun updateProductCategory(
+        site: SiteModel,
+        category: WCProductCategoryModel
+    ): WooPayload<WCProductCategoryModel> {
+        val path = WOOCOMMERCE.products.categories.id(category.remoteCategoryId).pathV3
+
+        val body = mutableMapOf(
+            "name" to category.name,
+            "parent" to category.parent
+        )
+
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = path,
+            body = body,
+            clazz = ProductCategoryApiResponse::class.java
+        )
+
+        return when {
+            response is WPAPIResponse.Success -> {
+                val updatedCategory = response.data?.let {
+                    it.asProductCategoryModel().apply {
+                        localSiteId = site.id
+                    }
+                }
+                WooPayload(updatedCategory)
+            }
+
+            else -> return WooPayload(
+                error = (response as WPAPIResponse.Error).error.toWooError()
+            )
+        }
+    }
+
+    suspend fun deleteProductCategory(site: SiteModel, remoteId: Long): WooPayload<WCProductCategoryModel> {
+        val path = WOOCOMMERCE.products.categories.id(remoteId).pathV3
+
+        val params = mutableMapOf(
+            "force" to "true",
+        )
+        val response = wooNetwork.executeDeleteGsonRequest(
+            site = site,
+            path = path,
+            params = params,
+            clazz = ProductCategoryApiResponse::class.java
+        )
+
+        return when {
+            response is WPAPIResponse.Success -> {
+                val updatedCategory = response.data?.let {
+                    it.asProductCategoryModel().apply {
+                        localSiteId = site.id
+                    }
+                }
+                WooPayload(updatedCategory)
+            }
+
+            else -> return WooPayload(
+                error = (response as WPAPIResponse.Error).error.toWooError()
+            )
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/reviews` retrieving a list of product reviews
+     * for a given WooCommerce [SiteModel].
+     *
+     * The number of reviews to fetch is defined in [WCProductStore.NUM_REVIEWS_PER_FETCH], and retrieving older
+     * reviews is done by passing an [offset].
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [offset] The offset to use for the fetch
+     * @param [reviewIds] Optional. A list of remote product review ID's to fetch
+     * @param [productIds] Optional. A list of remote product ID's to fetch product reviews for
+     * @param [filterByStatus] Optional. A list of product review statuses to fetch
+     */
+    suspend fun fetchProductReviews(
+        site: SiteModel,
+        offset: Int,
+        reviewIds: List<Long>? = null,
+        productIds: List<Long>? = null,
+        filterByStatus: List<String>? = null
+    ): FetchProductReviewsResponsePayload {
+        val statusFilter = filterByStatus?.joinToString { it } ?: "all"
+
+        val url = WOOCOMMERCE.products.reviews.pathV3
+        val params = mutableMapOf(
+            "per_page" to WCProductStore.NUM_REVIEWS_PER_FETCH.toString(),
+            "offset" to offset.toString(),
+            "status" to statusFilter
+        )
+        reviewIds?.let { ids ->
+            params.put("include", ids.map { it }.joinToString())
+        }
+        productIds?.let { ids ->
+            params.put("product", ids.map { it }.joinToString())
+        }
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<ProductReviewApiResponse>::class.java,
+            params = params
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                val productData = response.data
+                if (productData != null) {
+                    val reviews = productData.map { review ->
+                        productReviewResponseToProductReviewModel(review).apply { localSiteId = site.id }
+                    }
+                    FetchProductReviewsResponsePayload(
+                        site,
+                        reviews,
+                        productIds,
+                        filterByStatus,
+                        canLoadMore = reviews.size == WCProductStore.NUM_REVIEWS_PER_FETCH
+                    )
+                } else {
+                    FetchProductReviewsResponsePayload(
+                        ProductError(
+                            GENERIC_ERROR,
+                            "Success response with empty data"
+                        ),
+                        site
+                    )
+                }
+            }
+
+            is WPAPIResponse.Error -> {
+                FetchProductReviewsResponsePayload(
+                    wpAPINetworkErrorToProductError(response.error),
+                    site
+                )
+            }
+        }
+    }
+
+    /**
+     * Makes a GET request to `/wp-json/wc/v3/products/reviews/<id>` retrieving a product review by
+     * its remote ID for a given WooCommerce [SiteModel].
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [remoteReviewId] The remote id of the review to fetch
+     */
+    suspend fun fetchProductReviewById(
+        site: SiteModel,
+        remoteReviewId: Long
+    ): RemoteProductReviewPayload {
+        val url = WOOCOMMERCE.products.reviews.id(remoteReviewId).pathV3
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = ProductReviewApiResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.let {
+                    val review = productReviewResponseToProductReviewModel(it).apply {
+                        localSiteId = site.id
+                    }
+                    RemoteProductReviewPayload(site, review)
+                } ?: RemoteProductReviewPayload(
+                    error = ProductError(GENERIC_ERROR, "Success response with empty data"),
+                    site = site
+                )
+            }
+
+            is WPAPIResponse.Error -> {
+                val productReviewError = wpAPINetworkErrorToProductError(response.error)
+                RemoteProductReviewPayload(error = productReviewError, site = site)
+            }
+        }
+    }
+
+    /**
+     * Makes a PUT request to `/wp-json/wc/v3/products/reviews/<id>` updating the status for the
+     * given product review to [newStatus].
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [remoteReviewId] The remote ID of the product review to be updated
+     * @param [newStatus] The new status to update the product review to
+     *
+     * @return [WooPayload] with the updated [WCProductReviewModel]
+     */
+    suspend fun updateProductReviewStatus(
+        site: SiteModel,
+        remoteReviewId: Long,
+        newStatus: String
+    ): WooPayload<WCProductReviewModel> {
+        val url = WOOCOMMERCE.products.reviews.id(remoteReviewId).pathV3
+        val params = mapOf("status" to newStatus)
+        val response = wooNetwork.executePutGsonRequest(
+            site = site,
+            path = url,
+            clazz = ProductReviewApiResponse::class.java,
+            body = params
+        )
+
+        return response.toWooPayload {
+            productReviewResponseToProductReviewModel(it).apply {
+                localSiteId = site.id
+            }
+        }
+    }
+
+    /**
+     * Makes a POST request to `/wp-json/wc/v3/products` to add a product
+     *
+     * Dispatches a [WCProductAction.ADDED_PRODUCT] action with the result
+     *
+     * @param [site] The site to fetch product reviews for
+     * @param [productModel] the new product model
+     * @param [metaData] the metadata to be added to the product
+     */
+    fun addProduct(
+        site: SiteModel,
+        productModel: WCProductModel,
+        metaData: Map<String, WCMetaDataValue>? = null
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "addProduct") {
+            val url = WOOCOMMERCE.products.pathV3
+            val body = productModelToProductJsonBody(
+                productModel = null,
+                updatedProductModel = productModel,
+                metadata = metaData?.let {
+                    JsonArray().apply {
+                        it.forEach { (key, value) ->
+                            add(JsonObject().apply {
+                                addProperty(WCMetaData.KEY, key)
+                                add(WCMetaData.VALUE, value.jsonValue)
+                            })
+                        }
+                    }
+                }
+            )
+
+            val response = wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                body = body,
+                clazz = ProductApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let { dto ->
+                        val newModel = productDtoMapper.mapToModel(site.localId(), dto)
+                        val payload = RemoteAddProductPayload(site, newModel)
+                        dispatcher.dispatch(WCProductActionBuilder.newAddedProductAction(payload))
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteAddProductPayload(
+                        productError,
+                        site,
+                        ProductWithMetaData(WCProductModel())
+                    )
+                    dispatcher.dispatch(WCProductActionBuilder.newAddedProductAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Makes a DELETE request to `/wp-json/wc/v3/products/<id>` to delete a product
+     *
+     * Dispatches a [WCProductAction.DELETED_PRODUCT] action with the result
+     *
+     * @param [site] The site containing the product
+     * @param [remoteProductId] the ID of the product model to delete
+     * @param [forceDelete] whether to permanently delete the product (will be sent to trash if false)
+     */
+    fun deleteProduct(
+        site: SiteModel,
+        remoteProductId: Long,
+        forceDelete: Boolean = false
+    ) {
+        coroutineEngine.launch(AppLog.T.API, this, "deleteProduct") {
+            val url = WOOCOMMERCE.products.id(remoteProductId).pathV3
+            val params = mapOf("force" to forceDelete.toString())
+
+            val response = wooNetwork.executeDeleteGsonRequest(
+                site = site,
+                path = url,
+                params = params,
+                clazz = ProductApiResponse::class.java
+            )
+
+            when (response) {
+                is WPAPIResponse.Success -> {
+                    response.data?.let {
+                        val payload = RemoteDeleteProductPayload(site, remoteProductId)
+                        dispatcher.dispatch(WCProductActionBuilder.newDeletedProductAction(payload))
+                    }
+                }
+
+                is WPAPIResponse.Error -> {
+                    val productError = wpAPINetworkErrorToProductError(response.error)
+                    val payload = RemoteDeleteProductPayload(
+                        productError,
+                        site,
+                        remoteProductId
+                    )
+                    dispatcher.dispatch(WCProductActionBuilder.newDeletedProductAction(payload))
+                }
+            }
+        }
+    }
+
+    /**
+     * Build json body of product items to be updated to the backend.
+     *
+     * This method checks if there is a cached version of the product stored locally.
+     * If not, it generates a new product model for the same product ID, with default fields
+     * and verifies that the [updatedProductModel] has fields that are different from the default
+     * fields of [productModel]. This is to ensure that we do not update product fields that do not contain any changes
+     */
+    @Suppress("LongMethod", "ComplexMethod", "SwallowedException", "TooGenericExceptionCaught")
+    private fun productModelToProductJsonBody(
+        productModel: WCProductModel?,
+        updatedProductModel: WCProductModel,
+        metadata: JsonArray? = null
+    ): HashMap<String, Any> {
+        val body = HashMap<String, Any>()
+
+        val storedWCProductModel = productModel ?: WCProductModel().apply {
+            remoteProductId = updatedProductModel.remoteProductId
+        }
+        if (storedWCProductModel.description != updatedProductModel.description) {
+            body["description"] = updatedProductModel.description
+        }
+        if (storedWCProductModel.name != updatedProductModel.name) {
+            body["name"] = updatedProductModel.name
+        }
+        if (storedWCProductModel.type != updatedProductModel.type) {
+            body["type"] = updatedProductModel.type
+        }
+        if (storedWCProductModel.sku != updatedProductModel.sku) {
+            body["sku"] = updatedProductModel.sku
+        }
+        if (storedWCProductModel.globalUniqueId != updatedProductModel.globalUniqueId) {
+            body["global_unique_id"] = updatedProductModel.globalUniqueId
+        }
+        if (storedWCProductModel.status != updatedProductModel.status) {
+            body["status"] = updatedProductModel.status
+        }
+        if (storedWCProductModel.catalogVisibility != updatedProductModel.catalogVisibility) {
+            body["catalog_visibility"] = updatedProductModel.catalogVisibility
+        }
+        if (storedWCProductModel.slug != updatedProductModel.slug) {
+            body["slug"] = updatedProductModel.slug
+        }
+        if (storedWCProductModel.featured != updatedProductModel.featured) {
+            body["featured"] = updatedProductModel.featured
+        }
+        if (storedWCProductModel.manageStock != updatedProductModel.manageStock) {
+            body["manage_stock"] = updatedProductModel.manageStock
+        }
+        if (storedWCProductModel.externalUrl != updatedProductModel.externalUrl) {
+            body["external_url"] = updatedProductModel.externalUrl
+        }
+        if (storedWCProductModel.buttonText != updatedProductModel.buttonText) {
+            body["button_text"] = updatedProductModel.buttonText
+        }
+
+        // only allowed to change the following params if manageStock is enabled
+        if (updatedProductModel.manageStock) {
+            if (storedWCProductModel.stockQuantity != updatedProductModel.stockQuantity) {
+                // Conversion/rounding down because core API only accepts Int value for stock quantity.
+                // On the app side, make sure it only allows whole decimal quantity when updating, so that
+                // there's no undesirable conversion effect.
+                body["stock_quantity"] = updatedProductModel.stockQuantity.toInt()
+            }
+            if (storedWCProductModel.backorders != updatedProductModel.backorders) {
+                body["backorders"] = updatedProductModel.backorders
+            }
+        }
+        if (storedWCProductModel.stockStatus != updatedProductModel.stockStatus) {
+            body["stock_status"] = updatedProductModel.stockStatus
+        }
+        if (storedWCProductModel.soldIndividually != updatedProductModel.soldIndividually) {
+            body["sold_individually"] = updatedProductModel.soldIndividually
+        }
+        if (storedWCProductModel.regularPrice != updatedProductModel.regularPrice) {
+            body["regular_price"] = updatedProductModel.regularPrice
+        }
+        if (storedWCProductModel.salePrice != updatedProductModel.salePrice) {
+            body["sale_price"] = updatedProductModel.salePrice
+        }
+        if (storedWCProductModel.dateOnSaleFromGmt != updatedProductModel.dateOnSaleFromGmt) {
+            body["date_on_sale_from_gmt"] = updatedProductModel.dateOnSaleFromGmt
+        }
+        if (storedWCProductModel.dateOnSaleToGmt != updatedProductModel.dateOnSaleToGmt) {
+            body["date_on_sale_to_gmt"] = updatedProductModel.dateOnSaleToGmt
+        }
+        if (storedWCProductModel.taxStatus != updatedProductModel.taxStatus) {
+            body["tax_status"] = updatedProductModel.taxStatus
+        }
+        if (storedWCProductModel.taxClass != updatedProductModel.taxClass) {
+            body["tax_class"] = updatedProductModel.taxClass
+        }
+        if (storedWCProductModel.weight != updatedProductModel.weight) {
+            body["weight"] = updatedProductModel.weight
+        }
+
+        val dimensionsBody = mutableMapOf<String, String>()
+        if (storedWCProductModel.height != updatedProductModel.height) {
+            dimensionsBody["height"] = updatedProductModel.height
+        }
+        if (storedWCProductModel.width != updatedProductModel.width) {
+            dimensionsBody["width"] = updatedProductModel.width
+        }
+        if (storedWCProductModel.length != updatedProductModel.length) {
+            dimensionsBody["length"] = updatedProductModel.length
+        }
+        if (dimensionsBody.isNotEmpty()) {
+            body["dimensions"] = dimensionsBody
+        }
+        if (storedWCProductModel.shippingClass != updatedProductModel.shippingClass) {
+            body["shipping_class"] = updatedProductModel.shippingClass
+        }
+        if (storedWCProductModel.shortDescription != updatedProductModel.shortDescription) {
+            body["short_description"] = updatedProductModel.shortDescription
+        }
+        if (!storedWCProductModel.hasSameImages(updatedProductModel)) {
+            val updatedImages = updatedProductModel.getImageListOrEmpty()
+            body["images"] = JsonArray().also {
+                for (image in updatedImages) {
+                    it.add(image.toJson())
+                }
+            }
+        }
+        if (storedWCProductModel.reviewsAllowed != updatedProductModel.reviewsAllowed) {
+            body["reviews_allowed"] = updatedProductModel.reviewsAllowed
+        }
+        if (storedWCProductModel.virtual != updatedProductModel.virtual) {
+            body["virtual"] = updatedProductModel.virtual
+        }
+        if (storedWCProductModel.purchaseNote != updatedProductModel.purchaseNote) {
+            body["purchase_note"] = updatedProductModel.purchaseNote
+        }
+        if (storedWCProductModel.menuOrder != updatedProductModel.menuOrder) {
+            body["menu_order"] = updatedProductModel.menuOrder
+        }
+        if (!storedWCProductModel.hasSameCategories(updatedProductModel)) {
+            val updatedCategories = updatedProductModel.getCategoryList()
+            body["categories"] = JsonArray().also {
+                for (category in updatedCategories) {
+                    it.add(category.toJson())
+                }
+            }
+        }
+        if (!storedWCProductModel.hasSameTags(updatedProductModel)) {
+            val updatedTags = updatedProductModel.getTagList()
+            body["tags"] = JsonArray().also {
+                for (tag in updatedTags) {
+                    it.add(tag.toJson())
+                }
+            }
+        }
+        if (storedWCProductModel.groupedProductIds != updatedProductModel.groupedProductIds) {
+            body["grouped_products"] = updatedProductModel.getGroupedProductIdList()
+        }
+        if (storedWCProductModel.crossSellIds != updatedProductModel.crossSellIds) {
+            body["cross_sell_ids"] = updatedProductModel.getCrossSellProductIdList()
+        }
+        if (storedWCProductModel.upsellIds != updatedProductModel.upsellIds) {
+            body["upsell_ids"] = updatedProductModel.getUpsellProductIdList()
+        }
+        if (storedWCProductModel.downloadable != updatedProductModel.downloadable) {
+            body["downloadable"] = updatedProductModel.downloadable
+        }
+        if (storedWCProductModel.downloadLimit != updatedProductModel.downloadLimit) {
+            body["download_limit"] = updatedProductModel.downloadLimit
+        }
+        if (storedWCProductModel.downloadExpiry != updatedProductModel.downloadExpiry) {
+            body["download_expiry"] = updatedProductModel.downloadExpiry
+        }
+
+        if (storedWCProductModel.minAllowedQuantity != updatedProductModel.minAllowedQuantity) {
+            body["min_quantity"] = updatedProductModel.minAllowedQuantity
+        }
+
+        if (storedWCProductModel.maxAllowedQuantity != updatedProductModel.maxAllowedQuantity) {
+            body["max_quantity"] = updatedProductModel.maxAllowedQuantity
+        }
+
+        if (storedWCProductModel.groupOfQuantity != updatedProductModel.groupOfQuantity) {
+            body["group_of_quantity"] = updatedProductModel.groupOfQuantity
+        }
+
+        if (!storedWCProductModel.hasSameDownloadableFiles(updatedProductModel)) {
+            val updatedFiles = updatedProductModel.getDownloadableFiles()
+            body["downloads"] = JsonArray().apply {
+                updatedFiles.forEach { file ->
+                    add(file.toJson())
+                }
+            }
+        }
+        if (!storedWCProductModel.hasSameAttributes(updatedProductModel)) {
+            JsonParser().apply {
+                body["attributes"] = try {
+                    parse(updatedProductModel.attributes).asJsonArray
+                } catch (ex: Exception) {
+                    JsonArray()
+                }
+            }
+        }
+        if (metadata != null) {
+            body["meta_data"] = metadata
+        }
+        if (storedWCProductModel.password != updatedProductModel.password) {
+            body["post_password"] = updatedProductModel.password.orEmpty()
+        }
+
+        return body
+    }
+
+    private fun productTagApiResponseToProductTagModel(
+        response: ProductTagApiResponse,
+        site: SiteModel
+    ): WCProductTagModel {
+        return WCProductTagModel().apply {
+            remoteTagId = response.id
+            localSiteId = site.id
+            name = response.name ?: ""
+            slug = response.slug ?: ""
+            description = response.description ?: ""
+            count = response.count
+        }
+    }
+
+    private fun productShippingClassResponseToProductShippingClassModel(
+        response: ProductShippingClassApiResponse,
+        site: SiteModel
+    ): WCProductShippingClassModel {
+        return WCProductShippingClassModel().apply {
+            remoteShippingClassId = response.id
+            localSiteId = site.id
+            name = response.name ?: ""
+            slug = response.slug ?: ""
+            description = response.description ?: ""
+        }
+    }
+
+    private fun productReviewResponseToProductReviewModel(response: ProductReviewApiResponse): WCProductReviewModel {
+        return WCProductReviewModel().apply {
+            remoteProductReviewId = response.id
+            remoteProductId = response.product_id
+            dateCreated = response.date_created_gmt?.let { "${it}Z" } ?: ""
+            status = response.status ?: ""
+            reviewerName = response.reviewer ?: ""
+            reviewerEmail = response.reviewer_email ?: ""
+            review = response.review ?: ""
+            rating = response.rating
+            verified = response.verified
+            reviewerAvatarsJson = response.reviewer_avatar_urls?.toString() ?: ""
+        }
+    }
+
+    private fun networkErrorToProductError(wpComError: WPComGsonNetworkError): ProductError {
+        val productErrorType = when {
+            wpComError.apiError == "woocommerce_rest_product_invalid_id" ->
+                ProductErrorType.INVALID_PRODUCT_ID
+
+            wpComError.apiError == "rest_invalid_param" -> ProductErrorType.INVALID_PARAM
+            wpComError.apiError == "woocommerce_rest_review_invalid_id" ->
+                ProductErrorType.INVALID_REVIEW_ID
+
+            wpComError.apiError == "woocommerce_product_invalid_image_id" ->
+                ProductErrorType.INVALID_IMAGE_ID
+
+            wpComError.apiError == "product_invalid_sku" -> ProductErrorType.DUPLICATE_SKU
+            wpComError.apiError == "term_exists" -> ProductErrorType.TERM_EXISTS
+            wpComError.apiError == "woocommerce_variation_invalid_image_id" ->
+                ProductErrorType.INVALID_VARIATION_IMAGE_ID
+
+            wpComError.type == PARSE_ERROR -> ProductErrorType.PARSE_ERROR
+            else -> ProductErrorType.fromString(wpComError.apiError)
+        }
+        return ProductError(productErrorType, wpComError.combinedErrorMessage)
+    }
+
+    private fun wpAPINetworkErrorToProductError(wpAPINetworkError: WPAPINetworkError): ProductError {
+        val productErrorType = when {
+            wpAPINetworkError.errorCode == "woocommerce_rest_product_invalid_id" ->
+                ProductErrorType.INVALID_PRODUCT_ID
+
+            wpAPINetworkError.errorCode == "rest_invalid_param" -> ProductErrorType.INVALID_PARAM
+            wpAPINetworkError.errorCode == "woocommerce_rest_review_invalid_id" ->
+                ProductErrorType.INVALID_REVIEW_ID
+
+            wpAPINetworkError.errorCode == "woocommerce_product_invalid_image_id" ->
+                ProductErrorType.INVALID_IMAGE_ID
+
+            wpAPINetworkError.errorCode == "product_invalid_sku" -> ProductErrorType.DUPLICATE_SKU
+            wpAPINetworkError.errorCode == "term_exists" -> ProductErrorType.TERM_EXISTS
+            wpAPINetworkError.errorCode == "woocommerce_variation_invalid_image_id" ->
+                ProductErrorType.INVALID_VARIATION_IMAGE_ID
+
+            wpAPINetworkError.errorCode == "woocommerce_rest_invalid_min_quantity" ||
+                wpAPINetworkError.errorCode == "woocommerce_rest_invalid_max_quantity" ||
+                wpAPINetworkError.errorCode == "woocommerce_rest_invalid_variation_min_quantity" ||
+                wpAPINetworkError.errorCode == "woocommerce_rest_invalid_variation_max_quantity" ->
+                ProductErrorType.INVALID_MIN_MAX_QUANTITY
+
+            wpAPINetworkError.type == PARSE_ERROR -> ProductErrorType.PARSE_ERROR
+            else -> ProductErrorType.fromString(wpAPINetworkError.errorCode.orEmpty())
+        }
+        return ProductError(productErrorType, wpAPINetworkError.combinedErrorMessage)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductReviewApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductReviewApiResponse.kt
new file mode 100644
index 00000000000..533217e965f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductReviewApiResponse.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("PropertyName", "VariableNaming")
+class ProductReviewApiResponse : Response {
+    val id: Long = 0L
+    val date_created_gmt: String? = null
+    val product_id: Long = 0L
+    val status: String? = null
+    val reviewer: String? = null
+    val reviewer_email: String? = null
+    val review: String? = null
+    val rating: Int = 0
+    val verified: Boolean = false
+    val reviewer_avatar_urls: JsonElement? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductShippingClassApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductShippingClassApiResponse.kt
new file mode 100644
index 00000000000..fe6804c1c97
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductShippingClassApiResponse.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("PropertyName")
+class ProductShippingClassApiResponse : Response {
+    var id: Long = 0L
+
+    var name: String? = null
+    var slug: String? = null
+    var description: String? = null
+
+    var count = 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductTagApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductTagApiResponse.kt
new file mode 100644
index 00000000000..258f1677129
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductTagApiResponse.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("PropertyName")
+class ProductTagApiResponse : Response {
+    var id: Long = 0L
+
+    var name: String? = null
+    var slug: String? = null
+    var description: String? = null
+
+    val error: JsonElement? = null
+
+    var count = 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationApiResponse.kt
new file mode 100644
index 00000000000..44ec06986a4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationApiResponse.kt
@@ -0,0 +1,139 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.utils.getString
+
+@Suppress("PropertyName", "VariableNaming")
+class ProductVariationApiResponse : Response {
+    var id: Long = 0L
+
+    var description: String? = null
+    var permalink: String? = null
+    var sku: String? = null
+    var global_unique_id: String? = null
+    var status: String? = null
+    var price: String? = null
+    var regular_price: String? = null
+    var sale_price: String? = null
+
+    var date_on_sale_from: String? = null
+    var date_on_sale_to: String? = null
+    var date_on_sale_from_gmt: String? = null
+    var date_on_sale_to_gmt: String? = null
+
+    var tax_status: String? = null
+    var tax_class: String? = null
+
+    var date_created: String? = null
+    var date_modified: String? = null
+
+    var on_sale = false
+    var purchasable = false
+    var virtual = false
+    var downloadable = false
+
+    var backorders: String? = null
+    var backorders_allowed = false
+    var backordered = false
+
+    var shipping_class: String? = null
+    var shipping_class_id = 0
+
+    var download_limit = 0L
+    var download_expiry = 0
+
+    var manage_stock = false
+    var stock_quantity = 0.0
+    var stock_status: String? = null
+
+    var image: JsonElement? = null
+
+    var weight: String? = null
+    val menu_order: Int = 0
+
+    val min_quantity: String? = null
+    val max_quantity: String? = null
+    val group_of_quantity: String? = null
+    val variation_quantity_rules: String? = null
+
+    var dimensions: JsonElement? = null
+    var attributes: JsonElement? = null
+    var downloads: JsonElement? = null
+    var meta_data: JsonElement? = null
+
+    @Suppress("ComplexMethod")
+    fun asProductVariationModel() =
+        WCProductVariationModel().apply {
+            val response = this@ProductVariationApiResponse
+            remoteVariationId = response.id
+            permalink = response.permalink ?: ""
+
+            dateCreated = response.date_created ?: ""
+            dateModified = response.date_modified ?: ""
+
+            status = response.status ?: ""
+            description = response.description ?: ""
+            sku = response.sku ?: ""
+            globalUniqueId = response.global_unique_id ?: ""
+
+            price = response.price ?: ""
+            regularPrice = response.regular_price ?: ""
+            salePrice = response.sale_price ?: ""
+            onSale = response.on_sale
+
+            dateOnSaleFrom = response.date_on_sale_from ?: ""
+            dateOnSaleTo = response.date_on_sale_to ?: ""
+            dateOnSaleFromGmt = response.date_on_sale_from_gmt ?: ""
+            dateOnSaleToGmt = response.date_on_sale_to_gmt ?: ""
+
+            taxStatus = response.tax_status ?: ""
+            taxClass = response.tax_class ?: ""
+
+            backorders = response.backorders ?: ""
+            backordersAllowed = response.backorders_allowed
+            backordered = response.backordered
+
+            shippingClass = response.shipping_class ?: ""
+            shippingClassId = response.shipping_class_id
+
+            downloadLimit = response.download_limit
+            downloadExpiry = response.download_expiry
+
+            virtual = response.virtual
+            downloadable = response.downloadable
+            purchasable = response.purchasable
+
+            manageStock = response.manage_stock
+            stockQuantity = response.stock_quantity
+            stockStatus = response.stock_status ?: ""
+
+            attributes = response.attributes?.toString() ?: ""
+
+            weight = response.weight ?: ""
+            menuOrder = response.menu_order
+
+            attributes = response.attributes?.toString() ?: ""
+            downloads = response.downloads?.toString() ?: ""
+
+            response.dimensions?.asJsonObject?.let { json ->
+                length = json.getString("length") ?: ""
+                width = json.getString("width") ?: ""
+                height = json.getString("height") ?: ""
+            }
+
+            image = response.image?.toString() ?: ""
+
+            minAllowedQuantity = response.min_quantity?.toInt() ?: -1
+            maxAllowedQuantity = response.max_quantity?.let {
+                if (it.isEmpty()) "0" else it
+            }?.toInt() ?: -1
+            groupOfQuantity = response.group_of_quantity?.toInt() ?: -1
+            overrideProductQuantities = response.variation_quantity_rules?.let {
+                it == "yes"
+            } ?: false
+
+            metadata = response.meta_data?.toString()
+        }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationMapper.kt
new file mode 100644
index 00000000000..f2c66315f14
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductVariationMapper.kt
@@ -0,0 +1,146 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonParser
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.util.AppLog
+
+object ProductVariationMapper {
+    /**
+     * Build json body of product items to be updated to the backend.
+     *
+     * This method checks if there is a cached version of the product stored locally.
+     * If not, it generates a new product model for the same product ID, with default fields
+     * and verifies that the [updatedVariationModel] has fields that are different from the default
+     * fields of [variationModel]. This is to ensure that we do not update product fields that do not contain any
+     * changes.
+     */
+    @Suppress(
+        "ForbiddenComment",
+        "LongMethod",
+        "ComplexMethod",
+        "SwallowedException",
+        "TooGenericExceptionCaught"
+    )
+    fun variantModelToProductJsonBody(
+        variationModel: WCProductVariationModel?,
+        updatedVariationModel: WCProductVariationModel
+    ): HashMap<String, Any> {
+        val body = HashMap<String, Any>()
+
+        val storedVariationModel = variationModel ?: WCProductVariationModel().apply {
+            remoteProductId = updatedVariationModel.remoteProductId
+            remoteVariationId = updatedVariationModel.remoteVariationId
+        }
+        if (storedVariationModel.description != updatedVariationModel.description) {
+            body["description"] = updatedVariationModel.description
+        }
+        if (storedVariationModel.sku != updatedVariationModel.sku) {
+            body["sku"] = updatedVariationModel.sku
+        }
+        if (storedVariationModel.globalUniqueId != updatedVariationModel.globalUniqueId) {
+            body["global_unique_id"] = updatedVariationModel.globalUniqueId
+        }
+        if (storedVariationModel.status != updatedVariationModel.status) {
+            body["status"] = updatedVariationModel.status
+        }
+        if (storedVariationModel.manageStock != updatedVariationModel.manageStock) {
+            body["manage_stock"] = updatedVariationModel.manageStock
+        }
+
+        // only allowed to change the following params if manageStock is enabled
+        if (updatedVariationModel.manageStock) {
+            if (storedVariationModel.stockQuantity != updatedVariationModel.stockQuantity) {
+                // Conversion/rounding down because core API only accepts Int value for stock quantity.
+                // On the app side, make sure it only allows whole decimal quantity when updating, so that
+                // there's no undesirable conversion effect.
+                body["stock_quantity"] = updatedVariationModel.stockQuantity.toInt()
+            }
+            if (storedVariationModel.backorders != updatedVariationModel.backorders) {
+                body["backorders"] = updatedVariationModel.backorders
+            }
+        }
+        if (storedVariationModel.stockStatus != updatedVariationModel.stockStatus) {
+            body["stock_status"] = updatedVariationModel.stockStatus
+        }
+        if (storedVariationModel.regularPrice != updatedVariationModel.regularPrice) {
+            body["regular_price"] = updatedVariationModel.regularPrice
+        }
+        if (storedVariationModel.salePrice != updatedVariationModel.salePrice) {
+            body["sale_price"] = updatedVariationModel.salePrice
+        }
+        if (storedVariationModel.dateOnSaleFromGmt != updatedVariationModel.dateOnSaleFromGmt) {
+            body["date_on_sale_from_gmt"] = updatedVariationModel.dateOnSaleFromGmt
+        }
+        if (storedVariationModel.dateOnSaleToGmt != updatedVariationModel.dateOnSaleToGmt) {
+            body["date_on_sale_to_gmt"] = updatedVariationModel.dateOnSaleToGmt
+        }
+        if (storedVariationModel.taxStatus != updatedVariationModel.taxStatus) {
+            body["tax_status"] = updatedVariationModel.taxStatus
+        }
+        if (storedVariationModel.taxClass != updatedVariationModel.taxClass) {
+            body["tax_class"] = updatedVariationModel.taxClass
+        }
+        if (storedVariationModel.weight != updatedVariationModel.weight) {
+            body["weight"] = updatedVariationModel.weight
+        }
+
+        val dimensionsBody = mutableMapOf<String, String>()
+        if (storedVariationModel.height != updatedVariationModel.height) {
+            dimensionsBody["height"] = updatedVariationModel.height
+        }
+        if (storedVariationModel.width != updatedVariationModel.width) {
+            dimensionsBody["width"] = updatedVariationModel.width
+        }
+        if (storedVariationModel.length != updatedVariationModel.length) {
+            dimensionsBody["length"] = updatedVariationModel.length
+        }
+        if (dimensionsBody.isNotEmpty()) {
+            body["dimensions"] = dimensionsBody
+        }
+        if (storedVariationModel.shippingClass != updatedVariationModel.shippingClass) {
+            body["shipping_class"] = updatedVariationModel.shippingClass
+        }
+        // TODO: Once removal is supported, we can remove the extra isNotBlank() condition
+        if (storedVariationModel.image != updatedVariationModel.image && updatedVariationModel.image.isNotBlank()) {
+            body["image"] = updatedVariationModel.getImageModel()?.toJson() ?: ""
+        }
+        if (storedVariationModel.menuOrder != updatedVariationModel.menuOrder) {
+            body["menu_order"] = updatedVariationModel.menuOrder
+        }
+
+        if (storedVariationModel.minAllowedQuantity != updatedVariationModel.minAllowedQuantity) {
+            body["min_quantity"] = updatedVariationModel.minAllowedQuantity
+        }
+
+        if (storedVariationModel.maxAllowedQuantity != updatedVariationModel.maxAllowedQuantity) {
+            body["max_quantity"] = updatedVariationModel.maxAllowedQuantity
+        }
+
+        if (storedVariationModel.groupOfQuantity != updatedVariationModel.groupOfQuantity) {
+            body["group_of_quantity"] = updatedVariationModel.groupOfQuantity
+        }
+
+        if (storedVariationModel.attributes != updatedVariationModel.attributes) {
+            JsonParser().apply {
+                body["attributes"] = try {
+                    parse(updatedVariationModel.attributes).asJsonArray
+                } catch (ex: Exception) {
+                    JsonArray()
+                }
+            }
+        }
+        if (storedVariationModel.metadata != updatedVariationModel.metadata) {
+            JsonParser().apply {
+                body["meta_data"] = try {
+                    parse(updatedVariationModel.metadata).asJsonArray
+                } catch (ex: Exception) {
+                    AppLog.e(AppLog.T.API, "Error parsing product variation metadata", ex)
+                    JsonArray()
+                }
+            }
+        }
+
+        return body
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/AttributeApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/AttributeApiResponse.kt
new file mode 100644
index 00000000000..d8d19f20603
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/AttributeApiResponse.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class AttributeApiResponse : Response {
+    val id: String? = null
+    val name: String? = null
+    val slug: String? = null
+    val type: String? = null
+    @SerializedName("order_by")
+    val orderBy: String? = null
+    @SerializedName("has_archives")
+    val hasArchives: Boolean? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/ProductAttributeRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/ProductAttributeRestClient.kt
new file mode 100644
index 00000000000..38bb3f3d48c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/ProductAttributeRestClient.kt
@@ -0,0 +1,116 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.terms.AttributeTermApiResponse
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProductAttributeRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchProductFullAttributesList(
+        site: SiteModel
+    ) = WOOCOMMERCE.products.attributes.pathV3
+            .request<Array<AttributeApiResponse>>(site)
+
+    suspend fun fetchSingleAttribute(
+        site: SiteModel,
+        attributeID: Long
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).pathV3
+            .request<AttributeApiResponse>(site)
+
+    suspend fun postNewAttribute(
+        site: SiteModel,
+        args: Map<String, String>
+    ) = WOOCOMMERCE.products.attributes.pathV3
+            .post<AttributeApiResponse>(site, args)
+
+    suspend fun updateExistingAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        args: Map<String, String>
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).pathV3
+            .put<AttributeApiResponse>(site, args)
+
+    suspend fun deleteExistingAttribute(
+        site: SiteModel,
+        attributeID: Long
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).pathV3
+            .delete<AttributeApiResponse>(site)
+
+    suspend fun fetchAllAttributeTerms(
+        site: SiteModel,
+        attributeID: Long,
+        page: Int,
+        pageSize: Int
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).terms.pathV3
+            .request<Array<AttributeTermApiResponse>>(
+                site = site,
+                params = mapOf(
+                    "page" to page.toString(),
+                    "per_page" to pageSize.toString()
+                )
+            )
+
+    suspend fun postNewTerm(
+        site: SiteModel,
+        attributeID: Long,
+        args: Map<String, String>
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).terms.pathV3
+            .post<AttributeTermApiResponse>(site, args)
+
+    suspend fun updateExistingTerm(
+        site: SiteModel,
+        args: Map<String, String>,
+        attributeID: Long,
+        termID: Long
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).terms.term(termID).pathV3
+            .put<AttributeTermApiResponse>(site, args)
+
+    suspend fun deleteExistingTerm(
+        site: SiteModel,
+        attributeID: Long,
+        termID: Long
+    ) = WOOCOMMERCE.products.attributes.attribute(attributeID).terms.term(termID).pathV3
+            .delete<AttributeTermApiResponse>(site)
+
+    private suspend inline fun <reified T : Any> String.request(
+        site: SiteModel,
+        params: Map<String, String> = emptyMap()
+    ) = wooNetwork.executeGetGsonRequest(
+        site = site,
+        path = this,
+        clazz = T::class.java,
+        params = params
+    ).toWooPayload()
+
+    private suspend inline fun <reified T : Any> String.post(
+        site: SiteModel,
+        args: Map<String, String>
+    ) = wooNetwork.executeGetGsonRequest(
+        site = site,
+        path = this,
+        clazz = T::class.java,
+        params = args
+    ).toWooPayload()
+
+    private suspend inline fun <reified T : Any> String.put(
+        site: SiteModel,
+        args: Map<String, String>
+    ) = wooNetwork.executePostGsonRequest(
+        site = site,
+        path = this,
+        clazz = T::class.java,
+        body = args
+    ).toWooPayload()
+
+    private suspend inline fun <reified T : Any> String.delete(
+        site: SiteModel
+    ) = wooNetwork.executeDeleteGsonRequest(
+        site = site,
+        path = this,
+        clazz = T::class.java
+    ).toWooPayload()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/terms/AttributeTermApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/terms/AttributeTermApiResponse.kt
new file mode 100644
index 00000000000..40660889bac
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/attributes/terms/AttributeTermApiResponse.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.terms
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class AttributeTermApiResponse : Response {
+    val id: String? = null
+    val name: String? = null
+    val slug: String? = null
+    val description: String? = null
+    val count: String? = null
+    @SerializedName("menu_order")
+    val menuOrder: String? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/refunds/RefundRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/refunds/RefundRestClient.kt
new file mode 100644
index 00000000000..95ebec819f8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/refunds/RefundRestClient.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.order.LineItem
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel.WCRefundFeeLine
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel.WCRefundShippingLine
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.sumBy
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class RefundRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun createRefundByAmount(
+        site: SiteModel,
+        orderId: Long,
+        amount: String,
+        reason: String,
+        automaticRefund: Boolean
+    ): WooPayload<RefundResponse> {
+        val body = mapOf(
+                "amount" to amount,
+                "reason" to reason,
+                "api_refund" to automaticRefund.toString()
+        )
+        return createRefund(site, orderId, body)
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun createRefundByItems(
+        site: SiteModel,
+        orderId: Long,
+        reason: String,
+        automaticRefund: Boolean,
+        items: List<WCRefundModel.WCRefundItem>,
+        restockItems: Boolean
+    ): WooPayload<RefundResponse> {
+        val body = mapOf(
+                "reason" to reason,
+                "amount" to items.sumBy { it.subtotal + it.totalTax }.toString(),
+                "api_refund" to automaticRefund.toString(),
+                "line_items" to items.associateBy { it.itemId },
+                "restock_items" to restockItems
+        )
+        return createRefund(site, orderId, body)
+    }
+
+    private suspend fun createRefund(
+        site: SiteModel,
+        orderId: Long,
+        body: Map<String, Any>
+    ): WooPayload<RefundResponse> {
+        val url = WOOCOMMERCE.orders.id(orderId).refunds.pathV3
+        val response = wooNetwork.executePostGsonRequest(
+                site = site,
+                path = url,
+                body = body,
+                clazz = RefundResponse::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchRefund(
+        site: SiteModel,
+        orderId: Long,
+        refundId: Long
+    ): WooPayload<RefundResponse> {
+        val url = WOOCOMMERCE.orders.id(orderId).refunds.refund(refundId).pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = RefundResponse::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchAllRefunds(
+        site: SiteModel,
+        orderId: Long,
+        page: Int,
+        pageSize: Int
+    ): WooPayload<Array<RefundResponse>> {
+        val url = WOOCOMMERCE.orders.id(orderId).refunds.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<RefundResponse>::class.java,
+            params = mapOf(
+                "page" to page.toString(),
+                "per_page" to pageSize.toString()
+            )
+        )
+        return response.toWooPayload()
+    }
+
+    data class RefundResponse(
+        @SerializedName("id") val refundId: Long,
+        @SerializedName("date_created") val dateCreated: String?,
+        @SerializedName("amount") val amount: String?,
+        @SerializedName("reason") val reason: String?,
+        @SerializedName("refunded_payment") val refundedPayment: Boolean?,
+        @SerializedName("line_items") val items: List<LineItem>?,
+        @SerializedName("shipping_lines") val shippingLineItems: List<WCRefundShippingLine>?,
+        @SerializedName("fee_lines") val feeLineItems: List<WCRefundFeeLine>?
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsProductApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsProductApiResponse.kt
new file mode 100644
index 00000000000..4ffade56495
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsProductApiResponse.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.reports
+
+import com.google.gson.annotations.SerializedName
+
+data class ReportsProductApiResponse(
+    @SerializedName("product_id")
+    val productId: Long? = null,
+    @SerializedName("variation_id")
+    val variationId: Long? = null,
+    @SerializedName("items_sold")
+    val itemsSold: Int? = null,
+    @SerializedName("net_revenue")
+    val netRevenue: Double? = null,
+    @SerializedName("orders_count")
+    val ordersCount: Long? = null,
+    @SerializedName("extended_info")
+    val product: ReportProductItem? = null
+)
+
+data class ReportProductItem(
+    val name: String? = null,
+    val price: Double? = null,
+    @SerializedName("image")
+    val imageHTML: String? = null
+) {
+    companion object {
+        private val SRC_REGEX = Regex("src=\"(.*?)\"")
+    }
+
+    val imageUrl: String?
+        get() = imageHTML
+            ?.let { SRC_REGEX.find(it)?.value }
+            ?.replace("src=", "")
+            ?.replace("\"", "")
+}
+
+data class ProductStockItemApiResponse(
+    @SerializedName("id")
+    val productId: Long? = null,
+    @SerializedName("parent_id")
+    val parentId: Long? = null, // When the product is a variation, this is the parent product ID
+    @SerializedName("name")
+    val name: String? = null,
+    @SerializedName("stock_status")
+    val stockStatus: String? = null,
+    @SerializedName("stock_quantity")
+    val stockQuantity: Int? = null,
+    @SerializedName("low_stock_amount")
+    val lowStockAmount: Int? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsRestClient.kt
new file mode 100644
index 00000000000..81db0e44af6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/reports/ReportsRestClient.kt
@@ -0,0 +1,133 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.reports
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class ReportsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchTopPerformerProducts(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int = 5
+    ): WooPayload<Array<ReportsProductApiResponse>> {
+        fun createParameters(
+            startDate: String,
+            endDate: String,
+            quantity: Int
+        ) = mapOf(
+            "before" to endDate,
+            "after" to startDate,
+            "per_page" to quantity.toString(),
+            "extended_info" to "true",
+            "orderby" to "items_sold",
+            "order" to "desc"
+        ).filter { it.value.isNotEmpty() }
+
+        val url = WOOCOMMERCE.reports.products.pathV4Analytics
+        val parameters = createParameters(startDate, endDate, quantity)
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<ReportsProductApiResponse>::class.java,
+            params = parameters
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchProductStockReport(
+        site: SiteModel,
+        stockStatus: String,
+        page: Int,
+        quantity: Int
+    ): WooPayload<Array<ProductStockItemApiResponse>> {
+        val url = WOOCOMMERCE.reports.stock.pathV4Analytics
+        val parameters = mapOf(
+            "page" to page.toString(),
+            "per_page" to quantity.toString(),
+            "order" to "asc",
+            "type" to stockStatus
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<ProductStockItemApiResponse>::class.java,
+            params = parameters
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchProductSalesReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        productIds: List<Long>
+    ): WooPayload<Array<ReportsProductApiResponse>> {
+        val url = WOOCOMMERCE.reports.products.pathV4Analytics
+        val response = fetchSales(
+            endDate = endDate,
+            startDate = startDate,
+            productIds = productIds,
+            site = site,
+            url = url,
+            quantity = productIds.size
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchProductVariationsSalesReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        variationIds: List<Long>
+    ): WooPayload<Array<ReportsProductApiResponse>> {
+        val url = WOOCOMMERCE.reports.variations.pathV4Analytics
+        val response = fetchSales(
+            endDate = endDate,
+            startDate = startDate,
+            variationIds = variationIds,
+            site = site,
+            url = url,
+            quantity = variationIds.size
+        )
+        return response.toWooPayload()
+    }
+
+    private suspend fun fetchSales(
+        endDate: String,
+        startDate: String,
+        productIds: List<Long> = emptyList(),
+        variationIds: List<Long> = emptyList(),
+        site: SiteModel,
+        url: String,
+        quantity: Int
+    ): WPAPIResponse<Array<ReportsProductApiResponse>> {
+        val parameters = mapOf(
+            "before" to endDate,
+            "after" to startDate,
+            "products" to productIds.joinToString(","),
+            "variations" to variationIds.joinToString(","),
+            "extended_info" to "true",
+            "orderby" to "items_sold",
+            "order" to "desc",
+            "page" to "1",
+            "per_page" to quantity.toString()
+        )
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<ReportsProductApiResponse>::class.java,
+            params = parameters
+        )
+        return response
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/AccountSettingsApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/AccountSettingsApiResponse.kt
new file mode 100644
index 00000000000..dc3a5465e08
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/AccountSettingsApiResponse.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.shippinglabels.WCPaymentMethod
+
+data class AccountSettingsApiResponse(
+    @SerializedName("success") val success: Boolean,
+    @SerializedName("formData") val formData: FormData,
+    @SerializedName("formMeta") val formMeta: FormMeta,
+    @SerializedName("userMeta") val userMeta: UserMeta
+) {
+    data class FormData(
+        @SerializedName("enabled") val isCreatingLabelsEnabled: Boolean,
+        @SerializedName("selected_payment_method_id") val selectedPaymentId: Int?,
+        @SerializedName("paper_size") val paperSize: String,
+        @SerializedName("email_receipts") val isPaymentReceiptEnabled: Boolean
+    )
+
+    data class FormMeta(
+        @SerializedName("can_edit_settings") val canEditSettings: Boolean,
+        @SerializedName("can_manage_payments") val canManagePayments: Boolean,
+        @SerializedName("master_user_name") val storeOwnerName: String,
+        @SerializedName("master_user_login") val storeOwnerUserName: String,
+        @SerializedName("master_user_wpcom_login") val storeOwnerWpcomUserName: String,
+        @SerializedName("master_user_email") val storeOwnerWpcomEmail: String,
+        @SerializedName("payment_methods") val paymentMethods: List<WCPaymentMethod>?
+    )
+
+    data class UserMeta(
+        @SerializedName("last_box_id") val lastBoxId: String?
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/LabelItem.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/LabelItem.kt
new file mode 100644
index 00000000000..386df6e17b1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/LabelItem.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import java.math.BigDecimal
+
+class LabelItem {
+    @SerializedName("label_id") val labelId: Long? = null
+    @SerializedName("tracking") val trackingNumber: String? = null
+    @SerializedName("carrier_id") val carrierId: String? = null
+    @SerializedName("service_name") val serviceName: String? = null
+    @SerializedName("created_date") val dateCreated: Long? = null
+    @SerializedName("expiry_date") val expiryDate: Long? = null
+    @SerializedName("package_name") val packageName: String? = null
+    @SerializedName("product_names") val productNames: List<String>? = emptyList()
+    @SerializedName("product_ids") val productIds: List<Long>? = emptyList()
+    @SerializedName("refundable_amount") val refundableAmount: BigDecimal? = null
+    @SerializedName("commercial_invoice_url") val commercialInvoiceUrl: String? = null
+    val status: String? = null
+    val rate: BigDecimal? = null
+    val currency: String? = null
+    val refund: JsonElement? = null
+    val error: String? = null
+
+    companion object {
+        const val STATUS_PURCHASED = "PURCHASED"
+        const val STATUS_ERROR = "PURCHASE_ERROR"
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/SLCreationEligibilityApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/SLCreationEligibilityApiResponse.kt
new file mode 100644
index 00000000000..95e8d6c7567
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/SLCreationEligibilityApiResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+
+data class SLCreationEligibilityApiResponse(
+    @SerializedName("is_eligible")
+    val isEligible: Boolean,
+    @SerializedName("reason")
+    val reason: String?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelApiResponse.kt
new file mode 100644
index 00000000000..a5342511e5b
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelApiResponse.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.network.Response
+
+class ShippingLabelApiResponse : Response {
+    val orderId: Long? = null
+    val paperSize: String? = null
+
+    val formData: JsonElement? = null
+    val storeOptions: JsonElement? = null
+    val labelsData: List<LabelItem>? = null
+
+    val success: Boolean? = null
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClient.kt
new file mode 100644
index 00000000000..0e1f607fc2a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClient.kt
@@ -0,0 +1,422 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.CustomPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.PredefinedOption
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelPackageData
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingPackageCustoms
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.utils.toMap
+import org.wordpress.android.fluxc.utils.toWooPayload
+import java.math.BigDecimal
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.collections.toMap as asMap
+
+@Singleton
+class ShippingLabelRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchShippingLabelsForOrder(
+        orderId: Long,
+        site: SiteModel
+    ): WooPayload<ShippingLabelApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).pathV1
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingLabelApiResponse::class.java
+        ).toWooPayload()
+    }
+
+    suspend fun refundShippingLabelForOrder(
+        site: SiteModel,
+        orderId: Long,
+        remoteShippingLabelId: Long
+    ): WooPayload<ShippingLabelApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).shippingLabelId(remoteShippingLabelId).refund.pathV1
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingLabelApiResponse::class.java
+        ).toWooPayload()
+    }
+
+    suspend fun printShippingLabels(
+        site: SiteModel,
+        paperSize: String,
+        shippingLabelIds: List<Long>
+    ): WooPayload<PrintShippingLabelApiResponse> {
+        val url = WOOCOMMERCE.connect.label.print.pathV1
+        val params = mapOf(
+                "paper_size" to paperSize,
+                "label_id_csv" to shippingLabelIds.joinToString(","),
+                "caption_csv" to "",
+                "json" to "true"
+        )
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = PrintShippingLabelApiResponse::class.java,
+            params = params
+        ).toWooPayload()
+    }
+
+    suspend fun checkShippingLabelCreationEligibility(
+        site: SiteModel,
+        orderId: Long,
+        canCreatePackage: Boolean,
+        canCreatePaymentMethod: Boolean,
+        canCreateCustomsForm: Boolean
+    ): WooPayload<SLCreationEligibilityApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).creation_eligibility.pathV1
+        val params = mapOf(
+                "can_create_package" to canCreatePackage.toString(),
+                "can_create_payment_method" to canCreatePaymentMethod.toString(),
+                "can_create_customs_form" to canCreateCustomsForm.toString()
+        )
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = SLCreationEligibilityApiResponse::class.java,
+            params = params
+        ).toWooPayload()
+    }
+
+    suspend fun verifyAddress(
+        site: SiteModel,
+        address: ShippingLabelAddress,
+        type: ShippingLabelAddress.Type
+    ): WooPayload<VerifyAddressResponse> {
+        val url = WOOCOMMERCE.connect.normalize_address.pathV1
+        val body = mapOf(
+                "address" to address.toMap(),
+                "type" to type.name.toLowerCase(Locale.ROOT)
+        )
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = VerifyAddressResponse::class.java,
+            body = body
+        ).toWooPayload()
+    }
+
+    suspend fun getPackageTypes(
+        site: SiteModel
+    ): WooPayload<GetPackageTypesResponse> {
+        val url = WOOCOMMERCE.connect.packages.pathV1
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = GetPackageTypesResponse::class.java
+        ).toWooPayload()
+    }
+
+    suspend fun getAccountSettings(
+        site: SiteModel
+    ): WooPayload<AccountSettingsApiResponse> {
+        val url = WOOCOMMERCE.connect.account.settings.pathV1
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = AccountSettingsApiResponse::class.java
+        ).toWooPayload()
+    }
+
+    suspend fun updateAccountSettings(site: SiteModel, request: UpdateSettingsApiRequest): WooPayload<Boolean> {
+        val url = WOOCOMMERCE.connect.account.settings.pathV1
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = JsonObject::class.java,
+            body = request.toMap()
+        ).toWooPayload { it["success"].asBoolean }
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun getShippingRates(
+        site: SiteModel,
+        orderId: Long,
+        origin: ShippingLabelAddress,
+        destination: ShippingLabelAddress,
+        packages: List<ShippingLabelPackage>,
+        customsData: List<WCShippingPackageCustoms>?
+    ): WooPayload<ShippingRatesApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).rates.pathV1
+
+        val body = mapOf(
+            "origin" to origin.toMap(),
+            "destination" to destination.toMap(),
+            "packages" to packages.map { labelPackage ->
+                val customs = customsData?.first { it.id == labelPackage.id }
+                labelPackage.toMap() + (customs?.toMap() ?: emptyMap())
+            }
+        )
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingRatesApiResponse::class.java,
+            body = body
+        ).toWooPayload()
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun purchaseShippingLabels(
+        site: SiteModel,
+        orderId: Long,
+        origin: ShippingLabelAddress,
+        destination: ShippingLabelAddress,
+        packagesData: List<WCShippingLabelPackageData>,
+        customsData: List<WCShippingPackageCustoms>?,
+        emailReceipts: Boolean = false
+    ): WooPayload<ShippingLabelStatusApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).pathV1
+
+        val body = mapOf(
+                "async" to true,
+                "origin" to origin,
+                "destination" to destination,
+                "packages" to packagesData.map { labelPackage ->
+                    val customs = customsData?.first { it.id == labelPackage.id }
+                    labelPackage.toMap() + (customs?.toMap() ?: emptyMap())
+                },
+                "email_receipt" to emailReceipts,
+                "source" to "wc-android",
+        )
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingLabelStatusApiResponse::class.java,
+            body = body
+        ).toWooPayload()
+    }
+
+    suspend fun fetchShippingLabelsStatus(
+        site: SiteModel,
+        orderId: Long,
+        labelIds: List<Long>
+    ): WooPayload<ShippingLabelStatusApiResponse> {
+        val url = WOOCOMMERCE.connect.label.order(orderId).shippingLabels(labelIds.joinToString(separator = ",")).pathV1
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingLabelStatusApiResponse::class.java
+        ).toWooPayload()
+    }
+
+    // Supports both creating custom package(s), or activating existing predefined package(s).
+    // Creating singular or multiple items, as well as mixed items at once are supported.
+    suspend fun createPackages(
+        site: SiteModel,
+        customPackages: List<CustomPackage> = emptyList(),
+        predefinedOptions: List<PredefinedOption> = emptyList()
+    ): WooPayload<Boolean> {
+        // We need at least one of the lists to not be empty to continue with API call.
+        if (customPackages.isEmpty() && predefinedOptions.isEmpty()) {
+            return WooPayload(false)
+        }
+
+        val url = WOOCOMMERCE.connect.packages.pathV1
+
+        // 1. Mapping for custom packages
+        // Here we convert each CustomPackage instance into a Map with proper key names.
+        // This list of Maps will then be used as the "customs" key's value in the API request.
+        val mappedCustomPackages = customPackages.map {
+            mapOf(
+                    "name" to it.title,
+                    "is_letter" to it.isLetter,
+                    "inner_dimensions" to it.dimensions,
+                    "box_weight" to it.boxWeight,
+
+                    /*
+                    In wp-admin, The two values below are not user-editable but are saved during
+                    package creation with hardcoded values. Here we replicate the same behavior.
+                     */
+                    "is_user_defined" to true,
+                    "max_weight" to 0
+            )
+        }
+
+        // 2. Mapping for predefined options.
+        val predefinedParam = predefinedOptions
+                // First we group all options by carrier, because the list of predefinedOptions can contain
+                // multiple instances with the same carrier name.
+                //  For example, "USPS Priority Mail Express Boxes" and "USPS Priority Mail Boxes" are two separate
+                //  options having the same carrier: "usps".
+                .groupBy { it.carrier }
+
+                // Next, build a predefinedParam Map replicating the required JSON request structure.
+                // Example structure:
+                //
+                //    "carrier_1": [ "package_1", "package_2", ... ],
+                //    "carrier_2": [ "package_3", "package_4", "package_5" ... ],
+                .map { (carrier, options) ->
+                    carrier to options
+                            .flatMap { it.predefinedPackages } // Put all found package(s) in a list
+                            .map { it.id } // Grab all found package id(s)
+                }.asMap() // Convert list of Map to Map
+
+        val body = mapOf(
+                "custom" to mappedCustomPackages,
+                "predefined" to predefinedParam
+        )
+
+        return wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = JsonObject::class.java,
+            body = body
+        ).toWooPayload { it["success"].asBoolean }
+    }
+
+    data class PrintShippingLabelApiResponse(
+        val mimeType: String,
+        val b64Content: String,
+        val success: Boolean
+    )
+
+    data class ShippingRatesApiResponse(
+        @SerializedName("success") val isSuccess: Boolean,
+        @SerializedName("rates") private val boxesJson: JsonElement
+    ) {
+        companion object {
+            private val gson by lazy { Gson() }
+        }
+
+        val boxes: Map<String, Map<String, ShippingOption>>
+            get() {
+                val responseType = object : TypeToken<Map<String, Map<String, ShippingOption>>>() {}.type
+                return gson.fromJson(boxesJson, responseType) as? Map<String, Map<String, ShippingOption>> ?: emptyMap()
+            }
+
+        data class ShippingOption(
+            val rates: List<Rate>
+        ) {
+            data class Rate(
+                val title: String,
+                val insurance: String?,
+                val rate: BigDecimal,
+                @SerializedName("rate_id") val rateId: String,
+                @SerializedName("service_id") val serviceId: String,
+                @SerializedName("carrier_id") val carrierId: String,
+                @SerializedName("shipment_id") val shipmentId: String,
+                @SerializedName("tracking") val hasTracking: Boolean,
+                @SerializedName("retail_rate") val retailRate: BigDecimal,
+                @SerializedName("is_selected") val isSelected: Boolean,
+                @SerializedName("free_pickup") val isPickupFree: Boolean,
+                @SerializedName("delivery_days") val deliveryDays: Int,
+                @SerializedName("delivery_date_guaranteed") val deliveryDateGuaranteed: Boolean,
+                @SerializedName("delivery_date") val deliveryDate: Date?
+            )
+        }
+    }
+
+    data class VerifyAddressResponse(
+        @SerializedName("success") val isSuccess: Boolean,
+        @SerializedName("is_trivial_normalization") val isTrivialNormalization: Boolean,
+        @SerializedName("normalized") val suggestedAddress: ShippingLabelAddress?,
+        @SerializedName("field_errors") val error: Error?
+    ) {
+        data class Error(
+            @SerializedName("general") val message: String?,
+            @SerializedName("address") val address: String?
+        )
+    }
+
+    data class GetPackageTypesResponse(
+        @SerializedName("success") val isSuccess: Boolean,
+        val storeOptions: StoreOptions,
+        val formSchema: FormSchema,
+        val formData: FormData
+    ) {
+        companion object {
+            private val gson by lazy { Gson() }
+        }
+
+        data class StoreOptions(
+            @SerializedName("currency_symbol") val currency: String,
+            @SerializedName("dimension_unit") val dimensionUnit: String,
+            @SerializedName("weight_unit") val weightUnit: String,
+            @SerializedName("origin_country") val originCountry: String
+        )
+
+        data class FormData(
+            @SerializedName("custom") val customData: List<CustomData>,
+            @SerializedName("predefined") val predefinedJson: JsonElement
+        ) {
+            data class CustomData(
+                val name: String,
+                @SerializedName("inner_dimensions") val innerDimensions: String?,
+                @SerializedName("outer_dimensions") val outerDimensions: String?,
+                @SerializedName("dimensions") val dimensions: String?,
+                @SerializedName("box_weight") val boxWeight: Float?,
+                @SerializedName("max_weight") val maxWeight: Float?,
+                @SerializedName("is_user_defined") val isUserDefined: Boolean?,
+                @SerializedName("is_letter") val isLetter: Boolean
+            )
+
+            val predefinedData: Map<String, List<String?>>
+                get() {
+                    val responseType = object : TypeToken<Map<String, List<String?>>>() {}.type
+                    return gson.fromJson(predefinedJson, responseType) as? Map<String, List<String?>> ?: emptyMap()
+                }
+        }
+
+        data class FormSchema(
+            @SerializedName("custom") val customSchema: CustomSchema?,
+            @SerializedName("predefined") val predefinedJson: JsonElement?
+        ) {
+            data class CustomSchema(
+                val title: String,
+                val description: String
+            )
+
+            data class PackageOption(
+                val title: String,
+                val definitions: List<PackageDefinition>
+            ) {
+                data class PackageDefinition(
+                    val id: String,
+                    val name: String,
+                    val dimensions: Any?,
+                    @SerializedName("outer_dimensions") val outerDimensions: String,
+                    @SerializedName("inner_dimensions") val innerDimensions: String,
+                    @SerializedName("box_weight") val boxWeight: Float?,
+                    @SerializedName("max_weight") val maxWeight: Float?,
+                    @SerializedName("is_letter") val isLetter: Boolean,
+                    @SerializedName("is_flat_rate") val isFlatRate: Boolean?,
+                    @SerializedName("can_ship_international") val canShipInternational: Boolean?,
+                    @SerializedName("group_id") val groupId: String?,
+                    @SerializedName("service_group_ids") val serviceGroupIds: List<String>?
+                )
+            }
+
+            val predefinedSchema: Map<String, Map<String, PackageOption>>
+                get() {
+                    val responseType = object : TypeToken<Map<String, Map<String, PackageOption>>>() {}.type
+                    return gson.fromJson(predefinedJson, responseType) as?
+                            Map<String, Map<String, PackageOption>> ?: emptyMap()
+                }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelStatusApiResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelStatusApiResponse.kt
new file mode 100644
index 00000000000..9cd57b29fe5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelStatusApiResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+
+data class ShippingLabelStatusApiResponse(
+    @SerializedName("success")
+    val isSuccess: Boolean = false,
+    @SerializedName("labels")
+    val labels: List<LabelItem>? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/UpdateSettingsApiRequest.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/UpdateSettingsApiRequest.kt
new file mode 100644
index 00000000000..2107dbf73a9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/UpdateSettingsApiRequest.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import com.google.gson.annotations.SerializedName
+
+data class UpdateSettingsApiRequest(
+    @SerializedName("selected_payment_method_id")
+    val selectedPaymentMethodId: Int?,
+    @SerializedName("enabled")
+    val isCreatingLabelsEnabled: Boolean?,
+    @SerializedName("paper_size")
+    val paperSize: String?,
+    @SerializedName("email_receipts")
+    val isEmailReceiptEnabled: Boolean?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippingsmethods/ShippingMethodsRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippingsmethods/ShippingMethodsRestClient.kt
new file mode 100644
index 00000000000..e0f2c364e42
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippingsmethods/ShippingMethodsRestClient.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCShippingMethod
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods.ShippingMethodsRestClient.ShippingMethodDto
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class ShippingMethodsRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchShippingMethods(site: SiteModel): WooPayload<List<ShippingMethodDto>> {
+        val url = WOOCOMMERCE.shipping_methods.pathV3
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = Array<ShippingMethodDto>::class.java,
+        ).toWooPayload { methods -> methods.toList() }
+    }
+
+    suspend fun fetchShippingMethodsById(site: SiteModel, methodId: String): WooPayload<ShippingMethodDto> {
+        val url = WOOCOMMERCE.shipping_methods.id(methodId).pathV3
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = ShippingMethodDto::class.java,
+        ).toWooPayload()
+    }
+
+    data class ShippingMethodDto(
+        val id: String? = null,
+        val title: String? = null,
+    )
+}
+
+fun ShippingMethodDto.toAppModel() = WCShippingMethod(
+    id = this.id.orEmpty(),
+    title = this.title.orEmpty()
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartRestClient.kt
new file mode 100644
index 00000000000..4105d2c50e3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartRestClient.kt
@@ -0,0 +1,107 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.ShoppingCart.CartProduct
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ShoppingCartRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun addProductsToShoppingCart(
+        siteId: Long,
+        products: List<CartProduct>,
+        isTemporary: Boolean
+    ): WooPayload<ShoppingCart> {
+        val url = WPCOMREST.me.shopping_cart.site(siteId).urlV1_1
+
+        val body = mapOf(
+            "temporary" to isTemporary,
+            "products" to products
+        )
+
+        return when (val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            clazz = ShoppingCart::class.java
+        )) {
+            is Success -> {
+                WooPayload(response.data)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    suspend fun completePurchase(
+        cart: ShoppingCart,
+        paymentMethod: PaymentMethod
+    ): WooPayload<ShoppingCart> {
+        val url = WPCOMREST.me.transactions.urlV1_1
+
+        val payment = mapOf(
+            "payment_method" to paymentMethod.value
+        )
+
+        val body = mapOf(
+            "cart" to cart,
+            "payment" to payment
+        )
+
+        return when (val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            clazz = ShoppingCart::class.java
+        )) {
+            is Success -> {
+                WooPayload(response.data)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    data class ShoppingCart(
+        @SerializedName("blog_id") val blogId: Int,
+        @SerializedName("cart_key") val cartKey: Int,
+        val products: List<CartProduct>?
+    ) : Response {
+        data class CartProduct(
+            @SerializedName("product_id") val productId: Int,
+            val volume: Int = 1,
+            val quantity: Int? = null,
+            val meta: String? = null,
+            val extra: Map<String, Any> = emptyMap()
+        )
+    }
+
+    enum class PaymentMethod(val value: String) {
+        CREDIT_PAYMENT_METHOD("WPCOM_Billing_WPCOM"),
+        CREDIT_CARD_PAYMENT_METHOD("WPCOM_Billing_MoneyPress_Stored")
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartStore.kt
new file mode 100644
index 00000000000..b5b7389954c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/storecreation/ShoppingCartStore.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation
+
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.PaymentMethod
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.PaymentMethod.CREDIT_CARD_PAYMENT_METHOD
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.PaymentMethod.CREDIT_PAYMENT_METHOD
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.ShoppingCart
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.storecreation.ShoppingCartRestClient.ShoppingCart.CartProduct
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ShoppingCartStore @Inject constructor(
+    private val restClient: ShoppingCartRestClient,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun completePurchaseWithCredit(cart: ShoppingCart) =
+        completePurchase(cart, CREDIT_PAYMENT_METHOD)
+
+    suspend fun completePurchaseWithCreditCard(cart: ShoppingCart) =
+        completePurchase(cart, CREDIT_CARD_PAYMENT_METHOD)
+
+    suspend fun addProductToCart(
+        siteId: Long,
+        product: CartProduct
+    ): WooResult<ShoppingCart> {
+        return coroutineEngine.withDefaultContext(API, this, "addProductPlanToCart") {
+            val response = restClient.addProductsToShoppingCart(
+                siteId = siteId,
+                products = listOf(product),
+                isTemporary = false
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(response.result)
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    private suspend fun completePurchase(
+        cart: ShoppingCart,
+        payment: PaymentMethod
+    ): WooResult<Unit> {
+        return coroutineEngine.withDefaultContext(API, this, "completePurchase") {
+            val response = restClient.completePurchase(cart, payment)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(Unit)
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCApiVersionResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCApiVersionResponse.kt
new file mode 100644
index 00000000000..84009ac942b
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCApiVersionResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.system
+
+import org.wordpress.android.fluxc.model.SiteModel
+
+data class WCApiVersionResponse(
+    val siteModel: SiteModel,
+    val apiVersion: String?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCSystemPluginResponse.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCSystemPluginResponse.kt
new file mode 100644
index 00000000000..849aaba1650
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WCSystemPluginResponse.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.system
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCSystemPluginResponse.SystemPluginModel
+
+data class WCSystemPluginResponse(
+    @SerializedName("active_plugins") private val activePlugins: List<SystemPluginModel>?,
+    @SerializedName("inactive_plugins") private val inactivePlugins: List<SystemPluginModel>?
+) {
+    val plugins: List<SystemPluginModel>
+        get() = activePlugins.orEmpty().map { it.copy(isActive = true) } + inactivePlugins.orEmpty()
+
+    data class SystemPluginModel(
+        val plugin: String,
+        val name: String,
+        val version: String?,
+        val url: String?,
+        @SerializedName("version_latest") val versionLatest: String? = null,
+        @SerializedName("author_name") val authorName: String? = null,
+        @SerializedName("author_url") val authorUrl: String? = null,
+        val isActive: Boolean = false
+    )
+}
+
+/**
+ * Maps a System endpoint plugin item to [SitePluginModel]
+ *
+ * This function follows the same logic as Core to retrieve the name and slug from the plugin's path,
+ * Check class-wp-rest-plugins-controller.php and plugin.php in WPCore for more information.
+ */
+fun SystemPluginModel.toDomainModel(siteId: Int): SitePluginModel {
+    return SitePluginModel().apply {
+        localSiteId = siteId
+        name = this@toDomainModel.plugin.substringBeforeLast(".")
+        displayName = this@toDomainModel.name
+        authorName = this@toDomainModel.authorName
+        authorUrl = this@toDomainModel.authorUrl
+        slug = this@toDomainModel.plugin.substringBeforeLast("/")
+        version = this@toDomainModel.version
+        setIsActive(this@toDomainModel.isActive)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WooSystemRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WooSystemRestClient.kt
new file mode 100644
index 00000000000..52fbca79e9f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/system/WooSystemRestClient.kt
@@ -0,0 +1,129 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.system
+
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class WooSystemRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    companion object {
+        private const val NOT_FOUND = 404
+        private const val FORBIDDEN = 403
+        private const val SAVE_SITE_TITLE_RESPONSE_FIELD = "title"
+    }
+
+    suspend fun fetchInstalledPlugins(site: SiteModel): WooPayload<WCSystemPluginResponse> {
+        val url = WOOCOMMERCE.system_status.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf("_fields" to "active_plugins,inactive_plugins"),
+            clazz = WCSystemPluginResponse::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchSSR(site: SiteModel): WooPayload<SSRResponse> {
+        val url = WOOCOMMERCE.system_status.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf("_fields" to "environment,database,active_plugins,theme,settings,security,pages"),
+            clazz = SSRResponse::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    /**
+     * Test the settings endpoint of WooCommerce to confirm if the plugin is available or not.
+     * We pass an empty _fields just to reduce the response payload size, as we don't care about the contents
+     *
+     * @return JetpackSuccess(true) if WooCommerce is installed, JetpackSuccess(false) is we get a 404,
+     *         and JetpackError otherwise
+     */
+    suspend fun checkIfWooCommerceIsAvailable(site: SiteModel): WooPayload<Boolean> {
+        val url = WOOCOMMERCE.settings.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = mapOf("_fields" to ""),
+            clazz = Any::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Success -> WooPayload(true)
+            is WPAPIResponse.Error -> {
+                when (response.error.volleyError?.networkResponse?.statusCode) {
+                    NOT_FOUND -> WooPayload(false)
+                    FORBIDDEN -> {
+                        // If we get a 403 status code, we can infer that Woo is installed,
+                        // the user just doesn't have permission to access the Woo API
+                        WooPayload(true)
+                    }
+                    else -> WooPayload(response.error.toWooError())
+                }
+            }
+        }
+    }
+
+    suspend fun fetchSiteSettings(site: SiteModel): WooPayload<WPSiteSettingsResponse> {
+        val url = WPAPI.settings.urlV2
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            clazz = WPSiteSettingsResponse::class.java
+        )
+
+        return response.toWooPayload()
+    }
+
+    suspend fun saveSiteTitle(site: SiteModel, siteTitle: String): WooPayload<SaveSiteTitleResponse> {
+        val url = WPAPI.settings.urlV2
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = SaveSiteTitleResponse::class.java,
+            body = mapOf(
+                "title" to siteTitle,
+                "_fields" to SAVE_SITE_TITLE_RESPONSE_FIELD
+            )
+        )
+
+        return response.toWooPayload()
+    }
+
+    data class SaveSiteTitleResponse(
+        @SerializedName("title") val title: String? = null
+    )
+
+    data class SSRResponse(
+        val environment: JsonElement? = null,
+        val database: JsonElement? = null,
+        @SerializedName("active_plugins") val activePlugins: JsonElement? = null,
+        val theme: JsonElement? = null,
+        val settings: JsonElement? = null,
+        val security: JsonElement? = null,
+        val pages: JsonElement? = null
+    )
+
+    data class WPSiteSettingsResponse(
+        @SerializedName("title") val title: String? = null,
+        @SerializedName("description") val description: String? = null,
+        @SerializedName("url") val url: String? = null,
+        @SerializedName("show_on_front") val showOnFront: String? = null,
+        @SerializedName("page_on_front") val pageOnFront: Long? = null
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/TaxRateDto.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/TaxRateDto.kt
new file mode 100644
index 00000000000..6b75b7fb941
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/TaxRateDto.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.taxes.TaxRateEntity
+
+data class TaxRateDto (
+    val id: Long,
+    val country: String?,
+    val state: String?,
+    @SerializedName("postcode") val postCode: String?,
+    val city: String?,
+    @SerializedName("postcodes") val postCodes: List<String>?,
+    val cities: List<String>?,
+    val rate: String?,
+    val name: String?,
+    val priority: Int?,
+    val compound: Boolean?,
+    val shipping: Boolean?,
+    val order: Int?,
+    @SerializedName("class") val taxClass: String?,
+) {
+    fun toDataModel(localSiteId: LocalId): TaxRateEntity =
+        TaxRateEntity(
+            id = RemoteId(id),
+            localSiteId = localSiteId,
+            country = country,
+            state = state,
+            postcode = postCode,
+            city = city,
+            rate = rate,
+            name = name,
+            taxClass = taxClass,
+        )
+}
+
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/WCTaxRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/WCTaxRestClient.kt
new file mode 100644
index 00000000000..99994b61699
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/taxes/WCTaxRestClient.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCTaxRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchTaxClassList(
+        site: SiteModel
+    ): WooPayload<Array<TaxClassApiResponse>> {
+        val url = WOOCOMMERCE.taxes.classes.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site,
+            url,
+            Array<TaxClassApiResponse>::class.java
+        )
+        return response.toWooPayload()
+    }
+
+    suspend fun fetchTaxRateList(
+        site: SiteModel,
+        page: Int,
+        pageSize: Int,
+    ): WooPayload<Array<TaxRateDto>> {
+        val url = WOOCOMMERCE.taxes.pathV3
+
+        val response = wooNetwork.executeGetGsonRequest(
+            site,
+            url,
+            Array<TaxRateDto>::class.java,
+            mutableMapOf<String, String>().apply {
+                put("page", page.toString())
+                put("per_page", pageSize.toString())
+            }
+        )
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                WooPayload(response.data)
+            }
+            is WPAPIResponse.Error -> {
+                WooPayload(response.error.toWooError())
+            }
+        }
+    }
+
+    data class TaxClassApiResponse(
+        val name: String? = null,
+        val slug: String? = null
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerRestClient.kt
new file mode 100644
index 00000000000..721b146c29f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerRestClient.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.tracker
+
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.putIfNotEmpty
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+internal class TrackerRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun sendTelemetry(
+        appVersion: String,
+        site: SiteModel,
+        installationDate: String?
+    ): WooPayload<Unit> {
+        val url = WOOCOMMERCE.tracker.pathWcTelemetry
+
+        val response = wooNetwork.executePostGsonRequest(
+            site = site,
+            path = url,
+            clazz = Unit::class.java,
+            body = mutableMapOf(
+                "platform" to "android",
+                "version" to appVersion,
+            ).putIfNotEmpty("installation_date" to installationDate)
+        )
+
+        return response.toWooPayload()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerStore.kt
new file mode 100644
index 00000000000..51e16a736a7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/tracker/TrackerStore.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.tracker
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TrackerStore @Inject internal constructor(private val restClient: TrackerRestClient) {
+    suspend fun sendTelemetry(
+        appVersion: String,
+        site: SiteModel,
+        installationDateIso8601: String?
+    ): WooPayload<Unit> {
+        return restClient.sendTelemetry(appVersion, site, installationDateIso8601)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/user/WCUserRestClient.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/user/WCUserRestClient.kt
new file mode 100644
index 00000000000..a6849244b53
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/user/WCUserRestClient.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.user
+
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.utils.toWooPayload
+import javax.inject.Inject
+
+class WCUserRestClient @Inject constructor(private val wooNetwork: WooNetwork) {
+    suspend fun fetchUserInfo(
+        site: SiteModel
+    ): WooPayload<UserApiResponse> {
+        val url = WPAPI.users.me.urlV2
+        val params = mapOf(
+            "context" to "edit"
+        )
+
+        return wooNetwork.executeGetGsonRequest(
+            site = site,
+            path = url,
+            params = params,
+            clazz = UserApiResponse::class.java
+        ).toWooPayload()
+    }
+
+    data class UserApiResponse(
+        val id: Long,
+        val username: String?,
+        val name: String?,
+        @SerializedName("first_name") val firstName: String?,
+        @SerializedName("last_name") val lastName: String?,
+        val email: String?,
+        val roles: JsonElement
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/CustomerSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/CustomerSqlUtils.kt
new file mode 100644
index 00000000000..bdb603e5ce0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/CustomerSqlUtils.kt
@@ -0,0 +1,88 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCCustomerModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.customer.WCCustomerModel
+
+object CustomerSqlUtils {
+    // region get
+    fun getCustomerByRemoteId(site: SiteModel, remoteCustomerId: Long): WCCustomerModel? {
+        return WellSql.select(WCCustomerModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCCustomerModelTable.REMOTE_CUSTOMER_ID, remoteCustomerId)
+                .equals(WCCustomerModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup()
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getCustomersForSite(site: SiteModel): List<WCCustomerModel> {
+        return WellSql.select(WCCustomerModel::class.java)
+                .where()
+                .equals(WCCustomerModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+    }
+
+    fun getCustomerByRemoteIds(site: SiteModel, remoteCustomerId: List<Long>): List<WCCustomerModel> {
+        return WellSql.select(WCCustomerModel::class.java)
+                .where().beginGroup()
+                .isIn(WCCustomerModelTable.REMOTE_CUSTOMER_ID, remoteCustomerId)
+                .equals(WCCustomerModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .asModel
+    }
+    // endregion
+
+    // region insert-update
+    fun insertOrUpdateCustomer(customer: WCCustomerModel): Int {
+        val customerResult = WellSql.select(WCCustomerModel::class.java)
+                .where().beginGroup()
+                .equals(WCCustomerModelTable.ID, customer.id)
+                .or()
+                .beginGroup()
+                .equals(WCCustomerModelTable.REMOTE_CUSTOMER_ID, customer.remoteCustomerId)
+                .equals(WCCustomerModelTable.LOCAL_SITE_ID, customer.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (customerResult == null) {
+            // Insert
+            WellSql.insert(customer).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            WellSql.update(WCCustomerModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCCustomerModelTable.REMOTE_CUSTOMER_ID, customerResult.remoteCustomerId)
+                    .equals(WCCustomerModelTable.LOCAL_SITE_ID, customerResult.localSiteId)
+                    .endGroup().endWhere()
+                    .put(customer, UpdateAllExceptId(WCCustomerModel::class.java)).execute()
+        }
+    }
+
+    fun insertOrUpdateCustomers(customers: List<WCCustomerModel>): Int {
+        return customers.sumOf { insertOrUpdateCustomer(it) }
+    }
+
+    fun insertCustomers(customers: List<WCCustomerModel>) {
+        customers.forEach {
+            WellSql.insert(it).asSingleTransaction(true).execute()
+        }
+    }
+    // endregion
+
+    // region delete
+    fun deleteCustomersForSite(site: SiteModel): Int {
+        return WellSql.delete(WCCustomerModel::class.java)
+                .where().beginGroup()
+                .equals(WCCustomerModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup()
+                .endWhere()
+                .execute()
+    }
+    // endregion
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/OrderSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/OrderSqlUtils.kt
new file mode 100644
index 00000000000..4ef50255520
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/OrderSqlUtils.kt
@@ -0,0 +1,193 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCOrderShipmentProviderModelTable
+import com.wellsql.generated.WCOrderShipmentTrackingModelTable
+import com.wellsql.generated.WCOrderStatusModelTable
+import com.wellsql.generated.WCOrderSummaryModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+
+object OrderSqlUtils {
+    private const val CHUNK_SIZE = 200
+
+    fun insertOrUpdateOrderSummaries(orderSummaries: List<WCOrderSummaryModel>) {
+        WellSql.insert(orderSummaries).asSingleTransaction(true).execute()
+    }
+
+    /**
+     * Returns a list of [WCOrderSummaryModel]s that match the [remoteOrderIds] provided. This method uses
+     * Kotlin's chunked functionality to ensure we don't crash with the "SQLiteException: too many SQL variables"
+     * exception.
+     */
+    fun getOrderSummariesForRemoteIds(site: SiteModel, remoteOrderIds: List<Long>): List<WCOrderSummaryModel> {
+        if (remoteOrderIds.isEmpty()) {
+            return emptyList()
+        }
+
+        return remoteOrderIds.chunked(CHUNK_SIZE).map { doGetOrderSummariesForRemoteIds(site, it) }.flatten()
+    }
+
+    private fun doGetOrderSummariesForRemoteIds(
+        site: SiteModel,
+        orderIds: List<Long>
+    ): List<WCOrderSummaryModel> {
+        return WellSql.select(WCOrderSummaryModel::class.java)
+                .where()
+                .equals(WCOrderSummaryModelTable.LOCAL_SITE_ID, site.id)
+                .isIn(WCOrderSummaryModelTable.REMOTE_ORDER_ID, orderIds)
+                .endWhere()
+                .asModel
+    }
+
+    fun deleteOrderSummariesForSite(site: SiteModel) {
+        WellSql.delete(WCOrderSummaryModel::class.java)
+                .where()
+                .equals(WCOrderSummaryModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    fun deleteOrderSummaryById(site: SiteModel, orderId: Long) {
+        WellSql.delete(WCOrderSummaryModel::class.java)
+                .where()
+                .equals(WCOrderSummaryModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCOrderSummaryModelTable.REMOTE_ORDER_ID, orderId)
+                .endWhere()
+                .execute()
+    }
+
+    fun insertOrUpdateOrderStatusOption(orderStatus: WCOrderStatusModel): Int {
+        val result = WellSql.select(WCOrderStatusModel::class.java)
+                .where().beginGroup()
+                .equals(WCOrderStatusModelTable.ID, orderStatus.id)
+                .or()
+                .equals(WCOrderStatusModelTable.STATUS_KEY, orderStatus.statusKey)
+                .endGroup().endWhere().asModel
+
+        return if (result.isEmpty()) {
+            // Insert
+            WellSql.insert(orderStatus).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result[0].id
+            WellSql.update(WCOrderStatusModel::class.java).whereId(oldId)
+                    .put(orderStatus, UpdateAllExceptId(WCOrderStatusModel::class.java)).execute()
+        }
+    }
+
+    fun getOrderStatusOptionsForSite(site: SiteModel): List<WCOrderStatusModel> =
+            WellSql.select(WCOrderStatusModel::class.java)
+                    .where()
+                    .equals(WCOrderStatusModelTable.LOCAL_SITE_ID, site.id)
+                    .endWhere().asModel
+
+    fun getOrderStatusOptionForSiteByKey(site: SiteModel, key: String): WCOrderStatusModel? =
+            WellSql.select(WCOrderStatusModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCOrderStatusModelTable.STATUS_KEY, key)
+                    .equals(WCOrderStatusModelTable.LOCAL_SITE_ID, site.id)
+                    .endGroup().endWhere().asModel.firstOrNull()
+
+    fun deleteOrderStatusOption(orderStatus: WCOrderStatusModel): Int =
+            WellSql.delete(WCOrderStatusModel::class.java).whereId(orderStatus.id)
+
+    fun insertOrIgnoreOrderShipmentTracking(tracking: WCOrderShipmentTrackingModel): Int {
+        val result = WellSql.select(WCOrderShipmentTrackingModel::class.java)
+                .where().beginGroup()
+                .equals(WCOrderShipmentTrackingModelTable.ID, tracking.id)
+                .or()
+                .beginGroup()
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_SITE_ID, tracking.localSiteId)
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_ORDER_ID, tracking.orderId)
+                .equals(WCOrderShipmentTrackingModelTable.REMOTE_TRACKING_ID, tracking.remoteTrackingId)
+                .endGroup().endGroup().endWhere().asModel
+
+        return if (result.isEmpty()) {
+            WellSql.insert(tracking).asSingleTransaction(true).execute()
+            1
+        } else {
+            0
+        }
+    }
+
+    fun getShipmentTrackingsForOrder(
+        site: SiteModel,
+        orderId: Long
+    ): List<WCOrderShipmentTrackingModel> {
+        return WellSql.select(WCOrderShipmentTrackingModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_ORDER_ID, orderId)
+                .endGroup().endWhere()
+                .orderBy(WCOrderShipmentTrackingModelTable.DATE_SHIPPED, SelectQuery.ORDER_DESCENDING).asModel
+    }
+
+    fun getShipmentTrackingByTrackingNumber(
+        site: SiteModel,
+        orderId: Long,
+        trackingNumber: String
+    ): WCOrderShipmentTrackingModel? {
+        return WellSql.select(WCOrderShipmentTrackingModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCOrderShipmentTrackingModelTable.LOCAL_ORDER_ID, orderId)
+                .equals(WCOrderShipmentTrackingModelTable.TRACKING_NUMBER, trackingNumber)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun deleteOrderShipmentTrackingById(tracking: WCOrderShipmentTrackingModel): Int =
+            WellSql.delete(WCOrderShipmentTrackingModel::class.java).whereId(tracking.id)
+
+    fun deleteOrderShipmentTrackingsForSite(site: SiteModel): Int =
+            WellSql.delete(WCOrderShipmentTrackingModel::class.java)
+                    .where()
+                    .equals(WCOrderShipmentTrackingModelTable.LOCAL_SITE_ID, site.id)
+                    .endWhere()
+                    .execute()
+
+    fun deleteOrderShipmentProvidersForSite(site: SiteModel): Int =
+            WellSql.delete(WCOrderShipmentProviderModel::class.java)
+                    .where()
+                    .equals(WCOrderShipmentProviderModelTable.LOCAL_SITE_ID, site.id)
+                    .endWhere()
+                    .execute()
+
+    fun insertOrIgnoreOrderShipmentProvider(provider: WCOrderShipmentProviderModel): Int {
+        val result = WellSql.select(WCOrderShipmentProviderModel::class.java)
+                .where().beginGroup()
+                .equals(WCOrderShipmentProviderModelTable.ID, provider.id)
+                .or()
+                .beginGroup()
+                .equals(WCOrderShipmentProviderModelTable.LOCAL_SITE_ID, provider.localSiteId)
+                .equals(WCOrderShipmentProviderModelTable.CARRIER_NAME, provider.carrierName)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel
+
+        return if (result.isEmpty()) {
+            // Insert
+            WellSql.insert(provider).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Ignore
+            0
+        }
+    }
+
+    fun getOrderShipmentProvidersForSite(site: SiteModel): List<WCOrderShipmentProviderModel> =
+            WellSql.select(WCOrderShipmentProviderModel::class.java)
+                    .where()
+                    .equals(WCOrderShipmentProviderModelTable.LOCAL_SITE_ID, site.id)
+                    .endWhere()
+                    .orderBy(WCOrderShipmentProviderModelTable.COUNTRY, SelectQuery.ORDER_ASCENDING)
+                    .asModel
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductSqlUtils.kt
new file mode 100644
index 00000000000..acef5c29a0c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductSqlUtils.kt
@@ -0,0 +1,955 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.reflect.TypeToken
+import com.wellsql.generated.WCProductCategoryModelTable
+import com.wellsql.generated.WCProductModelTable
+import com.wellsql.generated.WCProductReviewModelTable
+import com.wellsql.generated.WCProductShippingClassModelTable
+import com.wellsql.generated.WCProductTagModelTable
+import com.wellsql.generated.WCProductVariationModelTable
+import com.yarolegovich.wellsql.ConditionClauseBuilder
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onStart
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCBundledProduct
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductComponent
+import org.wordpress.android.fluxc.model.WCProductImageModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductShippingClassModel
+import org.wordpress.android.fluxc.model.WCProductTagModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_CATEGORY_SORTING
+import org.wordpress.android.fluxc.store.WCProductStore.Companion.DEFAULT_PRODUCT_SORTING
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting.NAME_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting.NAME_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductFilterOption
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.DATE_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.DATE_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_DESC
+import org.wordpress.android.fluxc.store.WCProductStore.SkuSearchOptions
+import java.util.Locale
+
+@Suppress("LargeClass")
+object ProductSqlUtils {
+    private const val DEBOUNCE_DELAY_FOR_OBSERVERS = 50L
+    private val productsUpdatesTrigger = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    private val variationsUpdatesTrigger = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    private val categoriesUpdatesTrigger = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    private val gson by lazy { Gson() }
+
+    fun observeProductsCount(
+        site: SiteModel,
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        excludeSampleProducts: Boolean = false
+    ): Flow<Long> {
+        return productsUpdatesTrigger
+            .onStart { emit(Unit) }
+            .debounce(DEBOUNCE_DELAY_FOR_OBSERVERS)
+            .mapLatest {
+                getProductCountForSite(site, filterOptions, excludeSampleProducts)
+            }
+            .distinctUntilChanged()
+            .flowOn(Dispatchers.IO)
+    }
+
+    fun observeProducts(
+        site: SiteModel,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        excludeSampleProducts: Boolean = false,
+        limit: Int? = null
+    ): Flow<List<WCProductModel>> {
+        return productsUpdatesTrigger
+            .onStart { emit(Unit) }
+            .debounce(DEBOUNCE_DELAY_FOR_OBSERVERS)
+            .mapLatest {
+                if (filterOptions.isEmpty()) {
+                    getProductsForSite(
+                        site = site,
+                        sortType = sortType,
+                        excludeSampleProducts = excludeSampleProducts,
+                        limit = limit
+                    )
+                } else {
+                    getProducts(
+                        site = site,
+                        filterOptions = filterOptions,
+                        sortType = sortType,
+                        excludeSampleProducts = excludeSampleProducts,
+                        limit = limit
+                    )
+                }
+            }
+            .flowOn(Dispatchers.IO)
+    }
+
+    fun observeVariations(site: SiteModel, productId: Long): Flow<List<WCProductVariationModel>> {
+        return variationsUpdatesTrigger
+            .onStart { emit(Unit) }
+            .debounce(DEBOUNCE_DELAY_FOR_OBSERVERS)
+            .mapLatest {
+                getVariationsForProduct(site, productId)
+            }
+            .flowOn(Dispatchers.IO)
+    }
+
+    fun observeCategories(site: SiteModel, sortType: ProductCategorySorting): Flow<List<WCProductCategoryModel>> {
+        return categoriesUpdatesTrigger
+            .onStart { emit(Unit) }
+            .debounce(DEBOUNCE_DELAY_FOR_OBSERVERS)
+            .mapLatest {
+                getProductCategoriesForSite(site, sortType)
+            }
+            .flowOn(Dispatchers.IO)
+    }
+
+    fun getCompositeProducts(site: SiteModel, remoteProductId: Long): List<WCProductComponent> {
+        val productModel = getProductByRemoteId(site, remoteProductId)
+
+        return productModel?.let {
+            val responseType = object : TypeToken<List<WCProductComponent>>() {}.type
+            gson.fromJson(it.compositeComponents, responseType) as? List<WCProductComponent>
+        } ?: emptyList()
+    }
+
+    private fun getBundledProducts(site: SiteModel, remoteProductId: Long): List<WCBundledProduct> {
+        val productModel = WellSql.select(WCProductModel::class.java)
+            .where().beginGroup()
+            .equals(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+            .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+            .endGroup().endWhere()
+            .asModel.firstOrNull()
+
+        return productModel?.let {
+            val responseType = object : TypeToken<List<WCBundledProduct>>() {}.type
+            gson.fromJson(it.bundledItems, responseType) as? List<WCBundledProduct>
+        } ?: emptyList()
+    }
+
+    fun getBundledProductsCount(site: SiteModel, remoteProductId: Long): Int {
+        val bundledItems = getBundledProducts(site, remoteProductId)
+        return bundledItems.size
+    }
+
+    fun observeBundledProducts(
+        site: SiteModel,
+        remoteProductId: Long
+    ): Flow<List<WCBundledProduct>> {
+        return productsUpdatesTrigger
+            .onStart { emit(Unit) }
+            .debounce(DEBOUNCE_DELAY_FOR_OBSERVERS)
+            .mapLatest {
+                getBundledProducts(site, remoteProductId)
+            }
+            .flowOn(Dispatchers.IO)
+    }
+
+    fun insertOrUpdateProduct(product: WCProductModel): Int {
+        val productResult = WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.ID, product.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductModelTable.REMOTE_PRODUCT_ID, product.remoteProductId)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, product.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (productResult == null) {
+            // Insert
+            WellSql.insert(product).execute()
+            productsUpdatesTrigger.tryEmit(Unit)
+            1
+        } else {
+            // Update
+            WellSql.update(WCProductModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCProductModelTable.REMOTE_PRODUCT_ID, productResult.remoteProductId)
+                    .equals(WCProductModelTable.LOCAL_SITE_ID, productResult.localSiteId)
+                    .endGroup().endWhere()
+                    .put(product, UpdateAllExceptId(WCProductModel::class.java))
+                    .execute()
+                    .also(::triggerProductsUpdateIfNeeded)
+        }
+    }
+
+    fun insertOrUpdateProducts(products: List<WCProductModel>): Int {
+        var rowsAffected = 0
+        executeInTransaction {
+            products.forEach {
+                rowsAffected += insertOrUpdateProduct(it)
+            }
+        }
+        return rowsAffected
+    }
+
+    fun getProductByRemoteId(site: SiteModel, remoteProductId: Long): WCProductModel? {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getVariationByRemoteId(
+        site: SiteModel,
+        remoteProductId: Long,
+        remoteVariationId: Long
+    ): WCProductVariationModel? {
+        return WellSql.select(WCProductVariationModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductVariationModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .equals(WCProductVariationModelTable.REMOTE_VARIATION_ID, remoteVariationId)
+                .equals(WCProductVariationModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getProductsByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): List<WCProductModel> {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .isIn(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductIds)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .asModel
+    }
+
+    fun getProductCountByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): Int {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .isIn(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductIds)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .count().toInt()
+    }
+
+    fun getVirtualProductCountByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): Int {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .isIn(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductIds)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCProductModelTable.VIRTUAL, true)
+                .endGroup().endWhere()
+                .count().toInt()
+    }
+
+    fun getProducts(
+        site: SiteModel,
+        filterOptions: Map<ProductFilterOption, String>,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        excludedProductIds: List<Long>? = null,
+        searchQuery: String? = null,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        excludeSampleProducts: Boolean = false,
+        limit: Int? = null
+    ): List<WCProductModel> {
+        val queryBuilder = WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .applyProductFilterOptions(filterOptions)
+
+        if (searchQuery?.isNotEmpty() == true) {
+            when(skuSearchOptions) {
+                SkuSearchOptions.Disabled -> {
+                    queryBuilder
+                        .beginGroup()
+                        .contains(WCProductModelTable.NAME, searchQuery)
+                        .or()
+                        .contains(WCProductModelTable.DESCRIPTION, searchQuery)
+                        .or()
+                        .contains(WCProductModelTable.SHORT_DESCRIPTION, searchQuery)
+                        .endGroup()
+                }
+
+                SkuSearchOptions.ExactSearch -> {
+                    queryBuilder.beginGroup()
+                        // The search is case sensitive
+                        .equals(WCProductModelTable.SKU, searchQuery)
+                        .endGroup()
+                }
+
+                SkuSearchOptions.PartialMatch -> {
+                    queryBuilder.beginGroup()
+                        .contains(WCProductModelTable.SKU, searchQuery)
+                        .endGroup()
+                }
+            }
+        }
+
+        excludedProductIds?.let {
+            if (it.isNotEmpty()) {
+                queryBuilder.isNotIn(WCProductModelTable.REMOTE_PRODUCT_ID, it)
+            }
+        }
+
+        if (excludeSampleProducts) {
+            queryBuilder.equals(WCProductModelTable.IS_SAMPLE_PRODUCT, false)
+        }
+
+        val sortOrder = getSortOrder(sortType)
+        val sortField = getSortField(sortType)
+
+        val products = queryBuilder
+                .endGroup().endWhere()
+                .orderBy(sortField, sortOrder)
+                .apply { limit?.let { limit(it) } }
+                .asModel
+
+        return if (sortType == TITLE_ASC || sortType == TITLE_DESC) {
+            sortProductsByName(products, descending = sortType == TITLE_DESC)
+        } else {
+            products
+        }
+    }
+
+    /**
+     * WellSQL doesn't support "COLLATE NOCASE" so we have to manually provide case-insensitive sorting
+     */
+    private fun sortProductsByName(products: List<WCProductModel>, descending: Boolean): List<WCProductModel> {
+        return if (descending) {
+            products.sortedByDescending { it.name.toLowerCase(Locale.getDefault()) }
+        } else {
+            products.sortedBy { it.name.toLowerCase(Locale.getDefault()) }
+        }
+    }
+
+    fun geProductExistsByRemoteId(site: SiteModel, remoteProductId: Long): Boolean {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .exists()
+    }
+
+    fun getProductExistsBySku(site: SiteModel, sku: String): Boolean {
+        return WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.SKU, sku)
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .exists()
+    }
+
+    fun getProductsForSite(
+        site: SiteModel,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        excludeSampleProducts: Boolean = false,
+        limit: Int? = null
+    ): List<WCProductModel> {
+        val sortOrder = getSortOrder(sortType)
+        val sortField = getSortField(sortType)
+        val products = WellSql.select(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .apply {
+                    if (excludeSampleProducts) {
+                        equals(WCProductModelTable.IS_SAMPLE_PRODUCT, false)
+                    }
+                }
+                .endGroup().endWhere()
+                .orderBy(sortField, sortOrder)
+                .apply { limit?.let { limit(it) } }
+                .asModel
+
+        return if (sortType == TITLE_ASC || sortType == TITLE_DESC) {
+            sortProductsByName(products, descending = sortType == TITLE_DESC)
+        } else {
+            products
+        }
+    }
+
+    private fun getSortField(sortType: ProductSorting) =
+        when (sortType) {
+            TITLE_ASC, TITLE_DESC -> WCProductModelTable.NAME
+            DATE_ASC, DATE_DESC -> WCProductModelTable.DATE_CREATED
+        }
+
+    private fun getSortOrder(sortType: ProductSorting) =
+        when (sortType) {
+            TITLE_ASC, DATE_ASC -> SelectQuery.ORDER_ASCENDING
+            TITLE_DESC, DATE_DESC -> SelectQuery.ORDER_DESCENDING
+        }
+
+    fun deleteProductsForSite(site: SiteModel): Int {
+        return WellSql.delete(WCProductModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup()
+                .endWhere()
+                .execute()
+                .also(::triggerProductsUpdateIfNeeded)
+    }
+
+    fun insertOrUpdateProductVariation(variation: WCProductVariationModel): Int {
+        val result = WellSql.select(WCProductVariationModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductVariationModelTable.ID, variation.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductVariationModelTable.REMOTE_PRODUCT_ID, variation.remoteProductId)
+                .equals(WCProductVariationModelTable.REMOTE_VARIATION_ID, variation.remoteVariationId)
+                .equals(WCProductVariationModelTable.LOCAL_SITE_ID, variation.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(variation).execute()
+            variationsUpdatesTrigger.tryEmit(Unit)
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCProductVariationModel::class.java).whereId(oldId)
+                    .put(variation, UpdateAllExceptId(WCProductVariationModel::class.java))
+                    .execute()
+                    .also(::triggerVariationsUpdateIfNeeded)
+        }
+    }
+
+    fun insertOrUpdateProductVariations(variations: List<WCProductVariationModel>): Int {
+        var rowsAffected = 0
+        executeInTransaction {
+            variations.forEach {
+                rowsAffected += insertOrUpdateProductVariation(it)
+            }
+        }
+        return rowsAffected
+    }
+
+    fun getVariationsForProduct(site: SiteModel, remoteProductId: Long): List<WCProductVariationModel> {
+        return WellSql.select(WCProductVariationModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCProductVariationModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .equals(WCProductVariationModelTable.LOCAL_SITE_ID, site.id)
+                .endGroup().endWhere()
+                .orderBy(WCProductVariationModelTable.DATE_CREATED, SelectQuery.ORDER_ASCENDING)
+                .asModel
+    }
+
+    fun deleteVariationsForProduct(site: SiteModel, remoteProductId: Long): Int {
+        return WellSql.delete(WCProductVariationModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductVariationModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCProductVariationModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .endGroup()
+                .endWhere()
+                .execute()
+                .also(::triggerVariationsUpdateIfNeeded)
+    }
+
+    fun getProductCountForSite(
+        site: SiteModel,
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        excludeSampleProducts: Boolean = false
+    ): Long {
+        return WellSql.select(WCProductModel::class.java)
+            .where()
+            .beginGroup()
+            .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+            .applyProductFilterOptions(filterOptions)
+            .apply {
+                if (excludeSampleProducts) {
+                    equals(WCProductModelTable.IS_SAMPLE_PRODUCT, false)
+                }
+            }
+            .endGroup()
+            .endWhere()
+            .count()
+    }
+
+    fun insertOrUpdateProductReviews(productReviews: List<WCProductReviewModel>): Int {
+        var rowsAffected = 0
+        executeInTransaction {
+            productReviews.forEach {
+                rowsAffected += insertOrUpdateProductReview(it)
+            }
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateProductReview(productReview: WCProductReviewModel): Int {
+        val result = WellSql.select(WCProductReviewModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductReviewModelTable.ID, productReview.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductReviewModelTable.REMOTE_PRODUCT_REVIEW_ID, productReview.remoteProductReviewId)
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, productReview.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(productReview).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCProductReviewModel::class.java).whereId(oldId)
+                    .put(productReview, UpdateAllExceptId(WCProductReviewModel::class.java)).execute()
+        }
+    }
+
+    fun deleteProductReview(productReview: WCProductReviewModel) =
+            WellSql.delete(WCProductReviewModel::class.java)
+                    .where()
+                    .equals(WCProductReviewModelTable.REMOTE_PRODUCT_REVIEW_ID, productReview.remoteProductReviewId)
+                    .endWhere().execute()
+
+    fun getProductReviewByRemoteId(
+        localSiteId: Int,
+        remoteReviewId: Long
+    ): WCProductReviewModel? {
+        return WellSql.select(WCProductReviewModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCProductReviewModelTable.REMOTE_PRODUCT_REVIEW_ID, remoteReviewId)
+                .endGroup()
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getProductReviewsForSite(site: SiteModel): List<WCProductReviewModel> {
+        return WellSql.select(WCProductReviewModel::class.java)
+                .where()
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .orderBy(WCProductReviewModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .asModel
+    }
+
+    fun getProductReviewsByReviewIds(reviewIds: List<Long>): List<WCProductReviewModel> {
+        return WellSql.select(WCProductReviewModel::class.java)
+                .where()
+                .isIn(WCProductReviewModelTable.REMOTE_PRODUCT_REVIEW_ID, reviewIds)
+                .endWhere()
+                .orderBy(WCProductReviewModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .asModel
+    }
+
+    fun getProductReviewsForProductAndSiteId(
+        localSiteId: Int,
+        remoteProductId: Long
+    ): List<WCProductReviewModel> {
+        return WellSql.select(WCProductReviewModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductReviewModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, localSiteId)
+                .endGroup().endWhere()
+                .orderBy(WCProductReviewModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .asModel
+    }
+
+    fun deleteAllProductReviewsForSite(site: SiteModel): Int {
+        return WellSql.delete(WCProductReviewModel::class.java)
+                .where()
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, site.id)
+                .or()
+                .equals(WCProductReviewModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere().execute()
+    }
+
+    fun deleteAllProductReviews() = WellSql.delete(WCProductReviewModel::class.java).execute()
+
+    fun updateProductImages(product: WCProductModel, imageList: List<WCProductImageModel>): Int {
+        val jsonImageList = JsonArray()
+        imageList.forEach { image ->
+            JsonObject().also { jsonImage ->
+                jsonImage.addProperty("id", image.id)
+                jsonImage.addProperty("name", image.name)
+                jsonImage.addProperty("src", image.src)
+                jsonImage.addProperty("alt", image.alt)
+                jsonImageList.add(jsonImage)
+            }
+        }
+
+        product.images = jsonImageList.toString()
+        return insertOrUpdateProduct(product)
+    }
+
+    fun deleteProductImage(site: SiteModel, remoteProductId: Long, remoteMediaId: Long): Boolean {
+        val product = getProductByRemoteId(site, remoteProductId) ?: return false
+
+        // build a new image list containing all the product images except the passed one
+        val imageList = ArrayList<WCProductImageModel>()
+        product.getImageListOrEmpty().forEach { image ->
+            if (image.id != remoteMediaId) {
+                imageList.add(image)
+            }
+        }
+        return if (imageList.size == product.getImageListOrEmpty().size) {
+            false
+        } else {
+            updateProductImages(product, imageList) > 0
+        }
+    }
+
+    fun deleteProduct(site: SiteModel, remoteProductId: Long): Int {
+        return WellSql.delete(WCProductModel::class.java)
+                .where()
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCProductModelTable.REMOTE_PRODUCT_ID, remoteProductId)
+                .endWhere()
+                .execute()
+                .also(::triggerProductsUpdateIfNeeded)
+    }
+
+    fun getProductShippingClassListForSite(
+        localSiteId: Int
+    ): List<WCProductShippingClassModel> {
+        return WellSql.select(WCProductShippingClassModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductShippingClassModelTable.LOCAL_SITE_ID, localSiteId)
+                .endGroup().endWhere()
+                .asModel
+    }
+
+    fun getProductShippingClassByRemoteId(
+        remoteShippingClassId: Long,
+        localSiteId: Int
+    ): WCProductShippingClassModel? {
+        return WellSql.select(WCProductShippingClassModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductShippingClassModelTable.REMOTE_SHIPPING_CLASS_ID, remoteShippingClassId)
+                .equals(WCProductShippingClassModelTable.LOCAL_SITE_ID, localSiteId)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun deleteProductShippingClassListForSite(site: SiteModel): Int {
+        return WellSql.delete(WCProductShippingClassModel::class.java)
+                .where()
+                .equals(WCProductShippingClassModelTable.LOCAL_SITE_ID, site.id)
+                .or()
+                .equals(WCProductShippingClassModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere().execute()
+    }
+
+    fun insertOrUpdateProductShippingClassList(shippingClassList: List<WCProductShippingClassModel>): Int {
+        var rowsAffected = 0
+        executeInTransaction {
+            shippingClassList.forEach {
+                rowsAffected += insertOrUpdateProductShippingClass(it)
+            }
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateProductShippingClass(shippingClass: WCProductShippingClassModel): Int {
+        val result = WellSql.select(WCProductShippingClassModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductShippingClassModelTable.ID, shippingClass.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductShippingClassModelTable.LOCAL_SITE_ID, shippingClass.localSiteId)
+                .equals(WCProductShippingClassModelTable.REMOTE_SHIPPING_CLASS_ID, shippingClass.remoteShippingClassId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(shippingClass).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCProductShippingClassModel::class.java).whereId(oldId)
+                    .put(shippingClass, UpdateAllExceptId(WCProductShippingClassModel::class.java)).execute()
+        }
+    }
+
+    private fun sortCategoriesByName(
+        categories: List<WCProductCategoryModel>,
+        descending: Boolean
+    ): List<WCProductCategoryModel> {
+        return if (descending) {
+            categories.sortedByDescending { it.name.toLowerCase(Locale.getDefault()) }
+        } else {
+            categories.sortedBy { it.name.toLowerCase(Locale.getDefault()) }
+        }
+    }
+
+    fun getProductCategoriesForSite(
+        site: SiteModel,
+        sortType: ProductCategorySorting = DEFAULT_CATEGORY_SORTING
+    ): List<WCProductCategoryModel> {
+        val sortOrder = when (sortType) {
+            NAME_ASC -> SelectQuery.ORDER_ASCENDING
+            NAME_DESC -> SelectQuery.ORDER_DESCENDING
+        }
+        val sortField = when (sortType) {
+            NAME_ASC, NAME_DESC -> WCProductCategoryModelTable.NAME
+        }
+        val categories = WellSql.select(WCProductCategoryModel::class.java)
+                .where()
+                .equals(WCProductModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .orderBy(sortField, sortOrder)
+                .asModel
+
+        return if (sortType == NAME_ASC || sortType == NAME_DESC) {
+            sortCategoriesByName(categories, descending = sortType == NAME_DESC)
+        } else {
+            categories
+        }
+    }
+
+    fun getProductCategoryByRemoteId(
+        localSiteId: Int,
+        categoryId: Long
+    ): WCProductCategoryModel? {
+        return WellSql.select(WCProductCategoryModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCProductCategoryModelTable.REMOTE_CATEGORY_ID, categoryId)
+                .endGroup()
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getProductCategoriesByRemoteIds(
+        site: SiteModel,
+        categoryIds: List<Long>
+    ): List<WCProductCategoryModel> {
+        return WellSql.select(WCProductCategoryModel::class.java)
+            .where()
+            .beginGroup()
+            .isIn(WCProductCategoryModelTable.REMOTE_CATEGORY_ID, categoryIds)
+            .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, site.id)
+            .endGroup().endWhere()
+            .asModel
+    }
+
+    fun getProductCategoryByNameAndParentId(
+        localSiteId: Int,
+        categoryName: String,
+        parentId: Long
+    ): WCProductCategoryModel? {
+        return WellSql.select(WCProductCategoryModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCProductCategoryModelTable.NAME, categoryName)
+                .equals(WCProductCategoryModelTable.PARENT, parentId)
+                .endGroup()
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun insertOrUpdateProductCategories(productCategories: List<WCProductCategoryModel>): Int {
+        var rowsAffected = 0
+        executeInTransaction {
+            productCategories.forEach {
+                rowsAffected += insertOrUpdateProductCategory(it)
+            }
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateProductCategory(productCategory: WCProductCategoryModel): Int {
+        val result = WellSql.select(WCProductCategoryModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductCategoryModelTable.ID, productCategory.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductCategoryModelTable.REMOTE_CATEGORY_ID, productCategory.remoteCategoryId)
+                .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, productCategory.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(productCategory).execute()
+            categoriesUpdatesTrigger.tryEmit(Unit)
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCProductCategoryModel::class.java).whereId(oldId)
+                    .put(productCategory, UpdateAllExceptId(WCProductCategoryModel::class.java))
+                    .execute()
+                    .also(::triggerCategoriesUpdateIfNeeded)
+        }
+    }
+
+    fun deleteProductCategory(productCategory: WCProductCategoryModel) =
+            WellSql.delete(WCProductCategoryModel::class.java)
+                .where()
+                .equals(WCProductCategoryModelTable.REMOTE_CATEGORY_ID, productCategory.remoteCategoryId)
+                .endWhere().execute()
+
+    fun deleteAllProductCategoriesForSite(site: SiteModel): Int {
+        return WellSql.delete(WCProductCategoryModel::class.java)
+                .where()
+                .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, site.id)
+                .or()
+                .equals(WCProductCategoryModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere()
+                .execute()
+                .also(::triggerCategoriesUpdateIfNeeded)
+    }
+
+    fun deleteAllProductCategories() = WellSql.delete(WCProductCategoryModel::class.java)
+        .execute()
+        .also(::triggerCategoriesUpdateIfNeeded)
+
+    fun getProductTagsForSite(
+        localSiteId: Int
+    ): List<WCProductTagModel> {
+        return WellSql.select(WCProductTagModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, localSiteId)
+                .endGroup().endWhere()
+                .asModel
+    }
+
+    fun getProductTagsByNames(
+        localSiteId: Int,
+        tags: List<String>
+    ): List<WCProductTagModel> {
+        return WellSql.select(WCProductTagModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, localSiteId)
+                .isIn(WCProductModelTable.NAME, tags)
+                .endGroup().endWhere()
+                .asModel
+    }
+
+    fun getProductTagByName(
+        localSiteId: Int,
+        tagName: String
+    ): WCProductTagModel? {
+        return WellSql.select(WCProductTagModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCProductTagModelTable.NAME, tagName)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getProductTagByRemoteId(
+        remoteTagId: Long,
+        localSiteId: Int
+    ): WCProductTagModel? {
+        return WellSql.select(WCProductTagModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductTagModelTable.REMOTE_TAG_ID, remoteTagId)
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, localSiteId)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun deleteProductTagsForSite(site: SiteModel): Int {
+        return WellSql.delete(WCProductTagModel::class.java)
+                .where()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, site.id)
+                .or()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere().execute()
+    }
+
+    fun insertOrUpdateProductTags(tags: List<WCProductTagModel>): Int {
+        var rowsAffected = 0
+        tags.forEach {
+            rowsAffected += insertOrUpdateProductTag(it)
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateProductTag(tag: WCProductTagModel): Int {
+        val result = WellSql.select(WCProductTagModel::class.java)
+                .where().beginGroup()
+                .equals(WCProductTagModelTable.ID, tag.id)
+                .or()
+                .beginGroup()
+                .equals(WCProductTagModelTable.LOCAL_SITE_ID, tag.localSiteId)
+                .equals(WCProductTagModelTable.REMOTE_TAG_ID, tag.remoteTagId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(tag).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCProductTagModel::class.java).whereId(oldId)
+                    .put(tag, UpdateAllExceptId(WCProductTagModel::class.java)).execute()
+        }
+    }
+
+    private fun executeInTransaction(block: () -> Unit) {
+        val db = WellSql.giveMeWritableDb()
+        db.beginTransaction()
+
+        try {
+            block()
+            db.setTransactionSuccessful()
+        } finally {
+            db.endTransaction()
+        }
+    }
+
+    private fun triggerProductsUpdateIfNeeded(affectedRows: Int) {
+        if (affectedRows != 0) productsUpdatesTrigger.tryEmit(Unit)
+    }
+
+    private fun triggerVariationsUpdateIfNeeded(affectedRows: Int) {
+        if (affectedRows != 0) variationsUpdatesTrigger.tryEmit(Unit)
+    }
+
+    private fun triggerCategoriesUpdateIfNeeded(affectedRows: Int) {
+        if (affectedRows != 0) categoriesUpdatesTrigger.tryEmit(Unit)
+    }
+
+    private fun ConditionClauseBuilder<SelectQuery<WCProductModel>>.applyProductFilterOptions(
+        filterOptions: Map<ProductFilterOption, String>
+    ): ConditionClauseBuilder<SelectQuery<WCProductModel>> {
+        if (filterOptions.containsKey(ProductFilterOption.STATUS)) {
+            equals(WCProductModelTable.STATUS, filterOptions[ProductFilterOption.STATUS])
+        }
+        if (filterOptions.containsKey(ProductFilterOption.STOCK_STATUS)) {
+            equals(WCProductModelTable.STOCK_STATUS, filterOptions[ProductFilterOption.STOCK_STATUS])
+        }
+        if (filterOptions.containsKey(ProductFilterOption.TYPE)) {
+            equals(WCProductModelTable.TYPE, filterOptions[ProductFilterOption.TYPE])
+        }
+        if (filterOptions.containsKey(ProductFilterOption.CATEGORY)) {
+            // Building a custom filter, because in the table a product's categories are saved as JSON string, e.g:
+            // [{"id":1377,"name":"Decor","slug":"decor"},{"id":1374,"name":"Hoodies","slug":"hoodies"}]
+            val categoryFilter = "\"id\":${filterOptions[ProductFilterOption.CATEGORY]},"
+            contains(WCProductModelTable.CATEGORIES, categoryFilter)
+        }
+        return this
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt
new file mode 100644
index 00000000000..52ead0a6255
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/ProductStorageHelper.kt
@@ -0,0 +1,90 @@
+package org.wordpress.android.fluxc.persistence
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.ProductWithMetaData
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+import javax.inject.Inject
+
+class ProductStorageHelper @Inject constructor(
+    private val productSqlUtils: ProductSqlUtils,
+    private val metaDataDao: MetaDataDao
+) {
+    suspend fun getProduct(site: SiteModel, remoteProductId: Long): ProductWithMetaData? {
+        val product = withContext(Dispatchers.IO) {
+            productSqlUtils.getProductByRemoteId(site, remoteProductId)
+        } ?: return null
+        val metadata = getProductMetadata(site, remoteProductId)
+        return ProductWithMetaData(product, metadata)
+    }
+
+    suspend fun getProductMetadata(site: SiteModel, remoteProductId: Long): List<WCMetaData> {
+        return metaDataDao.getMetaData(site.localId(), remoteProductId).map { it.toDomainModel() }
+    }
+
+    suspend fun upsertProduct(productWithMetaData: ProductWithMetaData): Int {
+        val (product, metadata) = productWithMetaData
+        val rowsAffected = withContext(Dispatchers.IO) {
+            productSqlUtils.insertOrUpdateProduct(product)
+        }
+
+        metaDataDao.updateMetaData(
+            parentItemId = product.remoteProductId,
+            localSiteId = LocalId(product.localSiteId),
+            metaData = metadata.map {
+                MetaDataEntity.fromDomainModel(
+                    metaData = it,
+                    localSiteId = LocalId(product.localSiteId),
+                    parentItemId = product.remoteProductId,
+                    parentItemType = MetaDataParentItemType.PRODUCT
+                )
+            }
+        )
+        return rowsAffected
+    }
+
+    suspend fun upsertProducts(productsWithMetaData: List<ProductWithMetaData>): Int {
+        val products = productsWithMetaData.map { it.product }
+        val rowsAffected = withContext(Dispatchers.IO) {
+            productSqlUtils.insertOrUpdateProducts(products)
+        }
+
+        productsWithMetaData.forEach { productWithMetaData ->
+            val (product, metadata) = productWithMetaData
+            metaDataDao.updateMetaData(
+                parentItemId = product.remoteProductId,
+                localSiteId = LocalId(product.localSiteId),
+                metaData = metadata.map {
+                    MetaDataEntity.fromDomainModel(
+                        metaData = it,
+                        localSiteId = LocalId(product.localSiteId),
+                        parentItemId = product.remoteProductId,
+                        parentItemType = MetaDataParentItemType.PRODUCT
+                    )
+                }
+            )
+        }
+
+        return rowsAffected
+    }
+
+    suspend fun deleteProduct(site: SiteModel, remoteProductId: Long): Int {
+        val rowsAffected = withContext(Dispatchers.IO) {
+            productSqlUtils.deleteProduct(site, remoteProductId)
+        }
+        metaDataDao.deleteMetaData(site.localId(), remoteProductId)
+        return rowsAffected
+    }
+
+    suspend fun deleteProductsForSite(site: SiteModel) {
+        withContext(Dispatchers.IO) {
+            productSqlUtils.deleteProductsForSite(site)
+        }
+        metaDataDao.deleteMetaDataForSite(site.localId(), MetaDataParentItemType.PRODUCT)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/TransactionExecutor.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/TransactionExecutor.kt
new file mode 100644
index 00000000000..9dbd982b2b6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/TransactionExecutor.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.persistence
+
+interface TransactionExecutor {
+    suspend fun <R> executeInTransaction(block: suspend () -> R): R
+    fun <R> runInTransaction(block: () -> R): R
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCAndroidDatabase.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCAndroidDatabase.kt
new file mode 100644
index 00000000000..7f4bf71f905
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCAndroidDatabase.kt
@@ -0,0 +1,179 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.Context
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.room.withTransaction
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.taxes.TaxBasedOnSettingEntity
+import org.wordpress.android.fluxc.model.taxes.TaxRateEntity
+import org.wordpress.android.fluxc.persistence.converters.BigDecimalConverter
+import org.wordpress.android.fluxc.persistence.converters.LocalIdConverter
+import org.wordpress.android.fluxc.persistence.converters.LongListConverter
+import org.wordpress.android.fluxc.persistence.converters.RemoteIdConverter
+import org.wordpress.android.fluxc.persistence.converters.StringListConverter
+import org.wordpress.android.fluxc.persistence.dao.AddonsDao
+import org.wordpress.android.fluxc.persistence.dao.CouponsDao
+import org.wordpress.android.fluxc.persistence.dao.CustomerFromAnalyticsDao
+import org.wordpress.android.fluxc.persistence.dao.InboxNotesDao
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrderNotesDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDao
+import org.wordpress.android.fluxc.persistence.dao.ShippingMethodDao
+import org.wordpress.android.fluxc.persistence.dao.TaxBasedOnDao
+import org.wordpress.android.fluxc.persistence.dao.TaxRateDao
+import org.wordpress.android.fluxc.persistence.dao.TopPerformerProductsDao
+import org.wordpress.android.fluxc.persistence.dao.VisitorSummaryStatsDao
+import org.wordpress.android.fluxc.persistence.dao.WooPaymentsDepositsOverviewDao
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonOptionEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEmailEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity
+import org.wordpress.android.fluxc.persistence.entity.CustomerFromAnalyticsEntity
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteActionEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+import org.wordpress.android.fluxc.persistence.entity.ShippingMethodEntity
+import org.wordpress.android.fluxc.persistence.entity.TopPerformerProductEntity
+import org.wordpress.android.fluxc.persistence.entity.VisitorSummaryStatsEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsBalanceEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsOverviewEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEntity
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration13to14
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration14to15
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration16to17
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration17to18
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration18to19
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration19to20
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration23to24
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration32to33
+import org.wordpress.android.fluxc.persistence.migrations.AutoMigration37to38
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_10_11
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_11_12
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_15_16
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_20_21
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_21_22
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_22_23
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_24_25
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_27_28
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_30_31
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_31_32
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_3_4
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_4_5
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_5_6
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_6_7
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_7_8
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_8_9
+import org.wordpress.android.fluxc.persistence.migrations.MIGRATION_9_10
+
+const val WC_DATABASE_VERSION = 38
+
+@Database(
+    version = WC_DATABASE_VERSION,
+    entities = [
+        AddonEntity::class,
+        AddonOptionEntity::class,
+        CouponEntity::class,
+        CouponEmailEntity::class,
+        GlobalAddonGroupEntity::class,
+        OrderNoteEntity::class,
+        OrderEntity::class,
+        MetaDataEntity::class,
+        InboxNoteEntity::class,
+        InboxNoteActionEntity::class,
+        TopPerformerProductEntity::class,
+        TaxBasedOnSettingEntity::class,
+        TaxRateEntity::class,
+        WooPaymentsDepositsOverviewEntity::class,
+        WooPaymentsDepositEntity::class,
+        WooPaymentsManualDepositEntity::class,
+        WooPaymentsBalanceEntity::class,
+        VisitorSummaryStatsEntity::class,
+        ShippingMethodEntity::class,
+        CustomerFromAnalyticsEntity::class
+    ],
+    autoMigrations = [
+        AutoMigration(from = 12, to = 13),
+        AutoMigration(from = 13, to = 14, spec = AutoMigration13to14::class),
+        AutoMigration(from = 14, to = 15, spec = AutoMigration14to15::class),
+        AutoMigration(from = 16, to = 17, spec = AutoMigration16to17::class),
+        AutoMigration(from = 17, to = 18, spec = AutoMigration17to18::class),
+        AutoMigration(from = 18, to = 19, spec = AutoMigration18to19::class),
+        AutoMigration(from = 19, to = 20, spec = AutoMigration19to20::class),
+        AutoMigration(from = 23, to = 24, spec = AutoMigration23to24::class),
+        AutoMigration(from = 25, to = 26),
+        AutoMigration(from = 26, to = 27),
+        AutoMigration(from = 28, to = 29),
+        AutoMigration(from = 29, to = 30),
+        AutoMigration(from = 31, to = 32),
+        AutoMigration(from = 32, to = 33, spec = AutoMigration32to33::class),
+        AutoMigration(from = 33, to = 34),
+        AutoMigration(from = 34, to = 35),
+        AutoMigration(from = 35, to = 36),
+        AutoMigration(from = 36, to = 37),
+        AutoMigration(from = 37, to = 38, spec = AutoMigration37to38::class)
+    ]
+)
+@TypeConverters(
+    value = [
+        LocalIdConverter::class,
+        LongListConverter::class,
+        StringListConverter::class,
+        RemoteIdConverter::class,
+        BigDecimalConverter::class
+    ]
+)
+abstract class WCAndroidDatabase : RoomDatabase(), TransactionExecutor {
+    abstract val addonsDao: AddonsDao
+    abstract val ordersDao: OrdersDao
+    abstract val orderNotesDao: OrderNotesDao
+    abstract val metaDataDao: MetaDataDao
+    abstract val couponsDao: CouponsDao
+    abstract val inboxNotesDao: InboxNotesDao
+    abstract val topPerformerProductsDao: TopPerformerProductsDao
+    abstract val taxBasedOnSettingDao: TaxBasedOnDao
+    abstract val taxRateDao: TaxRateDao
+    abstract val wooPaymentsDepositsOverviewDao: WooPaymentsDepositsOverviewDao
+    abstract val visitorSummaryStatsDao: VisitorSummaryStatsDao
+    abstract val shippingMethodDao: ShippingMethodDao
+    abstract val customerFromAnalyticsDao: CustomerFromAnalyticsDao
+
+    companion object {
+        fun buildDb(applicationContext: Context) = Room.databaseBuilder(
+            applicationContext,
+            WCAndroidDatabase::class.java,
+            "wc-android-database"
+        ).allowMainThreadQueries()
+            .fallbackToDestructiveMigrationOnDowngrade()
+            .fallbackToDestructiveMigrationFrom(1, 2)
+            .addMigrations(MIGRATION_3_4)
+            .addMigrations(MIGRATION_4_5)
+            .addMigrations(MIGRATION_5_6)
+            .addMigrations(MIGRATION_6_7)
+            .addMigrations(MIGRATION_7_8)
+            .addMigrations(MIGRATION_8_9)
+            .addMigrations(MIGRATION_9_10)
+            .addMigrations(MIGRATION_10_11)
+            .addMigrations(MIGRATION_11_12)
+            .addMigrations(MIGRATION_15_16)
+            .addMigrations(MIGRATION_20_21)
+            .addMigrations(MIGRATION_21_22)
+            .addMigrations(MIGRATION_22_23)
+            .addMigrations(MIGRATION_24_25)
+            .addMigrations(MIGRATION_27_28)
+            .addMigrations(MIGRATION_30_31)
+            .addMigrations(MIGRATION_31_32)
+            .build()
+    }
+
+    override suspend fun <R> executeInTransaction(block: suspend () -> R): R =
+        withTransaction(block)
+
+    override fun <R> runInTransaction(block: () -> R): R = runInTransaction(block)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCCountriesSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCCountriesSqlUtils.kt
new file mode 100644
index 00000000000..72308d79b36
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCCountriesSqlUtils.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCLocationsTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.data.WCLocationModel
+
+object WCCountriesSqlUtils {
+    fun getCountries(): List<WCLocationModel> {
+        return WellSql.select(WCLocationModel::class.java)
+                .where()
+                .equals(WCLocationsTable.PARENT_CODE, "")
+                .endWhere()
+                .asModel
+    }
+
+    fun getStates(country: String): List<WCLocationModel> {
+        return if (country.isNotEmpty()) {
+            WellSql.select(WCLocationModel::class.java)
+                .where()
+                .equals(WCLocationsTable.PARENT_CODE, country)
+                .endWhere()
+                .asModel
+        } else {
+            emptyList()
+        }
+    }
+
+    fun insertOrUpdateLocations(locations: List<WCLocationModel>): Int {
+        var rowsAffected = 0
+        locations.forEach {
+            rowsAffected += insertOrUpdateLocation(it)
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateLocation(location: WCLocationModel): Int {
+        val result = WellSql.select(WCLocationModel::class.java)
+                .where()
+                .equals(WCLocationsTable.CODE, location.code)
+                .equals(WCLocationsTable.PARENT_CODE, location.parentCode)
+                .endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(location).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCLocationModel::class.java).whereId(oldId)
+                    .put(location, UpdateAllExceptId(WCLocationModel::class.java)).execute()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGatewaySqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGatewaySqlUtils.kt
new file mode 100644
index 00000000000..2cdd24a0402
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGatewaySqlUtils.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.wellsql.generated.WCGatewaysTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient.GatewayResponse
+
+object WCGatewaySqlUtils {
+    private val gson: Gson by lazy {
+        val builder = GsonBuilder()
+        builder.create()
+    }
+
+    fun insertOrUpdate(site: SiteModel, data: GatewayResponse) =
+            insertOrUpdate(site, listOf(data))
+
+    fun insertOrUpdate(site: SiteModel, data: List<GatewayResponse>) {
+        data.forEach { item ->
+            val json = gson.toJson(item)
+            WellSql.delete(GatewaysTable::class.java)
+                .where()
+                .equals(WCGatewaysTable.LOCAL_SITE_ID, site.id)
+                .equals(WCGatewaysTable.GATEWAY_ID, item.gatewayId)
+                .endWhere()
+                .execute()
+            WellSql.insert(
+                    GatewaysTable(
+                            localSiteId = site.id,
+                            gatewayId = item.gatewayId,
+                            data = json
+                    )
+            ).execute()
+        }
+    }
+
+    fun selectAllGateways(
+        site: SiteModel
+    ): List<GatewayResponse> {
+        val models = WellSql.select(GatewaysTable::class.java)
+                .where()
+                .equals(WCGatewaysTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+        return models.map { gson.fromJson(it.data, GatewayResponse::class.java) }
+    }
+
+    fun selectGateway(
+        site: SiteModel,
+        gatewayId: String
+    ): GatewayResponse? {
+        val model = WellSql.select(GatewaysTable::class.java)
+                .where()
+                .equals(WCGatewaysTable.LOCAL_SITE_ID, site.id)
+                .equals(WCGatewaysTable.GATEWAY_ID, gatewayId)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+        return model?.let { gson.fromJson(it.data, GatewayResponse::class.java) }
+    }
+
+    @Table(name = "WCGateways")
+    data class GatewaysTable(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var gatewayId: String,
+        @Column var data: String
+    ) : Identifiable {
+        constructor() : this(-1, -1, "", "")
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGlobalAttributeSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGlobalAttributeSqlUtils.kt
new file mode 100644
index 00000000000..bd6a6886cdb
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCGlobalAttributeSqlUtils.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCAttributeTermModelTable
+import com.wellsql.generated.WCGlobalAttributeModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeModel
+import org.wordpress.android.fluxc.model.attribute.terms.WCAttributeTermModel
+
+object WCGlobalAttributeSqlUtils {
+    fun getCurrentAttributes(siteID: Int) =
+            WellSql.select(WCGlobalAttributeModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCGlobalAttributeModelTable.LOCAL_SITE_ID, siteID)
+                    .endGroup().endWhere()
+                    .asModel
+                    ?.toList()
+                    .orEmpty()
+
+    fun insertFromScratchCompleteAttributesList(attributes: List<WCGlobalAttributeModel>, siteID: Int) {
+        deleteCompleteAttributesList(siteID)
+        WellSql.insert(attributes)
+                .asSingleTransaction(true).execute()
+    }
+
+    fun insertSingleAttribute(attribute: WCGlobalAttributeModel) = attribute.apply {
+        WellSql.insert(attribute)
+                .asSingleTransaction(true)
+                .execute()
+    }
+
+    fun fetchSingleStoredAttribute(attributeId: Int, siteID: Int) =
+        WellSql.select(WCGlobalAttributeModel::class.java)
+                .where().beginGroup()
+                .equals(WCGlobalAttributeModelTable.REMOTE_ID, attributeId)
+                .equals(WCGlobalAttributeModelTable.LOCAL_SITE_ID, siteID)
+                .endGroup().endWhere()
+                .asModel
+                .takeIf { it.isNotEmpty() }
+                ?.first()
+
+    fun deleteSingleStoredAttribute(attribute: WCGlobalAttributeModel, siteID: Int) = attribute.apply {
+        WellSql.delete(WCGlobalAttributeModel::class.java)
+                .where().beginGroup()
+                .equals(WCGlobalAttributeModelTable.REMOTE_ID, attribute.remoteId)
+                .equals(WCGlobalAttributeModelTable.LOCAL_SITE_ID, siteID)
+                .endGroup().endWhere()
+                .execute()
+    }
+
+    fun updateSingleStoredAttribute(attribute: WCGlobalAttributeModel, siteID: Int) = attribute.apply {
+        WellSql.update(WCGlobalAttributeModel::class.java)
+                .where().beginGroup()
+                .equals(WCGlobalAttributeModelTable.REMOTE_ID, attribute.remoteId)
+                .equals(WCGlobalAttributeModelTable.LOCAL_SITE_ID, siteID)
+                .endGroup().endWhere()
+                .put(attribute)
+                .execute()
+    }
+
+    fun insertOrUpdateSingleAttribute(attribute: WCGlobalAttributeModel, siteID: Int) =
+            fetchSingleStoredAttribute(attribute.remoteId, siteID)
+                    ?.let {
+                        attribute.id = it.id
+                        updateSingleStoredAttribute(attribute, siteID)
+                    }
+                    ?: insertSingleAttribute(attribute)
+
+    fun updateSingleAttributeTermsMapping(attributeID: Int, termsMapping: String, siteID: Int) =
+        fetchSingleStoredAttribute(attributeID, siteID)
+                ?.let {
+                    it.termsId = termsMapping
+                    updateSingleStoredAttribute(it, siteID)
+                }
+
+    fun getTerm(siteID: Int, termID: Int) =
+            WellSql.select(WCAttributeTermModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCAttributeTermModelTable.REMOTE_ID, termID)
+                    .equals(WCAttributeTermModelTable.LOCAL_SITE_ID, siteID)
+                    .endGroup().endWhere()
+                    .asModel
+                    ?.toList()
+                    ?.firstOrNull()
+
+    fun insertAttributeTermsFromScratch(
+        attributeID: Int,
+        siteID: Int,
+        terms: List<WCAttributeTermModel>
+    ) {
+        deleteAllTermsFromSingleAttribute(attributeID, siteID)
+        WellSql.insert(terms)
+                .asSingleTransaction(true)
+                .execute()
+    }
+
+    private fun deleteCompleteAttributesList(siteID: Int) =
+            WellSql.delete(WCGlobalAttributeModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCGlobalAttributeModelTable.LOCAL_SITE_ID, siteID)
+                    .endGroup().endWhere()
+                    .execute()
+
+    private fun deleteAllTermsFromSingleAttribute(attributeID: Int, siteID: Int) =
+            WellSql.delete(WCAttributeTermModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCAttributeTermModelTable.LOCAL_SITE_ID, siteID)
+                    .equals(WCAttributeTermModelTable.ATTRIBUTE_ID, attributeID)
+                    .endGroup().endWhere()
+                    .execute()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCProductSettingsSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCProductSettingsSqlUtils.kt
new file mode 100644
index 00000000000..63d893829de
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCProductSettingsSqlUtils.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCProductSettingsModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductSettingsModel
+
+object WCProductSettingsSqlUtils {
+    fun insertOrUpdateProductSettings(settings: WCProductSettingsModel): Int {
+        val result = WellSql.select(WCProductSettingsModel::class.java)
+                .where()
+                .equals(WCProductSettingsModelTable.LOCAL_SITE_ID, settings.localSiteId)
+                .endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            WellSql.insert(settings).asSingleTransaction(true).execute()
+            1
+        } else {
+            val oldId = result.id
+            WellSql.update(WCProductSettingsModel::class.java).whereId(oldId)
+                    .put(settings, UpdateAllExceptId(WCProductSettingsModel::class.java)).execute()
+        }
+    }
+
+    fun getProductSettingsForSite(site: SiteModel): WCProductSettingsModel? {
+        return WellSql.select(WCProductSettingsModel::class.java)
+                .where()
+                .equals(WCProductSettingsModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCRefundSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCRefundSqlUtils.kt
new file mode 100644
index 00000000000..bf3bacef134
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCRefundSqlUtils.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.wellsql.generated.WCRefundsTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds.RefundRestClient.RefundResponse
+
+object WCRefundSqlUtils {
+    private val gson: Gson by lazy {
+        val builder = GsonBuilder()
+        builder.create()
+    }
+
+    fun insertOrUpdate(site: SiteModel, orderId: Long, data: RefundResponse) =
+            insertOrUpdate(site, orderId, listOf(data))
+
+    fun insertOrUpdate(site: SiteModel, orderId: Long, data: List<RefundResponse>) {
+        data.forEach { item ->
+            val json = gson.toJson(item)
+            WellSql.delete(RefundBuilder::class.java)
+                .where()
+                .equals(WCRefundsTable.LOCAL_SITE_ID, site.id)
+                .equals(WCRefundsTable.ORDER_ID, orderId)
+                .equals(WCRefundsTable.REFUND_ID, item.refundId)
+                .endWhere()
+                .execute()
+            WellSql.insert(
+                    RefundBuilder(
+                            localSiteId = site.id,
+                            orderId = orderId,
+                            refundId = item.refundId,
+                            data = json
+                    )
+            ).execute()
+        }
+    }
+
+    fun selectAllRefunds(
+        site: SiteModel,
+        orderId: Long
+    ): List<RefundResponse> {
+        val models = WellSql.select(RefundBuilder::class.java)
+                .where()
+                .equals(WCRefundsTable.LOCAL_SITE_ID, site.id)
+                .equals(WCRefundsTable.ORDER_ID, orderId)
+                .endWhere()
+                .asModel
+        return models.map { gson.fromJson(it.data, RefundResponse::class.java) }
+    }
+
+    fun selectRefund(
+        site: SiteModel,
+        orderId: Long,
+        refundId: Long
+    ): RefundResponse? {
+        val model = WellSql.select(RefundBuilder::class.java)
+                .where()
+                .equals(WCRefundsTable.LOCAL_SITE_ID, site.id)
+                .equals(WCRefundsTable.ORDER_ID, orderId)
+                .equals(WCRefundsTable.REFUND_ID, refundId)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+        return model?.let { gson.fromJson(it.data, RefundResponse::class.java) }
+    }
+
+    @Table(name = "WCRefunds")
+    data class RefundBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var orderId: Long,
+        @Column var refundId: Long,
+        @Column var data: String
+    ) : Identifiable {
+        constructor() : this(-1, -1, -1, -1, "")
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCSettingsSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCSettingsSqlUtils.kt
new file mode 100644
index 00000000000..0bb5efac49a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCSettingsSqlUtils.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.ContentValues
+import com.wellsql.generated.WCSettingsModelTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition
+
+object WCSettingsSqlUtils {
+    fun insertOrUpdateSettings(settings: WCSettingsModel): Int {
+        val orderResult = WellSql.select(WCSettingsBuilder::class.java)
+                .where()
+                .equals(WCSettingsModelTable.LOCAL_SITE_ID, settings.localSiteId)
+                .endWhere()
+                .asModel
+
+        return if (orderResult.isEmpty()) {
+            // Insert
+            WellSql.insert(settings.toBuilder()).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = orderResult[0].id
+            WellSql.update(WCSettingsBuilder::class.java).whereId(oldId)
+                    .put(settings.toBuilder(), UpdateAllExceptId(WCSettingsBuilder::class.java)).execute()
+        }
+    }
+
+    fun setCouponsEnabled(site: SiteModel, value: Boolean): Int {
+        return WellSql.update(WCSettingsBuilder::class.java)
+            .whereId(site.id)
+            .put(value) {
+                val cv = ContentValues()
+                cv.put(WCSettingsModelTable.COUPONS_ENABLED, it)
+                cv
+            }.execute()
+    }
+
+    fun getSettingsForSite(site: SiteModel): WCSettingsModel? {
+        return WellSql.select(WCSettingsBuilder::class.java)
+                .where()
+                .equals(WCSettingsModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel.firstOrNull()?.build()
+    }
+
+    @Table(name = "WCSettingsModel", addOn = WellSqlConfig.ADDON_WOOCOMMERCE)
+    data class WCSettingsBuilder(
+        @PrimaryKey @Column private var id: Int = 0,
+        @Column var localSiteId: Int = 0,
+        @Column var currencyCode: String = "",
+        @Column var currencyPosition: String = "",
+        @Column var currencyThousandSeparator: String = "",
+        @Column var currencyDecimalSeparator: String = "",
+        @Column var currencyDecimalNumber: Int = 2,
+        @Column var countryCode: String = "",
+        @Column var stateCode: String = "",
+        @Column var address: String = "",
+        @Column var address2: String = "",
+        @Column var city: String = "",
+        @Column var postalCode: String = "",
+        @Column var couponsEnabled: Boolean = false
+    ) : Identifiable {
+        override fun getId() = id
+
+        override fun setId(id: Int) {
+            this.id = id
+        }
+
+        fun build(): WCSettingsModel {
+            return WCSettingsModel(
+                    localSiteId = localSiteId,
+                    currencyCode = currencyCode,
+                    currencyPosition = CurrencyPosition.fromString(currencyPosition),
+                    currencyThousandSeparator = currencyThousandSeparator,
+                    currencyDecimalSeparator = currencyDecimalSeparator,
+                    currencyDecimalNumber = currencyDecimalNumber,
+                    countryCode = countryCode,
+                    stateCode = stateCode,
+                    address = address,
+                    address2 = address2,
+                    city = city,
+                    postalCode = postalCode,
+                    couponsEnabled = couponsEnabled
+            )
+        }
+    }
+
+    private fun WCSettingsModel.toBuilder(): WCSettingsBuilder {
+        return WCSettingsBuilder(
+                localSiteId = this.localSiteId,
+                currencyCode = this.currencyCode,
+                currencyPosition = this.currencyPosition.name.toLowerCase(),
+                currencyThousandSeparator = this.currencyThousandSeparator,
+                currencyDecimalSeparator = this.currencyDecimalSeparator,
+                currencyDecimalNumber = this.currencyDecimalNumber,
+                countryCode = countryCode,
+                stateCode = stateCode,
+                address = address,
+                address2 = address2,
+                city = city,
+                postalCode = postalCode,
+                couponsEnabled = couponsEnabled
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCShippingLabelSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCShippingLabelSqlUtils.kt
new file mode 100644
index 00000000000..f0882012268
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCShippingLabelSqlUtils.kt
@@ -0,0 +1,118 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCShippingLabelCreationEligibilityTable
+import com.wellsql.generated.WCShippingLabelModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelCreationEligibility
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel
+
+object WCShippingLabelSqlUtils {
+    fun getShippingClassesForOrder(
+        localSiteId: Int,
+        orderId: Long
+    ): List<WCShippingLabelModel> {
+        return WellSql.select(WCShippingLabelModel::class.java)
+                .where()
+                .equals(WCShippingLabelModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCShippingLabelModelTable.REMOTE_ORDER_ID, orderId)
+                .endWhere()
+                .asModel
+    }
+
+    fun getShippingLabelById(
+        localSiteId: Int,
+        orderId: Long,
+        remoteShippingLabelId: Long
+    ): WCShippingLabelModel? {
+        return WellSql.select(WCShippingLabelModel::class.java)
+                .where()
+                .equals(WCShippingLabelModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCShippingLabelModelTable.REMOTE_ORDER_ID, orderId)
+                .equals(WCShippingLabelModelTable.REMOTE_SHIPPING_LABEL_ID, remoteShippingLabelId)
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun insertOrUpdateShippingLabels(shippingLabels: List<WCShippingLabelModel>): Int {
+        var totalChanged = 0
+        shippingLabels.forEach { totalChanged += insertOrUpdateShippingLabel(it) }
+        return totalChanged
+    }
+
+    fun insertOrUpdateShippingLabel(shippingLabel: WCShippingLabelModel): Int {
+        val orderResult = WellSql.select(WCShippingLabelModel::class.java)
+                .where().beginGroup()
+                .equals(WCShippingLabelModelTable.ID, shippingLabel.id)
+                .or()
+                .beginGroup()
+                .equals(WCShippingLabelModelTable.REMOTE_SHIPPING_LABEL_ID, shippingLabel.remoteShippingLabelId)
+                .equals(WCShippingLabelModelTable.REMOTE_ORDER_ID, shippingLabel.remoteOrderId)
+                .equals(WCShippingLabelModelTable.LOCAL_SITE_ID, shippingLabel.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel
+
+        return if (orderResult.isEmpty()) {
+            // Insert
+            WellSql.insert(shippingLabel).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = orderResult[0].id
+            WellSql.update(WCShippingLabelModel::class.java).whereId(oldId)
+                    .put(shippingLabel, UpdateAllExceptId(WCShippingLabelModel::class.java)).execute()
+        }
+    }
+
+    fun deleteShippingLabelsForOrder(orderId: Long): Int =
+            WellSql.delete(WCShippingLabelModel::class.java)
+                    .where()
+                    .equals(WCShippingLabelModelTable.REMOTE_ORDER_ID, orderId)
+                    .endWhere().execute()
+
+    fun deleteShippingLabelsForSite(localSiteId: Int): Int {
+        return WellSql.delete(WCShippingLabelModel::class.java)
+                .where()
+                .equals(WCShippingLabelModelTable.LOCAL_SITE_ID, localSiteId)
+                .or()
+                .equals(WCShippingLabelModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere().execute()
+    }
+
+    fun insertOrUpdateSLCreationEligibility(eligibility: WCShippingLabelCreationEligibility): Int {
+        val result = WellSql.select(WCShippingLabelCreationEligibility::class.java)
+                .where().beginGroup()
+                .equals(WCShippingLabelCreationEligibilityTable.ID, eligibility.id)
+                .or()
+                .beginGroup()
+                .equals(WCShippingLabelCreationEligibilityTable.REMOTE_ORDER_ID, eligibility.remoteOrderId)
+                .equals(WCShippingLabelCreationEligibilityTable.LOCAL_SITE_ID, eligibility.localSiteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel
+
+        return if (result.isEmpty()) {
+            // Insert
+            WellSql.insert(eligibility).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result[0].id
+            WellSql.update(WCShippingLabelCreationEligibility::class.java).whereId(oldId)
+                    .put(eligibility, UpdateAllExceptId(WCShippingLabelCreationEligibility::class.java)).execute()
+        }
+    }
+
+    fun getSLCreationEligibilityForOrder(
+        localSiteId: Int,
+        orderId: Long
+    ): WCShippingLabelCreationEligibility? {
+        return WellSql.select(WCShippingLabelCreationEligibility::class.java)
+                .where()
+                .equals(WCShippingLabelCreationEligibilityTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCShippingLabelCreationEligibilityTable.REMOTE_ORDER_ID, orderId)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCStatsSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCStatsSqlUtils.kt
new file mode 100644
index 00000000000..baa4736d087
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCStatsSqlUtils.kt
@@ -0,0 +1,75 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCRevenueStatsModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+
+object WCStatsSqlUtils {
+    /**
+     * Methods to support the new v4 revenue stats api
+     */
+    fun insertOrUpdateRevenueStats(stats: WCRevenueStatsModel): Int {
+        val statsResult = searchMatchingRevenueStatsInDatabase(stats)
+
+        return if (statsResult.isEmpty()) {
+            // insert
+            WellSql.insert(stats).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = statsResult[0].id
+            WellSql.update(WCRevenueStatsModel::class.java).whereId(oldId)
+                    .put(stats, UpdateAllExceptId(WCRevenueStatsModel::class.java)).execute()
+        }
+    }
+
+    private fun searchMatchingRevenueStatsInDatabase(stats: WCRevenueStatsModel): List<WCRevenueStatsModel> {
+        return if (stats.rangeId.isNotEmpty()) {
+            WellSql.select(WCRevenueStatsModel::class.java)
+                .where().beginGroup()
+                .equals(WCRevenueStatsModelTable.LOCAL_SITE_ID, stats.localSiteId)
+                .equals(WCRevenueStatsModelTable.RANGE_ID, stats.rangeId)
+                .endGroup().endWhere()
+                .asModel
+        } else {
+            WellSql.select(WCRevenueStatsModel::class.java)
+                .where().beginGroup()
+                .equals(WCRevenueStatsModelTable.LOCAL_SITE_ID, stats.localSiteId)
+                .equals(WCRevenueStatsModelTable.INTERVAL, stats.interval)
+                .equals(WCRevenueStatsModelTable.START_DATE, stats.startDate)
+                .equals(WCRevenueStatsModelTable.END_DATE, stats.endDate)
+                .endGroup().endWhere()
+                .asModel
+        }
+    }
+
+    fun getRevenueStatsForSiteIntervalAndDate(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String
+    ): WCRevenueStatsModel? {
+        return WellSql.select(WCRevenueStatsModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCRevenueStatsModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCRevenueStatsModelTable.INTERVAL, granularity)
+                .equals(WCRevenueStatsModelTable.START_DATE, startDate)
+                .equals(WCRevenueStatsModelTable.END_DATE, endDate)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getRevenueStatsFromRangeId(
+        site: SiteModel,
+        revenueRangeId: String
+    ) = WellSql.select(WCRevenueStatsModel::class.java)
+        .where()
+        .beginGroup()
+        .equals(WCRevenueStatsModelTable.LOCAL_SITE_ID, site.id)
+        .equals(WCRevenueStatsModelTable.RANGE_ID, revenueRangeId)
+        .endGroup().endWhere()
+        .asModel.firstOrNull()
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCTaxSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCTaxSqlUtils.kt
new file mode 100644
index 00000000000..8fed2c8def0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCTaxSqlUtils.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCTaxClassModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassModel
+
+object WCTaxSqlUtils {
+    fun getTaxClassesForSite(
+        localSiteId: Int
+    ): List<WCTaxClassModel> {
+        return WellSql.select(WCTaxClassModel::class.java)
+                .where()
+                .equals(WCTaxClassModelTable.LOCAL_SITE_ID, localSiteId)
+                .endWhere()
+                .asModel
+    }
+
+    fun deleteTaxClassesForSite(site: SiteModel): Int {
+        return WellSql.delete(WCTaxClassModel::class.java)
+                .where()
+                .equals(WCTaxClassModelTable.LOCAL_SITE_ID, site.id)
+                .or()
+                .equals(WCTaxClassModelTable.LOCAL_SITE_ID, 0) // Should never happen, but sanity cleanup
+                .endWhere().execute()
+    }
+
+    fun insertOrUpdateTaxClasses(taxClassList: List<WCTaxClassModel>): Int {
+        var rowsAffected = 0
+        taxClassList.forEach {
+            rowsAffected += insertOrUpdateTaxClass(it)
+        }
+        return rowsAffected
+    }
+
+    fun insertOrUpdateTaxClass(taxClass: WCTaxClassModel): Int {
+        val result = WellSql.select(WCTaxClassModel::class.java)
+                .where().beginGroup()
+                .equals(WCTaxClassModelTable.ID, taxClass.id)
+                .or()
+                .beginGroup()
+                .equals(WCTaxClassModelTable.LOCAL_SITE_ID, taxClass.localSiteId)
+                .equals(WCTaxClassModelTable.SLUG, taxClass.slug)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(taxClass).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCTaxClassModel::class.java).whereId(oldId)
+                    .put(taxClass, UpdateAllExceptId(WCTaxClassModel::class.java)).execute()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCUserSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCUserSqlUtils.kt
new file mode 100644
index 00000000000..74fdcb39dc9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCUserSqlUtils.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCUserModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.user.WCUserModel
+
+object WCUserSqlUtils {
+    fun getUsersBySite(
+        localSiteId: Int
+    ): List<WCUserModel> {
+        return WellSql.select(WCUserModel::class.java)
+                .where()
+                .equals(WCUserModelTable.LOCAL_SITE_ID, localSiteId)
+                .endWhere()
+                .asModel
+    }
+
+    fun getUserBySiteAndEmail(
+        localSiteId: Int,
+        userEmail: String
+    ): WCUserModel? {
+        return WellSql.select(WCUserModel::class.java)
+                .where()
+                .equals(WCUserModelTable.LOCAL_SITE_ID, localSiteId)
+                .equals(WCUserModelTable.EMAIL, userEmail)
+                .endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun insertOrUpdateUser(user: WCUserModel): Int {
+        val result = WellSql.select(WCUserModel::class.java)
+                .where().beginGroup()
+                .equals(WCUserModelTable.ID, user.id)
+                .or()
+                .beginGroup()
+                .equals(WCUserModelTable.LOCAL_SITE_ID, user.localSiteId)
+                .equals(WCUserModelTable.EMAIL, user.email)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+
+        return if (result == null) {
+            // Insert
+            WellSql.insert(user).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update
+            val oldId = result.id
+            WellSql.update(WCUserModel::class.java).whereId(oldId)
+                    .put(user, UpdateAllExceptId(WCUserModel::class.java)).execute()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCVisitorStatsSqlUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCVisitorStatsSqlUtils.kt
new file mode 100644
index 00000000000..92fed241144
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCVisitorStatsSqlUtils.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WCNewVisitorStatsModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCNewVisitorStatsModel
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+
+object WCVisitorStatsSqlUtils {
+    /**
+     * Methods to support the new v4 stats changes
+     */
+    fun insertOrUpdateNewVisitorStats(stats: WCNewVisitorStatsModel): Int {
+        val statsResult = if (stats.isCustomField) {
+            WellSql.select(WCNewVisitorStatsModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCNewVisitorStatsModelTable.LOCAL_SITE_ID, stats.localSiteId)
+                    .equals(WCNewVisitorStatsModelTable.GRANULARITY, stats.granularity)
+                    .equals(WCNewVisitorStatsModelTable.DATE, stats.date)
+                    .equals(WCNewVisitorStatsModelTable.QUANTITY, stats.quantity)
+                    .equals(WCNewVisitorStatsModelTable.IS_CUSTOM_FIELD, stats.isCustomField)
+                    .endGroup().endWhere()
+                    .asModel
+        } else {
+            WellSql.select(WCNewVisitorStatsModel::class.java)
+                    .where().beginGroup()
+                    .equals(WCNewVisitorStatsModelTable.LOCAL_SITE_ID, stats.localSiteId)
+                    .equals(WCNewVisitorStatsModelTable.GRANULARITY, stats.granularity)
+                    .equals(WCNewVisitorStatsModelTable.IS_CUSTOM_FIELD, stats.isCustomField)
+                    .endGroup().endWhere()
+                    .asModel
+        }
+
+        if (statsResult.isEmpty()) {
+            /*
+             * if no visitor stats available for this particular date, quantity, granularity and site:
+             * - check if the incoming data is custom data or default data.
+             *      - if custom data, we need to delete any previously cached custom data
+             *        for the particular site before inserting incoming data
+             */
+            if (stats.isCustomField) {
+                deleteNewCustomVisitorStatsForSite(stats.localSiteId)
+            }
+
+            WellSql.insert(stats).asSingleTransaction(true).execute()
+            return 1
+        } else {
+            // Update
+            val oldId = statsResult[0].id
+            return WellSql.update(WCNewVisitorStatsModel::class.java).whereId(oldId)
+                    .put(stats, UpdateAllExceptId(WCNewVisitorStatsModel::class.java)).execute()
+        }
+    }
+
+    fun getNewRawVisitorStatsForSiteGranularityQuantityAndDate(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        quantity: String? = null,
+        date: String? = null,
+        isCustomField: Boolean = false
+    ): WCNewVisitorStatsModel? {
+        if (!isCustomField)
+            return getNewRawVisitorStatsForSiteAndGranularity(site, granularity)
+
+        return WellSql.select(WCNewVisitorStatsModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCNewVisitorStatsModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCNewVisitorStatsModelTable.GRANULARITY, granularity)
+                .equals(WCNewVisitorStatsModelTable.QUANTITY, quantity)
+                .equals(WCNewVisitorStatsModelTable.DATE, date)
+                .equals(WCNewVisitorStatsModelTable.IS_CUSTOM_FIELD, isCustomField)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    private fun getNewRawVisitorStatsForSiteAndGranularity(
+        site: SiteModel,
+        granularity: StatsGranularity
+    ): WCNewVisitorStatsModel? {
+        return WellSql.select(WCNewVisitorStatsModel::class.java)
+                .where()
+                .beginGroup()
+                .equals(WCNewVisitorStatsModelTable.LOCAL_SITE_ID, site.id)
+                .equals(WCNewVisitorStatsModelTable.GRANULARITY, granularity)
+                .equals(WCNewVisitorStatsModelTable.IS_CUSTOM_FIELD, false)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    private fun deleteNewCustomVisitorStatsForSite(siteId: Int): Int {
+        return WellSql.delete(WCNewVisitorStatsModel::class.java)
+                .where()
+                .equals(WCNewVisitorStatsModelTable.LOCAL_SITE_ID, siteId)
+                .equals(WCNewVisitorStatsModelTable.IS_CUSTOM_FIELD, true)
+                .endWhere()
+                .execute()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/BigDecimalConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/BigDecimalConverter.kt
new file mode 100644
index 00000000000..14cc0361c0b
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/BigDecimalConverter.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import java.math.BigDecimal
+
+class BigDecimalConverter {
+    @TypeConverter
+    fun bigDecimalToString(input: BigDecimal): String = input.toPlainString()
+
+    @TypeConverter
+    fun stringToBigDecimal(input: String): BigDecimal = input.toBigDecimalOrNull() ?: BigDecimal.ZERO
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/DiscountTypeConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/DiscountTypeConverter.kt
new file mode 100644
index 00000000000..c8edeafe63d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/DiscountTypeConverter.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity.DiscountType
+
+class DiscountTypeConverter {
+    @TypeConverter
+    fun fromDiscountType(type: DiscountType) = type.value
+
+    @TypeConverter
+    fun toDiscountType(value: String) = DiscountType.fromString(value)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/ISO8601DateConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/ISO8601DateConverter.kt
new file mode 100644
index 00000000000..cc81c938271
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/ISO8601DateConverter.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+
+/**
+ * A Room type converter for ISO 8601-formatted dates
+ */
+class ISO8601DateConverter {
+    @TypeConverter
+    fun stringToDate(value: String?) = value?.let { DateTimeUtils.dateUTCFromIso8601(it) }
+
+    @TypeConverter
+    fun dateToString(date: Date?) = date?.let { DateTimeUtils.iso8601FromDate(it) }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LocalIdConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LocalIdConverter.kt
new file mode 100644
index 00000000000..78629710d3e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LocalIdConverter.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+
+class LocalIdConverter {
+    @TypeConverter
+    fun fromLocalId(value: LocalId?) = value?.value
+
+    @TypeConverter
+    fun toLocalId(value: Int?) = value?.let { LocalId(it) }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LongListConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LongListConverter.kt
new file mode 100644
index 00000000000..2098ec1bc02
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/LongListConverter.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+
+class LongListConverter {
+    companion object {
+        private const val SEPARATOR = ","
+    }
+
+    @TypeConverter
+    fun listToString(value: List<Long>?): String? =
+        value?.joinToString(separator = SEPARATOR)
+
+    @TypeConverter
+    fun stringToList(value: String?): List<Long>? = value?.let {
+        if (it.isEmpty()) {
+            emptyList()
+        } else {
+            it.split(SEPARATOR).map(String::toLong)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/RemoteIdConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/RemoteIdConverter.kt
new file mode 100644
index 00000000000..d116136d0ef
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/RemoteIdConverter.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+class RemoteIdConverter {
+    @TypeConverter
+    fun fromRemoteId(value: RemoteId?) = value?.value
+
+    @TypeConverter
+    fun toRemoteId(value: Long?) = value?.let { RemoteId(it) }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/StringListConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/StringListConverter.kt
new file mode 100644
index 00000000000..b8f2e8e1639
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/StringListConverter.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+
+class StringListConverter {
+    companion object {
+        private const val SEPARATOR = ","
+    }
+
+    @TypeConverter
+    fun listToString(value: List<String>?): String? =
+        value?.joinToString(separator = SEPARATOR)
+
+    @TypeConverter
+    fun stringToList(value: String?): List<String>? = value?.let {
+        if (it.isEmpty()) {
+            emptyList()
+        } else {
+            it.split(SEPARATOR)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt
new file mode 100644
index 00000000000..70dbd63d71e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/converters/WCMetaDataConverter.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.persistence.converters
+
+import androidx.room.TypeConverter
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+internal class WCMetaDataConverter {
+    @TypeConverter
+    @Suppress("ReturnCount")
+    fun metaDataListToString(value: List<WCMetaData>?): String? {
+        if (value == null) {
+            return null
+        }
+        if (value.isEmpty()) {
+            return ""
+        }
+
+        return JsonArray().apply {
+            value.forEach { metaData ->
+                add(metaData.toJson())
+            }
+        }.toString()
+    }
+
+    @TypeConverter
+    @Suppress("ReturnCount")
+    fun stringToMetaDataList(value: String?): List<WCMetaData>? {
+        if (value == null) {
+            return null
+        }
+        if (value.isEmpty()) {
+            return emptyList()
+        }
+
+        return JsonParser().parse(value).asJsonArray.map { jsonElement ->
+            val jsonObject = jsonElement as? JsonObject ?: return@map null
+            return@map WCMetaData.fromJson(jsonObject)
+        }.filterNotNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/AddonsDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/AddonsDao.kt
new file mode 100644
index 00000000000..544c80f445a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/AddonsDao.kt
@@ -0,0 +1,123 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.HasOptions
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonOptionEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonWithOptions
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupEntity
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupWithAddons
+import org.wordpress.android.fluxc.persistence.entity.ProductBasedIdentification
+import org.wordpress.android.fluxc.persistence.mappers.DatabaseAddonOptionMapper
+import org.wordpress.android.fluxc.persistence.mappers.ToDatabaseAddonGroupMapper
+import org.wordpress.android.fluxc.persistence.mappers.ToDatabaseAddonsMapper
+
+@Dao
+abstract class AddonsDao {
+    @Transaction
+    @Query("SELECT * FROM GlobalAddonGroupEntity WHERE localSiteId = :localSiteId")
+    abstract fun observeGlobalAddonsForSite(localSiteId: LocalId): Flow<List<GlobalAddonGroupWithAddons>>
+
+    @Transaction
+    @Query("SELECT * FROM AddonEntity WHERE localSiteId = :localSiteId AND productRemoteId = :productRemoteId")
+    abstract fun observeSingleProductAddons(
+        localSiteId: LocalId,
+        productRemoteId: RemoteId
+    ): Flow<List<AddonWithOptions>>
+
+    @Insert
+    abstract suspend fun insertGroup(globalAddonGroupEntity: GlobalAddonGroupEntity): Long
+
+    @Insert
+    abstract suspend fun insertAddons(addonEntities: AddonEntity): Long
+
+    @Insert
+    abstract suspend fun insertAddonOptions(vararg addonOptions: AddonOptionEntity)
+
+    @Query("DELETE FROM GlobalAddonGroupEntity WHERE localSiteId = :localSiteId")
+    abstract suspend fun deleteGlobalAddonsForSite(localSiteId: LocalId)
+
+    @Query("DELETE FROM AddonEntity WHERE productRemoteId = :productRemoteId AND localSiteId = :localSiteId")
+    abstract suspend fun deleteAddonsForSpecifiedProduct(productRemoteId: RemoteId, localSiteId: LocalId)
+
+    @Transaction
+    open suspend fun cacheGroups(
+        globalAddonGroups: List<GlobalAddonGroup>,
+        localSiteId: LocalId
+    ) {
+        deleteGlobalAddonsForSite(localSiteId)
+
+        globalAddonGroups.forEach { group ->
+            val entity = ToDatabaseAddonGroupMapper.toEntityModel(
+                    domain = group,
+                    localSiteId = localSiteId
+            )
+            val globalAddonGroupEntityId = insertGroup(entity)
+            insertAddonEntity(group.addons, globalAddonGroupEntityId)
+        }
+    }
+
+    @Transaction
+    open suspend fun cacheProductAddons(
+        productRemoteId: RemoteId,
+        localSiteId: LocalId,
+        addons: List<Addon>
+    ) {
+        deleteAddonsForSpecifiedProduct(productRemoteId = productRemoteId, localSiteId = localSiteId)
+
+        addons.forEach { addon ->
+
+            val addonEntity = ToDatabaseAddonsMapper.toEntityModel(
+                    domain = addon,
+                    productBasedIdentification = ProductBasedIdentification(
+                            localSiteId = localSiteId,
+                            productRemoteId = productRemoteId
+                    )
+            )
+            val addonEntityId = insertAddons(addonEntity)
+
+            if (addon is HasOptions) {
+                insertAddonOptionEntity(addon.options, addonEntityId)
+            }
+        }
+    }
+
+    private suspend fun insertAddonEntity(
+        addons: List<Addon>,
+        groupId: Long
+    ) {
+        addons.forEach { addon ->
+            val addonEntity = ToDatabaseAddonsMapper.toEntityModel(
+                    domain = addon,
+                    globalGroupLocalId = groupId
+            )
+            val addonEntityId = insertAddons(addonEntity)
+
+            if (addon is HasOptions) {
+                insertAddonOptionEntity(addon.options, addonEntityId)
+            }
+        }
+    }
+
+    private suspend fun insertAddonOptionEntity(
+        options: List<HasOptions.Option>?,
+        addonEntityId: Long
+    ) {
+        options?.forEach { addonOption ->
+            DatabaseAddonOptionMapper.toLocalEntity(addonOption, addonEntityId)
+            val addonOptionEntity = DatabaseAddonOptionMapper.toLocalEntity(
+                    addonLocalId = addonEntityId,
+                    domain = addonOption
+            )
+            insertAddonOptions(addonOptionEntity)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CouponsDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CouponsDao.kt
new file mode 100644
index 00000000000..7e46db8e8bf
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CouponsDao.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.entity.CouponEmailEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponWithEmails
+
+@Dao
+interface CouponsDao {
+    @Transaction
+    @Query("SELECT * FROM Coupons WHERE localSiteId = :localSiteId ORDER BY dateCreated DESC")
+    fun observeCoupons(localSiteId: LocalId): Flow<List<CouponWithEmails>>
+
+    @Transaction
+    @Query("SELECT * FROM Coupons WHERE localSiteId = :localSiteId AND id IN (:couponIds) ORDER BY dateCreated DESC")
+    fun observeCoupons(localSiteId: LocalId, couponIds: List<Long>): Flow<List<CouponWithEmails>>
+
+    @Transaction
+    @Query("SELECT * FROM Coupons " +
+        "WHERE localSiteId = :localSiteId AND id IN (:couponIds) ORDER BY dateCreated DESC"
+    )
+    suspend fun getCoupons(localSiteId: LocalId, couponIds: List<RemoteId>): List<CouponWithEmails>
+
+    @Transaction
+    @Query("SELECT * FROM Coupons WHERE localSiteId = :localSiteId AND id = :couponId")
+    fun observeCoupon(localSiteId: LocalId, couponId: RemoteId): Flow<CouponWithEmails?>
+
+    @Transaction
+    @Query("SELECT * FROM Coupons WHERE localSiteId = :localSiteId AND id = :couponId")
+    suspend fun getCoupon(localSiteId: LocalId, couponId: RemoteId): CouponWithEmails?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOrUpdateCoupon(entity: CouponEntity): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOrUpdateCouponEmail(entity: CouponEmailEntity): Long
+
+    @Query("DELETE FROM Coupons WHERE localSiteId = :localSiteId AND id = :couponId")
+    suspend fun deleteCoupon(localSiteId: LocalId, couponId: RemoteId)
+
+    @Query("DELETE FROM Coupons WHERE localSiteId = :localSiteId")
+    suspend fun deleteAllCoupons(localSiteId: LocalId)
+
+    @Query("SELECT COUNT(*) FROM CouponEmails WHERE localSiteId = :localSiteId AND couponId = :couponId")
+    suspend fun getEmailCount(localSiteId: LocalId, couponId: RemoteId): Int
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CustomerFromAnalyticsDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CustomerFromAnalyticsDao.kt
new file mode 100644
index 00000000000..56a75d6daf7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/CustomerFromAnalyticsDao.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.persistence.entity.CustomerFromAnalyticsEntity
+
+@Dao
+interface CustomerFromAnalyticsDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertCustomersFromAnalytics(customers: List<CustomerFromAnalyticsEntity>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertCustomerFromAnalytics(customers: CustomerFromAnalyticsEntity)
+
+    @Query("SELECT * FROM CustomerFromAnalytics WHERE localSiteId = :localSiteId AND id = :analyticCustomerId")
+    suspend fun getCustomerByAnalyticCustomerId(
+        localSiteId: LocalOrRemoteId.LocalId,
+        analyticCustomerId: Long
+    ): CustomerFromAnalyticsEntity?
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/InboxNotesDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/InboxNotesDao.kt
new file mode 100644
index 00000000000..10f22c57ed4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/InboxNotesDao.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteActionEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteWithActions
+
+@Dao
+abstract class InboxNotesDao {
+    @Transaction
+    @Query("SELECT * FROM InboxNotes WHERE localSiteId = :localSiteId ORDER BY dateCreated DESC, remoteId DESC")
+    abstract fun observeInboxNotes(localSiteId: LocalId): Flow<List<InboxNoteWithActions>>
+
+    @Transaction
+    @Query("SELECT * FROM InboxNotes WHERE localSiteId = :localSiteId")
+    abstract fun getInboxNotesForSite(localSiteId: LocalId): List<InboxNoteEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insertOrUpdateInboxNote(entity: InboxNoteEntity): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insertOrUpdateInboxNoteAction(entity: InboxNoteActionEntity)
+
+    @Transaction
+    @Query("DELETE FROM InboxNotes WHERE localSiteId = :localSiteId")
+    abstract fun deleteInboxNotesForSite(localSiteId: LocalId)
+
+    @Query("DELETE FROM InboxNotes WHERE remoteId = :remoteNoteId AND localSiteId = :localSiteId")
+    abstract suspend fun deleteInboxNote(remoteNoteId: Long, localSiteId: LocalId)
+
+    @Transaction
+    open suspend fun deleteAllAndInsertInboxNotes(
+        localSiteId: LocalId,
+        vararg notes: InboxNoteWithActions
+    ) {
+        deleteInboxNotesForSite(localSiteId)
+        notes.forEach { noteWithActions ->
+            val localNoteId = insertOrUpdateInboxNote(noteWithActions.inboxNote)
+            noteWithActions.noteActions.forEach {
+                insertOrUpdateInboxNoteAction(it.copy(inboxNoteLocalId = localNoteId))
+            }
+        }
+    }
+
+    @Transaction
+    open suspend fun updateNote(localSiteId: LocalId, noteWithActions: InboxNoteWithActions) {
+        deleteInboxNote(noteWithActions.inboxNote.remoteId, localSiteId)
+        val localNoteId = insertOrUpdateInboxNote(noteWithActions.inboxNote)
+        noteWithActions.noteActions.forEach {
+            insertOrUpdateInboxNoteAction(it.copy(inboxNoteLocalId = localNoteId))
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt
new file mode 100644
index 00000000000..9ceb420bdc7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/MetaDataDao.kt
@@ -0,0 +1,109 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.Companion.REPLACE
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+
+@Dao
+abstract class MetaDataDao {
+    @Insert(onConflict = REPLACE)
+    abstract fun insertOrUpdateMetaData(metaDataEntity: MetaDataEntity)
+
+    @Insert(onConflict = REPLACE)
+    abstract fun insertOrUpdateMetaData(metaData: List<MetaDataEntity>)
+
+    @Query("SELECT * FROM MetaData WHERE parentItemId = :parentItemId AND localSiteId = :localSiteId")
+    abstract suspend fun getMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): List<MetaDataEntity>
+
+    @Query("SELECT * FROM MetaData WHERE parentItemId = :parentItemId AND localSiteId = :localSiteId")
+    abstract fun observeMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): Flow<List<MetaDataEntity>>
+
+    @Query(
+        """
+        SELECT * FROM MetaData 
+        WHERE parentItemId = :parentItemId 
+        AND localSiteId = :localSiteId 
+        AND `key` NOT LIKE '\_%'
+        ESCAPE '\'
+        """
+    )
+    abstract fun observeDisplayableMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): Flow<List<MetaDataEntity>>
+
+    @Query("SELECT * FROM MetaData WHERE id = :id AND parentItemId = :parentItemId AND localSiteId = :localSiteId")
+    abstract suspend fun getMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long,
+        id: Long
+    ): MetaDataEntity?
+
+    @Query("SELECT * FROM MetaData WHERE parentItemId = :parentItemId AND localSiteId = :localSiteId AND `key` = :key")
+    abstract suspend fun getMetaDataByKey(
+        localSiteId: LocalId,
+        parentItemId: Long,
+        key: String
+    ): List<MetaDataEntity>?
+
+    @Query("""
+        SELECT * FROM MetaData
+        WHERE parentItemId = :parentItemId 
+        AND localSiteId = :localSiteId 
+        AND `key` NOT LIKE '\_%'
+        ESCAPE '\'
+        """)
+    abstract suspend fun getDisplayableMetaData(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): List<MetaDataEntity>
+
+    @Query("SELECT COUNT(*) FROM MetaData WHERE parentItemId = :parentItemId AND localSiteId = :localSiteId")
+    abstract suspend fun getMetaDataCount(parentItemId: Long, localSiteId: LocalId): Int
+
+    @Query(
+        """
+        SELECT COUNT(*) FROM MetaData 
+        WHERE parentItemId = :parentItemId 
+        AND localSiteId = :localSiteId 
+        AND `key` NOT LIKE '\_%'
+        ESCAPE '\'
+        """
+    )
+    abstract suspend fun getDisplayableMetaDataCount(
+        localSiteId: LocalId,
+        parentItemId: Long
+    ): Int
+
+    @Query("DELETE FROM MetaData WHERE localSiteId = :localSiteId AND parentItemId = :parentItemId")
+    abstract suspend fun deleteMetaData(localSiteId: LocalId, parentItemId: Long)
+
+    @Query("DELETE FROM MetaData WHERE localSiteId = :localSiteId AND type = :type")
+    abstract suspend fun deleteMetaDataForSite(localSiteId: LocalId, type: MetaDataParentItemType)
+
+    @Transaction
+    open suspend fun updateMetaData(
+        parentItemId: Long,
+        localSiteId: LocalId,
+        metaData: List<MetaDataEntity>
+    ) {
+        deleteMetaData(localSiteId, parentItemId)
+        insertOrUpdateMetaData(metaData)
+    }
+
+    suspend fun hasMetaData(parentItemId: Long, localSiteId: LocalId): Boolean {
+        return getMetaDataCount(parentItemId, localSiteId) > 0
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrderNotesDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrderNotesDao.kt
new file mode 100644
index 00000000000..e99d8c3bfcc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrderNotesDao.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.Companion.REPLACE
+import androidx.room.Query
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+
+@Dao
+interface OrderNotesDao {
+    @Insert(onConflict = REPLACE)
+    suspend fun insertNotes(vararg notes: OrderNoteEntity)
+
+    @Query("SELECT * FROM OrderNotes WHERE localSiteId = :localSiteId AND orderId = :orderId")
+    suspend fun queryNotesOfOrder(localSiteId: LocalId, orderId: RemoteId): List<OrderNoteEntity>
+
+    @Query("DELETE FROM OrderNotes WHERE localSiteId = :localSiteId")
+    fun deleteOrderNotesForSite(localSiteId: LocalId)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDao.kt
new file mode 100644
index 00000000000..6fbeca6dd5e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDao.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.Companion.REPLACE
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+
+/**
+ * ⚠️AVOID USING THIS CLASS DIRECTLY -
+ * Use [OrdersDaoDecorator] to ensure the [org.wordpress.android.fluxc.store.ListStore] component
+ * keeps receiving events.
+ */
+@Dao
+abstract class OrdersDao {
+    @Query("SELECT * FROM OrderEntity")
+    abstract suspend fun getAllOrders(): List<OrderEntity>
+
+    @Insert(onConflict = REPLACE)
+    abstract fun insertOrUpdateOrder(order: OrderEntity)
+
+    @Query("SELECT * FROM OrderEntity WHERE orderId = :orderId AND localSiteId = :localSiteId")
+    abstract suspend fun getOrder(orderId: Long, localSiteId: LocalId): OrderEntity?
+
+    @Query("SELECT * FROM OrderEntity WHERE orderId = :orderId AND localSiteId = :localSiteId")
+    abstract fun observeOrder(orderId: Long, localSiteId: LocalId): Flow<OrderEntity?>
+
+    @Transaction
+    open suspend fun updateLocalOrder(
+        orderId: Long,
+        localSiteId: LocalId,
+        updateOrder: OrderEntity.() -> OrderEntity
+    ) {
+        getOrder(orderId, localSiteId)
+            ?.let(updateOrder)
+            ?.let { insertOrUpdateOrder(it) }
+    }
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId AND status IN (:status) ORDER BY datePaid DESC")
+    abstract suspend fun getPaidOrdersForSiteDesc(
+        localSiteId: LocalId,
+        status: List<String> = listOf(CoreOrderStatus.COMPLETED.value)
+    ): List<OrderEntity>
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId AND status IN (:status)")
+    abstract suspend fun getOrdersForSite(localSiteId: LocalId, status: List<String>): List<OrderEntity>
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId")
+    abstract suspend fun getOrdersForSite(localSiteId: LocalId): List<OrderEntity>
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId")
+    abstract fun observeOrdersForSite(localSiteId: LocalId): Flow<List<OrderEntity>>
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId AND status IN (:status)")
+    abstract fun observeOrdersForSite(localSiteId: LocalId, status: List<String>): Flow<List<OrderEntity>>
+
+    @Query("SELECT * FROM OrderEntity WHERE localSiteId = :localSiteId AND orderId IN (:orderIds)")
+    abstract fun getOrdersForSiteByRemoteIds(
+        localSiteId: LocalId,
+        orderIds: List<Long>
+    ): List<OrderEntity>
+
+    @Query("DELETE FROM OrderEntity WHERE localSiteId = :localSiteId")
+    abstract fun deleteOrdersForSite(localSiteId: LocalId)
+
+    @Query("SELECT COUNT(*) FROM OrderEntity WHERE localSiteId = :localSiteId")
+    abstract fun getOrderCountForSite(localSiteId: LocalId): Int
+
+    @Query("SELECT COUNT(*) FROM OrderEntity WHERE localSiteId = :localSiteId AND status IN (:status)")
+    abstract fun observeOrderCountForSite(localSiteId: LocalId, status: List<String>): Flow<Int>
+
+    @Query("SELECT COUNT(*) FROM OrderEntity WHERE localSiteId = :localSiteId")
+    abstract fun observeOrderCountForSite(localSiteId: LocalId): Flow<Int>
+
+    @Query("DELETE FROM OrderEntity WHERE localSiteId = :localSiteId AND orderId = :orderId")
+    abstract suspend fun deleteOrder(localSiteId: LocalId, orderId: Long)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecorator.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecorator.kt
new file mode 100644
index 00000000000..965eb49595d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecorator.kt
@@ -0,0 +1,158 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.ListActionBuilder
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OrdersDaoDecorator @Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val ordersDao: OrdersDao,
+) {
+    suspend fun updateLocalOrder(
+        orderId: Long,
+        localSiteId: LocalOrRemoteId.LocalId,
+        updateOrder: OrderEntity.() -> OrderEntity
+    ) {
+        getOrder(orderId, localSiteId)
+            ?.let(updateOrder)
+            ?.let { insertOrUpdateOrder(it) }
+    }
+
+    @Suppress("unused")
+    suspend fun getAllOrders(): List<OrderEntity> = ordersDao.getAllOrders()
+
+    suspend fun insertOrUpdateOrder(
+        order: OrderEntity,
+        listUpdateStrategy: ListUpdateStrategy = ListUpdateStrategy.DEFAULT
+    ): UpdateOrderResult {
+        val orderBeforeUpdate = ordersDao.getOrder(order.orderId, order.localSiteId)
+        ordersDao.insertOrUpdateOrder(order)
+
+        when (listUpdateStrategy) {
+            ListUpdateStrategy.REFRESH -> {
+                emitRefreshListEvent(order.localSiteId)
+            }
+
+            ListUpdateStrategy.INVALIDATE -> {
+                emitInvalidateListEvent(order.localSiteId)
+            }
+
+            ListUpdateStrategy.DEFAULT -> {
+                // Draft orders are not returned from the API. We need to re-fetch order list from the API
+                // when the order is new or its status changed from draft to another status.
+                val orderIsNewOrMovingFromDraft = orderBeforeUpdate == null
+                        || (order.status != "auto-draft" && orderBeforeUpdate.status == "auto-draft")
+                if (orderIsNewOrMovingFromDraft) {
+                    // Re-fetch order list
+                    emitRefreshListEvent(order.localSiteId)
+                } else {
+                    // Re-load order list from local db
+                    emitInvalidateListEvent(order.localSiteId)
+                }
+            }
+
+            ListUpdateStrategy.SUPPRESS -> {} // Don't update the list
+        }
+        return when {
+            orderBeforeUpdate == null -> UpdateOrderResult.INSERTED
+            // Ignore changes to the modifiedDate - it's updated even when there are no other changes
+            // and results in an infinite loop.
+            order.copy(dateModified = "") != orderBeforeUpdate.copy(dateModified = "") -> UpdateOrderResult.UPDATED
+            else -> UpdateOrderResult.UNCHANGED
+        }
+    }
+
+    suspend fun getOrder(orderId: Long, localSiteId: LocalOrRemoteId.LocalId): OrderEntity? =
+        ordersDao.getOrder(orderId, localSiteId)
+
+    @Suppress("unused")
+    fun observeOrder(orderId: Long, localSiteId: LocalOrRemoteId.LocalId): Flow<OrderEntity?> =
+        ordersDao.observeOrder(orderId, localSiteId)
+
+    suspend fun getPaidOrdersForSiteDesc(
+        localSiteId: LocalOrRemoteId.LocalId,
+        status: List<String> = listOf(CoreOrderStatus.COMPLETED.value)
+    ): List<OrderEntity> = ordersDao.getPaidOrdersForSiteDesc(localSiteId, status)
+
+    suspend fun getOrdersForSite(
+        localSiteId: LocalOrRemoteId.LocalId, status: List<String>
+    ): List<OrderEntity> = ordersDao.getOrdersForSite(localSiteId, status)
+
+    suspend fun getOrdersForSite(localSiteId: LocalOrRemoteId.LocalId): List<OrderEntity> =
+        ordersDao.getOrdersForSite(localSiteId)
+
+    fun observeOrdersForSite(localSiteId: LocalOrRemoteId.LocalId): Flow<List<OrderEntity>> =
+        ordersDao.observeOrdersForSite(localSiteId)
+
+    fun observeOrdersForSite(
+        localSiteId: LocalOrRemoteId.LocalId, status: List<String>
+    ): Flow<List<OrderEntity>> = ordersDao.observeOrdersForSite(localSiteId, status)
+
+    fun getOrdersForSiteByRemoteIds(
+        localSiteId: LocalOrRemoteId.LocalId, orderIds: List<Long>
+    ): List<OrderEntity> = ordersDao.getOrdersForSiteByRemoteIds(localSiteId, orderIds)
+
+    fun deleteOrdersForSite(localSiteId: LocalOrRemoteId.LocalId) {
+        ordersDao.deleteOrdersForSite(localSiteId)
+        emitInvalidateListEvent(localSiteId)
+    }
+
+    fun getOrderCountForSite(localSiteId: LocalOrRemoteId.LocalId): Int =
+        ordersDao.getOrderCountForSite(localSiteId)
+
+    fun observeOrderCountForSite(localSiteId: LocalOrRemoteId.LocalId, status: List<String>?): Flow<Int> {
+        return if (status == null) {
+            ordersDao.observeOrderCountForSite(localSiteId)
+        } else {
+            ordersDao.observeOrderCountForSite(localSiteId, status)
+        }
+    }
+
+    suspend fun deleteOrder(localSiteId: LocalOrRemoteId.LocalId, orderId: Long) {
+        ordersDao.deleteOrder(localSiteId, orderId)
+        emitInvalidateListEvent(localSiteId)
+    }
+
+    /**
+     * Emit DataInvalidated event - the ListStore component reloads the data from the DB.
+     */
+    private fun emitInvalidateListEvent(localSiteId: LocalOrRemoteId.LocalId) {
+        val listTypeIdentifier = WCOrderListDescriptor.calculateTypeIdentifier(
+            localSiteId = localSiteId.value
+        )
+        dispatcher.dispatch(ListActionBuilder.newListDataInvalidatedAction(listTypeIdentifier))
+    }
+
+    /**
+     * Emit RefreshList event - the ListStore component refetches the list of order ids from remote.
+     */
+    private fun emitRefreshListEvent(localSiteId: LocalOrRemoteId.LocalId) {
+        val listTypeIdentifier = WCOrderListDescriptor.calculateTypeIdentifier(
+            localSiteId = localSiteId.value
+        )
+        dispatcher.dispatch(ListActionBuilder.newListRequiresRefreshAction(listTypeIdentifier))
+    }
+
+    enum class ListUpdateStrategy {
+        DEFAULT,
+        // Re-fetch the order list
+        REFRESH,
+        // Re-load the order list from the DB
+        INVALIDATE,
+        // Do not update the list
+        SUPPRESS
+    }
+
+    enum class UpdateOrderResult {
+        UPDATED, INSERTED, UNCHANGED
+    }
+}
+
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDao.kt
new file mode 100644
index 00000000000..15fee71b9e3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDao.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.ShippingMethodEntity
+
+@Dao
+abstract class ShippingMethodDao {
+    @Query("SELECT * FROM ShippingMethod WHERE localSiteId = :localSiteId")
+    abstract fun observeShippingMethods(localSiteId: LocalId): Flow<List<ShippingMethodEntity>>
+
+    @Query("SELECT * FROM ShippingMethod WHERE localSiteId = :localSiteId AND id = :id")
+    abstract suspend fun getShippingMethodById(localSiteId: LocalId, id: String): ShippingMethodEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insertShippingMethods(shippingMethods: List<ShippingMethodEntity>)
+
+    @Query("DELETE FROM ShippingMethod WHERE localSiteId = :localSiteId")
+    abstract suspend fun deleteShippingMethodsForSite(localSiteId: LocalId)
+
+    @Transaction
+    open suspend fun updateShippingMethods(shippingMethods: List<ShippingMethodEntity>) {
+        val localSiteId = shippingMethods.firstOrNull()?.localSiteId ?: return
+        deleteShippingMethodsForSite(localSiteId)
+        insertShippingMethods(shippingMethods)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxBasedOnDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxBasedOnDao.kt
new file mode 100644
index 00000000000..334405a9931
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxBasedOnDao.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.taxes.TaxBasedOnSettingEntity
+
+@Dao
+interface TaxBasedOnDao {
+    @Query("SELECT * FROM TaxBasedOnSetting WHERE localSiteId = :localSiteId")
+    suspend fun getTaxBasedOnSetting(localSiteId: LocalOrRemoteId.LocalId): TaxBasedOnSettingEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOrUpdate(taxBasedOnSetting: TaxBasedOnSettingEntity): Long
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxRateDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxRateDao.kt
new file mode 100644
index 00000000000..45aa43dbd30
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TaxRateDao.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.taxes.TaxRateEntity
+
+@Dao
+interface TaxRateDao {
+    @Transaction
+    @Query("SELECT * FROM TaxRate WHERE localSiteId = :localSiteId")
+    fun observeTaxRates(localSiteId: LocalId): Flow<List<TaxRateEntity>>
+
+    @Query("SELECT * FROM TaxRate WHERE localSiteId = :localSiteId")
+    suspend fun getTaxRates(localSiteId: LocalId): List<TaxRateEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOrUpdate(taxRate: TaxRateEntity): Long
+
+    @Query("DELETE FROM TaxRate WHERE localSiteId = :localSiteId")
+    suspend fun deleteAll(localSiteId: LocalId)
+
+    @Transaction
+    @Query("SELECT * FROM TaxRate WHERE localSiteId = :localSiteId AND id = :taxRateId")
+    suspend fun getTaxRate(localSiteId: LocalId, taxRateId: RemoteId): TaxRateEntity?
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TopPerformerProductsDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TopPerformerProductsDao.kt
new file mode 100644
index 00000000000..fdb701be4d0
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/TopPerformerProductsDao.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.TopPerformerProductEntity
+
+@Dao
+interface TopPerformerProductsDao {
+    @Query("SELECT * FROM TopPerformerProducts WHERE datePeriod = :datePeriod AND localSiteId = :localSiteId")
+    fun observeTopPerformerProducts(
+        localSiteId: LocalId,
+        datePeriod: String
+    ): Flow<List<TopPerformerProductEntity>>
+
+    @Query("SELECT * FROM TopPerformerProducts WHERE datePeriod = :datePeriod AND localSiteId = :localSiteId")
+    suspend fun getTopPerformerProductsFor(
+        localSiteId: LocalId,
+        datePeriod: String
+    ): List<TopPerformerProductEntity>
+
+    @Query("SELECT * FROM TopPerformerProducts WHERE localSiteId = :localSiteId")
+    suspend fun getTopPerformerProductsForSite(
+        localSiteId: LocalId
+    ): List<TopPerformerProductEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(entity: TopPerformerProductEntity)
+
+    @Query("DELETE FROM TopPerformerProducts WHERE datePeriod = :datePeriod AND localSiteId = :localSiteId")
+    suspend fun deleteAllFor(localSiteId: LocalId, datePeriod: String)
+
+    @Transaction
+    suspend fun updateTopPerformerProductsFor(
+        localSiteId: LocalId,
+        datePeriod: String,
+        topPerformerProducts: List<TopPerformerProductEntity>
+    ) {
+        deleteAllFor(localSiteId, datePeriod)
+        topPerformerProducts.forEach { topPerformerProduct ->
+            insert(topPerformerProduct)
+        }
+    }
+
+    @Transaction
+    suspend fun updateTopPerformerProductsForSite(
+        localSiteId: LocalId,
+        topPerformerProducts: List<TopPerformerProductEntity>
+    ) {
+        topPerformerProducts.forEach { topPerformerProduct ->
+            insert(topPerformerProduct)
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/VisitorSummaryStatsDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/VisitorSummaryStatsDao.kt
new file mode 100644
index 00000000000..3e16c064941
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/VisitorSummaryStatsDao.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.VisitorSummaryStatsEntity
+
+@Dao
+interface VisitorSummaryStatsDao {
+    @Query(
+        """
+        SELECT * FROM VisitorSummaryStatsEntity 
+        WHERE localSiteId = :siteId 
+        AND granularity = :granularity 
+        AND date = :date
+        """
+    )
+    suspend fun getVisitorSummaryStats(siteId: LocalId, granularity: String, date: String): VisitorSummaryStatsEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(entity: VisitorSummaryStatsEntity)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/WooPaymentsDepositsOverviewDao.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/WooPaymentsDepositsOverviewDao.kt
new file mode 100644
index 00000000000..34df312386d
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/WooPaymentsDepositsOverviewDao.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverviewComposedEntities
+import org.wordpress.android.fluxc.persistence.entity.BalanceType
+import org.wordpress.android.fluxc.persistence.entity.DepositType
+import org.wordpress.android.fluxc.persistence.entity.DepositType.LAST_PAID
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsBalanceEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsOverviewEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEntity
+
+@Dao
+interface WooPaymentsDepositsOverviewDao {
+    @Transaction
+    suspend fun getOverviewComposed(localSiteId: LocalId): WooPaymentsDepositsOverviewComposedEntities? {
+        val overview = getWooPaymentsDepositsOverviewEntity(localSiteId) ?: return null
+        return WooPaymentsDepositsOverviewComposedEntities(
+            overview = overview,
+
+            lastPaidDeposits = getDeposits(localSiteId, LAST_PAID),
+            lastManualDeposits = getManualDeposits(localSiteId),
+
+            pendingBalances = getBalances(localSiteId, BalanceType.PENDING),
+            availableBalances = getBalances(localSiteId, BalanceType.AVAILABLE),
+            instantBalances = getBalances(localSiteId, BalanceType.INSTANT)
+        )
+    }
+
+    @Query("SELECT * FROM WooPaymentsDepositsOverview WHERE localSiteId = :localSiteId")
+    suspend fun getWooPaymentsDepositsOverviewEntity(localSiteId: LocalId): WooPaymentsDepositsOverviewEntity?
+
+    @Query(
+        """
+        SELECT * FROM WooPaymentsDeposits 
+        WHERE localSiteId = :localSiteId AND depositType = :type
+    """
+    )
+    fun getDeposits(
+        localSiteId: LocalId,
+        type: DepositType
+    ): List<WooPaymentsDepositEntity>
+
+    @Query(
+        """
+        SELECT * FROM WooPaymentsManualDeposits 
+        WHERE localSiteId = :localSiteId
+    """
+    )
+    fun getManualDeposits(localSiteId: LocalId): List<WooPaymentsManualDepositEntity>
+
+    @Query(
+        """
+        SELECT * FROM WooPaymentsBalance
+        WHERE localSiteId = :localSiteId AND balanceType = :balanceType
+    """
+    )
+    fun getBalances(
+        localSiteId: LocalId,
+        balanceType: BalanceType,
+    ): List<WooPaymentsBalanceEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOverview(overview: WooPaymentsDepositsOverviewEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertDeposit(deposit: WooPaymentsDepositEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertManualDeposit(manualDeposit: WooPaymentsManualDepositEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertBalance(balance: WooPaymentsBalanceEntity)
+
+    @Transaction
+    @Suppress("LongParameterList")
+    suspend fun insertOverviewAll(
+        localSiteId: LocalId,
+        overviewEntity: WooPaymentsDepositsOverviewEntity,
+        lastPaidDepositsEntities: List<WooPaymentsDepositEntity>,
+        manualDepositEntities: List<WooPaymentsManualDepositEntity>,
+        pendingBalancesEntities: List<WooPaymentsBalanceEntity>,
+        availableBalancesEntities: List<WooPaymentsBalanceEntity>,
+        instantBalancesEntities: List<WooPaymentsBalanceEntity>
+    ) {
+        insertOverview(overviewEntity)
+
+        lastPaidDepositsEntities.forEach { insertDeposit(it) }
+        manualDepositEntities.forEach { insertManualDeposit(it) }
+
+        pendingBalancesEntities.forEach { insertBalance(it) }
+        availableBalancesEntities.forEach { insertBalance(it) }
+        instantBalancesEntities.forEach { insertBalance(it) }
+    }
+
+    @Query("DELETE FROM WooPaymentsDepositsOverview WHERE localSiteId = :localSiteId")
+    suspend fun delete(localSiteId: LocalId)
+}
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonEntity.kt
new file mode 100644
index 00000000000..2f4b6dcd1f6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonEntity.kt
@@ -0,0 +1,84 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.Companion.CASCADE
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+data class AddonWithOptions(
+    @Embedded val addon: AddonEntity,
+    @Relation(
+            parentColumn = "addonLocalId",
+            entityColumn = "addonLocalId"
+    )
+    val options: List<AddonOptionEntity>
+)
+
+@Entity(
+        foreignKeys = [ForeignKey(
+                entity = GlobalAddonGroupEntity::class,
+                parentColumns = ["globalGroupLocalId"],
+                childColumns = ["globalGroupLocalId"],
+                onDelete = CASCADE
+        )]
+)
+data class AddonEntity(
+    @PrimaryKey(autoGenerate = true) val addonLocalId: Long = 0,
+    @ColumnInfo(index = true) val globalGroupLocalId: Long? = null,
+    val productRemoteId: RemoteId? = null,
+    val localSiteId: LocalId? = null,
+    val type: LocalType,
+    val display: LocalDisplay? = null,
+    val name: String,
+    val titleFormat: LocalTitleFormat,
+    val description: String?,
+    val required: Boolean,
+    val position: Int,
+    val restrictions: LocalRestrictions? = null,
+    val priceType: LocalPriceType? = null,
+    val price: String? = null,
+    val min: Long? = null,
+    val max: Long? = null
+) {
+    enum class LocalType {
+        MultipleChoice,
+        Checkbox,
+        CustomText,
+        CustomTextArea,
+        FileUpload,
+        CustomPrice,
+        InputMultiplier,
+        Heading
+    }
+
+    enum class LocalDisplay {
+        Select,
+        RadioButton,
+        Images
+    }
+
+    enum class LocalTitleFormat {
+        Label,
+        Heading,
+        Hide
+    }
+
+    enum class LocalRestrictions {
+        AnyText,
+        OnlyLetters,
+        OnlyNumbers,
+        OnlyLettersNumbers,
+        Email
+    }
+
+    enum class LocalPriceType {
+        FlatFee,
+        QuantityBased,
+        PercentageBased
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonOptionEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonOptionEntity.kt
new file mode 100644
index 00000000000..d295350e8ee
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/AddonOptionEntity.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.Companion.CASCADE
+import androidx.room.PrimaryKey
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalPriceType
+
+@Entity(
+        foreignKeys = [ForeignKey(
+                entity = AddonEntity::class,
+                parentColumns = ["addonLocalId"],
+                childColumns = ["addonLocalId"],
+                onDelete = CASCADE
+        )]
+)
+data class AddonOptionEntity(
+    @PrimaryKey(autoGenerate = true) val addonOptionLocalId: Long = 0,
+    @ColumnInfo(index = true) val addonLocalId: Long,
+    val priceType: LocalPriceType,
+    val label: String?,
+    val price: String?,
+    val image: String?
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEmailEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEmailEntity.kt
new file mode 100644
index 00000000000..e7af38b20f7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEmailEntity.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+@Entity(
+    tableName = "CouponEmails",
+    foreignKeys = [
+        ForeignKey(
+            entity = CouponEntity::class,
+            parentColumns = ["id", "localSiteId"],
+            childColumns = ["couponId", "localSiteId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ],
+    primaryKeys = ["couponId", "localSiteId", "email"]
+)
+data class CouponEmailEntity(
+    val couponId: RemoteId,
+    val localSiteId: LocalId,
+    val email: String
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEntity.kt
new file mode 100644
index 00000000000..b49c66edb30
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CouponEntity.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.Relation
+import androidx.room.TypeConverters
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.converters.DiscountTypeConverter
+import java.math.BigDecimal
+
+@Entity(
+    tableName = "Coupons",
+    primaryKeys = ["id", "localSiteId"]
+)
+data class CouponEntity(
+    val id: RemoteId,
+    val localSiteId: LocalId,
+    val code: String? = null,
+    val amount: BigDecimal? = null,
+    val dateCreated: String? = null,
+    val dateCreatedGmt: String? = null,
+    val dateModified: String? = null,
+    val dateModifiedGmt: String? = null,
+    @field:TypeConverters(DiscountTypeConverter::class) val discountType: DiscountType? = null,
+    val description: String? = null,
+    val dateExpires: String? = null,
+    val dateExpiresGmt: String? = null,
+    val usageCount: Int? = null,
+    val isForIndividualUse: Boolean? = null,
+    val usageLimit: Int? = null,
+    val usageLimitPerUser: Int? = null,
+    val limitUsageToXItems: Int? = null,
+    val isShippingFree: Boolean? = null,
+    val areSaleItemsExcluded: Boolean? = null,
+    val minimumAmount: BigDecimal? = null,
+    val maximumAmount: BigDecimal? = null,
+    val includedProductIds: List<Long>? = null,
+    val excludedProductIds: List<Long>? = null,
+    val includedCategoryIds: List<Long>? = null,
+    val excludedCategoryIds: List<Long>? = null
+) {
+    sealed class DiscountType(open val value: String) {
+        object Percent : DiscountType("percent")
+        object FixedCart : DiscountType("fixed_cart")
+        object FixedProduct : DiscountType("fixed_product")
+        data class Custom(override val value: String) : DiscountType(value)
+
+        companion object {
+            fun fromString(value: String): DiscountType {
+                return when (value) {
+                    Percent.value -> Percent
+                    FixedProduct.value -> FixedProduct
+                    FixedCart.value -> FixedCart
+                    else -> Custom(value)
+                }
+            }
+        }
+
+        override fun toString() = value
+    }
+}
+
+data class CouponWithEmails(
+    @Embedded val coupon: CouponEntity,
+    @Relation(parentColumn = "id", entityColumn = "couponId")
+    val restrictedEmails: List<CouponEmailEntity>
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CustomerFromAnalyticsEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CustomerFromAnalyticsEntity.kt
new file mode 100644
index 00000000000..e841d3d102e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/CustomerFromAnalyticsEntity.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+
+@Entity(tableName = "CustomerFromAnalytics", primaryKeys = ["localSiteId", "id"])
+data class CustomerFromAnalyticsEntity (
+    val localSiteId: LocalOrRemoteId.LocalId,
+    val id: Long,
+    val userId: Long,
+    val avgOrderValue: Double,
+    val city: String,
+    val country: String,
+    val dateLastActive: String,
+    val dateLastActiveGmt: String,
+    val dateLastOrder: String,
+    val dateRegistered: String,
+    val dateRegisteredGmt: String,
+    val email: String,
+    val name: String,
+    val ordersCount: Int,
+    val postcode: String,
+    val state: String,
+    val totalSpend: Double,
+    val username: String
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/GlobalAddonGroupEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/GlobalAddonGroupEntity.kt
new file mode 100644
index 00000000000..af7aa0540d5
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/GlobalAddonGroupEntity.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+
+data class GlobalAddonGroupWithAddons(
+    @Embedded val group: GlobalAddonGroupEntity,
+    @Relation(
+            parentColumn = "globalGroupLocalId",
+            entityColumn = "globalGroupLocalId",
+            entity = AddonEntity::class
+    )
+    val addons: List<AddonWithOptions>
+)
+
+@Entity
+data class GlobalAddonGroupEntity(
+    @PrimaryKey(autoGenerate = true) val globalGroupLocalId: Long = 0,
+    val name: String,
+    val restrictedCategoriesIds: List<Long>,
+    val localSiteId: LocalId
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteActionEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteActionEntity.kt
new file mode 100644
index 00000000000..ed7c5ee18a6
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteActionEntity.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+
+@Entity(
+    tableName = "InboxNoteActions",
+    foreignKeys = [ForeignKey(
+        entity = InboxNoteEntity::class,
+        parentColumns = ["localId"],
+        childColumns = ["inboxNoteLocalId"],
+        onDelete = ForeignKey.CASCADE
+    )],
+    primaryKeys = ["remoteId", "inboxNoteLocalId"]
+)
+data class InboxNoteActionEntity(
+    val remoteId: Long,
+    @ColumnInfo(index = true) val inboxNoteLocalId: Long,
+    val localSiteId: LocalId,
+    val name: String,
+    val label: String,
+    val url: String,
+    val query: String? = null,
+    val status: String? = null,
+    val primary: Boolean = false,
+    val actionedText: String? = null
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteEntity.kt
new file mode 100644
index 00000000000..10026e1f723
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/InboxNoteEntity.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+
+data class InboxNoteWithActions(
+    @Embedded val inboxNote: InboxNoteEntity,
+    @Relation(
+        parentColumn = "localId",
+        entityColumn = "inboxNoteLocalId"
+    )
+    val noteActions: List<InboxNoteActionEntity>
+)
+
+@Entity(
+    tableName = "InboxNotes",
+    indices = [Index(
+        value = ["remoteId", "localSiteId"],
+        unique = true
+    )]
+)
+data class InboxNoteEntity(
+    @PrimaryKey(autoGenerate = true) val localId: Long = 0,
+    val remoteId: Long,
+    val localSiteId: LocalId,
+    val name: String,
+    val title: String,
+    val content: String,
+    val dateCreated: String,
+    val status: LocalInboxNoteStatus,
+    val source: String?,
+    val type: String?,
+    val dateReminder: String?
+) {
+    enum class LocalInboxNoteStatus {
+        Unactioned,
+        Actioned,
+        Snoozed,
+        Unknown
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt
new file mode 100644
index 00000000000..2579386eb25
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/MetaDataEntity.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+/**
+ * The MetaDataEntity table is used to store viewable wordpress metadata. WordPress metadata
+ * can potentially be quite large, so we keep it separate from the order.
+ *
+ * For now, this stores metadata for orders and products.
+ */
+@Entity(
+    tableName = "MetaData",
+    primaryKeys = ["localSiteId", "parentItemId", "id"]
+)
+data class MetaDataEntity(
+    @ColumnInfo(name = "localSiteId")
+    val localSiteId: LocalId,
+    val id: Long,
+    val parentItemId: Long,
+    val key: String,
+    val value: String,
+    @ColumnInfo(defaultValue = "ORDER") // We default to ORDER for backwards compatibility
+    val type: MetaDataParentItemType
+) {
+    fun toDomainModel() = WCMetaData(
+        id = id,
+        key = key,
+        value = value
+    )
+
+    companion object {
+        fun fromDomainModel(
+            metaData: WCMetaData,
+            localSiteId: LocalId,
+            parentItemId: Long,
+            parentItemType: MetaDataParentItemType
+        ) = MetaDataEntity(
+            localSiteId = localSiteId,
+            id = metaData.id,
+            parentItemId = parentItemId,
+            key = metaData.key,
+            value = metaData.value.jsonValue.toString(),
+            type = parentItemType
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/OrderNoteEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/OrderNoteEntity.kt
new file mode 100644
index 00000000000..08bd1dbc0ca
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/OrderNoteEntity.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import androidx.room.TypeConverters
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.converters.ISO8601DateConverter
+import java.util.Date
+
+@Entity(tableName = "OrderNotes", primaryKeys = ["localSiteId", "noteId"])
+data class OrderNoteEntity(
+    val localSiteId: LocalId,
+    val noteId: RemoteId,
+    val orderId: RemoteId,
+    @field:TypeConverters(ISO8601DateConverter::class) val dateCreated: Date? = null,
+    val note: String? = null,
+    val author: String? = null,
+    val isSystemNote: Boolean, // True if the note is 'system-created', else created by a site user
+    val isCustomerNote: Boolean // False if private, else customer-facing.
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ProductBasedIdentification.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ProductBasedIdentification.kt
new file mode 100644
index 00000000000..7c99994e4fa
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ProductBasedIdentification.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+data class ProductBasedIdentification(
+    val productRemoteId: RemoteId,
+    val localSiteId: LocalId
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ShippingMethodEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ShippingMethodEntity.kt
new file mode 100644
index 00000000000..0333672a3f7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/ShippingMethodEntity.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.WCShippingMethod
+
+@Entity(tableName = "ShippingMethod", primaryKeys = ["localSiteId", "id"])
+data class ShippingMethodEntity (
+    val id: String,
+    val localSiteId: LocalId,
+    val title: String
+)
+
+fun WCShippingMethod.toEntity(localSiteId: LocalId) = ShippingMethodEntity(
+    id = this.id,
+    localSiteId = localSiteId,
+    title = this.title
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/TopPerformerProductEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/TopPerformerProductEntity.kt
new file mode 100644
index 00000000000..afacdb57afc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/TopPerformerProductEntity.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+
+@Entity(
+    tableName = "TopPerformerProducts",
+    primaryKeys = ["datePeriod", "productId", "localSiteId"]
+)
+data class TopPerformerProductEntity(
+    val localSiteId: LocalId,
+    val datePeriod: String,
+    val productId: RemoteId,
+    val name: String,
+    val imageUrl: String?,
+    val quantity: Int,
+    val currency: String,
+    val total: Double,
+    val millisSinceLastUpdated: Long
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/VisitorSummaryStatsEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/VisitorSummaryStatsEntity.kt
new file mode 100644
index 00000000000..2f9b81546e9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/VisitorSummaryStatsEntity.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Entity
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.WCVisitorStatsSummary
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+
+@Entity(
+    primaryKeys = ["localSiteId", "date", "granularity"]
+)
+data class VisitorSummaryStatsEntity(
+    val localSiteId: LocalId,
+    val date: String,
+    val granularity: String,
+    val views: Int,
+    val visitors: Int
+)
+
+fun VisitorSummaryStatsEntity.toDomainModel() = WCVisitorStatsSummary(
+    date = date,
+    granularity = StatsGranularity.valueOf(granularity),
+    views = views,
+    visitors = visitors
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/WooPaymentsDepositsOverviewEntity.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/WooPaymentsDepositsOverviewEntity.kt
new file mode 100644
index 00000000000..d4870f1d8ff
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/WooPaymentsDepositsOverviewEntity.kt
@@ -0,0 +1,122 @@
+package org.wordpress.android.fluxc.persistence.entity
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.Companion.CASCADE
+import androidx.room.PrimaryKey
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+
+@Entity(tableName = "WooPaymentsDepositsOverview")
+data class WooPaymentsDepositsOverviewEntity(
+    @PrimaryKey(autoGenerate = false)
+    val localSiteId: LocalOrRemoteId.LocalId,
+
+    @Embedded
+    val account: WooPaymentsAccountDepositSummaryEntity?
+)
+
+data class WooPaymentsAccountDepositSummaryEntity(
+    val depositsEnabled: Boolean?,
+    val depositsBlocked: Boolean?,
+    @Embedded
+    val depositsSchedule: WooPaymentsDepositsSchedule?,
+    val defaultCurrency: String?
+)
+
+data class WooPaymentsDepositsSchedule(
+    val delayDays: Int?,
+    val weeklyAnchor: String?,
+    val monthlyAnchor: Int?,
+    val interval: String?
+)
+
+@Entity(
+    tableName = "WooPaymentsDeposits",
+    foreignKeys = [ForeignKey(
+        entity = WooPaymentsDepositsOverviewEntity::class,
+        parentColumns = ["localSiteId"],
+        childColumns = ["localSiteId"],
+        onDelete = CASCADE
+    )]
+)
+data class WooPaymentsDepositEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+
+    val localSiteId: LocalOrRemoteId.LocalId,
+
+    val depositId: String?,
+    val date: Long?,
+    val type: String?,
+    val amount: Long?,
+    val status: String?,
+    val bankAccount: String?,
+    val currency: String?,
+    val automatic: Boolean?,
+    val fee: Long?,
+    val feePercentage: Double?,
+    val created: Long?,
+
+    val depositType: DepositType,
+)
+
+enum class DepositType {
+    LAST_PAID,
+}
+
+@Entity(
+    tableName = "WooPaymentsManualDeposits",
+    foreignKeys = [ForeignKey(
+        entity = WooPaymentsDepositsOverviewEntity::class,
+        parentColumns = ["localSiteId"],
+        childColumns = ["localSiteId"],
+        onDelete = CASCADE
+    )]
+)
+data class WooPaymentsManualDepositEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+
+    val localSiteId: LocalOrRemoteId.LocalId,
+
+    val currency: String?,
+    val date: Long?
+)
+
+@Entity(
+    tableName = "WooPaymentsBalance",
+    foreignKeys = [ForeignKey(
+        entity = WooPaymentsDepositsOverviewEntity::class,
+        parentColumns = ["localSiteId"],
+        childColumns = ["localSiteId"],
+        onDelete = CASCADE
+    )]
+)
+data class WooPaymentsBalanceEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+
+    val localSiteId: LocalOrRemoteId.LocalId,
+
+    val amount: Long?,
+    val currency: String?,
+    val fee: Long?,
+    val feePercentage: Double?,
+    val net: Long?,
+
+    @Embedded
+    val sourceTypes: SourceTypes?,
+
+    val balanceType: BalanceType,
+)
+
+data class SourceTypes(
+    val card: Int?
+)
+
+enum class BalanceType {
+    PENDING,
+    AVAILABLE,
+    INSTANT,
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/DatabaseAddonOptionMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/DatabaseAddonOptionMapper.kt
new file mode 100644
index 00000000000..6307141f5fd
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/DatabaseAddonOptionMapper.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType.FlatFee
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType.PercentageBased
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType.QuantityBased
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonOptionEntity
+import org.wordpress.android.fluxc.persistence.mappers.FromDatabaseAddonsMapper.mapToDomain
+
+object DatabaseAddonOptionMapper {
+    fun toLocalEntity(domain: Addon.HasOptions.Option, addonLocalId: Long): AddonOptionEntity {
+        return AddonOptionEntity(
+                addonLocalId = addonLocalId,
+                label = domain.label,
+                image = domain.image,
+                priceType = domain.price.type(),
+                price = domain.price.value
+        )
+    }
+
+    fun toDomain(entity: AddonOptionEntity): Addon.HasOptions.Option {
+        return Addon.HasOptions.Option(
+                price = Addon.HasAdjustablePrice.Price.Adjusted(
+                        priceType = entity.priceType.mapToDomain(),
+                        value = entity.price.orEmpty()
+                ),
+                label = entity.label,
+                image = entity.image
+        )
+    }
+
+    private fun Addon.HasAdjustablePrice.Price.Adjusted.type(): AddonEntity.LocalPriceType {
+        return when (this.priceType) {
+            FlatFee -> AddonEntity.LocalPriceType.FlatFee
+            QuantityBased -> AddonEntity.LocalPriceType.QuantityBased
+            PercentageBased -> AddonEntity.LocalPriceType.PercentageBased
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonGroupMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonGroupMapper.kt
new file mode 100644
index 00000000000..0e76c3391b9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonGroupMapper.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.AllProductsCategories
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.SpecifiedProductCategories
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupWithAddons
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+
+class FromDatabaseAddonGroupMapper @Inject constructor(private val logger: AppLogWrapper) {
+    fun toDomainModel(entity: GlobalAddonGroupWithAddons): GlobalAddonGroup {
+        return GlobalAddonGroup(
+                name = entity.group.name,
+                restrictedCategoriesIds = if (entity.group.restrictedCategoriesIds.isEmpty()) {
+                    AllProductsCategories
+                } else {
+                    SpecifiedProductCategories(entity.group.restrictedCategoriesIds)
+                },
+                addons = entity.addons.mapNotNull { addonEntity ->
+                    try {
+                        FromDatabaseAddonsMapper.toDomainModel(addonEntity)
+                    } catch (exception: MappingDatabaseException) {
+                        logger.e(API, exception.message)
+                        null
+                    }
+                }
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonsMapper.kt
new file mode 100644
index 00000000000..1c77bf946ae
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/FromDatabaseAddonsMapper.kt
@@ -0,0 +1,182 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.CustomText.Restrictions
+import org.wordpress.android.fluxc.domain.Addon.TitleFormat
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalDisplay.Images
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalDisplay.RadioButton
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalDisplay.Select
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalPriceType.FlatFee
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalPriceType.PercentageBased
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalPriceType.QuantityBased
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalRestrictions.AnyText
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalRestrictions.Email
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalRestrictions.OnlyLetters
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalRestrictions.OnlyLettersNumbers
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalRestrictions.OnlyNumbers
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalTitleFormat.Hide
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalTitleFormat.Label
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.Checkbox
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.CustomPrice
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.CustomText
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.CustomTextArea
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.FileUpload
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.Heading
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.InputMultiplier
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType.MultipleChoice
+import org.wordpress.android.fluxc.persistence.entity.AddonWithOptions
+
+object FromDatabaseAddonsMapper {
+    fun toDomainModel(entity: AddonWithOptions): Addon {
+        return when (entity.addon.type) {
+            MultipleChoice -> multipleChoice(entity)
+            Checkbox -> checkbox(entity)
+            CustomText -> customText(entity)
+            CustomTextArea -> customTextArea(entity)
+            FileUpload -> fileUpload(entity)
+            CustomPrice -> customPrice(entity)
+            InputMultiplier -> inputMultiplier(entity)
+            Heading -> heading(entity)
+        }
+    }
+
+    private fun multipleChoice(entity: AddonWithOptions) = Addon.MultipleChoice(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        options = entity.mapOptions(),
+        display = entity.addon.display?.toDomainModel() ?: throw MappingDatabaseException(
+            "Can't map ${entity.addon.name}. MultipleChoice add-on type has to have `display` defined."
+        )
+    )
+
+    private fun checkbox(entity: AddonWithOptions) = Addon.Checkbox(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        options = entity.mapOptions()
+    )
+
+    private fun customText(entity: AddonWithOptions) = Addon.CustomText(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        restrictions = entity.addon.mapRestrictions(),
+        price = entity.addon.mapPrice(),
+        characterLength = prepareRange(entity.addon.min, entity.addon.max)
+    )
+
+    private fun customTextArea(entity: AddonWithOptions) = Addon.CustomTextArea(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        price = entity.addon.mapPrice(),
+        characterLength = prepareRange(entity.addon.min, entity.addon.max)
+    )
+
+    private fun fileUpload(entity: AddonWithOptions) = Addon.FileUpload(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        price = entity.addon.mapPrice()
+    )
+
+    private fun customPrice(entity: AddonWithOptions) = Addon.CustomPrice(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        priceRange = prepareRange(entity.addon.min, entity.addon.max)
+    )
+
+    private fun inputMultiplier(entity: AddonWithOptions) = Addon.InputMultiplier(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position,
+        price = entity.addon.mapPrice(),
+        quantityRange = prepareRange(entity.addon.min, entity.addon.max)
+    )
+
+    private fun heading(entity: AddonWithOptions) = Addon.Heading(
+        name = entity.addon.name,
+        titleFormat = entity.addon.titleFormat.toDomainModel(),
+        description = entity.addon.description,
+        required = entity.addon.required,
+        position = entity.addon.position
+    )
+
+    private fun prepareRange(min: Long?, max: Long?) = if (max == null || max == 0L) {
+        null
+    } else {
+        (min ?: 0)..max
+    }
+
+    private fun AddonWithOptions.mapOptions(): List<Addon.HasOptions.Option> {
+        return this.options.map { optionEntity ->
+            DatabaseAddonOptionMapper.toDomain(optionEntity)
+        }
+    }
+
+    private fun AddonEntity.mapRestrictions(): Restrictions {
+        return if (restrictions != null) {
+            when (this.restrictions) {
+                AnyText -> Restrictions.AnyText
+                OnlyLetters -> Restrictions.OnlyLetters
+                OnlyNumbers -> Restrictions.OnlyNumbers
+                OnlyLettersNumbers -> Restrictions.OnlyLettersNumbers
+                Email -> Restrictions.Email
+            }
+        } else {
+            throw MappingDatabaseException("Can't map $name. CustomText Add-on has to have restrictions defined.")
+        }
+    }
+
+    private fun AddonEntity.mapPrice(): Addon.HasAdjustablePrice.Price {
+        return if (this.priceType != null) {
+            Addon.HasAdjustablePrice.Price.Adjusted(
+                priceType = this.priceType.mapToDomain(),
+                value = this.price.orEmpty()
+            )
+        } else {
+            Addon.HasAdjustablePrice.Price.NotAdjusted
+        }
+    }
+
+    private fun AddonEntity.LocalTitleFormat.toDomainModel(): TitleFormat {
+        return when (this) {
+            Label -> TitleFormat.Label
+            AddonEntity.LocalTitleFormat.Heading -> TitleFormat.Heading
+            Hide -> TitleFormat.Hide
+        }
+    }
+
+    private fun AddonEntity.LocalDisplay.toDomainModel(): Addon.MultipleChoice.Display {
+        return when (this) {
+            Select -> Addon.MultipleChoice.Display.Select
+            RadioButton -> Addon.MultipleChoice.Display.RadioButton
+            Images -> Addon.MultipleChoice.Display.Images
+        }
+    }
+
+    fun AddonEntity.LocalPriceType.mapToDomain(): Addon.HasAdjustablePrice.Price.Adjusted.PriceType {
+        return when (this) {
+            FlatFee -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.FlatFee
+            QuantityBased -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.QuantityBased
+            PercentageBased -> Addon.HasAdjustablePrice.Price.Adjusted.PriceType.PercentageBased
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/MappingDatabaseException.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/MappingDatabaseException.kt
new file mode 100644
index 00000000000..89118fb47ca
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/MappingDatabaseException.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+internal class MappingDatabaseException(override val message: String) : Exception()
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonGroupMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonGroupMapper.kt
new file mode 100644
index 00000000000..beca4e9b17e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonGroupMapper.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.AllProductsCategories
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.SpecifiedProductCategories
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupEntity
+
+object ToDatabaseAddonGroupMapper {
+    fun toEntityModel(domain: GlobalAddonGroup, localSiteId: LocalId): GlobalAddonGroupEntity {
+        return GlobalAddonGroupEntity(
+                name = domain.name,
+                restrictedCategoriesIds = when (domain.restrictedCategoriesIds) {
+                    AllProductsCategories -> emptyList()
+                    is SpecifiedProductCategories -> domain.restrictedCategoriesIds.productCategories
+                },
+                localSiteId = localSiteId
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonsMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonsMapper.kt
new file mode 100644
index 00000000000..e8e133c4e7f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/ToDatabaseAddonsMapper.kt
@@ -0,0 +1,123 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.CustomText.Restrictions
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType
+import org.wordpress.android.fluxc.domain.Addon.MultipleChoice.Display
+import org.wordpress.android.fluxc.domain.Addon.TitleFormat
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.ProductBasedIdentification
+
+object ToDatabaseAddonsMapper {
+    fun toEntityModel(
+        domain: Addon,
+        globalGroupLocalId: Long? = null,
+        productBasedIdentification: ProductBasedIdentification? = null
+    ): AddonEntity {
+        check(globalGroupLocalId != null || productBasedIdentification != null) {
+            "Addon has to be identified with a Group or a Product"
+        }
+
+        val range = domain.mapRange()
+        return AddonEntity(
+                globalGroupLocalId = globalGroupLocalId,
+                productRemoteId = productBasedIdentification?.productRemoteId,
+                localSiteId = productBasedIdentification?.localSiteId,
+                titleFormat = domain.titleFormat.toLocalEntity(),
+                restrictions = domain.mapRestrictions(),
+                priceType = domain.mapPriceType(),
+                type = domain.mapType(),
+                display = domain.mapDisplay(),
+                name = domain.name,
+                description = domain.description,
+                required = domain.required,
+                position = domain.position,
+                price = domain.mapPrice(),
+                min = range?.first,
+                max = range?.second
+        )
+    }
+
+    private fun TitleFormat.toLocalEntity(): AddonEntity.LocalTitleFormat {
+        return when (this) {
+            TitleFormat.Label -> AddonEntity.LocalTitleFormat.Label
+            TitleFormat.Heading -> AddonEntity.LocalTitleFormat.Heading
+            TitleFormat.Hide -> AddonEntity.LocalTitleFormat.Hide
+        }
+    }
+
+    private fun Addon.mapRestrictions(): AddonEntity.LocalRestrictions? {
+        return if (this is Addon.CustomText) {
+            when (this.restrictions) {
+                Restrictions.AnyText -> AddonEntity.LocalRestrictions.AnyText
+                Restrictions.OnlyLetters -> AddonEntity.LocalRestrictions.OnlyLetters
+                Restrictions.OnlyNumbers -> AddonEntity.LocalRestrictions.OnlyNumbers
+                Restrictions.OnlyLettersNumbers -> AddonEntity.LocalRestrictions.OnlyLettersNumbers
+                Restrictions.Email -> AddonEntity.LocalRestrictions.Email
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun Addon.mapPriceType(): AddonEntity.LocalPriceType? {
+        return (this as? HasAdjustablePrice).let {
+            (it?.price as? Adjusted)?.priceType
+        }?.let { priceType ->
+            when (priceType) {
+                PriceType.FlatFee -> AddonEntity.LocalPriceType.FlatFee
+                PriceType.QuantityBased -> AddonEntity.LocalPriceType.QuantityBased
+                PriceType.PercentageBased -> AddonEntity.LocalPriceType.PercentageBased
+            }
+        }
+    }
+
+    private fun Addon.mapType(): AddonEntity.LocalType {
+        return when (this) {
+            is Addon.Checkbox -> AddonEntity.LocalType.Checkbox
+            is Addon.CustomPrice -> AddonEntity.LocalType.CustomPrice
+            is Addon.CustomText -> AddonEntity.LocalType.CustomText
+            is Addon.CustomTextArea -> AddonEntity.LocalType.CustomTextArea
+            is Addon.FileUpload -> AddonEntity.LocalType.FileUpload
+            is Addon.Heading -> AddonEntity.LocalType.Heading
+            is Addon.InputMultiplier -> AddonEntity.LocalType.InputMultiplier
+            is Addon.MultipleChoice -> AddonEntity.LocalType.MultipleChoice
+        }
+    }
+
+    private fun Addon.mapDisplay(): AddonEntity.LocalDisplay? {
+        return if (this is Addon.MultipleChoice) {
+            when (this.display) {
+                Display.Select -> AddonEntity.LocalDisplay.Select
+                Display.RadioButton -> AddonEntity.LocalDisplay.RadioButton
+                Display.Images -> AddonEntity.LocalDisplay.Images
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun Addon.mapPrice(): String? =
+            (this as? HasAdjustablePrice)
+                    ?.let { it.price as? Adjusted }
+                    ?.value
+
+    private fun Addon.mapRange(): Pair<Long, Long>? {
+        return when (this) {
+            is Addon.CustomText -> mapRangeToPair(characterLength)
+            is Addon.CustomTextArea -> mapRangeToPair(characterLength)
+            is Addon.InputMultiplier -> mapRangeToPair(quantityRange)
+            is Addon.CustomPrice -> mapRangeToPair(priceRange)
+            else -> null
+        }
+    }
+
+    private fun mapRangeToPair(characterLength: LongRange?) =
+            if (characterLength != null) {
+                characterLength.first to characterLength.last
+            } else {
+                null
+            }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapper.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapper.kt
new file mode 100644
index 00000000000..70579882c89
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapper.kt
@@ -0,0 +1,242 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Account
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Account.DepositsSchedule
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Balance
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Balance.SourceTypes
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Deposit
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Deposit.Info
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview.Deposit.ManualDeposit
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverviewComposedEntities
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsBalance
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDeposit
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDepositsOverviewApiResponse
+import org.wordpress.android.fluxc.persistence.entity.BalanceType
+import org.wordpress.android.fluxc.persistence.entity.DepositType
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsAccountDepositSummaryEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsBalanceEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsOverviewEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsSchedule
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEntity
+import javax.inject.Inject
+
+class WooPaymentsDepositsOverviewMapper @Inject constructor() {
+    fun mapApiResponseToModel(apiResponse: WooPaymentsDepositsOverviewApiResponse) =
+        WooPaymentsDepositsOverview(
+            account = apiResponse.account?.let { summary ->
+                Account(
+                    defaultCurrency = summary.defaultCurrency,
+                    depositsBlocked = summary.depositsBlocked,
+                    depositsEnabled = summary.depositsEnabled,
+                    depositsSchedule = summary.depositsSchedule?.let {
+                        DepositsSchedule(
+                            delayDays = it.delayDays,
+                            weeklyAnchor = it.weeklyAnchor,
+                            monthlyAnchor = it.monthlyAnchor,
+                            interval = it.interval
+                        )
+                    }
+                )
+            },
+            balance = apiResponse.balance?.let {
+                Balance(
+                    available = it.available?.map { available -> mapApiResponseBalanceToModel(available) },
+                    instant = it.instant?.map { instant -> mapApiResponseBalanceToModel(instant) },
+                    pending = it.pending?.map { pending -> mapApiResponseBalanceToModel(pending) }
+                )
+            },
+            deposit = apiResponse.deposit?.let {
+                Deposit(
+                    lastManualDeposits = it.lastManualDeposits?.map { manualDeposit ->
+                        ManualDeposit(
+                            currency = manualDeposit.currency,
+                            date = manualDeposit.date
+                        )
+                    },
+                    lastPaid = it.lastPaid?.map {
+                        info -> mapApiDepositToModel(info)
+                    },
+                )
+            }
+        )
+
+    fun mapEntityToModel(entity: WooPaymentsDepositsOverviewComposedEntities?) =
+        entity?.let { entity ->
+            WooPaymentsDepositsOverview(
+                account = mapEntityAccountToModel(entity.overview.account),
+                balance = Balance(
+                    available = entity.availableBalances?.map { mapBonusToEntity(it) },
+                    instant = entity.instantBalances?.map { mapBonusToEntity(it) },
+                    pending = entity.pendingBalances?.map { mapBonusToEntity(it) },
+                ),
+                deposit = Deposit(
+                    lastManualDeposits = entity.lastManualDeposits?.map {
+                        ManualDeposit(
+                            currency = it.currency,
+                            date = it.date
+                        )
+                    },
+                    lastPaid = entity.lastPaidDeposits?.map {
+                        Info(
+                            amount = it.amount,
+                            automatic = it.automatic,
+                            bankAccount = it.bankAccount,
+                            created = it.created,
+                            currency = it.currency,
+                            date = it.date,
+                            fee = it.fee,
+                            feePercentage = it.feePercentage,
+                            status = it.status,
+                            type = it.type,
+                            depositId = it.depositId
+                        )
+                    },
+                )
+            )
+        }
+
+    private fun mapBonusToEntity(it: WooPaymentsBalanceEntity) =
+        Balance.Info(
+            amount = it.amount,
+            currency = it.currency,
+            sourceTypes = it.sourceTypes?.let { sourceTypes ->
+                SourceTypes(
+                    card = sourceTypes.card
+                )
+            },
+            fee = it.fee,
+            feePercentage = it.feePercentage,
+            net = it.net,
+        )
+
+    fun mapModelDepositToEntity(
+        deposit: Info,
+        site: SiteModel,
+        depositType: DepositType
+    ): WooPaymentsDepositEntity =
+        WooPaymentsDepositEntity(
+            localSiteId = site.localId(),
+            date = deposit.date,
+            type = deposit.type,
+            amount = deposit.amount,
+            status = deposit.status,
+            bankAccount = deposit.bankAccount,
+            currency = deposit.currency,
+            automatic = deposit.automatic,
+            fee = deposit.fee,
+            feePercentage = deposit.feePercentage,
+            created = deposit.created,
+            depositId = deposit.depositId,
+            depositType = depositType,
+        )
+
+    fun mapModelManualDepositToEntity(
+        manualDeposit: ManualDeposit,
+        site: SiteModel
+    ): WooPaymentsManualDepositEntity =
+        WooPaymentsManualDepositEntity(
+            localSiteId = site.localId(),
+            currency = manualDeposit.currency,
+            date = manualDeposit.date
+        )
+
+    fun mapModelBalanceToEntity(
+        balance: Balance.Info,
+        site: SiteModel,
+        balanceType: BalanceType,
+    ): WooPaymentsBalanceEntity =
+        WooPaymentsBalanceEntity(
+            localSiteId = site.localId(),
+            amount = balance.amount,
+            currency = balance.currency,
+            sourceTypes = balance.sourceTypes?.let { sourceTypes ->
+                org.wordpress.android.fluxc.persistence.entity.SourceTypes(
+                    card = sourceTypes.card
+                )
+            },
+            fee = balance.fee,
+            feePercentage = balance.feePercentage,
+            net = balance.net,
+            balanceType = balanceType,
+        )
+
+    fun mapModelToEntity(
+        model: WooPaymentsDepositsOverview,
+        site: SiteModel
+    ) = WooPaymentsDepositsOverviewEntity(
+        localSiteId = site.localId(),
+        account = mapModelAccountToEntity(model.account),
+    )
+
+    private fun mapApiResponseBalanceToModel(available: WooPaymentsBalance) =
+        Balance.Info(
+            amount = available.amount,
+            currency = available.currency,
+            sourceTypes = available.sourceTypes?.let { sourceTypes ->
+                SourceTypes(
+                    card = sourceTypes.card
+                )
+            },
+            fee = available.fee,
+            feePercentage = available.feePercentage,
+            net = available.net,
+        )
+
+    private fun mapEntityAccountToModel(account: WooPaymentsAccountDepositSummaryEntity?) =
+        account?.let {
+            Account(
+                defaultCurrency = it.defaultCurrency,
+                depositsBlocked = it.depositsBlocked,
+                depositsEnabled = it.depositsEnabled,
+                depositsSchedule = mapEntityDepositsScheduleToModel(it.depositsSchedule)
+            )
+        }
+
+    private fun mapEntityDepositsScheduleToModel(depositsSchedule: WooPaymentsDepositsSchedule?) =
+        depositsSchedule?.let {
+            DepositsSchedule(
+                delayDays = it.delayDays,
+                weeklyAnchor = it.weeklyAnchor,
+                monthlyAnchor = it.monthlyAnchor,
+                interval = it.interval
+            )
+        }
+
+    private fun mapModelAccountToEntity(account: Account?) =
+        account?.let {
+            WooPaymentsAccountDepositSummaryEntity(
+                depositsEnabled = it.depositsEnabled,
+                depositsBlocked = it.depositsBlocked,
+                depositsSchedule = mapModelDepositsScheduleToEntity(it.depositsSchedule),
+                defaultCurrency = it.defaultCurrency
+            )
+        }
+
+    private fun mapModelDepositsScheduleToEntity(depositsSchedule: DepositsSchedule?) =
+        depositsSchedule?.let {
+            WooPaymentsDepositsSchedule(
+                delayDays = it.delayDays,
+                weeklyAnchor = it.weeklyAnchor,
+                monthlyAnchor = it.monthlyAnchor,
+                interval = it.interval
+            )
+        }
+
+    private fun mapApiDepositToModel(info: WooPaymentsDeposit) =
+        Info(
+            amount = info.amount,
+            automatic = info.automatic,
+            bankAccount = info.bankAccount,
+            created = info.created,
+            currency = info.currency,
+            date = info.date,
+            fee = info.fee,
+            feePercentage = info.feePercentage,
+            status = info.status,
+            type = info.type,
+            depositId = info.id
+        )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/migrations/Migrations.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/migrations/Migrations.kt
new file mode 100644
index 00000000000..c32b2d99f77
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/migrations/Migrations.kt
@@ -0,0 +1,1077 @@
+package org.wordpress.android.fluxc.persistence.migrations
+
+import androidx.room.DeleteColumn
+import androidx.room.DeleteTable
+import androidx.room.RenameColumn
+import androidx.room.RenameTable
+import androidx.room.migration.AutoMigrationSpec
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+internal val MIGRATION_3_4 = object : Migration(3, 4) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            // language=RoomSql
+            execSQL(
+                """
+                              CREATE TABLE IF NOT EXISTS `OrderEntity` (
+                                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                                `localSiteId` INTEGER NOT NULL,
+                                `remoteOrderId` INTEGER NOT NULL,
+                                `number` TEXT NOT NULL, 
+                                `status` TEXT NOT NULL,
+                                `currency` TEXT NOT NULL,
+                                `orderKey` TEXT NOT NULL,
+                                `dateCreated` TEXT NOT NULL,
+                                `dateModified` TEXT NOT NULL,
+                                `total` TEXT NOT NULL, 
+                                `totalTax` TEXT NOT NULL,
+                                `shippingTotal` TEXT NOT NULL,
+                                `paymentMethod` TEXT NOT NULL,
+                                `paymentMethodTitle` TEXT NOT NULL,
+                                `datePaid` TEXT NOT NULL,
+                                `pricesIncludeTax` INTEGER NOT NULL,
+                                `customerNote` TEXT NOT NULL,
+                                `discountTotal` TEXT NOT NULL,
+                                `discountCodes` TEXT NOT NULL,
+                                `refundTotal` REAL NOT NULL,
+                                `billingFirstName` TEXT NOT NULL,
+                                `billingLastName` TEXT NOT NULL,
+                                `billingCompany` TEXT NOT NULL,
+                                `billingAddress1` TEXT NOT NULL,
+                                `billingAddress2` TEXT NOT NULL,
+                                `billingCity` TEXT NOT NULL,
+                                `billingState` TEXT NOT NULL,
+                                `billingPostcode` TEXT NOT NULL,
+                                `billingCountry` TEXT NOT NULL,
+                                `billingEmail` TEXT NOT NULL,
+                                `billingPhone` TEXT NOT NULL,
+                                `shippingFirstName` TEXT NOT NULL,
+                                `shippingLastName` TEXT NOT NULL,
+                                `shippingCompany` TEXT NOT NULL,
+                                `shippingAddress1` TEXT NOT NULL,
+                                `shippingAddress2` TEXT NOT NULL,
+                                `shippingCity` TEXT NOT NULL,
+                                `shippingState` TEXT NOT NULL,
+                                `shippingPostcode` TEXT NOT NULL,
+                                `shippingCountry` TEXT NOT NULL,
+                                `shippingPhone` TEXT NOT NULL,
+                                `lineItems` TEXT NOT NULL,
+                                `shippingLines` TEXT NOT NULL,
+                                `feeLines` TEXT NOT NULL,
+                                `metaData` TEXT NOT NULL
+                            );
+                            """.trimIndent()
+            )
+            // language=RoomSql
+            execSQL(
+                """
+                            CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` 
+                            ON `OrderEntity` (`localSiteId`, `remoteOrderId`);
+                    """.trimIndent()
+            )
+        }
+    }
+}
+
+internal val MIGRATION_4_5 = object : Migration(4, 5) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE SSREntity")
+    }
+}
+
+internal val MIGRATION_5_6 = object : Migration(5, 6) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS OrderEntity (
+                        `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        `localSiteId` INTEGER NOT NULL,
+                        `remoteOrderId` INTEGER NOT NULL,
+                        `number` TEXT NOT NULL,
+                        `status` TEXT NOT NULL,
+                        `currency` TEXT NOT NULL,
+                        `orderKey` TEXT NOT NULL,
+                        `dateCreated` TEXT NOT NULL,
+                        `dateModified` TEXT NOT NULL,
+                        `total` TEXT NOT NULL,
+                        `totalTax` TEXT NOT NULL,
+                        `shippingTotal` TEXT NOT NULL,
+                        `paymentMethod` TEXT NOT NULL,
+                        `paymentMethodTitle` TEXT NOT NULL,
+                        `datePaid` TEXT NOT NULL,
+                        `pricesIncludeTax` INTEGER NOT NULL,
+                        `customerNote` TEXT NOT NULL,
+                        `discountTotal` TEXT NOT NULL,
+                        `discountCodes` TEXT NOT NULL,
+                        `refundTotal` TEXT NOT NULL,
+                        `billingFirstName` TEXT NOT NULL,
+                        `billingLastName` TEXT NOT NULL,
+                        `billingCompany` TEXT NOT NULL,
+                        `billingAddress1` TEXT NOT NULL,
+                        `billingAddress2` TEXT NOT NULL,
+                        `billingCity` TEXT NOT NULL,
+                        `billingState` TEXT NOT NULL,
+                        `billingPostcode` TEXT NOT NULL,
+                        `billingCountry` TEXT NOT NULL,
+                        `billingEmail` TEXT NOT NULL,
+                        `billingPhone` TEXT NOT NULL,
+                        `shippingFirstName` TEXT NOT NULL,
+                        `shippingLastName` TEXT NOT NULL,
+                        `shippingCompany` TEXT NOT NULL,
+                        `shippingAddress1` TEXT NOT NULL,
+                        `shippingAddress2` TEXT NOT NULL,
+                        `shippingCity` TEXT NOT NULL,
+                        `shippingState` TEXT NOT NULL,
+                        `shippingPostcode` TEXT NOT NULL,
+                        `shippingCountry` TEXT NOT NULL,
+                        `shippingPhone` TEXT NOT NULL,
+                        `lineItems` TEXT NOT NULL,
+                        `shippingLines` TEXT NOT NULL,
+                        `feeLines` TEXT NOT NULL,
+                        `metaData` TEXT NOT NULL)
+                    """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                            CREATE UNIQUE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_remoteOrderId` 
+                            ON `OrderEntity` (`localSiteId`, `remoteOrderId`);
+                    """.trimIndent()
+            )
+        }
+    }
+}
+
+internal val MIGRATION_6_7 = object : Migration(6, 7) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE OrderEntity ADD taxLines TEXT NOT NULL DEFAULT ''")
+    }
+}
+
+internal val MIGRATION_7_8 = object : Migration(7, 8) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS OrderNotes (
+                siteId INTEGER NOT NULL,
+                noteId INTEGER NOT NULL,
+                orderId INTEGER NOT NULL,
+                dateCreated TEXT,
+                note TEXT,
+                author TEXT,
+                isSystemNote INTEGER NOT NULL,
+                isCustomerNote INTEGER NOT NULL,
+                PRIMARY KEY(`siteId`, `noteId`))
+        """.trimIndent()
+        )
+    }
+}
+
+internal val MIGRATION_8_9 = object : Migration(8, 9) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `Coupons` (`id` INTEGER NOT NULL,
+                        `siteId` INTEGER NOT NULL,
+                        `code` TEXT,
+                        `dateCreated` TEXT,
+                        `dateCreatedGmt` TEXT,
+                        `dateModified` TEXT,
+                        `dateModifiedGmt` TEXT,
+                        `discountType` TEXT,
+                        `description` TEXT,
+                        `dateExpires` TEXT,
+                        `dateExpiresGmt` TEXT,
+                        `usageCount` INTEGER,
+                        `isForIndividualUse` INTEGER,
+                        `usageLimit` INTEGER,
+                        `usageLimitPerUser` INTEGER,
+                        `limitUsageToXItems` INTEGER,
+                        `isShippingFree` INTEGER,
+                        `areSaleItemsExcluded` INTEGER,
+                        `minimumAmount` TEXT,
+                        `maximumAmount` TEXT,
+                        PRIMARY KEY(`id`,`siteId`))
+                        """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `Products` (
+                    `id` INTEGER NOT NULL,
+                    `siteId` INTEGER NOT NULL,
+                    `name` TEXT,
+                    `slug` TEXT,
+                    `permalink` TEXT,
+                    `dateCreated` TEXT,
+                    `dateModified` TEXT,
+                    `type` TEXT,
+                    `status` TEXT,
+                    `isFeatured` INTEGER,
+                    `catalogVisibility` TEXT,
+                    `description` TEXT,
+                    `shortDescription` TEXT,
+                    `sku` TEXT,
+                    `price` TEXT,
+                    `regularPrice` TEXT,
+                    `salePrice` TEXT,
+                    `isOnSale` INTEGER,
+                    `totalSales` INTEGER,
+                    `isPurchasable` INTEGER,
+                    `dateOnSaleFrom` TEXT,
+                    `dateOnSaleTo` TEXT,
+                    `dateOnSaleFromGmt` TEXT,
+                    `dateOnSaleToGmt` TEXT,
+                    `isVirtual` INTEGER,
+                    `isDownloadable` INTEGER,
+                    `downloadLimit` INTEGER,
+                    `downloadExpiry` INTEGER,
+                    `isSoldIndividually` INTEGER,
+                    `externalUrl` TEXT,
+                    `buttonText` TEXT,
+                    `taxStatus` TEXT,
+                    `taxClass` TEXT,
+                    `isStockManaged` INTEGER,
+                    `stockQuantity` REAL,
+                    `stockStatus` TEXT,
+                    `backorders` TEXT,
+                    `areBackordersAllowed` INTEGER,
+                    `isBackordered` INTEGER,
+                    `isShippingRequired` INTEGER,
+                    `isShippingTaxable` INTEGER,
+                    `shippingClass` TEXT,
+                    `shippingClassId` INTEGER,
+                    `areReviewsAllowed` INTEGER,
+                    `averageRating` TEXT,
+                    `ratingCount` INTEGER,
+                    `parentId` INTEGER,
+                    `purchaseNote` TEXT,
+                    `menuOrder` INTEGER,
+                    PRIMARY KEY(`id`,`siteId`))
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `ProductCategories` (
+                `id` INTEGER NOT NULL,
+                `siteId` INTEGER NOT NULL,
+                `parentId` INTEGER,
+                `name` TEXT,
+                `slug` TEXT,
+                PRIMARY KEY(`id`,`siteId`))
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `CouponEmails` (
+                    `couponId` INTEGER NOT NULL, 
+                    `siteId` INTEGER NOT NULL, 
+                    `email` TEXT NOT NULL, 
+                    PRIMARY KEY(`couponId`, `siteId`, `email`), 
+                    FOREIGN KEY(`couponId`, `siteId`) 
+                    REFERENCES `Coupons`(`id`, `siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `CouponsAndProducts` (`couponId` INTEGER NOT NULL,
+                    `siteId` INTEGER NOT NULL,
+                    `productId` INTEGER NOT NULL,
+                    `isExcluded` INTEGER NOT NULL,
+                    PRIMARY KEY(`couponId`,`productId`),
+                    FOREIGN KEY(`couponId`,`siteId`) 
+                    REFERENCES `Coupons`(`id`,`siteId`) 
+                    ON UPDATE NO ACTION ON DELETE CASCADE ,
+                    FOREIGN KEY(`productId`,`siteId`) 
+                    REFERENCES `Products`(`id`,`siteId`) ON UPDATE NO ACTION ON DELETE CASCADE )
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `CouponsAndProductCategories` (
+                    `couponId` INTEGER NOT NULL,
+                    `siteId` INTEGER NOT NULL,
+                    `productCategoryId` INTEGER NOT NULL,
+                    `isExcluded` INTEGER NOT NULL,
+                    PRIMARY KEY(`couponId`, `productCategoryId`),
+                    FOREIGN KEY(`couponId`, `siteId`) REFERENCES `Coupons`(`id`, `siteId`) 
+                    ON UPDATE NO ACTION ON DELETE CASCADE ,
+                    FOREIGN KEY(`productCategoryId`, `siteId`) 
+                    REFERENCES `ProductCategories`(`id`, `siteId`) 
+                    ON UPDATE NO ACTION ON DELETE CASCADE )
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `Coupons` (`id`, `siteId`);
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_CouponEmails_couponId_siteId_email` 
+                    ON `CouponEmails` (`couponId`, `siteId`, `email`)
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_couponId_siteId` 
+                    ON `CouponsAndProducts` (`couponId`, `siteId`)
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_CouponsAndProducts_productId_siteId` 
+                    ON `CouponsAndProducts` (`productId`, `siteId`)
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_couponId_siteId` 
+                    ON `CouponsAndProductCategories` (`couponId`, `siteId`)
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_CouponsAndProductCategories_productCategoryId_siteId` 
+                    ON `CouponsAndProductCategories` (`productCategoryId`, `siteId`)
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+internal val MIGRATION_9_10 = object : Migration(9, 10) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            execSQL(
+                // language=RoomSql
+                """ 
+                        CREATE TABLE IF NOT EXISTS OrderEntity (
+                        `localSiteId` INTEGER NOT NULL,
+                        `orderId` INTEGER NOT NULL,
+                        `number` TEXT NOT NULL,
+                        `status` TEXT NOT NULL,
+                        `currency` TEXT NOT NULL,
+                        `orderKey` TEXT NOT NULL,
+                        `dateCreated` TEXT NOT NULL,
+                        `dateModified` TEXT NOT NULL,
+                        `total` TEXT NOT NULL,
+                        `totalTax` TEXT NOT NULL,
+                        `shippingTotal` TEXT NOT NULL,
+                        `paymentMethod` TEXT NOT NULL,
+                        `paymentMethodTitle` TEXT NOT NULL,
+                        `datePaid` TEXT NOT NULL,
+                        `pricesIncludeTax` INTEGER NOT NULL,
+                        `customerNote` TEXT NOT NULL,
+                        `discountTotal` TEXT NOT NULL,
+                        `discountCodes` TEXT NOT NULL,
+                        `refundTotal` TEXT NOT NULL,
+                        `billingFirstName` TEXT NOT NULL,
+                        `billingLastName` TEXT NOT NULL,
+                        `billingCompany` TEXT NOT NULL,
+                        `billingAddress1` TEXT NOT NULL,
+                        `billingAddress2` TEXT NOT NULL,
+                        `billingCity` TEXT NOT NULL,
+                        `billingState` TEXT NOT NULL,
+                        `billingPostcode` TEXT NOT NULL,
+                        `billingCountry` TEXT NOT NULL,
+                        `billingEmail` TEXT NOT NULL,
+                        `billingPhone` TEXT NOT NULL,
+                        `shippingFirstName` TEXT NOT NULL,
+                        `shippingLastName` TEXT NOT NULL,
+                        `shippingCompany` TEXT NOT NULL,
+                        `shippingAddress1` TEXT NOT NULL,
+                        `shippingAddress2` TEXT NOT NULL,
+                        `shippingCity` TEXT NOT NULL,
+                        `shippingState` TEXT NOT NULL,
+                        `shippingPostcode` TEXT NOT NULL,
+                        `shippingCountry` TEXT NOT NULL,
+                        `shippingPhone` TEXT NOT NULL,
+                        `lineItems` TEXT NOT NULL,
+                        `shippingLines` TEXT NOT NULL,
+                        `feeLines` TEXT NOT NULL,
+                        `metaData` TEXT NOT NULL,
+                        `taxLines` TEXT NOT NULL,
+                         PRIMARY KEY(`localSiteId`, `orderId`)
+                        )
+                    """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                        CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` 
+                        ON `OrderEntity` (`localSiteId`, `orderId`);
+                    """.trimIndent()
+            )
+        }
+    }
+}
+
+internal val MIGRATION_10_11 = object : Migration(10, 11) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE Coupons")
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `Coupons` (`id` INTEGER NOT NULL,
+                        `siteId` INTEGER NOT NULL,
+                        `code` TEXT,
+                        `amount` TEXT,
+                        `dateCreated` TEXT,
+                        `dateCreatedGmt` TEXT,
+                        `dateModified` TEXT,
+                        `dateModifiedGmt` TEXT,
+                        `discountType` TEXT,
+                        `description` TEXT,
+                        `dateExpires` TEXT,
+                        `dateExpiresGmt` TEXT,
+                        `usageCount` INTEGER,
+                        `isForIndividualUse` INTEGER,
+                        `usageLimit` INTEGER,
+                        `usageLimitPerUser` INTEGER,
+                        `limitUsageToXItems` INTEGER,
+                        `isShippingFree` INTEGER,
+                        `areSaleItemsExcluded` INTEGER,
+                        `minimumAmount` TEXT,
+                        `maximumAmount` TEXT,
+                        PRIMARY KEY(`id`,`siteId`))
+                        """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE INDEX IF NOT EXISTS `index_Coupons_id_siteId` ON `Coupons` (`id`, `siteId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+internal val MIGRATION_11_12 = object : Migration(11, 12) {
+    @Suppress("MaxLineLength")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `InboxNotes` (
+                    `localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                    `remoteId` INTEGER NOT NULL,
+                    `siteId` INTEGER NOT NULL,
+                    `name` TEXT NOT NULL,
+                    `title` TEXT NOT NULL,
+                    `content` TEXT NOT NULL,
+                    `dateCreated` TEXT NOT NULL,
+                    `status` TEXT NOT NULL,
+                    `source` TEXT,
+                    `type` TEXT,
+                    `dateReminder` TEXT)
+                    """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_siteId` ON `InboxNotes` (`remoteId`, `siteId`)
+                """.trimIndent()
+            )
+
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `InboxNoteActions` (
+                    `remoteId` INTEGER NOT NULL,
+                    `inboxNoteLocalId` INTEGER NOT NULL,
+                    `siteId` INTEGER NOT NULL,
+                    `name` TEXT NOT NULL,
+                    `label` TEXT NOT NULL,
+                    `url` TEXT NOT NULL,
+                    `query` TEXT,
+                    `status` TEXT,
+                    `primary` INTEGER NOT NULL,
+                    `actionedText` TEXT,
+                    PRIMARY KEY(`remoteId`,`inboxNoteLocalId`),
+                    FOREIGN KEY(`inboxNoteLocalId`)
+                    REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )
+                    """.trimIndent()
+            )
+        }
+    }
+}
+
+@DeleteTable(tableName = "CouponsAndProducts")
+@DeleteTable(tableName = "CouponsAndProductCategories")
+internal class AutoMigration13to14 : AutoMigrationSpec
+
+@DeleteTable(tableName = "Products")
+@DeleteTable(tableName = "ProductCategories")
+internal class AutoMigration14to15 : AutoMigrationSpec
+
+internal val MIGRATION_15_16 = object : Migration(15, 16) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` 
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+internal class AutoMigration16to17 : AutoMigrationSpec
+
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "OrderMetaData", columnName = "displayKey"),
+    DeleteColumn(tableName = "OrderMetaData", columnName = "displayValue")
+)
+internal class AutoMigration17to18 : AutoMigrationSpec
+
+internal class AutoMigration18to19 : AutoMigrationSpec
+
+internal class AutoMigration19to20 : AutoMigrationSpec
+
+internal val MIGRATION_20_21 = object : Migration(20, 21) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE TopPerformerProducts")
+            execSQL(
+                // language=RoomSql
+                """CREATE TABLE IF NOT EXISTS `TopPerformerProducts` (
+                    `siteId` INTEGER NOT NULL,
+                    `datePeriod` TEXT NOT NULL,
+                    `productId` INTEGER NOT NULL,
+                    `name` TEXT NOT NULL,
+                    `imageUrl` TEXT,
+                    `quantity` INTEGER NOT NULL,
+                    `currency` TEXT NOT NULL,
+                    `total` REAL NOT NULL,
+                    `millisSinceLastUpdated` INTEGER NOT NULL,
+                    PRIMARY KEY(`datePeriod`,`productId`,`siteId`)
+                    )
+                    """.trimIndent()
+            )
+        }
+    }
+}
+
+@Suppress("MaxLineLength")
+internal val MIGRATION_21_22 = Migration(21, 22) { database ->
+    // TopPerformerProducts
+    database.execSQL("DROP TABLE `TopPerformerProducts`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `TopPerformerProducts` (`localSiteId` INTEGER NOT NULL, `datePeriod` TEXT NOT NULL, `productId` INTEGER NOT NULL, `name` TEXT NOT NULL, `imageUrl` TEXT, `quantity` INTEGER NOT NULL, `currency` TEXT NOT NULL, `total` REAL NOT NULL, `millisSinceLastUpdated` INTEGER NOT NULL, PRIMARY KEY(`datePeriod`, `productId`, `localSiteId`))")
+
+    // Coupons
+    database.execSQL("DROP TABLE `Coupons`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `Coupons` (`id` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `code` TEXT, `amount` TEXT, `dateCreated` TEXT, `dateCreatedGmt` TEXT, `dateModified` TEXT, `dateModifiedGmt` TEXT, `discountType` TEXT, `description` TEXT, `dateExpires` TEXT, `dateExpiresGmt` TEXT, `usageCount` INTEGER, `isForIndividualUse` INTEGER, `usageLimit` INTEGER, `usageLimitPerUser` INTEGER, `limitUsageToXItems` INTEGER, `isShippingFree` INTEGER, `areSaleItemsExcluded` INTEGER, `minimumAmount` TEXT, `maximumAmount` TEXT, `includedProductIds` TEXT, `excludedProductIds` TEXT, `includedCategoryIds` TEXT, `excludedCategoryIds` TEXT, PRIMARY KEY(`id`, `localSiteId`))")
+    database.execSQL("DROP TABLE `CouponEmails`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `CouponEmails` (`couponId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `email` TEXT NOT NULL, PRIMARY KEY(`couponId`, `localSiteId`, `email`), FOREIGN KEY(`couponId`, `localSiteId`) REFERENCES `Coupons`(`id`, `localSiteId`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+
+    // Addons
+    database.execSQL("DROP TABLE `GlobalAddonGroupEntity`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `GlobalAddonGroupEntity` (`globalGroupLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `restrictedCategoriesIds` TEXT NOT NULL, `localSiteId` INTEGER NOT NULL)")
+    database.execSQL("DROP TABLE `AddonEntity`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `AddonEntity` (`addonLocalId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `globalGroupLocalId` INTEGER, `productRemoteId` INTEGER, `localSiteId` INTEGER, `type` TEXT NOT NULL, `display` TEXT, `name` TEXT NOT NULL, `titleFormat` TEXT NOT NULL, `description` TEXT, `required` INTEGER NOT NULL, `position` INTEGER NOT NULL, `restrictions` TEXT, `priceType` TEXT, `price` TEXT, `min` INTEGER, `max` INTEGER, FOREIGN KEY(`globalGroupLocalId`) REFERENCES `GlobalAddonGroupEntity`(`globalGroupLocalId`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+
+    // Inbox
+    database.execSQL("DROP TABLE `InboxNotes`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `InboxNotes` (`localId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `dateCreated` TEXT NOT NULL, `status` TEXT NOT NULL, `source` TEXT, `type` TEXT, `dateReminder` TEXT)")
+    database.execSQL("DROP TABLE `InboxNoteActions`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `InboxNoteActions` (`remoteId` INTEGER NOT NULL, `inboxNoteLocalId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `name` TEXT NOT NULL, `label` TEXT NOT NULL, `url` TEXT NOT NULL, `query` TEXT, `status` TEXT, `primary` INTEGER NOT NULL, `actionedText` TEXT, PRIMARY KEY(`remoteId`, `inboxNoteLocalId`), FOREIGN KEY(`inboxNoteLocalId`) REFERENCES `InboxNotes`(`localId`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+    database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_InboxNotes_remoteId_localSiteId` ON `InboxNotes` (`remoteId`, `localSiteId`)")
+
+    // Order Notes
+    database.execSQL("DROP TABLE `OrderNotes`")
+    database.execSQL("CREATE TABLE IF NOT EXISTS `OrderNotes` (`localSiteId` INTEGER NOT NULL, `noteId` INTEGER NOT NULL, `orderId` INTEGER NOT NULL, `dateCreated` TEXT, `note` TEXT, `author` TEXT, `isSystemNote` INTEGER NOT NULL, `isCustomerNote` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`, `noteId`))")
+
+    // Foreign Key missing indices
+    database.execSQL("CREATE INDEX IF NOT EXISTS `index_AddonOptionEntity_addonLocalId` ON `AddonOptionEntity` (`addonLocalId`)")
+    database.execSQL("CREATE INDEX IF NOT EXISTS `index_AddonEntity_globalGroupLocalId` ON `AddonEntity` (`globalGroupLocalId`)")
+    database.execSQL("CREATE INDEX IF NOT EXISTS `index_InboxNoteActions_inboxNoteLocalId` ON `InboxNoteActions` (`inboxNoteLocalId`)")
+}
+internal class AutoMigration23to24 : AutoMigrationSpec
+
+/**
+ * We are storing "receipt_url" into the order metadata. The purpose of this migration
+ * is to recreate all of the orders freshly from the API so that the "receipt_url" will be stored
+ * in every orders metadata and not just on the newly created ones.
+ *
+ * We need the "receipt_url" metadata to identify whether the order is an IPP order or not. We
+ * use "receipt_url" along with the "paymentMethod" to identify the IPP order.
+ */
+internal val MIGRATION_22_23 = object : Migration(22, 23) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId` 
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+/**
+ * We are storing "coupon_lines" array into OrderEntity property.
+ * The purpose is to allow adding and removing coupon lines creating and editing
+ * orders.
+ */
+internal val MIGRATION_24_25 = object : Migration(24, 25) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `couponLines` TEXT NOT NULL DEFAULT '',
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId`
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+/**
+ * We are storing "needs_payment" and "needs_processing" into OrderEntity property.
+ * This information will make rendering the UI easier.
+ */
+internal val MIGRATION_27_28 = object : Migration(27, 28) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                /* sql = */ """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `couponLines` TEXT NOT NULL DEFAULT '',
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  `needsPayment` INTEGER,
+                  `needsProcessing` INTEGER,
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId`
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+/**
+ * OrderEntity contains a new `customerId` field tagged with `ColumnInfo` annotation
+ * requiring a proper migration to it.
+ */
+internal val MIGRATION_30_31 = object : Migration(30, 31) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                /* sql = */ """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `couponLines` TEXT NOT NULL DEFAULT '',
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  `needsPayment` INTEGER,
+                  `needsProcessing` INTEGER,
+                  `customerId` INTEGER NOT NULL DEFAULT 0,
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId`
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+/**
+ * We are storing "giftCards" into OrderEntity property as a new extensions support.
+ */
+internal val MIGRATION_31_32 = object : Migration(31, 32) {
+    @Suppress("LongMethod")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.apply {
+            execSQL("DROP TABLE OrderEntity")
+            // language=RoomSql
+            execSQL(
+                /* sql = */ """
+                CREATE TABLE IF NOT EXISTS  `OrderEntity` (
+                  `localSiteId` INTEGER NOT NULL,
+                  `orderId` INTEGER NOT NULL,
+                  `number` TEXT NOT NULL,
+                  `status` TEXT NOT NULL,
+                  `currency` TEXT NOT NULL,
+                  `orderKey` TEXT NOT NULL,
+                  `dateCreated` TEXT NOT NULL,
+                  `dateModified` TEXT NOT NULL,
+                  `total` TEXT NOT NULL,
+                  `totalTax` TEXT NOT NULL,
+                  `shippingTotal` TEXT NOT NULL,
+                  `paymentMethod` TEXT NOT NULL,
+                  `paymentMethodTitle` TEXT NOT NULL,
+                  `datePaid` TEXT NOT NULL,
+                  `pricesIncludeTax` INTEGER NOT NULL,
+                  `customerNote` TEXT NOT NULL,
+                  `discountTotal` TEXT NOT NULL,
+                  `discountCodes` TEXT NOT NULL,
+                  `refundTotal` TEXT NOT NULL,
+                  `billingFirstName` TEXT NOT NULL,
+                  `billingLastName` TEXT NOT NULL,
+                  `billingCompany` TEXT NOT NULL,
+                  `billingAddress1` TEXT NOT NULL,
+                  `billingAddress2` TEXT NOT NULL,
+                  `billingCity` TEXT NOT NULL,
+                  `billingState` TEXT NOT NULL,
+                  `billingPostcode` TEXT NOT NULL,
+                  `billingCountry` TEXT NOT NULL,
+                  `billingEmail` TEXT NOT NULL,
+                  `billingPhone` TEXT NOT NULL,
+                  `shippingFirstName` TEXT NOT NULL,
+                  `shippingLastName` TEXT NOT NULL,
+                  `shippingCompany` TEXT NOT NULL,
+                  `shippingAddress1` TEXT NOT NULL,
+                  `shippingAddress2` TEXT NOT NULL,
+                  `shippingCity` TEXT NOT NULL,
+                  `shippingState` TEXT NOT NULL,
+                  `shippingPostcode` TEXT NOT NULL,
+                  `shippingCountry` TEXT NOT NULL,
+                  `shippingPhone` TEXT NOT NULL,
+                  `lineItems` TEXT NOT NULL,
+                  `shippingLines` TEXT NOT NULL,
+                  `feeLines` TEXT NOT NULL,
+                  `taxLines` TEXT NOT NULL,
+                  `couponLines` TEXT NOT NULL DEFAULT '',
+                  `metaData` TEXT NOT NULL,
+                  `paymentUrl` TEXT NOT NULL DEFAULT '',
+                  `isEditable` INTEGER NOT NULL DEFAULT 1,
+                  `needsPayment` INTEGER,
+                  `needsProcessing` INTEGER,
+                  `customerId` INTEGER NOT NULL DEFAULT 0,
+                  `giftCardCode` TEXT NOT NULL DEFAULT '',
+                  `giftCardAmount` TEXT NOT NULL DEFAULT '',
+                  PRIMARY KEY(`localSiteId`, `orderId`)
+                )
+            """.trimIndent()
+            )
+            execSQL(
+                // language=RoomSql
+                """
+                    CREATE INDEX IF NOT EXISTS `index_OrderEntity_localSiteId_orderId`
+                    ON `OrderEntity` (`localSiteId`, `orderId`);
+                """.trimIndent()
+            )
+        }
+    }
+}
+
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "WooPaymentsBalance", columnName = "transactionIds"),
+    DeleteColumn(tableName = "WooPaymentsBalance", columnName = "depositsCount"),
+)
+internal class AutoMigration32to33 : AutoMigrationSpec
+
+@RenameColumn.Entries(
+    RenameColumn(tableName = "OrderMetaData", fromColumnName = "orderId", toColumnName = "parentItemId"),
+)
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "OrderMetaData", columnName = "isDisplayable")
+)
+@RenameTable.Entries(
+    RenameTable(fromTableName = "OrderMetaData", toTableName = "MetaData")
+)
+internal class AutoMigration37to38 : AutoMigrationSpec
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/CouponStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/CouponStore.kt
new file mode 100644
index 00000000000..3c5a23f4eed
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/CouponStore.kt
@@ -0,0 +1,268 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.coupon.UpdateCouponRequest
+import org.wordpress.android.fluxc.model.coupons.CouponReport
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_PARAM
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.CouponDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.CouponRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.toDataModel
+import org.wordpress.android.fluxc.persistence.TransactionExecutor
+import org.wordpress.android.fluxc.persistence.dao.CouponsDao
+import org.wordpress.android.fluxc.persistence.entity.CouponEmailEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponWithEmails
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.API
+import java.util.Date
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CouponStore @Inject constructor(
+    private val restClient: CouponRestClient,
+    private val couponsDao: CouponsDao,
+    private val coroutineEngine: CoroutineEngine,
+    private val database: TransactionExecutor
+) {
+    companion object {
+        // Just get everything
+        const val DEFAULT_PAGE_SIZE = 100
+        const val DEFAULT_PAGE = 1
+    }
+
+    // Returns a boolean indicating whether more coupons can be fetched
+    suspend fun fetchCoupons(
+        site: SiteModel,
+        page: Int = DEFAULT_PAGE,
+        pageSize: Int = DEFAULT_PAGE_SIZE,
+        couponIds: List<Long> = emptyList(),
+        deleteOldData: Boolean = page == 1
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchCoupons") {
+            val response = restClient.fetchCoupons(
+                site = site,
+                page = page,
+                pageSize = pageSize,
+                couponIds = couponIds
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    database.executeInTransaction {
+                        if (deleteOldData) {
+                            couponsDao.deleteAllCoupons(site.localId())
+                        }
+
+                        response.result.forEach { addCouponToDatabase(it, site) }
+                    }
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(canLoadMore)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun searchCoupons(
+        site: SiteModel,
+        searchString: String,
+        page: Int = DEFAULT_PAGE,
+        pageSize: Int = DEFAULT_PAGE_SIZE
+    ): WooResult<CouponSearchResult> {
+        return coroutineEngine.withDefaultContext(API, this, "searchCoupons") {
+            val response = restClient.fetchCoupons(site, page, pageSize, searchString)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    database.executeInTransaction {
+                        response.result.forEach { addCouponToDatabase(it, site) }
+                    }
+
+                    val couponIds = response.result.map { RemoteId(it.id) }
+                    val coupons = couponsDao.getCoupons(site.localId(), couponIds)
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(CouponSearchResult(coupons, canLoadMore))
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun fetchCoupon(site: SiteModel, couponId: Long): WooResult<Unit> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchCoupon") {
+            val response = restClient.fetchCoupon(site, couponId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    addCouponToDatabase(response.result, site)
+                    WooResult(Unit)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    private suspend fun addCouponToDatabase(dto: CouponDto, site: SiteModel) {
+        database.executeInTransaction {
+            couponsDao.insertOrUpdateCoupon(dto.toDataModel(site.localId()))
+            insertRestrictedEmailAddresses(dto, site)
+        }
+    }
+
+    suspend fun deleteCoupon(
+        site: SiteModel,
+        couponId: Long,
+        trash: Boolean = true
+    ): WooResult<Unit> {
+        return coroutineEngine.withDefaultContext(T.API, this, "deleteCoupon") {
+            val result = restClient.deleteCoupon(site, couponId, trash)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(result.error)
+            } else {
+                couponsDao.deleteCoupon(site.localId(), RemoteId(couponId))
+                WooResult(Unit)
+            }
+        }
+    }
+
+    private suspend fun insertRestrictedEmailAddresses(dto: CouponDto, site: SiteModel) {
+        dto.restrictedEmails?.forEach { email ->
+            couponsDao.insertOrUpdateCouponEmail(
+                CouponEmailEntity(
+                    couponId = RemoteId(dto.id),
+                    localSiteId = site.localId(),
+                    email = email
+                )
+            )
+        }
+    }
+
+    fun observeCoupon(site: SiteModel, couponId: Long) =
+        couponsDao.observeCoupon(site.localId(), RemoteId(couponId))
+            .distinctUntilChanged()
+
+    suspend fun getCoupon(site: SiteModel, couponId: Long) =
+        couponsDao.getCoupon(site.localId(), RemoteId(couponId))
+
+    fun observeCoupons(
+        site: SiteModel,
+        couponIds: List<Long> = emptyList()
+    ): Flow<List<CouponWithEmails>> {
+        return if (couponIds.isEmpty()) {
+            couponsDao.observeCoupons(site.localId())
+        } else {
+            couponsDao.observeCoupons(site.localId(), couponIds)
+        }.distinctUntilChanged()
+    }
+
+    suspend fun fetchCouponReport(site: SiteModel, couponId: Long): WooResult<CouponReport> =
+        coroutineEngine.withDefaultContext(T.API, this, "fetchCouponReport") {
+            // Old date, 1 second since epoch
+            val date = Date(TimeUnit.SECONDS.toMillis(1))
+
+            return@withDefaultContext restClient.fetchCouponReport(site, couponId, date)
+                .let { result ->
+                    if (result.isError) {
+                        WooResult(result.error)
+                    } else {
+                        WooResult(result.result!!.toDataModel())
+                    }
+                }
+        }
+
+    suspend fun createCoupon(
+        site: SiteModel,
+        updateCouponRequest: UpdateCouponRequest
+    ): WooResult<Long> =
+        coroutineEngine.withDefaultContext(T.API, this, "createCoupon") {
+            return@withDefaultContext restClient.createCoupon(site, updateCouponRequest)
+                .let { response ->
+                    if (response.isError || response.result == null) {
+                        WooResult(response.error)
+                    } else {
+                        addCouponToDatabase(response.result, site)
+                        WooResult(response.result.id)
+                    }
+                }
+        }
+
+    suspend fun updateCoupon(
+        couponId: Long,
+        site: SiteModel,
+        updateCouponRequest: UpdateCouponRequest
+    ): WooResult<Unit> {
+        return if (updateCouponRequest.code.isNullOrEmpty()) {
+            WooResult(
+                WooError(
+                    type = INVALID_PARAM,
+                    original = UNKNOWN,
+                    message = "Coupon code cannot be empty"
+                )
+            )
+        } else {
+            coroutineEngine.withDefaultContext(T.API, this, "createCoupon") {
+                return@withDefaultContext restClient.updateCoupon(
+                    site,
+                    couponId,
+                    updateCouponRequest
+                )
+                    .let { response ->
+                        if (response.isError || response.result == null) {
+                            WooResult(response.error)
+                        } else {
+                            addCouponToDatabase(response.result, site)
+                            WooResult(Unit)
+                        }
+                    }
+            }
+        }
+    }
+
+    suspend fun fetchMostActiveCoupons(
+        site: SiteModel,
+        dateRange: ClosedRange<Date>,
+        limit: Int
+    ): WooResult<List<CouponReport>> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchMostRecentCoupons") {
+            val response = restClient.fetchCouponsReports(
+                site = site,
+                before = dateRange.endInclusive,
+                after = dateRange.start,
+                perPage = limit,
+                orderBy = CouponRestClient.CouponsReportOrderBy.OrdersCount,
+            )
+
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val reports = response.result.map { it.toDataModel() }
+                    WooResult(reports)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun getCoupons(site: SiteModel, couponIds: List<Long>): List<CouponWithEmails> {
+        return couponsDao.getCoupons(site.localId(), couponIds.map { RemoteId(it) })
+    }
+
+    data class CouponSearchResult(
+        val coupons: List<CouponWithEmails>,
+        val canLoadMore: Boolean
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt
new file mode 100644
index 00000000000..2f326a72e55
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/InsertOrder.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.ListActionBuilder
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+import org.wordpress.android.fluxc.persistence.TransactionExecutor
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+import javax.inject.Inject
+
+class InsertOrder @Inject internal constructor(
+    private val dispatcher: Dispatcher,
+    private val ordersDaoDecorator: OrdersDaoDecorator,
+    private val metaDataDao: MetaDataDao,
+    private val transactionExecutor: TransactionExecutor
+) {
+    suspend operator fun invoke(
+        localSiteId: LocalOrRemoteId.LocalId,
+        vararg ordersPack: Pair<OrderEntity, List<WCMetaData>>
+    ) {
+        var orderChanged = false
+        transactionExecutor.executeInTransaction {
+            ordersPack.forEach { (order, metaData) ->
+                val result = ordersDaoDecorator.insertOrUpdateOrder(
+                    order,
+                    OrdersDaoDecorator.ListUpdateStrategy.SUPPRESS
+                )
+                if (result == OrdersDaoDecorator.UpdateOrderResult.UPDATED) {
+                    orderChanged = true
+                }
+                metaDataDao.updateMetaData(
+                    order.orderId,
+                    order.localSiteId,
+                    metaData.map {
+                        MetaDataEntity.fromDomainModel(
+                            metaData = it,
+                            localSiteId = order.localSiteId,
+                            parentItemId = order.orderId,
+                            parentItemType = MetaDataParentItemType.ORDER
+                        )
+                    }
+                )
+            }
+        }
+        val listTypeIdentifier = WCOrderListDescriptor.calculateTypeIdentifier(
+            localSiteId = localSiteId.value
+        )
+        // Re-fetch the list only when at least one of the inserted orders has changed
+        if (orderChanged) {
+            dispatcher.dispatch(ListActionBuilder.newListDataInvalidatedAction(listTypeIdentifier))
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/JitmStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/JitmStore.kt
new file mode 100644
index 00000000000..2a25f657e3a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/JitmStore.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JITMApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JitmRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class JitmStore @Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val restClient: JitmRestClient
+) {
+    suspend fun fetchJitmMessage(
+        site: SiteModel,
+        messagePath: String,
+        query: String,
+    ): WooResult<Array<JITMApiResponse>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "jitm") {
+            restClient.fetchJitmMessage(site, messagePath, query).asWooResult()
+        }
+    }
+
+    suspend fun dismissJitmMessage(
+        site: SiteModel,
+        jitmId: String,
+        featureClass: String,
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "jitm-dismiss") {
+            restClient.dismissJitmMessage(site, jitmId, featureClass).asWooResult()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt
new file mode 100644
index 00000000000..729a5255bcf
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/MetaDataStore.kt
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata.MetaDataRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.StripOrderMetaData
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MetaDataStore @Inject internal constructor(
+    private val metaDataRestClient: MetaDataRestClient,
+    private val metaDataDao: MetaDataDao,
+    private val stripProductMetaData: StripProductMetaData,
+    private val stripOrderMetaData: StripOrderMetaData
+) {
+    suspend fun updateMetaData(
+        site: SiteModel,
+        request: UpdateMetadataRequest
+    ): WooResult<Unit> {
+        val result = metaDataRestClient.updateMetaData(site, request)
+
+        result.result?.let {
+            persistMetaData(
+                site = site,
+                parentItemId = request.parentItemId,
+                parentItemType = request.parentItemType,
+                metaDataList = it
+            )
+        }
+
+        @Suppress("RedundantUnitExpression")
+        return result.asWooResult { Unit }
+    }
+
+    suspend fun refreshMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType
+    ): WooResult<Unit> {
+        val result = metaDataRestClient.fetchMetaData(site, parentItemId, parentItemType)
+
+        result.result?.let {
+            persistMetaData(
+                site = site,
+                parentItemId = parentItemId,
+                parentItemType = parentItemType,
+                metaDataList = it
+            )
+        }
+
+        @Suppress("RedundantUnitExpression")
+        return result.asWooResult { Unit }
+    }
+
+    private suspend fun persistMetaData(
+        site: SiteModel,
+        parentItemId: Long,
+        parentItemType: MetaDataParentItemType,
+        metaDataList: List<WCMetaData>
+    ) {
+        val filteredValues = when (parentItemType) {
+            MetaDataParentItemType.ORDER -> stripOrderMetaData(metaDataList)
+            MetaDataParentItemType.PRODUCT -> stripProductMetaData(metaDataList)
+        }
+
+        metaDataDao.updateMetaData(
+            localSiteId = site.localId(),
+            parentItemId = parentItemId,
+            metaData = filteredValues.map { metaData ->
+                MetaDataEntity.fromDomainModel(
+                    metaData = metaData,
+                    localSiteId = site.localId(),
+                    parentItemId = parentItemId,
+                    parentItemType = parentItemType
+                )
+            }
+        )
+    }
+
+    fun observeMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.observeMetaData(site.localId(), parentItemId)
+        .map { list -> list.map { it.toDomainModel() } }
+
+    fun observeDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.observeDisplayableMetaData(site.localId(), parentItemId)
+        .map { list -> list.map { it.toDomainModel() } }
+
+    suspend fun getMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getMetaData(site.localId(), parentItemId).map { it.toDomainModel() }
+
+    suspend fun getDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getDisplayableMetaData(site.localId(), parentItemId).map { it.toDomainModel() }
+
+    suspend fun getMetaDataById(
+        site: SiteModel,
+        parentItemId: Long,
+        metaDataId: Long
+    ) = metaDataDao.getMetaData(
+        localSiteId = site.localId(),
+        parentItemId = parentItemId,
+        id = metaDataId
+    )
+        ?.toDomainModel()
+
+    suspend fun getMetaDataByKey(
+        site: SiteModel,
+        parentItemId: Long,
+        key: String
+    ) = metaDataDao.getMetaDataByKey(site.localId(), parentItemId, key)?.map { it.toDomainModel() }
+
+    suspend fun hasDisplayableMetaData(
+        site: SiteModel,
+        parentItemId: Long
+    ) = metaDataDao.getDisplayableMetaDataCount(site.localId(), parentItemId) > 0
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OnboardingStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OnboardingStore.kt
new file mode 100644
index 00000000000..e6f092a8d61
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OnboardingStore.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.onboarding.OnboardingRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.onboarding.TaskDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WooSystemRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OnboardingStore @Inject constructor(
+    private val restClient: OnboardingRestClient,
+    private val systemRestClient: WooSystemRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val wooCommerceStore: WooCommerceStore
+) {
+    private companion object {
+        const val ONBOARDING_TASKS_KEY = "setup"
+    }
+
+    suspend fun fetchOnboardingTasks(site: SiteModel): WooResult<List<TaskDto>> =
+        coroutineEngine.withDefaultContext(API, this, "fetchOnboardingTasks") {
+            val response = restClient.fetchOnboardingTasks(site)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(
+                    response.result
+                        .firstOrNull { it.id == ONBOARDING_TASKS_KEY }
+                        ?.tasks ?: emptyList()
+                )
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+
+    suspend fun saveSiteTitle(site: SiteModel, siteTitle: String): WooResult<String> =
+        coroutineEngine.withDefaultContext(API, this, "saveSiteTitleOnboarding") {
+            val response = systemRestClient.saveSiteTitle(site, siteTitle)
+
+            when {
+                response.isError -> WooResult(response.error)
+                response.result?.title != null -> {
+                    val fetchResult = wooCommerceStore.fetchWooCommerceSite(site)
+                    if (fetchResult.isError) {
+                        AppLog.e(
+                            API,
+                            "Error fetching WooCommerce site after saving title: " +
+                                "${fetchResult.error.message}"
+                        )
+                        WooResult(WooError(fetchResult.error.type, fetchResult.error.original))
+                    } else {
+                        WooResult(response.result.title)
+                    }
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+}
+
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OrderUpdateStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OrderUpdateStore.kt
new file mode 100644
index 00000000000..38c41f654a7
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/OrderUpdateStore.kt
@@ -0,0 +1,421 @@
+package org.wordpress.android.fluxc.store
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.order.FeeLine
+import org.wordpress.android.fluxc.model.order.FeeLineTaxStatus
+import org.wordpress.android.fluxc.model.order.OrderAddress
+import org.wordpress.android.fluxc.model.order.OrderAddress.Billing
+import org.wordpress.android.fluxc.model.order.OrderAddress.Shipping
+import org.wordpress.android.fluxc.model.order.UpdateOrderRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDtoMapper.Companion.toDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderChanged
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderError
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType
+import org.wordpress.android.fluxc.store.WCOrderStore.RemoteOrderPayload
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult.RemoteUpdateResult
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+typealias UpdateOrderFlowPredicate = suspend FlowCollector<UpdateOrderResult>.(OrderEntity, SiteModel) -> Unit
+
+@Singleton
+class OrderUpdateStore @Inject internal constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val wcOrderRestClient: OrderRestClient,
+    private val ordersDaoDecorator: OrdersDaoDecorator,
+    private val metaDataDao: MetaDataDao,
+    private val siteSqlUtils: SiteSqlUtils,
+    private val orderSqlUtils: OrderSqlUtils
+) {
+    suspend fun updateCustomerOrderNote(
+        orderId: Long,
+        site: SiteModel,
+        newCustomerNote: String
+    ): Flow<UpdateOrderResult> {
+        return coroutineEngine.flowWithDefaultContext(T.API, this, "updateCustomerOrderNote") {
+            val initialOrder = ordersDaoDecorator.getOrder(orderId, site.localId())
+
+            if (initialOrder == null) {
+                emitNoEntityFound("Order with id $orderId not found")
+            } else {
+                ordersDaoDecorator.updateLocalOrder(initialOrder.orderId, initialOrder.localSiteId) {
+                    copy(customerNote = newCustomerNote)
+                }
+                emit(UpdateOrderResult.OptimisticUpdateResult(OnOrderChanged()))
+
+                val updateRemoteOrderPayload = wcOrderRestClient.updateCustomerOrderNote(
+                    initialOrder,
+                    site,
+                    newCustomerNote
+                )
+                val remoteUpdateResult = if (updateRemoteOrderPayload.isError) {
+                    ordersDaoDecorator.insertOrUpdateOrder(initialOrder)
+                    OnOrderChanged(orderError = updateRemoteOrderPayload.error)
+                } else {
+                    ordersDaoDecorator.insertOrUpdateOrder(updateRemoteOrderPayload.order)
+                    OnOrderChanged()
+                }
+                emit(RemoteUpdateResult(remoteUpdateResult))
+            }
+        }
+    }
+
+    suspend fun updateOrderAddress(
+        orderId: Long,
+        localSiteId: LocalId,
+        newAddress: OrderAddress
+    ): Flow<UpdateOrderResult> {
+        return coroutineEngine.flowWithDefaultContext(T.API, this, "updateOrderAddress") {
+            takeWhenOrderDataAcquired(orderId, localSiteId) { initialOrder, site ->
+                updateLocalOrderAddress(initialOrder, newAddress)
+                emit(UpdateOrderResult.OptimisticUpdateResult(OnOrderChanged()))
+
+                when (newAddress) {
+                    is Billing -> {
+                        val payload = wcOrderRestClient.updateBillingAddress(initialOrder, site, newAddress.toDto())
+                        emitRemoteUpdateContainingBillingAddress(payload, initialOrder, newAddress)
+                    }
+                    is Shipping -> {
+                        val payload = wcOrderRestClient.updateShippingAddress(initialOrder, site, newAddress.toDto())
+                        emitRemoteUpdateResultOrRevertOnError(payload, initialOrder)
+                    }
+                }
+            }
+        }
+    }
+
+    suspend fun updateBothOrderAddresses(
+        orderId: Long,
+        localSiteId: LocalId,
+        shippingAddress: Shipping,
+        billingAddress: Billing
+    ): Flow<UpdateOrderResult> {
+        return coroutineEngine.flowWithDefaultContext(T.API, this, "updateBothOrderAddresses") {
+            takeWhenOrderDataAcquired(orderId, localSiteId) { initialOrder, site ->
+                updateBothLocalOrderAddresses(
+                    initialOrder,
+                    shippingAddress,
+                    billingAddress
+                ).let { emit(UpdateOrderResult.OptimisticUpdateResult(OnOrderChanged())) }
+
+                wcOrderRestClient.updateBothOrderAddresses(
+                    initialOrder,
+                    site,
+                    shippingAddress.toDto(),
+                    billingAddress.toDto()
+                ).let { emitRemoteUpdateContainingBillingAddress(it, initialOrder, billingAddress) }
+            }
+        }
+    }
+
+    /**
+     * Creates a "simple payment," which is an empty order assigned the passed amount. The backend will
+     * return a new order with the tax already calculated.
+     */
+    suspend fun createSimplePayment(
+        site: SiteModel,
+        amount: String,
+        isTaxable: Boolean,
+        status: WCOrderStatusModel? = null,
+        customerNote: String? = null
+    ): WooResult<OrderEntity> {
+        val createOrderRequest = UpdateOrderRequest(
+            status = status,
+            feeLines = generateSimplePaymentFeeLineList(amount, isTaxable),
+            customerNote = customerNote
+        )
+        return createOrder(site, createOrderRequest)
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun updateSimplePayment(
+        site: SiteModel,
+        orderId: Long,
+        amount: String,
+        customerNote: String,
+        billingEmail: String,
+        isTaxable: Boolean,
+        status: WCOrderStatusModel? = null
+    ): Flow<UpdateOrderResult> {
+        return coroutineEngine.flowWithDefaultContext(T.API, this, "updateSimplePayment") {
+            val initialOrder = ordersDaoDecorator.getOrder(orderId, site.localId())
+            if (initialOrder == null) {
+                emitNoEntityFound("Order with id $orderId not found")
+            } else {
+                // simple payment is assigned a single fee list item upon creation and we must re-use the
+                // existing fee id or else a new fee will be added
+                val feeId = if (initialOrder.getFeeLineList().isNotEmpty()) {
+                    initialOrder.getFeeLineList()[0].id
+                } else {
+                    null
+                }
+
+                ordersDaoDecorator.updateLocalOrder(initialOrder.orderId, initialOrder.localSiteId) {
+                    copy(
+                        customerNote = customerNote,
+                        billingEmail = billingEmail,
+                        feeLines = generateSimplePaymentFeeLineJson(amount, isTaxable, feeId).toString()
+                    )
+                }
+                emit(UpdateOrderResult.OptimisticUpdateResult(OnOrderChanged()))
+
+                val billing = if (billingEmail.isNotEmpty()) {
+                    Billing(
+                        email = billingEmail,
+                        firstName = "",
+                        lastName = "",
+                        company = "",
+                        address1 = "",
+                        address2 = "",
+                        city = "",
+                        state = "",
+                        postcode = "",
+                        country = "",
+                        phone = ""
+                    )
+                } else {
+                    null
+                }
+
+                val updateRequest = UpdateOrderRequest(
+                    status = status,
+                    customerNote = customerNote,
+                    billingAddress = billing,
+                    feeLines = generateSimplePaymentFeeLineList(amount, isTaxable, feeId)
+                )
+                val result = updateOrder(site, orderId, updateRequest)
+                val remoteUpdateResult = if (result.isError) {
+                    ordersDaoDecorator.insertOrUpdateOrder(initialOrder)
+                    OnOrderChanged(orderError = OrderError(message = result.error.message ?: ""))
+                } else {
+                    OnOrderChanged()
+                }
+                emit(RemoteUpdateResult(remoteUpdateResult))
+            }
+        }
+    }
+
+    /**
+     * Generates the feeLines for a simple payment order containing a single fee line item with
+     * the passed information. Pass null for the feeId if this is a new fee line item, otherwise
+     * pass the id of an existing fee line item to replace it.
+     */
+    private fun generateSimplePaymentFeeLineList(
+        amount: String,
+        isTaxable: Boolean,
+        feeId: Long? = null
+    ): List<FeeLine> {
+        FeeLine().also { feeLine ->
+            feeId?.let {
+                feeLine.id = it
+            }
+            feeLine.name = SIMPLE_PAYMENT_FEELINE_NAME
+            feeLine.total = amount
+            feeLine.taxStatus = if (isTaxable) FeeLineTaxStatus.Taxable else FeeLineTaxStatus.None
+            return listOf(feeLine)
+        }
+    }
+
+    suspend fun createOrder(
+        site: SiteModel,
+        createOrderRequest: UpdateOrderRequest,
+        attributionSourceType: String? = null
+    ): WooResult<OrderEntity> {
+        return coroutineEngine.withDefaultContext(T.API, this, "createOrder") {
+            val result = wcOrderRestClient.createOrder(site, createOrderRequest, attributionSourceType)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(result.error)
+            } else {
+                val model = result.result!!
+                ordersDaoDecorator.insertOrUpdateOrder(model)
+                WooResult(model)
+            }
+        }
+    }
+
+    suspend fun updateOrder(
+        site: SiteModel,
+        orderId: Long,
+        updateRequest: UpdateOrderRequest
+    ): WooResult<OrderEntity> {
+        return coroutineEngine.withDefaultContext(T.API, this, "updateOrder") {
+            val result = wcOrderRestClient.updateOrder(site, orderId, updateRequest)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(result.error)
+            } else {
+                val model = result.result!!
+                ordersDaoDecorator.insertOrUpdateOrder(model)
+                WooResult(model)
+            }
+        }
+    }
+
+    suspend fun deleteOrder(
+        site: SiteModel,
+        orderId: Long,
+        trash: Boolean = true
+    ): WooResult<Unit> {
+        return coroutineEngine.withDefaultContext(T.API, this, "deleteOrder") {
+            val result = wcOrderRestClient.deleteOrder(site, orderId, trash)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(result.error)
+            } else {
+                ordersDaoDecorator.deleteOrder(site.localId(), orderId)
+                metaDataDao.deleteMetaData(localSiteId = site.localId(), parentItemId = orderId)
+                orderSqlUtils.deleteOrderSummaryById(site, orderId)
+                WooResult(Unit)
+            }
+        }
+    }
+
+    private suspend fun FlowCollector<UpdateOrderResult>.takeWhenOrderDataAcquired(
+        orderId: Long,
+        localSiteId: LocalId,
+        predicate: UpdateOrderFlowPredicate
+    ) {
+        ordersDaoDecorator.getOrder(orderId, localSiteId)?.let { initialOrder ->
+            siteSqlUtils.getSiteWithLocalId(initialOrder.localSiteId)
+                ?.let { predicate(initialOrder, it) }
+                ?: emitNoEntityFound("Site with local id ${initialOrder.localSiteId} not found")
+        } ?: emitNoEntityFound("Order with id $orderId not found")
+    }
+
+    private suspend fun updateLocalOrderAddress(
+        initialOrder: OrderEntity,
+        newAddress: OrderAddress
+    ) = ordersDaoDecorator.updateLocalOrder(initialOrder.orderId, initialOrder.localSiteId) {
+        when (newAddress) {
+            is Billing -> updateLocalBillingAddress(newAddress)
+            is Shipping -> updateLocalShippingAddress(newAddress)
+        }
+    }
+
+    private suspend fun updateBothLocalOrderAddresses(
+        initialOrder: OrderEntity,
+        shippingAddress: Shipping,
+        billingAddress: Billing
+    ) = ordersDaoDecorator.updateLocalOrder(initialOrder.orderId, initialOrder.localSiteId) {
+        updateLocalShippingAddress(shippingAddress)
+        updateLocalBillingAddress(billingAddress)
+    }
+
+    private fun OrderEntity.updateLocalShippingAddress(newAddress: OrderAddress): OrderEntity {
+        return copy(
+            shippingFirstName = newAddress.firstName,
+            shippingLastName = newAddress.lastName,
+            shippingCompany = newAddress.company,
+            shippingAddress1 = newAddress.address1,
+            shippingAddress2 = newAddress.address2,
+            shippingCity = newAddress.city,
+            shippingState = newAddress.state,
+            shippingPostcode = newAddress.postcode,
+            shippingCountry = newAddress.country,
+            shippingPhone = newAddress.phone
+        )
+    }
+
+    private fun OrderEntity.updateLocalBillingAddress(newAddress: Billing): OrderEntity {
+        return copy(
+            billingFirstName = newAddress.firstName,
+            billingLastName = newAddress.lastName,
+            billingCompany = newAddress.company,
+            billingAddress1 = newAddress.address1,
+            billingAddress2 = newAddress.address2,
+            billingCity = newAddress.city,
+            billingState = newAddress.state,
+            billingPostcode = newAddress.postcode,
+            billingCountry = newAddress.country,
+            billingEmail = newAddress.email,
+            billingPhone = newAddress.phone
+        )
+    }
+
+    private suspend fun FlowCollector<UpdateOrderResult>.emitRemoteUpdateContainingBillingAddress(
+        updateRemoteOrderPayload: RemoteOrderPayload,
+        initialOrder: OrderEntity,
+        billingAddress: Billing
+    ) = emitRemoteUpdateResultOrRevertOnError(
+        updateRemoteOrderPayload,
+        initialOrder,
+        mapError = { originalOrderError: OrderError? ->
+            /**
+             * It's *likely* as INVALID_PARAM can be caused by probably other cases too and
+             * empty billing address email in future releases of WooCommerce will be not relevant.
+             */
+            val isLikelyEmptyBillingEmailError =
+                updateRemoteOrderPayload.error.type == OrderErrorType.INVALID_PARAM &&
+                    billingAddress.email.isBlank()
+
+            if (isLikelyEmptyBillingEmailError) {
+                OrderError(
+                    type = OrderErrorType.EMPTY_BILLING_EMAIL,
+                    message = "Can't set empty billing email address on WooCommerce <= 5.8.1"
+                )
+            } else {
+                originalOrderError
+            }
+        }
+    )
+
+    private suspend fun FlowCollector<UpdateOrderResult>.emitRemoteUpdateResultOrRevertOnError(
+        updateRemoteOrderPayload: RemoteOrderPayload,
+        initialOrder: OrderEntity,
+        mapError: (OrderError?) -> OrderError? = {
+        updateRemoteOrderPayload.error
+        }
+    ) {
+        val remoteUpdateResult = if (updateRemoteOrderPayload.isError) {
+            ordersDaoDecorator.insertOrUpdateOrder(initialOrder)
+            OnOrderChanged(orderError = mapError(updateRemoteOrderPayload.error))
+        } else {
+            ordersDaoDecorator.insertOrUpdateOrder(updateRemoteOrderPayload.order)
+            OnOrderChanged()
+        }
+
+        emit(RemoteUpdateResult(remoteUpdateResult))
+    }
+
+    private suspend fun FlowCollector<UpdateOrderResult>.emitNoEntityFound(message: String) {
+        emit(UpdateOrderResult.OptimisticUpdateResult(
+            OnOrderChanged(orderError = OrderError(message = message))
+        ))
+    }
+
+    companion object {
+        private const val SIMPLE_PAYMENT_FEELINE_NAME = "Simple Payment"
+
+        fun generateSimplePaymentFeeLineJson(amount: String, isTaxable: Boolean, feeId: Long? = null): JsonArray {
+            val jsonFee = JsonObject().also { json ->
+                feeId?.let {
+                    json.addProperty("id", it)
+                }
+                json.addProperty("name", SIMPLE_PAYMENT_FEELINE_NAME)
+                json.addProperty("total", amount)
+                json.addProperty(
+                        "tax_status",
+                        if (isTaxable) FeeLineTaxStatus.Taxable.value else FeeLineTaxStatus.None.value
+                )
+            }
+            return JsonArray().also { it.add(jsonFee) }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCAddonsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCAddonsStore.kt
new file mode 100644
index 00000000000..1b55509da5f
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCAddonsStore.kt
@@ -0,0 +1,118 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.AllProductsCategories
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.SpecifiedProductCategories
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.AddOnsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers.RemoteGlobalAddonGroupMapper
+import org.wordpress.android.fluxc.persistence.dao.AddonsDao
+import org.wordpress.android.fluxc.persistence.entity.AddonWithOptions
+import org.wordpress.android.fluxc.persistence.mappers.FromDatabaseAddonGroupMapper
+import org.wordpress.android.fluxc.persistence.mappers.FromDatabaseAddonsMapper
+import org.wordpress.android.fluxc.persistence.mappers.MappingDatabaseException
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCAddonsStore @Inject internal constructor(
+    private val restClient: AddOnsRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val dao: AddonsDao,
+    private val remoteGlobalAddonGroupMapper: RemoteGlobalAddonGroupMapper,
+    private val fromDatabaseAddonGroupMapper: FromDatabaseAddonGroupMapper,
+    private val logger: AppLogWrapper
+) {
+    suspend fun fetchAllGlobalAddonsGroups(site: SiteModel): WooResult<Unit> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchGlobalAddonsGroups") {
+            val response = restClient.fetchGlobalAddOnGroups(site)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val globalAddonGroupsDto = response.result
+
+                    val domain = globalAddonGroupsDto.map { dtoGroup ->
+                        remoteGlobalAddonGroupMapper.toDomain(dtoGroup)
+                    }
+
+                    dao.cacheGroups(domain, site.localId())
+                    WooResult(Unit)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    fun observeProductSpecificAddons(site: SiteModel, productRemoteId: Long): Flow<List<Addon>> {
+        return dao.observeSingleProductAddons(site.localId(), RemoteId(productRemoteId))
+                .map {
+                    it.map { entityAddon ->
+                        FromDatabaseAddonsMapper.toDomainModel(entityAddon)
+                    }
+                }
+    }
+
+    fun observeAllAddonsForProduct(site: SiteModel, product: WCProductModel): Flow<List<Addon>> {
+        return dao.observeGlobalAddonsForSite(localSiteId = site.localId())
+                .map { globalGroupsEntities ->
+                    val domainGroup = globalGroupsEntities.map { globalGroupEntity ->
+                        fromDatabaseAddonGroupMapper.toDomainModel(
+                                globalGroupEntity
+                        )
+                    }
+                    getAddonsFromGlobalGroups(domainGroup, product)
+                }
+                .combine(
+                        dao.observeSingleProductAddons(
+                                localSiteId = site.localId(),
+                                productRemoteId = product.remoteId
+                        ).map { addonEntities ->
+                            addonEntities.mapNotNull { addonEntity ->
+                                mapEntityToAddonSafely(addonEntity)
+                            }
+                        }
+                ) { fromGlobalAddons, fromSingleProductAddons ->
+                    fromGlobalAddons + fromSingleProductAddons
+                }
+    }
+
+    private fun mapEntityToAddonSafely(addonEntity: AddonWithOptions): Addon? {
+        return try {
+            FromDatabaseAddonsMapper.toDomainModel(addonEntity)
+        } catch (exception: MappingDatabaseException) {
+            logger.e(API, exception.message)
+            null
+        }
+    }
+
+    private fun getAddonsFromGlobalGroups(
+        globalGroups: List<GlobalAddonGroup>,
+        product: WCProductModel
+    ): List<Addon> {
+        return globalGroups.filter { globalGroup ->
+            when (globalGroup.restrictedCategoriesIds) {
+                AllProductsCategories -> true
+                is SpecifiedProductCategories -> globalGroup.restrictedCategoriesIds.appliesToProduct(product)
+            }
+        }.flatMap { it.addons }
+    }
+
+    private fun SpecifiedProductCategories.appliesToProduct(product: WCProductModel): Boolean {
+        val productCategoriesIds = product.getCategoryList().map { it.id }
+
+        return this.productCategories.intersect(productCategoriesIds).isNotEmpty()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCCustomerStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCCustomerStore.kt
new file mode 100644
index 00000000000..8b160342c11
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCCustomerStore.kt
@@ -0,0 +1,304 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.customer.WCCustomerFromAnalytics
+import org.wordpress.android.fluxc.model.customer.WCCustomerFromAnalyticsMapper
+import org.wordpress.android.fluxc.model.customer.WCCustomerMapper
+import org.wordpress.android.fluxc.model.customer.WCCustomerModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.NAME_ASC
+import org.wordpress.android.fluxc.persistence.CustomerSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.CustomerFromAnalyticsDao
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCCustomerStore @Inject constructor(
+    private val restClient: CustomerRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: WCCustomerMapper,
+    private val customerFromAnalyticsDao: CustomerFromAnalyticsDao,
+    private val customerFromAnalyticsMapper: WCCustomerFromAnalyticsMapper
+) {
+    /**
+     * returns cached customers for the given site
+     */
+    fun getCustomersForSite(site: SiteModel) = CustomerSqlUtils.getCustomersForSite(site)
+
+    /**
+     * returns a cached customer with provided remote id or null if not in cache
+     */
+    fun getCustomerByRemoteId(site: SiteModel, remoteCustomerId: Long) =
+        CustomerSqlUtils.getCustomerByRemoteId(site, remoteCustomerId)
+
+    /**
+     * returns a cached customers with provided remote ids or empty list if not in cache
+     */
+    fun getCustomerByRemoteIds(site: SiteModel, remoteCustomerId: List<Long>) =
+        CustomerSqlUtils.getCustomerByRemoteIds(site, remoteCustomerId)
+
+    fun saveCustomers(customers: List<WCCustomerModel>) {
+        CustomerSqlUtils.insertCustomers(customers)
+    }
+
+    fun deleteCustomersForSite(site: SiteModel) {
+        CustomerSqlUtils.deleteCustomersForSite(site)
+    }
+
+    /**
+     * returns a customer with provided remote id
+     */
+    suspend fun fetchSingleCustomer(
+        site: SiteModel,
+        remoteCustomerId: Long
+    ): WooResult<WCCustomerModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchSingleCustomer") {
+            val response = restClient.fetchSingleCustomer(site, remoteCustomerId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val customer = mapper.mapToModel(site, response.result)
+                    CustomerSqlUtils.insertOrUpdateCustomer(customer)
+                    WooResult(customer)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns customers from the backend
+     */
+    suspend fun fetchCustomers(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_CUSTOMER_PAGE_SIZE,
+        offset: Long = 0,
+        sortType: CustomerSorting = DEFAULT_CUSTOMER_SORTING,
+        searchQuery: String? = null,
+        email: String? = null,
+        role: String? = null,
+        context: String? = null,
+        remoteCustomerIds: List<Long>? = null,
+        excludedCustomerIds: List<Long>? = null
+    ): WooResult<List<WCCustomerModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchCustomers") {
+            val response = restClient.fetchCustomers(
+                site = site,
+                pageSize = pageSize,
+                sortType = sortType,
+                offset = offset,
+                searchQuery = searchQuery,
+                email = email,
+                role = role,
+                context = context,
+                remoteCustomerIds = remoteCustomerIds,
+                excludedCustomerIds = excludedCustomerIds
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val customers = response.result.map { mapper.mapToModel(site, it) }
+
+                    // clear cache if it's the first page for the site
+                    if (offset == 0L) CustomerSqlUtils.deleteCustomersForSite(site)
+                    CustomerSqlUtils.insertOrUpdateCustomers(customers)
+
+                    WooResult(customers)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns customers from the backend by id and store them
+     */
+    suspend fun fetchCustomersByIdsAndCache(
+        site: SiteModel,
+        pageSize: Int = DEFAULT_CUSTOMER_PAGE_SIZE,
+        remoteCustomerIds: List<Long>
+    ): WooResult<Unit> {
+        suspend fun doFetch(
+            site: SiteModel,
+            pageSize: Int,
+            remoteCustomerIds: List<Long>
+        ): WooResult<Unit> {
+            val response = restClient.fetchCustomers(
+                site = site,
+                pageSize = pageSize,
+                remoteCustomerIds = remoteCustomerIds
+            )
+            return when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val customers = response.result.map { mapper.mapToModel(site, it) }
+                    CustomerSqlUtils.insertOrUpdateCustomers(customers)
+                    WooResult(Unit)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this,
+            "fetchCustomersByIdsAndCache"
+        ) {
+            val jobs = mutableListOf<Deferred<WooResult<Unit>>>()
+            remoteCustomerIds.chunked(pageSize).forEach { idsToFetch ->
+                jobs.add(async { doFetch(site, pageSize, idsToFetch) })
+            }
+
+            val results = jobs.awaitAll()
+            val firstError = results.firstOrNull { it.error != null }
+            if (firstError == null) WooResult(Unit)
+            else WooResult(WooError(GENERIC_ERROR, UNKNOWN, firstError.error?.message))
+        }
+    }
+
+    /**
+     * creates a customer on the backend
+     */
+    suspend fun createCustomer(
+        site: SiteModel,
+        customer: WCCustomerModel
+    ): WooResult<WCCustomerModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "createCustomer") {
+            val response = restClient.createCustomer(site, mapper.mapToDTO(customer))
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(mapper.mapToModel(site, response.result))
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns customers from analytics
+     */
+    suspend fun fetchCustomersFromAnalytics(
+        site: SiteModel,
+        page: Int,
+        pageSize: Int = DEFAULT_CUSTOMER_PAGE_SIZE,
+        sortType: CustomerSorting = DEFAULT_CUSTOMER_SORTING,
+        searchQuery: String? = null,
+        searchBy: String? = null,
+        filterEmpty: List<String>? = null,
+    ): WooResult<List<WCCustomerModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchCustomersFromAnalytics") {
+            val response = restClient.fetchCustomersFromAnalytics(
+                site = site,
+                pageSize = pageSize,
+                page = page,
+                sortType = sortType,
+                searchQuery = searchQuery,
+                searchBy = searchBy,
+                filterEmpty = filterEmpty,
+            )
+            when {
+                response.isError -> {
+                    AppLog.e(AppLog.T.API, "Error fetching customers from analytics: ${response.error.message}")
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    // Save customer locally
+                    response.result.map {
+                        customerFromAnalyticsMapper.mapDTOToEntity(site, it)
+                    }.let { entities ->
+                        customerFromAnalyticsDao.insertCustomersFromAnalytics(entities)
+                    }
+
+                    WooResult(response.result.map { mapper.mapToModel(site, it) })
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns analytics customer by user id
+     */
+    suspend fun fetchSingleCustomerFromAnalyticsByUserId(
+        site: SiteModel,
+        remoteCustomerId: Long
+    ): WooResult<WCCustomerFromAnalytics> {
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this,
+            "fetchSingleCustomerFromAnalyticsByUserId"
+        ) {
+            val response = restClient.fetchSingleCustomerFromAnalyticsByUserId(site, remoteCustomerId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val entity = customerFromAnalyticsMapper.mapDTOToEntity(site, response.result)
+                    customerFromAnalyticsDao.insertCustomerFromAnalytics(entity)
+                    val customer = customerFromAnalyticsMapper.mapEntityToModel(entity)
+                    WooResult(customer)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns analytics customer by analytic id
+     */
+    suspend fun fetchSingleCustomerFromAnalyticsByAnalyticsCustomerId(
+        site: SiteModel,
+        analyticsCustomerId: Long
+    ): WooResult<WCCustomerFromAnalytics> {
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this,
+            "fetchSingleCustomerFromAnalyticsByAnalyticsCustomerId"
+        ) {
+            val response = restClient.fetchSingleCustomerFromAnalyticsByCustomerId(site, analyticsCustomerId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val entity = customerFromAnalyticsMapper.mapDTOToEntity(site, response.result)
+                    customerFromAnalyticsDao.insertCustomerFromAnalytics(entity)
+                    val customer = customerFromAnalyticsMapper.mapEntityToModel(entity)
+                    WooResult(customer)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun getCustomerFromAnalyticsByAnalyticsId(
+        site: SiteModel,
+        analyticCustomerId: Long
+    ): WCCustomerFromAnalytics? {
+        return customerFromAnalyticsDao.getCustomerByAnalyticCustomerId(
+            site.localId(),
+            analyticCustomerId
+        )?.let {
+            customerFromAnalyticsMapper.mapEntityToModel(it)
+        }
+    }
+
+
+    companion object {
+        private const val DEFAULT_CUSTOMER_PAGE_SIZE = 25
+        private val DEFAULT_CUSTOMER_SORTING = NAME_ASC
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCDataStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCDataStore.kt
new file mode 100644
index 00000000000..fec58c63a8a
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCDataStore.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.data.WCCountryMapper
+import org.wordpress.android.fluxc.model.data.WCLocationModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.data.WCDataRestClient
+import org.wordpress.android.fluxc.persistence.WCCountriesSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCDataStore @Inject constructor(
+    private val restClient: WCDataRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: WCCountryMapper
+) {
+    /**
+     * Returns a list of countries
+     */
+    fun getCountries(): List<WCLocationModel> =
+            WCCountriesSqlUtils.getCountries()
+
+    /**
+     * Returns a list of states
+     */
+    fun getStates(country: String): List<WCLocationModel> =
+            WCCountriesSqlUtils.getStates(country)
+
+    suspend fun fetchCountriesAndStates(site: SiteModel): WooResult<List<WCLocationModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchCountries") {
+            val response = restClient.fetchCountries(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val locationModels = response.result.flatMap {
+                        mapper.map(it)
+                    }
+
+                    // delete existing tax classes for site before adding incoming entries
+                    WCCountriesSqlUtils.insertOrUpdateLocations(locationModels)
+                    WooResult(locationModels)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGatewayStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGatewayStore.kt
new file mode 100644
index 00000000000..8b29df1890c
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGatewayStore.kt
@@ -0,0 +1,86 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.gateways.GatewayMapper
+import org.wordpress.android.fluxc.model.gateways.WCGatewayModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient.GatewayId
+import org.wordpress.android.fluxc.persistence.WCGatewaySqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCGatewayStore @Inject constructor(
+    private val restClient: GatewayRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: GatewayMapper
+) {
+    fun getGateway(site: SiteModel, gatewayId: String): WCGatewayModel? =
+            WCGatewaySqlUtils.selectGateway(site, gatewayId)?.let { mapper.map(it) }
+
+    suspend fun fetchGateway(site: SiteModel, gatewayId: String): WooResult<WCGatewayModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchGateway") {
+            val response = restClient.fetchGateway(site, gatewayId)
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    WCGatewaySqlUtils.insertOrUpdate(site, response.result)
+                    WooResult(mapper.map(response.result))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun updatePaymentGateway(
+        site: SiteModel,
+        gatewayId: GatewayId,
+        enabled: Boolean? = null,
+        title: String? = null,
+        description: String? = null,
+        settings: Settings? = null
+    ): WooResult<WCGatewayModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "updatePaymentGateway") {
+            val response = restClient.updatePaymentGateway(site, gatewayId, enabled, title, description, settings)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    WCGatewaySqlUtils.insertOrUpdate(site, response.result)
+                    WooResult(mapper.map(response.result))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+    }
+}
+
+    fun getAllGateways(site: SiteModel): List<WCGatewayModel> =
+            WCGatewaySqlUtils.selectAllGateways(site).map { mapper.map(it) }
+
+    suspend fun fetchAllGateways(site: SiteModel): WooResult<List<WCGatewayModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchAllGateways") {
+            val response = restClient.fetchAllGateways(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    WCGatewaySqlUtils.insertOrUpdate(site, response.result.toList())
+                    WooResult(response.result.map { mapper.map(it) })
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+}
+
+data class Settings(
+    val instructions: String,
+)
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGlobalAttributeStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGlobalAttributeStore.kt
new file mode 100644
index 00000000000..d6390b65269
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGlobalAttributeStore.kt
@@ -0,0 +1,202 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeMapper
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.ProductAttributeRestClient
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.deleteSingleStoredAttribute
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.fetchSingleStoredAttribute
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.getCurrentAttributes
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.insertAttributeTermsFromScratch
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.insertFromScratchCompleteAttributesList
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.insertOrUpdateSingleAttribute
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.insertSingleAttribute
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.updateSingleAttributeTermsMapping
+import org.wordpress.android.fluxc.persistence.WCGlobalAttributeSqlUtils.updateSingleStoredAttribute
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCGlobalAttributeStore @Inject constructor(
+    private val restClient: ProductAttributeRestClient,
+    private val mapper: WCGlobalAttributeMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchStoreAttributes(
+        site: SiteModel
+    ): WooResult<List<WCGlobalAttributeModel>> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchStoreAttributes") {
+                restClient.fetchProductFullAttributesList(site)
+                        .asWooResult()
+                        .model
+                        ?.takeIf { it.isNotEmpty() }
+                        ?.let { mapper.responseToAttributeModelList(it, site) }
+                        ?.let {
+                            insertFromScratchCompleteAttributesList(it, site.id)
+                            getCurrentAttributes(site.id)
+                        }
+                        ?.let { WooResult(it) }
+                        ?: getCurrentAttributes(site.id)
+                                .takeIf { it.isNotEmpty() }
+                                ?.let { WooResult(it) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    fun loadCachedStoreAttributes(
+        site: SiteModel
+    ) = WooResult(getCurrentAttributes(site.id))
+
+    suspend fun fetchAttributeTerms(
+        site: SiteModel,
+        attributeID: Long,
+        page: Int = DEFAULT_PAGE_INDEX,
+        pageSize: Int = DEFAULT_PAGE_SIZE
+    ) = restClient.fetchAllAttributeTerms(site, attributeID, page, pageSize)
+            .result?.map { mapper.responseToAttributeTermModel(it, attributeID.toInt(), site) }
+            ?.apply {
+                insertAttributeTermsFromScratch(attributeID.toInt(), site.id, this)
+                map { it.remoteId.toString() }
+                        .takeIf { it.isNotEmpty() }
+                        ?.reduce { total, new -> "$total;$new" }
+                        ?.let { termsId ->
+                            updateSingleAttributeTermsMapping(attributeID.toInt(), termsId, site.id)
+                                    ?: handleMissingAttribute(site, attributeID, termsId)
+                        }
+            }
+            ?.let { WooResult(it) }
+
+    suspend fun fetchAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        withTerms: Boolean = false
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "createStoreAttributes") {
+                restClient.fetchSingleAttribute(site, attributeID)
+                        .asWooResult()
+                        .model
+                        ?.let { mapper.responseToAttributeModel(it, site) }
+                        ?.let { insertOrUpdateSingleAttribute(it, site.id) }
+                        ?.apply { takeIf { withTerms }?.let { fetchAttributeTerms(site, attributeID) } }
+                        ?.let { fetchSingleStoredAttribute(attributeID.toInt(), site.id) }
+                        ?.let { WooResult(it) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    suspend fun createAttribute(
+        site: SiteModel,
+        name: String,
+        slug: String = name,
+        type: String = "select",
+        orderBy: String = "menu_order",
+        hasArchives: Boolean = false
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "createStoreAttributes") {
+                restClient.postNewAttribute(
+                        site, mapOf(
+                        "name" to name,
+                        "slug" to slug,
+                        "type" to type,
+                        "order_by" to orderBy,
+                        "has_archives" to hasArchives.toString()
+                )
+                )
+                        .asWooResult()
+                        .model
+                        ?.let { mapper.responseToAttributeModel(it, site) }
+                        ?.let { insertSingleAttribute(it) }
+                        ?.let { WooResult(it) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    suspend fun updateAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        name: String,
+        slug: String = name,
+        type: String = "select",
+        orderBy: String = "menu_order",
+        hasArchives: Boolean = false
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "updateStoreAttributes") {
+                restClient.updateExistingAttribute(
+                        site, attributeID, mapOf(
+                        "id" to attributeID.toString(),
+                        "name" to name,
+                        "slug" to slug,
+                        "type" to type,
+                        "order_by" to orderBy,
+                        "has_archives" to hasArchives.toString()
+                )
+                )
+                        .asWooResult()
+                        .model
+                        ?.let { mapper.responseToAttributeModel(it, site) }
+                        ?.let { updateSingleStoredAttribute(it, site.id) }
+                        ?.let { WooResult(it) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    suspend fun deleteAttribute(
+        site: SiteModel,
+        attributeID: Long
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "deleteStoreAttributes") {
+                restClient.deleteExistingAttribute(site, attributeID)
+                        .asWooResult()
+                        .model
+                        ?.let { mapper.responseToAttributeModel(it, site) }
+                        ?.let { deleteSingleStoredAttribute(it, site.id) }
+                        ?.let { WooResult(it) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    suspend fun createOptionValueForAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        term: String
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "createAttributeTerm") {
+                restClient.postNewTerm(
+                        site, attributeID,
+                        mapOf("name" to term)
+                )
+                        .asWooResult()
+                        .model
+                        ?.let { fetchAttribute(site, attributeID) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    suspend fun deleteOptionValueFromAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        termID: Long
+    ): WooResult<WCGlobalAttributeModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "deleteAttributeTerm") {
+                restClient.deleteExistingTerm(site, attributeID, termID)
+                        .asWooResult()
+                        .model
+                        ?.let { fetchAttribute(site, attributeID) }
+                        ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+
+    private suspend fun handleMissingAttribute(
+        site: SiteModel,
+        attributeID: Long,
+        termsId: String
+    ) {
+        fetchAttribute(site, attributeID)
+                .model
+                ?.let { updateSingleAttributeTermsMapping(attributeID.toInt(), termsId, site.id) }
+    }
+
+    companion object {
+        const val DEFAULT_PAGE_SIZE = 100
+        const val DEFAULT_PAGE_INDEX = 1
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGoogleStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGoogleStore.kt
new file mode 100644
index 00000000000..f900f16bf32
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCGoogleStore.kt
@@ -0,0 +1,169 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCampaign
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCampaignMapper
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCardStats
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsPrograms
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsProgramsMapper
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.GoogleAdsTotalsDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleAdsProgramsDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleRestClient
+import org.wordpress.android.fluxc.store.WCGoogleStore.TotalsType.SALES
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * This store is intended to be used to support the Google Listings and Ads plugin.
+ * https://wordpress.org/plugins/google-listings-and-ads/
+ */
+@Singleton
+class WCGoogleStore @Inject constructor(
+    private val restClient: WCGoogleRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val campaignMapper: WCGoogleAdsCampaignMapper,
+    private val programsMapper: WCGoogleAdsProgramsMapper
+) {
+    /**
+     * Checks the connection status of the Google Ads account used in the plugin.
+     *
+     * @return WooResult<Boolean> true if the account is connected, false otherwise. Optionally,
+     * passes error, too.
+     */
+    suspend fun isGoogleAdsAccountConnected(site: SiteModel): WooResult<Boolean> =
+        coroutineEngine.withDefaultContext(API, this, "fetchGoogleAdsConnectionStatus") {
+            val response = restClient.fetchGoogleAdsConnectionStatus(site)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> response.asWooResult()
+                else -> WooResult(false)
+            }
+        }
+
+    /**
+     * Fetches the Google Ads campaigns.
+     *
+     * @param excludeRemovedCampaigns Exclude removed (deleted) campaigns from being fetched.
+     * @return WooResult<List<WCGoogleAdsCampaign>> a list of Google Ads campaigns. Optionally,
+     * passes error, too.
+     */
+    suspend fun fetchGoogleAdsCampaigns(
+        site: SiteModel,
+        excludeRemovedCampaigns: Boolean = true
+    ): WooResult<List<WCGoogleAdsCampaign>> =
+        coroutineEngine.withDefaultContext(API, this, "fetchGoogleAdsCampaigns") {
+            val response = restClient.fetchGoogleAdsCampaigns(site, excludeRemovedCampaigns)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val campaigns = response.result.map { campaignMapper.mapToModel(it) }
+                    WooResult(campaigns)
+                }
+
+                else -> WooResult(emptyList())
+            }
+        }
+
+    suspend fun fetchAllPrograms(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        totals: List<TotalsType>,
+        orderBy: TotalsType = SALES
+    ): WooResult<WCGoogleAdsPrograms?> =
+        coroutineEngine.withDefaultContext(API, this, "fetchAllPrograms") {
+            val pages: MutableList<WCGoogleAdsProgramsDTO> = mutableListOf()
+            var lastReceivedError: WooError? = null
+            var nextPageToken: String? = null
+            var hasMorePages = true
+
+            while (hasMorePages) {
+                val page = restClient.fetchAllPrograms(
+                    site = site,
+                    startDate = startDate,
+                    endDate = endDate,
+                    fields = totals.joinToString(",") { it.parameterName },
+                    orderBy = orderBy.parameterName,
+                    nextPageToken = nextPageToken
+                )
+
+                page.takeIf { it.isError.not() }?.result?.let {
+                    pages.add(it)
+                    nextPageToken = it.nextPageToken
+                    hasMorePages = it.nextPageToken?.isNotEmpty() ?: false
+                } ?: run { lastReceivedError = page.error }
+            }
+
+            val response = lastReceivedError?.takeIf { pages.isEmpty() }?.let {
+                WooPayload(error = it)
+            } ?: pages.mergeData()
+
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(programsMapper.mapToModel(response.result))
+                else -> WooResult(
+                    WooError(WooErrorType.INVALID_RESPONSE, GenericErrorType.INVALID_RESPONSE)
+                )
+            }
+        }
+
+    suspend fun fetchImpressionsAndClicks(
+        site: SiteModel,
+        startDate: String,
+        endDate: String
+    ): WooResult<WCGoogleAdsCardStats> =
+        coroutineEngine.withDefaultContext(API, this, "fetchImpressionsAndClicks") {
+            val response = restClient.fetchImpressionsAndClicks(site, startDate, endDate)
+
+            if (response.isError) {
+                return@withDefaultContext WooResult(response.error)
+            }
+
+            val totals = response.result?.totals
+            val clicks = totals?.clicks
+            val impressions = totals?.impressions
+
+            if (clicks != null && impressions != null) {
+                WooResult(
+                    WCGoogleAdsCardStats(
+                        clicks = clicks,
+                        impressions = impressions
+                    )
+                )
+            } else {
+                WooResult(
+                    WooError(WooErrorType.INVALID_RESPONSE, GenericErrorType.INVALID_RESPONSE)
+                )
+            }
+        }
+
+    private fun List<WCGoogleAdsProgramsDTO>.mergeData(): WooPayload<WCGoogleAdsProgramsDTO> {
+        return WCGoogleAdsProgramsDTO(
+            campaigns = flatMap { it.campaigns.orEmpty() },
+            intervals = flatMap { it.intervals.orEmpty() },
+            totals = GoogleAdsTotalsDTO(
+                sales = sumOf { it.totals?.sales ?: 0.0 },
+                spend = sumOf { it.totals?.spend ?: 0.0 },
+                clicks = sumOf { it.totals?.clicks ?: 0.0 },
+                impressions = sumOf { it.totals?.impressions ?: 0.0 },
+                conversions = sumOf { it.totals?.conversions ?: 0.0 }
+            ),
+            nextPageToken = null
+        ).let { WooPayload(it) }
+    }
+
+    enum class TotalsType(val parameterName: String) {
+        SALES("sales"),
+        SPEND("spend"),
+        CLICKS("clicks"),
+        IMPRESSIONS("impressions"),
+        CONVERSIONS("conversions")
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInPersonPaymentsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInPersonPaymentsStore.kt
new file mode 100644
index 00000000000..52fb5c781f1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInPersonPaymentsStore.kt
@@ -0,0 +1,105 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.payments.inperson.WCCapturePaymentResponsePayload
+import org.wordpress.android.fluxc.model.payments.inperson.WCConnectionTokenResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentAccountResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentChargeApiResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCPaymentTransactionsSummaryResult
+import org.wordpress.android.fluxc.model.payments.inperson.WCTerminalStoreLocationResult
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson.InPersonPaymentsRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCInPersonPaymentsStore @Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val restClient: InPersonPaymentsRestClient
+) {
+    suspend fun fetchConnectionToken(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WooResult<WCConnectionTokenResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchConnectionToken") {
+            val response = restClient.fetchConnectionToken(activePlugin, site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    WooResult(WCConnectionTokenResult(response.result.token, response.result.isTestMode))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun capturePayment(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel,
+        paymentId: String,
+        orderId: Long
+    ): WCCapturePaymentResponsePayload {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "capturePayment") {
+            restClient.capturePayment(activePlugin, site, paymentId, orderId)
+        }
+    }
+
+    suspend fun loadAccount(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WooResult<WCPaymentAccountResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "loadAccount") {
+            restClient.loadAccount(activePlugin, site).asWooResult()
+        }
+    }
+
+    suspend fun getStoreLocationForSite(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel
+    ): WCTerminalStoreLocationResult {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "getStoreLocationForSite") {
+            restClient.getStoreLocationForSite(activePlugin, site)
+        }
+    }
+
+    suspend fun fetchPaymentCharge(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel,
+        chargeId: String
+    ): WooPayload<WCPaymentChargeApiResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchPaymentCharge") {
+            restClient.fetchPaymentCharge(activePlugin, chargeId, site)
+        }
+    }
+
+    /**
+     * Fetches a summary of IPP transactions made in a given period of time.
+     * The method is available for stores using WCPay plugin.
+     *
+     * @param activePlugin The active IPP plugin [InPersonPaymentsPluginType].
+     * @param site The site to fetch the transactions for.
+     * @param dateAfter The start date of the period to fetch the transactions for, in ISO 8601 format YYYY-mm-DD.
+     */
+    suspend fun fetchTransactionsSummary(
+        activePlugin: InPersonPaymentsPluginType,
+        site: SiteModel,
+        dateAfter: String? = null
+    ): WooPayload<WCPaymentTransactionsSummaryResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchTransactionsSummary") {
+            restClient.fetchTransactionsSummary(activePlugin, site, dateAfter)
+        }
+    }
+
+    enum class InPersonPaymentsPluginType {
+        WOOCOMMERCE_PAYMENTS,
+        STRIPE
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInboxStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInboxStore.kt
new file mode 100644
index 00000000000..5b628fd5577
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCInboxStore.kt
@@ -0,0 +1,132 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox.InboxNoteDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox.InboxRestClient
+import org.wordpress.android.fluxc.persistence.dao.InboxNotesDao
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteWithActions
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCInboxStore @Inject constructor(
+    private val restClient: InboxRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val inboxNotesDao: InboxNotesDao
+) {
+    companion object {
+        // API has a restriction were no more than 25 notes can be deleted at once so when deleting all notes
+        // for site we have to calculate the number of "pages" to be deleted. This only applies for deletion.
+        const val MAX_PAGE_SIZE_FOR_DELETING_NOTES = 25
+        const val DEFAULT_PAGE_SIZE = 100
+        const val DEFAULT_PAGE = 1
+        val INBOX_NOTE_TYPES_FOR_APPS = arrayOf(
+            "info",
+            "survey",
+            "marketing",
+            "warning"
+        )
+    }
+
+    suspend fun fetchInboxNotes(
+        site: SiteModel,
+        page: Int = DEFAULT_PAGE,
+        pageSize: Int = DEFAULT_PAGE_SIZE,
+        inboxNoteTypes: Array<String> = INBOX_NOTE_TYPES_FOR_APPS
+    ): WooResult<Unit> =
+        coroutineEngine.withDefaultContext(API, this, "fetchInboxNotes") {
+            val response = restClient.fetchInboxNotes(site, page, pageSize, inboxNoteTypes)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    saveInboxNotes(response.result, site)
+                    WooResult(Unit)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+
+    fun observeInboxNotes(site: SiteModel): Flow<List<InboxNoteWithActions>> =
+        inboxNotesDao.observeInboxNotes(site.localId())
+            .distinctUntilChanged()
+
+    suspend fun markInboxNoteAsActioned(
+        site: SiteModel,
+        noteId: Long,
+        actionId: Long
+    ): WooResult<Unit> =
+        coroutineEngine.withDefaultContext(API, this, "fetchInboxNotes") {
+            val response = restClient.markInboxNoteAsActioned(site, noteId, actionId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    markNoteAsActionedLocally(site, response.result)
+                    WooResult(Unit)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+
+    suspend fun deleteNote(
+        site: SiteModel,
+        noteId: Long
+    ): WooResult<Unit> =
+        coroutineEngine.withDefaultContext(API, this, "fetchInboxNotes") {
+            val response = restClient.deleteNote(site, noteId)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    inboxNotesDao.deleteInboxNote(noteId, site.localId())
+                    WooResult(Unit)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+
+    suspend fun deleteNotesForSite(
+        site: SiteModel,
+        pageSize: Int = MAX_PAGE_SIZE_FOR_DELETING_NOTES,
+        inboxNoteTypes: Array<String> = INBOX_NOTE_TYPES_FOR_APPS
+    ): WooResult<Unit> =
+        coroutineEngine.withDefaultContext(API, this, "fetchInboxNotes") {
+            var latestResult = WooResult(Unit)
+            for (page in 1..getNumberOfPagesToDelete(site)) {
+                latestResult = restClient
+                    .deleteAllNotesForSite(site, page, pageSize, inboxNoteTypes)
+                    .asWooResult()
+                if (latestResult.isError) break
+            }
+            if (!latestResult.isError) {
+                inboxNotesDao.deleteInboxNotesForSite(site.localId())
+            }
+            latestResult
+        }
+
+    private fun getNumberOfPagesToDelete(site: SiteModel): Int {
+        val sizeOfCachedNotesForSite = inboxNotesDao.getInboxNotesForSite(site.localId()).size
+        var numberOfPagesToDelete = sizeOfCachedNotesForSite / MAX_PAGE_SIZE_FOR_DELETING_NOTES
+        if (sizeOfCachedNotesForSite % MAX_PAGE_SIZE_FOR_DELETING_NOTES > 0) {
+            numberOfPagesToDelete++
+        }
+        return numberOfPagesToDelete
+    }
+
+    @Suppress("SpreadOperator")
+    private suspend fun saveInboxNotes(result: Array<InboxNoteDto>, site: SiteModel) {
+        val notesWithActions = result.map { it.toInboxNoteWithActionsEntity(site.localId()) }
+        inboxNotesDao.deleteAllAndInsertInboxNotes(site.localId(), *notesWithActions.toTypedArray())
+    }
+
+    private suspend fun markNoteAsActionedLocally(site: SiteModel, updatedNote: InboxNoteDto) {
+        val noteWithActionsEntity = updatedNote.toInboxNoteWithActionsEntity(site.localId())
+        inboxNotesDao.updateNote(site.localId(), noteWithActionsEntity)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCLeaderboardsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCLeaderboardsStore.kt
new file mode 100644
index 00000000000..50a18566f53
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCLeaderboardsStore.kt
@@ -0,0 +1,165 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.leaderboards.WCProductLeaderboardsMapper
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.PRODUCTS
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsRestClient
+import org.wordpress.android.fluxc.persistence.dao.TopPerformerProductsDao
+import org.wordpress.android.fluxc.persistence.entity.TopPerformerProductEntity
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.DateUtils
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Suppress("LongParameterList")
+@Singleton
+class WCLeaderboardsStore @Inject constructor(
+    private val restClient: LeaderboardsRestClient,
+    private val productStore: WCProductStore,
+    private val mapper: WCProductLeaderboardsMapper,
+    private val coroutineEngine: CoroutineEngine,
+    private val topPerformersDao: TopPerformerProductsDao,
+    private val reportsRestClient: ReportsRestClient,
+    private val wooCommerceStore: WooCommerceStore
+) {
+    @Suppress("Unused")
+    fun observeTopPerformerProducts(
+        site: SiteModel,
+        datePeriod: String
+    ): Flow<List<TopPerformerProductEntity>> =
+        topPerformersDao
+            .observeTopPerformerProducts(site.localId(), datePeriod)
+            .distinctUntilChanged()
+
+    @Suppress("Unused")
+    suspend fun getCachedTopPerformerProducts(
+        site: SiteModel,
+        datePeriod: String
+    ): List<TopPerformerProductEntity> =
+        topPerformersDao.getTopPerformerProductsFor(site.localId(), datePeriod)
+
+    @Suppress("LongParameterList")
+    suspend fun fetchTopPerformerProductsLegacy(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int? = null,
+        addProductsPath: Boolean = false,
+        forceRefresh: Boolean = false,
+        interval: String = ""
+    ): WooResult<List<TopPerformerProductEntity>> {
+        val period = DateUtils.getDatePeriod(startDate, endDate)
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchLeaderboards") {
+            fetchAllLeaderboards(
+                site = site,
+                startDate = startDate,
+                endDate = endDate,
+                quantity = quantity,
+                addProductsPath = addProductsPath,
+                forceRefresh = forceRefresh,
+                interval = interval
+            )
+                .model
+                ?.firstOrNull { it.type == PRODUCTS }
+                ?.run {
+                    mapper.mapTopPerformerProductsEntity(
+                        response = this,
+                        site = site,
+                        productStore = productStore,
+                        datePeriod = period
+                    )
+                }
+                ?.let {
+                    topPerformersDao.updateTopPerformerProductsFor(
+                        localSiteId = site.localId(),
+                        datePeriod = period,
+                        topPerformerProducts = it
+                    )
+                    WooResult(it)
+                } ?: WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+        }
+    }
+
+    suspend fun fetchTopPerformerProducts(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int = 5,
+    ): WooResult<List<TopPerformerProductEntity>> {
+        val response = reportsRestClient.fetchTopPerformerProducts(
+            site = site,
+            startDate = startDate,
+            endDate = endDate,
+            quantity = quantity
+        )
+
+        return when {
+            response.isError -> WooResult(response.error)
+            response.result != null -> {
+                val period = DateUtils.getDatePeriod(startDate, endDate)
+                val currency = wooCommerceStore.getSiteSettings(site)?.currencyCode ?: ""
+                val topPerformers = response.result.map { item ->
+                    mapper.mapTopPerformerProductsEntity(item, site, period, currency)
+                }
+
+                topPerformersDao.updateTopPerformerProductsFor(
+                    localSiteId = site.localId(),
+                    datePeriod = period,
+                    topPerformerProducts = topPerformers
+                )
+
+                WooResult(topPerformers)
+            }
+
+            else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+        }
+    }
+
+    @Suppress("LongParameterList")
+    private suspend fun fetchAllLeaderboards(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int?,
+        addProductsPath: Boolean,
+        forceRefresh: Boolean,
+        interval: String,
+    ): WooResult<List<LeaderboardsApiResponse>> {
+        val response = restClient.fetchLeaderboards(
+            site = site,
+            startDate = startDate,
+            endDate = endDate,
+            quantity = quantity,
+            addProductsPath = addProductsPath,
+            interval = interval,
+            forceRefresh = forceRefresh
+        )
+
+        return when {
+            response.isError -> WooResult(response.error)
+            response.result != null -> WooResult(response.result.toList())
+            else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+        }
+    }
+
+    fun invalidateTopPerformers(site: SiteModel) {
+        coroutineEngine.launch(AppLog.T.DB, this, "Invalidating top performer products") {
+            val invalidatedTopPerformers =
+                topPerformersDao.getTopPerformerProductsForSite(site.localId())
+                    .map { it.copy(millisSinceLastUpdated = 0) }
+            topPerformersDao.updateTopPerformerProductsForSite(
+                site.localId(),
+                invalidatedTopPerformers
+            )
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderFetcher.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderFetcher.kt
new file mode 100644
index 00000000000..f57679b38c1
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderFetcher.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.WCOrderActionBuilder
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersByIdsPayload
+import org.wordpress.android.fluxc.store.WCOrderStore.OnOrdersFetchedByIds
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.util.Collections
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * This Singleton is a light-weight class that provides methods for ensuring that orders matching a provided list
+ * of [RemoteId]'s exist in the local DB. If they do not exist, or if they have been modified since last saved to
+ * the DB, FluxC will pull down fresh versions from the API and save them to the DB. Once all orders have been
+ * successfully fetched, any [androidx.paging.PagedList] views observing this specific type of data will update
+ * automatically.
+ */
+@Singleton
+class WCOrderFetcher @Inject constructor(private val dispatcher: Dispatcher) {
+    companion object {
+        private const val TAG = "OrderFetcher"
+    }
+
+    /**
+     * The [RemoteId] of the [OrderEntity] in the process of being fetched from
+     * the remote API.
+     */
+    private val ongoingRequests = Collections.synchronizedSet(mutableSetOf<Long>())
+
+    init {
+        dispatcher.register(this)
+    }
+
+    /**
+     * Fetch a list of orders matching the provided list of [RemoteId]'s from the
+     * API. Will first remove any [RemoteId]'s already in the process of being
+     * fetched.
+     *
+     * @param [site] The [SiteModel] to fetch the orders from
+     * @param [orderIds] A list containing the ids of the orders to fetch
+     */
+    fun fetchOrders(site: SiteModel, orderIds: List<Long>) {
+        val idsToFetch = orderIds.filter {
+            // ignore duplicate requests
+            !ongoingRequests.contains(it)
+        }
+        if (idsToFetch.isNotEmpty()) {
+            ongoingRequests.addAll(idsToFetch)
+            val payload = FetchOrdersByIdsPayload(site = site, orderIds = idsToFetch)
+            dispatcher.dispatch(WCOrderActionBuilder.newFetchOrdersByIdsAction(payload))
+        }
+    }
+
+    @Suppress("unused", "ForbiddenComment")
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    fun onOrdersFetchedById(event: OnOrdersFetchedByIds) {
+        if (event.isError) {
+            AppLog.e(T.API, "$TAG: Error fetching orders by remoteOrderId: ${event.error.message}")
+            // FIXME: Add error handling
+            // FIXME: Possible add new tracks event to track error fetching order list data "order_list_load_failed"
+        }
+        ongoingRequests.removeAll(event.orderIds)
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt
new file mode 100644
index 00000000000..b79d42680ad
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCOrderStore.kt
@@ -0,0 +1,1210 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.WCOrderAction
+import org.wordpress.android.fluxc.action.WCOrderAction.FETCH_ORDERS
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.generated.ListActionBuilder
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.API_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.BatchOrderApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient.OrderBy
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient.SortOrder
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrderNotesDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+import org.wordpress.android.fluxc.store.ListStore.FetchedListItemsPayload
+import org.wordpress.android.fluxc.store.ListStore.ListError
+import org.wordpress.android.fluxc.store.ListStore.ListErrorType
+import org.wordpress.android.fluxc.store.ListStore.OnListDataFailure
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.TIMEOUT_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult.OptimisticUpdateResult
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult.RemoteUpdateResult
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrdersStatusResult.FailedOrder
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
+@Singleton
+class WCOrderStore @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wcOrderRestClient: OrderRestClient,
+    private val wcOrderFetcher: WCOrderFetcher,
+    private val coroutineEngine: CoroutineEngine,
+    private val ordersDaoDecorator: OrdersDaoDecorator,
+    private val orderNotesDao: OrderNotesDao,
+    private val metaDataDao: MetaDataDao,
+    private val insertOrder: InsertOrder
+) : Store(dispatcher) {
+    companion object {
+        const val NUM_ORDERS_PER_FETCH = 15
+    }
+
+    class FetchOrdersPayload(
+        var site: SiteModel,
+        var statusFilter: String? = null,
+        var loadMore: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    class FetchOrderListPayload(
+        val listDescriptor: WCOrderListDescriptor,
+        val offset: Long,
+        val requestStartTime: Calendar = Calendar.getInstance()
+    ) : Payload<BaseNetworkError>()
+
+    class FetchOrdersByIdsPayload(
+        val site: SiteModel,
+        val orderIds: List<Long>
+    ) : Payload<BaseNetworkError>()
+
+    data class FetchOrdersResponsePayload(
+        val site: SiteModel,
+        val ordersWithMeta: List<Pair<OrderEntity, List<WCMetaData>>> = emptyList(),
+        val statusFilter: String? = null,
+        val loadedMore: Boolean = false,
+        val canLoadMore: Boolean = false
+    ) : Payload<OrderError>() {
+        val orders = ordersWithMeta.map { it.first }
+
+        constructor(error: OrderError, site: SiteModel) : this(site) {
+            this.error = error
+        }
+    }
+
+    class FetchOrderListResponsePayload(
+        val listDescriptor: WCOrderListDescriptor,
+        var orderSummaries: List<WCOrderSummaryModel> = emptyList(),
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false,
+        val requestStartTime: Calendar
+    ) : Payload<OrderError>() {
+        constructor(
+            error: OrderError,
+            listDescriptor: WCOrderListDescriptor,
+            requestStartTime: Calendar
+        ) : this(listDescriptor, requestStartTime = requestStartTime) {
+            this.error = error
+        }
+    }
+
+    class FetchOrdersByIdsResponsePayload(
+        val site: SiteModel,
+        var orderIds: List<Long>,
+        var fetchedOrders: List<Pair<OrderEntity, List<WCMetaData>>> = emptyList()
+    ) : Payload<OrderError>() {
+        constructor(
+            error: OrderError,
+            site: SiteModel,
+            orderIds: List<Long>
+        ) : this(site = site, orderIds = orderIds) {
+            this.error = error
+        }
+    }
+
+    class SearchOrdersPayload(
+        var site: SiteModel,
+        var searchQuery: String,
+        var offset: Int
+    ) : Payload<BaseNetworkError>()
+
+    class SearchOrdersResponsePayload(
+        var site: SiteModel,
+        var searchQuery: String,
+        var canLoadMore: Boolean = false,
+        var offset: Int = 0,
+        var orders: List<OrderEntity> = emptyList()
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel, query: String) : this(site, query) {
+            this.error = error
+        }
+    }
+
+    class FetchOrdersCountPayload(
+        var site: SiteModel,
+        var statusFilter: String
+    ) : Payload<BaseNetworkError>()
+
+    class FetchOrdersCountResponsePayload(
+        var site: SiteModel,
+        var statusFilter: String?,
+        var count: Int = 0
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel, statusFilter: String?) : this(site, statusFilter) {
+            this.error = error
+        }
+    }
+
+    class FetchHasOrdersResponsePayload(
+        var site: SiteModel,
+        var statusFilter: String? = null,
+        var hasOrders: Boolean = false
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel) : this(site) {
+            this.error = error
+        }
+    }
+
+    class UpdateOrderStatusPayload(
+        val order: OrderEntity,
+        val site: SiteModel,
+        val status: String
+    ) : Payload<BaseNetworkError>()
+
+    sealed class RemoteOrderPayload : Payload<OrderError>() {
+        abstract val site: SiteModel
+        abstract val order: OrderEntity
+
+        data class Fetching(
+            val orderWithMeta: Pair<OrderEntity, List<WCMetaData>>,
+            override val site: SiteModel
+        ) : RemoteOrderPayload() {
+            override val order = orderWithMeta.first
+
+            constructor(
+                error: OrderError,
+                order: Pair<OrderEntity, List<WCMetaData>>,
+                site: SiteModel
+            ) : this(order, site) {
+                this.error = error
+            }
+        }
+
+        data class Updating(
+            override val order: OrderEntity,
+            override val site: SiteModel
+        ) : RemoteOrderPayload() {
+            constructor(
+                error: OrderError,
+                order: OrderEntity,
+                site: SiteModel
+            ) : this(order, site) {
+                this.error = error
+            }
+        }
+    }
+
+    sealed class UpdateOrderResult {
+        abstract val event: OnOrderChanged
+
+        data class OptimisticUpdateResult(override val event: OnOrderChanged) : UpdateOrderResult()
+        data class RemoteUpdateResult(override val event: OnOrderChanged) : UpdateOrderResult()
+    }
+
+    class FetchOrderStatusOptionsPayload(val site: SiteModel) : Payload<BaseNetworkError>()
+
+    class FetchOrderStatusOptionsResponsePayload(
+        val site: SiteModel,
+        val labels: List<WCOrderStatusModel> = emptyList()
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel) : this(site) {
+            this.error = error
+        }
+    }
+
+    class FetchOrderShipmentTrackingsResponsePayload(
+        var site: SiteModel,
+        var orderId: Long,
+        var trackings: List<WCOrderShipmentTrackingModel> = emptyList()
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel, orderId: Long) :
+            this(site, orderId) {
+            this.error = error
+        }
+    }
+
+    class AddOrderShipmentTrackingPayload(
+        val site: SiteModel,
+        var orderId: Long,
+        val tracking: WCOrderShipmentTrackingModel,
+        val isCustomProvider: Boolean
+    ) : Payload<BaseNetworkError>()
+
+    class AddOrderShipmentTrackingResponsePayload(
+        val site: SiteModel,
+        var orderId: Long,
+        val tracking: WCOrderShipmentTrackingModel?
+    ) : Payload<OrderError>() {
+        constructor(
+            error: OrderError,
+            site: SiteModel,
+            orderId: Long,
+            tracking: WCOrderShipmentTrackingModel
+        ) : this(site, orderId, tracking) {
+            this.error = error
+        }
+    }
+
+    class DeleteOrderShipmentTrackingPayload(
+        val site: SiteModel,
+        var orderId: Long,
+        val tracking: WCOrderShipmentTrackingModel
+    ) : Payload<BaseNetworkError>()
+
+    class DeleteOrderShipmentTrackingResponsePayload(
+        val site: SiteModel,
+        var orderId: Long,
+        val tracking: WCOrderShipmentTrackingModel?
+    ) : Payload<OrderError>() {
+        constructor(
+            error: OrderError,
+            site: SiteModel,
+            orderId: Long,
+            tracking: WCOrderShipmentTrackingModel?
+        ) : this(site, orderId, tracking) {
+            this.error = error
+        }
+    }
+
+    class FetchOrderShipmentProvidersPayload(
+        val site: SiteModel,
+        val order: OrderEntity
+    ) : Payload<BaseNetworkError>()
+
+    class FetchOrderShipmentProvidersResponsePayload(
+        val site: SiteModel,
+        val order: OrderEntity,
+        val providers: List<WCOrderShipmentProviderModel> = emptyList()
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError, site: SiteModel, order: OrderEntity) : this(site, order) {
+            this.error = error
+        }
+    }
+
+    class BulkUpdateOrderStatusResponsePayload(
+        val response: List<BatchOrderApiResponse.OrderResponse>
+    ) : Payload<OrderError>() {
+        constructor(error: OrderError) : this(emptyList()) {
+            this.error = error
+        }
+    }
+
+    data class UpdateOrdersStatusResult(
+        val updatedOrders: List<Long> = emptyList(),
+        val failedOrders: List<FailedOrder> = emptyList()
+    ) {
+        data class FailedOrder(
+            val id: Long,
+            val errorCode: String,
+            val errorMessage: String,
+            val errorStatus: Int
+        )
+    }
+
+    data class OrderError(val type: OrderErrorType = GENERIC_ERROR, val message: String = "") : OnChangedError
+
+    enum class OrderErrorType {
+        INVALID_PARAM,
+        INVALID_ID,
+        ORDER_STATUS_NOT_FOUND,
+        PLUGIN_NOT_ACTIVE,
+        INVALID_RESPONSE,
+        GENERIC_ERROR,
+        PARSE_ERROR,
+        TIMEOUT_ERROR,
+        EMPTY_BILLING_EMAIL,
+        BULK_UPDATE_LIMIT_EXCEEDED;
+
+        companion object {
+            private val reverseMap = values().associateBy(OrderErrorType::name)
+            fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR
+        }
+    }
+
+    sealed class HasOrdersResult {
+        data class Success(val hasOrders: Boolean) : HasOrdersResult()
+        data class Failure(val error: OrderError) : HasOrdersResult()
+    }
+
+    sealed class OrdersCountResult {
+        data class Success(val count: Int) : OrdersCountResult()
+        data class Failure(val error: OrderError) : OrdersCountResult()
+    }
+
+    // OnChanged events
+    data class OnOrderChanged(
+        val statusFilter: String? = null,
+        val canLoadMore: Boolean = false,
+        val causeOfChange: WCOrderAction? = null,
+        private val orderError: OrderError? = null
+    ) : OnChanged<OrderError>() {
+        init {
+            super.error = orderError
+        }
+    }
+
+    /**
+     * Emitted after fetching a list of Order summaries from the network.
+     */
+    class OnOrderSummariesFetched(
+        val listDescriptor: WCOrderListDescriptor,
+        val duration: Long
+    ) : OnChanged<OrderError>()
+
+    class OnOrdersFetchedByIds(
+        val site: SiteModel,
+        val orderIds: List<Long>
+    ) : OnChanged<OrderError>()
+
+    class OnOrdersSearched(
+        var searchQuery: String = "",
+        var canLoadMore: Boolean = false,
+        var nextOffset: Int = 0,
+        var searchResults: List<OrderEntity> = emptyList()
+    ) : OnChanged<OrderError>()
+
+    class OnOrderStatusOptionsChanged(
+        var rowsAffected: Int
+    ) : OnChanged<OrderError>()
+
+    class OnOrderShipmentProvidersChanged(
+        var rowsAffected: Int
+    ) : OnChanged<OrderError>()
+
+    override fun onRegister() = AppLog.d(API, "WCOrderStore onRegister")
+
+    /**
+     * Given a [SiteModel] and optional statuses, returns all orders for that site matching any of those statuses.
+     */
+    suspend fun getOrdersForSite(site: SiteModel, vararg status: String) = if (status.isEmpty()) {
+        ordersDaoDecorator.getOrdersForSite(site.localId())
+    } else {
+        ordersDaoDecorator.getOrdersForSite(site.localId(), status = status.asList())
+    }
+
+    suspend fun getPaidOrdersForSiteDesc(siteModel: SiteModel) =
+        ordersDaoDecorator.getPaidOrdersForSiteDesc(siteModel.localId())
+
+    /**
+     * Observe the changes to orders for a given [SiteModel]
+     *
+     * @param site the current site
+     * @param statuses an optional list of statuses to filter the list of orders, pass an empty list to include all
+     *                 orders
+     */
+    fun observeOrdersForSite(site: SiteModel, statuses: List<String> = emptyList()): Flow<List<OrderEntity>> {
+        return if (statuses.isEmpty()) {
+            ordersDaoDecorator.observeOrdersForSite(site.localId())
+        } else {
+            ordersDaoDecorator.observeOrdersForSite(site.localId(), statuses)
+        }
+    }
+
+    /**
+     * Observe the changes to the number of orders for a given [SiteModel]
+     *
+     * @param site the current site
+     * @param statuses a list of statuses to filter the list of orders, pass null to include all orders
+     */
+    fun observeOrderCountForSite(
+        site: SiteModel,
+        statuses: List<String>? = null
+    ): Flow<Int> = ordersDaoDecorator.observeOrderCountForSite(site.localId(), statuses)
+
+    fun getOrdersForDescriptor(
+        orderListDescriptor: WCOrderListDescriptor,
+        orderIds: List<Long>
+    ): Map<Long, OrderEntity> {
+        val orders = ordersDaoDecorator.getOrdersForSiteByRemoteIds(orderListDescriptor.site.localId(), orderIds)
+        return orders.associateBy { it.orderId }
+    }
+
+    fun getOrderSummariesByRemoteOrderIds(
+        site: SiteModel,
+        orderIds: List<Long>
+    ): Map<RemoteId, WCOrderSummaryModel> {
+        val orderSummaries = OrderSqlUtils.getOrderSummariesForRemoteIds(site, orderIds)
+        return orderSummaries.associateBy { RemoteId(it.orderId) }
+    }
+
+    /**
+     * Given an order id and [SiteModel],
+     * returns the corresponding order from the database as a [OrderEntity].
+     */
+    suspend fun getOrderByIdAndSite(orderId: Long, site: SiteModel): OrderEntity? {
+        return ordersDaoDecorator.getOrder(orderId, site.localId())
+    }
+
+    /**
+     * Given an order id and [SiteModel],
+     * returns the metadata from the database for an order
+     */
+    suspend fun getOrderMetadata(orderId: Long, site: SiteModel): List<WCMetaData> {
+        return metaDataDao.getMetaData(site.localId(), orderId).map { it.toDomainModel() }
+    }
+
+    /**
+     * Given an order id and [SiteModel],
+     * returns the displayable metadata from the database for an order
+     */
+    suspend fun getDisplayableOrderMetadata(orderId: Long, site: SiteModel): List<WCMetaData> {
+        return metaDataDao.getDisplayableMetaData(site.localId(), orderId).map { it.toDomainModel() }
+    }
+
+    /**
+     * Given an order id and [SiteModel],
+     * returns whether there is metadata in the database for an order
+     */
+    suspend fun hasOrderMetadata(orderId: Long, site: SiteModel): Boolean {
+        return metaDataDao.hasMetaData(orderId, site.localId())
+    }
+
+    /**
+     * Given an order id and [SiteModel],
+     * returns whether there is displayable metadata in the database for an order
+     */
+    suspend fun hasDisplayableOrderMetadata(orderId: Long, site: SiteModel): Boolean {
+        return metaDataDao.getDisplayableMetaDataCount(site.localId(), orderId) > 0
+    }
+
+    /**
+     * Returns the notes belonging to supplied [OrderEntity] as a list of [OrderNoteEntity].
+     */
+    suspend fun getOrderNotesForOrder(site: SiteModel, orderId: Long): List<OrderNoteEntity> =
+            orderNotesDao.queryNotesOfOrder(localSiteId = site.localId(), orderId = RemoteId(orderId))
+
+    /**
+     * Returns the order status options available for the provided site [SiteModel] as a list of [WCOrderStatusModel].
+     */
+    fun getOrderStatusOptionsForSite(site: SiteModel): List<WCOrderStatusModel> =
+        OrderSqlUtils.getOrderStatusOptionsForSite(site)
+
+    /**
+     * Returns the order status as a [WCOrderStatusModel] that matches the provided order status key.
+     */
+    fun getOrderStatusForSiteAndKey(site: SiteModel, key: String): WCOrderStatusModel? =
+        OrderSqlUtils.getOrderStatusOptionForSiteByKey(site, key)
+
+    /**
+     * Returns shipment trackings as list of [WCOrderShipmentTrackingModel] for a single [OrderEntity]
+     */
+    fun getShipmentTrackingsForOrder(site: SiteModel, orderId: Long): List<WCOrderShipmentTrackingModel> =
+        OrderSqlUtils.getShipmentTrackingsForOrder(site, orderId)
+
+    fun getShipmentTrackingByTrackingNumber(site: SiteModel, orderId: Long, trackingNumber: String) =
+        OrderSqlUtils.getShipmentTrackingByTrackingNumber(site, orderId, trackingNumber)
+
+    /**
+     * Returns the shipment providers as a list of [WCOrderShipmentProviderModel]
+     */
+    fun getShipmentProvidersForSite(site: SiteModel): List<WCOrderShipmentProviderModel> =
+        OrderSqlUtils.getOrderShipmentProvidersForSite(site)
+
+    @Suppress("ComplexMethod", "UseCheckOrError")
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? WCOrderAction ?: return
+        when (actionType) {
+            // remote actions
+            FETCH_ORDERS -> fetchOrders(action.payload as FetchOrdersPayload)
+            WCOrderAction.FETCH_ORDER_LIST -> fetchOrderList(action.payload as FetchOrderListPayload)
+            WCOrderAction.FETCH_ORDERS_BY_IDS -> fetchOrdersByIds(action.payload as FetchOrdersByIdsPayload)
+            WCOrderAction.FETCH_ORDERS_COUNT -> fetchOrdersCount(action.payload as FetchOrdersCountPayload)
+            WCOrderAction.UPDATE_ORDER_STATUS ->
+                throw IllegalStateException("Invalid action. Use suspendable updateOrderStatus(..) directly")
+            WCOrderAction.SEARCH_ORDERS -> searchOrders(action.payload as SearchOrdersPayload)
+            WCOrderAction.FETCH_ORDER_STATUS_OPTIONS ->
+                fetchOrderStatusOptions(action.payload as FetchOrderStatusOptionsPayload)
+
+            // remote responses
+            WCOrderAction.FETCHED_ORDERS -> handleFetchOrdersCompleted(action.payload as FetchOrdersResponsePayload)
+            WCOrderAction.FETCHED_ORDER_LIST ->
+                handleFetchOrderListCompleted(action.payload as FetchOrderListResponsePayload)
+            WCOrderAction.FETCHED_ORDERS_BY_IDS ->
+                handleFetchOrderByIdsCompleted(action.payload as FetchOrdersByIdsResponsePayload)
+            WCOrderAction.FETCHED_ORDERS_COUNT ->
+                handleFetchOrdersCountCompleted(action.payload as FetchOrdersCountResponsePayload)
+            WCOrderAction.SEARCHED_ORDERS -> handleSearchOrdersCompleted(action.payload as SearchOrdersResponsePayload)
+            WCOrderAction.FETCHED_ORDER_STATUS_OPTIONS ->
+                handleFetchOrderStatusOptionsCompleted(action.payload as FetchOrderStatusOptionsResponsePayload)
+        }
+    }
+
+    private fun fetchOrders(payload: FetchOrdersPayload) {
+        val offset = if (payload.loadMore) {
+            ordersDaoDecorator.getOrderCountForSite(payload.site.localId())
+        } else {
+            0
+        }
+        wcOrderRestClient.fetchOrders(payload.site, offset, payload.statusFilter)
+    }
+
+    private fun fetchOrderList(payload: FetchOrderListPayload) {
+        wcOrderRestClient.fetchOrderListSummaries(
+            listDescriptor = payload.listDescriptor,
+            offset = payload.offset,
+            requestStartTime = payload.requestStartTime
+        )
+    }
+
+    private fun fetchOrdersByIds(payload: FetchOrdersByIdsPayload) {
+        payload.orderIds.chunked(NUM_ORDERS_PER_FETCH).forEach { idsToFetch ->
+            wcOrderRestClient.fetchOrdersByIds(payload.site, idsToFetch)
+        }
+    }
+
+    private fun searchOrders(payload: SearchOrdersPayload) {
+        wcOrderRestClient.searchOrders(payload.site, payload.searchQuery, payload.offset)
+    }
+
+    private fun fetchOrdersCount(payload: FetchOrdersCountPayload) {
+        with(payload) { wcOrderRestClient.fetchOrderCountSync(site, statusFilter) }
+    }
+
+    suspend fun fetchOrdersCount(site: SiteModel, filterByStatus: String? = null): OrdersCountResult {
+        return coroutineEngine.withDefaultContext(API, this, "checkIfHasOrders") {
+            val result = wcOrderRestClient.fetchOrderCountSync(site, filterByStatus)
+            return@withDefaultContext if (result.isError) {
+                 OrdersCountResult.Failure(result.error)
+            } else {
+                OrdersCountResult.Success(result.count)
+            }
+        }
+    }
+
+    suspend fun hasOrders(site: SiteModel): HasOrdersResult {
+        return coroutineEngine.withDefaultContext(API, this, "checkIfHasOrders") {
+            val ordersCount = ordersDaoDecorator.getOrderCountForSite(site.localId())
+            return@withDefaultContext if (ordersCount > 0) {
+                HasOrdersResult.Success(true)
+            } else {
+                fetchHasOrders(site, null)
+            }
+        }
+    }
+
+    suspend fun fetchHasOrders(site: SiteModel, status: String?): HasOrdersResult {
+        return coroutineEngine.withDefaultContext(API, this, "fetchHasOrders") {
+            val result = wcOrderRestClient.fetchHasOrders(site, status)
+
+            return@withDefaultContext if (result.isError) {
+                HasOrdersResult.Failure(result.error)
+            } else {
+                HasOrdersResult.Success(result.hasOrders)
+            }
+        }
+    }
+
+    suspend fun fetchSingleOrder(site: SiteModel, remoteOrderId: Long): OnOrderChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchSingleOrder") {
+            val result = wcOrderRestClient.fetchSingleOrder(site, remoteOrderId)
+
+            return@withDefaultContext if (result.isError) {
+                OnOrderChanged(orderError = result.error)
+            } else {
+                insertOrder(site.localId(), result.orderWithMeta)
+                OnOrderChanged()
+            }
+        }
+    }
+
+    suspend fun fetchSingleOrderSync(site: SiteModel, remoteOrderId: Long): WooResult<OrderEntity> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchSingleOrderSync") {
+            val result = wcOrderRestClient.fetchSingleOrder(site, remoteOrderId)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(WooError(API_ERROR, SERVER_ERROR, result.error.message))
+            } else {
+                insertOrder(site.localId(), result.orderWithMeta)
+                WooResult(result.order)
+            }
+        }
+    }
+
+    @Suppress("SpreadOperator")
+    suspend fun fetchOrders(
+        site: SiteModel,
+        count: Int = NUM_ORDERS_PER_FETCH,
+        page: Int = 1,
+        orderBy: OrderBy = OrderBy.DATE,
+        sortOrder: SortOrder = SortOrder.DESCENDING,
+        statusFilter: String? = null,
+        deleteOldData: Boolean = page == 1
+    ): WooResult<List<OrderEntity>> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchOrders") {
+            val result = wcOrderRestClient.fetchOrders(site, count, page, orderBy, sortOrder, statusFilter)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(WooError(API_ERROR, SERVER_ERROR, result.error.message))
+            } else {
+                if (deleteOldData) {
+                    ordersDaoDecorator.deleteOrdersForSite(site.localId())
+                }
+                insertOrder(site.localId(), *result.ordersWithMeta.toTypedArray())
+
+                WooResult(result.orders)
+            }
+        }
+    }
+
+    suspend fun updateOrderStatus(
+        orderId: Long,
+        site: SiteModel,
+        newStatus: WCOrderStatusModel
+    ): Flow<UpdateOrderResult> =
+        updateOrderStatusAndPaymentMethod(orderId, site, newStatus, null, null)
+
+    suspend fun updateOrderStatusAndPaymentMethod(
+        orderId: Long,
+        site: SiteModel,
+        newStatus: WCOrderStatusModel,
+        newPaymentMethodId: String?,
+        newPaymentMethodTitle: String?,
+    ): Flow<UpdateOrderResult> {
+        return coroutineEngine.flowWithDefaultContext(API, this, "updateOrderStatusAndPaymentMethod") {
+            val orderModel = ordersDaoDecorator.getOrder(orderId, site.localId())
+
+            if (orderModel != null) {
+                optimisticallyUpdateOrder(
+                    orderId,
+                    site.localId(),
+                    newStatus.statusKey,
+                    newPaymentMethodId,
+                    newPaymentMethodTitle,
+                    OrdersDaoDecorator.ListUpdateStrategy.INVALIDATE
+                )
+
+                val optimisticUpdateResult = OnOrderChanged(
+                    causeOfChange = WCOrderAction.UPDATE_ORDER_STATUS
+                )
+
+                emit(OptimisticUpdateResult(optimisticUpdateResult))
+
+                // Ensure the code gets executed even when the VM dies - eg. when the client app marks an order as
+                // completed and navigates to a different screen.
+                val remoteUpdateResult: OnOrderChanged = withContext(NonCancellable) {
+                    val remotePayload = wcOrderRestClient.updateOrderStatusAndPaymentMethod(
+                        orderModel,
+                        site,
+                        newStatus.statusKey,
+                        newPaymentMethodId,
+                        newPaymentMethodTitle,
+                    )
+                    if (remotePayload.isError) {
+                        revertOptimisticOrderUpdate(remotePayload)
+                    } else {
+                        ordersDaoDecorator.insertOrUpdateOrder(
+                            remotePayload.order,
+                            // Re-fetch the list to ensure the order is correctly placed even when a filter is applied
+                            OrdersDaoDecorator.ListUpdateStrategy.REFRESH
+                        )
+                        OnOrderChanged()
+                    }.copy(causeOfChange = WCOrderAction.UPDATE_ORDER_STATUS)
+                }
+
+                emit(RemoteUpdateResult(remoteUpdateResult))
+                // Needs to remain here until all event bus observables are removed from the client code
+                emitChange(remoteUpdateResult)
+            } else {
+                emit(
+                    OptimisticUpdateResult(
+                        OnOrderChanged(
+                            orderError = OrderError(
+                                message = "Order with id $orderId not found"
+                            )
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    suspend fun fetchOrdersReceipt(
+        site: SiteModel,
+        orderId: Long,
+        expirationDate: String? = null,
+        expirationDays: Int? = null,
+        forceNew: Boolean? = null
+    ) = wcOrderRestClient.fetchOrdersReceipt(
+        site,
+        orderId,
+        expirationDate,
+        expirationDays,
+        forceNew
+    )
+
+    suspend fun sendOrderReceipt(
+        site: SiteModel,
+        orderId: Long,
+    ) = wcOrderRestClient.sendOrderReceipt(
+        site,
+        orderId
+    )
+
+    private suspend fun optimisticallyUpdateOrder(
+        orderId: Long,
+        localSiteId: LocalId,
+        newStatus: String,
+        newPaymentMethodId: String? = null,
+        newPaymentMethodTitle: String? = null,
+        listUpdateStrategy: OrdersDaoDecorator.ListUpdateStrategy = OrdersDaoDecorator.ListUpdateStrategy.DEFAULT
+    ) {
+        val updatedOrder = ordersDaoDecorator.getOrder(orderId, localSiteId)!!.let {
+            it.copy(
+                status = newStatus,
+                paymentMethod = newPaymentMethodId ?: it.paymentMethod,
+                paymentMethodTitle = newPaymentMethodTitle ?: it.paymentMethodTitle
+            )
+        }
+        ordersDaoDecorator.insertOrUpdateOrder(updatedOrder, listUpdateStrategy)
+    }
+
+    @Suppress("SpreadOperator")
+    suspend fun fetchOrderNotes(
+        site: SiteModel,
+        orderId: Long
+    ): WooResult<List<OrderNoteEntity>> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchOrderNotes") {
+            val result = wcOrderRestClient.fetchOrderNotes(orderId, site)
+
+            return@withDefaultContext result.let {
+                if (!it.isError) {
+                    orderNotesDao.insertNotes(*it.result!!.toTypedArray())
+                }
+                result.asWooResult()
+            }
+        }
+    }
+
+    suspend fun postOrderNote(
+        site: SiteModel,
+        orderId: Long,
+        note: String,
+        isCustomerNote: Boolean
+    ): WooResult<OrderNoteEntity> {
+        return coroutineEngine.withDefaultContext(API, this, "postOrderNote") {
+            val result = wcOrderRestClient.postOrderNote(orderId, site, note, isCustomerNote)
+
+            return@withDefaultContext if (result.isError) {
+                result.asWooResult()
+            } else {
+                orderNotesDao.insertNotes(result.result!!)
+                result.asWooResult()
+            }
+        }
+    }
+
+    private fun fetchOrderStatusOptions(payload: FetchOrderStatusOptionsPayload) {
+        wcOrderRestClient.fetchOrderStatusOptions(payload.site)
+    }
+
+    suspend fun fetchOrderShipmentTrackings(orderId: Long, site: SiteModel): OnOrderChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchOrderShipmentTrackings") {
+            val result = wcOrderRestClient.fetchOrderShipmentTrackings(site, orderId)
+            return@withDefaultContext if (result.isError) {
+                OnOrderChanged(orderError = result.error)
+            } else {
+                // Calculate which existing records should be deleted because they no longer exist in the payload
+                val existingTrackings = OrderSqlUtils.getShipmentTrackingsForOrder(
+                    result.site,
+                    result.orderId
+                )
+                val deleteTrackings = mutableListOf<WCOrderShipmentTrackingModel>()
+                existingTrackings.iterator().forEach { existing ->
+                    var exists = false
+                    result.trackings.iterator().forEach nti@{ newTracking ->
+                        if (newTracking.remoteTrackingId == existing.remoteTrackingId) {
+                            exists = true
+                            return@nti
+                        }
+                    }
+                    if (!exists) deleteTrackings.add(existing)
+                }
+                var rowsAffected = deleteTrackings.sumBy { OrderSqlUtils.deleteOrderShipmentTrackingById(it) }
+
+                // Save new shipment trackings to the database
+                rowsAffected += result.trackings.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+                OnOrderChanged()
+            }
+        }
+    }
+
+    suspend fun addOrderShipmentTracking(payload: AddOrderShipmentTrackingPayload): OnOrderChanged {
+        return coroutineEngine.withDefaultContext(API, this, "addOrderShipmentTracking") {
+            val result = with(payload) {
+                wcOrderRestClient.addOrderShipmentTrackingForOrder(
+                    site, orderId, tracking, isCustomProvider
+                )
+            }
+
+            return@withDefaultContext if (result.isError) {
+                OnOrderChanged(orderError = result.error)
+            } else {
+                result.tracking?.let { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+                OnOrderChanged()
+            }
+        }
+    }
+
+    suspend fun deleteOrderShipmentTracking(payload: DeleteOrderShipmentTrackingPayload): OnOrderChanged {
+        return coroutineEngine.withDefaultContext(API, this, "deleteOrderShipmentTracking") {
+            val result = with(payload) {
+                wcOrderRestClient.deleteShipmentTrackingForOrder(site, orderId, tracking)
+            }
+
+            return@withDefaultContext if (result.isError) {
+                OnOrderChanged(orderError = result.error)
+            } else {
+                // Remove the record from the database and send response
+                result.tracking?.let { OrderSqlUtils.deleteOrderShipmentTrackingById(it) }
+                OnOrderChanged()
+            }
+        }
+    }
+
+    suspend fun fetchOrderShipmentProviders(
+        payload: FetchOrderShipmentProvidersPayload
+    ): OnOrderShipmentProvidersChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchOrderShipmentProviders") {
+            val result = with(payload) {
+                wcOrderRestClient.fetchOrderShipmentProviders(site, order)
+            }
+
+            return@withDefaultContext if (result.isError) {
+                OnOrderShipmentProvidersChanged(0).also { it.error = result.error }
+            } else {
+                // Delete all providers from the db
+                OrderSqlUtils.deleteOrderShipmentProvidersForSite(payload.site)
+
+                // Add new list to the database
+                val rowsAffected = result.providers.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentProvider(it) }
+                OnOrderShipmentProvidersChanged(rowsAffected)
+            }
+        }
+    }
+
+    @Suppress("SpreadOperator")
+    private fun handleFetchOrdersCompleted(payload: FetchOrdersResponsePayload) {
+        coroutineEngine.launch(API, this, "handleFetchOrdersCompleted") {
+            val onOrderChanged: OnOrderChanged = if (payload.isError) {
+                OnOrderChanged(orderError = payload.error)
+            } else {
+                // Clear existing uploading orders if this is a fresh fetch (loadMore = false in the original request)
+                // This is the simplest way of keeping our local orders in sync with remote orders
+                // (in case of deletions, or if the user manual changed some order IDs).
+                if (!payload.loadedMore) {
+                    ordersDaoDecorator.deleteOrdersForSite(payload.site.localId())
+                    orderNotesDao.deleteOrderNotesForSite(payload.site.localId())
+                    OrderSqlUtils.deleteOrderShipmentTrackingsForSite(payload.site)
+                }
+
+                insertOrder(payload.site.localId(), *payload.ordersWithMeta.toTypedArray())
+                OnOrderChanged(payload.statusFilter, canLoadMore = payload.canLoadMore)
+            }.copy(causeOfChange = FETCH_ORDERS)
+
+            emitChange(onOrderChanged)
+        }
+    }
+
+    @Suppress("ForbiddenComment")
+    private fun handleFetchOrderListCompleted(payload: FetchOrderListResponsePayload) {
+        // TODO: Ideally we would have a separate process that prunes the following
+        // tables of defunct records:
+        // - WCOrderModel
+        // - WCOrderNoteModel
+        // - WCOrderShipmentTrackingModel
+        if (!payload.isError) {
+            // Save order summaries to the db
+            OrderSqlUtils.insertOrUpdateOrderSummaries(payload.orderSummaries)
+
+            // Fetch outdated or missing orders
+            fetchOutdatedOrMissingOrders(payload.listDescriptor.site, payload.orderSummaries)
+        }
+
+        val duration = Calendar.getInstance().timeInMillis - payload.requestStartTime.timeInMillis
+        emitChange(OnOrderSummariesFetched(listDescriptor = payload.listDescriptor, duration = duration))
+
+        mDispatcher.dispatch(ListActionBuilder.newFetchedListItemsAction(FetchedListItemsPayload(
+            listDescriptor = payload.listDescriptor,
+            remoteItemIds = payload.orderSummaries.map { it.orderId },
+            loadedMore = payload.loadedMore,
+            canLoadMore = payload.canLoadMore,
+            error = payload.error?.let { fetchError ->
+                ListError(
+                    type = when (fetchError.type) {
+                        PARSE_ERROR -> ListErrorType.PARSE_ERROR
+                        TIMEOUT_ERROR -> ListErrorType.TIMEOUT_ERROR
+                        else -> ListErrorType.GENERIC_ERROR
+                    },
+                    message = fetchError.message
+                )
+            }
+        )))
+    }
+
+    private fun fetchOutdatedOrMissingOrders(site: SiteModel, fetchedSummaries: List<WCOrderSummaryModel>) {
+        val fetchedSummariesIds = fetchedSummaries.map { it.orderId }
+        val localOrdersForFetchedSummaries =
+            ordersDaoDecorator.getOrdersForSiteByRemoteIds(site.localId(), fetchedSummariesIds)
+
+        val idsToFetch = outdatedOrdersIds(fetchedSummaries, localOrdersForFetchedSummaries)
+            .plus(missingOrdersIds(fetchedSummariesIds, localOrdersForFetchedSummaries))
+
+        wcOrderFetcher.fetchOrders(site = site, orderIds = idsToFetch)
+    }
+
+    private fun outdatedOrdersIds(
+        fetchedSummaries: List<WCOrderSummaryModel>,
+        localOrdersForSiteByRemoteIds: List<OrderEntity>
+    ): List<Long> {
+        val summaryModifiedDates = fetchedSummaries.associate { it.orderId to it.dateModified }
+
+        return localOrdersForSiteByRemoteIds.filter { order ->
+            order.dateModified != summaryModifiedDates[order.orderId]
+        }.map(OrderEntity::orderId)
+    }
+
+    private fun missingOrdersIds(
+        fetchedSummariesIds: List<Long>,
+        localOrdersForSiteByRemoteIds: List<OrderEntity>
+    ): List<Long> {
+        return fetchedSummariesIds.minus(
+            localOrdersForSiteByRemoteIds.map(OrderEntity::orderId)
+        )
+    }
+
+    @Suppress("SpreadOperator")
+    private fun handleFetchOrderByIdsCompleted(payload: FetchOrdersByIdsResponsePayload) {
+        coroutineEngine.launch(API, this, "handleFetchOrderByIdsCompleted") {
+            val onOrdersFetchedByIds = if (payload.isError) {
+                OnOrdersFetchedByIds(payload.site, payload.orderIds).apply { error = payload.error }
+            } else {
+                OnOrdersFetchedByIds(
+                    payload.site,
+                    payload.fetchedOrders.map { it.first }.map { it.orderId })
+            }
+
+            // Notify listeners that the list of orders has changed (only call this if there is no error)
+            val listTypeIdentifier = WCOrderListDescriptor.calculateTypeIdentifier(localSiteId = payload.site.id)
+
+            if (!payload.isError) {
+                // Save the list of orders to the database
+
+                insertOrder(payload.site.localId(), *payload.fetchedOrders.toTypedArray())
+
+                mDispatcher.dispatch(
+                    ListActionBuilder.newListDataInvalidatedAction(
+                        listTypeIdentifier
+                    )
+                )
+            } else {
+                val errorType = if(payload.error.type == PARSE_ERROR){
+                    ListErrorType.PARSE_ERROR
+                } else {
+                    ListErrorType.GENERIC_ERROR
+                }
+
+                mDispatcher.dispatch(
+                    ListActionBuilder.newListDataFailureAction(
+                            OnListDataFailure(listTypeIdentifier).apply {
+                                error = ListError(
+                                    errorType,
+                                    payload.error.message
+                                )
+                            }
+                    )
+                )
+            }
+            emitChange(onOrdersFetchedByIds)
+        }
+    }
+
+    private fun handleSearchOrdersCompleted(payload: SearchOrdersResponsePayload) {
+        val onOrdersSearched = if (payload.isError) {
+            OnOrdersSearched(payload.searchQuery)
+        } else {
+            OnOrdersSearched(payload.searchQuery, payload.canLoadMore, payload.offset, payload.orders)
+        }
+        emitChange(onOrdersSearched)
+    }
+
+    /**
+     * This is a response to a request to retrieve only the count of orders matching a filter. These
+     * results are not stored in the database.
+     */
+    private fun handleFetchOrdersCountCompleted(payload: FetchOrdersCountResponsePayload) {
+        val onOrderChanged = if (payload.isError) {
+            OnOrderChanged(orderError = payload.error)
+        } else {
+            with(payload) {
+                OnOrderChanged(statusFilter = statusFilter)
+            }
+        }.copy(causeOfChange = WCOrderAction.FETCH_ORDERS_COUNT)
+        emitChange(onOrderChanged)
+    }
+
+    private suspend fun revertOptimisticOrderUpdate(payload: RemoteOrderPayload.Updating): OnOrderChanged {
+        optimisticallyUpdateOrder(
+            payload.order.orderId,
+            payload.order.localSiteId,
+            payload.order.status,
+            payload.order.paymentMethod,
+            payload.order.paymentMethodTitle
+        )
+        return OnOrderChanged(orderError = payload.error)
+    }
+
+    private fun handleFetchOrderStatusOptionsCompleted(payload: FetchOrderStatusOptionsResponsePayload) {
+        val onOrderStatusLabelsChanged: OnOrderStatusOptionsChanged
+
+        if (payload.isError) {
+            onOrderStatusLabelsChanged = OnOrderStatusOptionsChanged(0).also { it.error = payload.error }
+        } else {
+            onOrderStatusLabelsChanged = onOrderStatusOptionsChanged(payload)
+        }
+
+        emitChange(onOrderStatusLabelsChanged)
+    }
+
+    private fun onOrderStatusOptionsChanged(
+        payload: FetchOrderStatusOptionsResponsePayload
+    ): OnOrderStatusOptionsChanged {
+        val existingOptions = OrderSqlUtils.getOrderStatusOptionsForSite(payload.site)
+        var rowsAffected = addOrUpdateOptions(payload, existingOptions).sumBy {
+            OrderSqlUtils.insertOrUpdateOrderStatusOption(it)
+        }
+        rowsAffected += deleteOptions(payload, existingOptions).sumBy {
+            OrderSqlUtils.deleteOrderStatusOption(it)
+        }
+        return OnOrderStatusOptionsChanged(rowsAffected)
+    }
+
+    @Suppress("NestedBlockDepth")
+    private fun addOrUpdateOptions(
+        payload: FetchOrderStatusOptionsResponsePayload,
+        existingOptions: List<WCOrderStatusModel>
+    ): List<WCOrderStatusModel> {
+        val addOrUpdateOptions = mutableListOf<WCOrderStatusModel>()
+        payload.labels.iterator().forEach { newOption ->
+            var exists = false
+            existingOptions.iterator().forEach eoi@{ existingOption ->
+                if (newOption.statusKey == existingOption.statusKey) {
+                    exists = true
+                    if (newOption.label != existingOption.label ||
+                        newOption.statusCount != existingOption.statusCount) {
+                        addOrUpdateOptions.add(newOption)
+                    }
+                    return@eoi
+                }
+            }
+            if (!exists) addOrUpdateOptions.add(newOption)
+        }
+        return addOrUpdateOptions
+    }
+
+    private fun deleteOptions(
+        payload: FetchOrderStatusOptionsResponsePayload,
+        existingOptions: List<WCOrderStatusModel>
+    ): List<WCOrderStatusModel> {
+        val deleteOptions = mutableListOf<WCOrderStatusModel>()
+        existingOptions.iterator().forEach { existingOption ->
+            var exists = false
+            payload.labels.iterator().forEach noi@{ newOption ->
+                if (newOption.statusKey == existingOption.statusKey) {
+                    exists = true
+                    return@noi
+                }
+            }
+            if (!exists) deleteOptions.add(existingOption)
+        }
+        return deleteOptions
+    }
+
+    suspend fun fetchOrdersListFirstPage(
+        listDescriptor: WCOrderListDescriptor,
+        deleteOldData: Boolean = false
+    ): WooResult<List<OrderEntity>> {
+        val response = wcOrderRestClient.fetchOrdersListFirstPage(listDescriptor)
+        return if (response.isError) {
+            WooResult(WooError(API_ERROR, SERVER_ERROR, response.error.message))
+        } else {
+            val result = response.result.orEmpty()
+            val orders = result.map { it.first }
+
+            orders.map { order ->
+                WCOrderSummaryModel().apply {
+                    localSiteId = listDescriptor.site.localId().value
+                    orderId = order.orderId
+                    dateCreated = order.dateCreated
+                    dateModified = order.dateModified
+                }
+            }.let { orderSummaries ->
+                OrderSqlUtils.insertOrUpdateOrderSummaries(orderSummaries)
+            }
+
+            if (deleteOldData) {
+                ordersDaoDecorator.deleteOrdersForSite(listDescriptor.site.localId())
+            }
+
+            @Suppress("SpreadOperator")
+            insertOrder(listDescriptor.site.localId(), *result.toTypedArray())
+            WooResult(orders)
+        }
+    }
+
+    @Suppress("NestedBlockDepth")
+    suspend fun batchUpdateOrdersStatus(
+        site: SiteModel,
+        orderIds: List<Long>,
+        newStatus: WCOrderStatusModel
+    ): WooResult<UpdateOrdersStatusResult> {
+        val result = wcOrderRestClient.batchUpdateOrdersStatus(site, orderIds, newStatus.statusKey)
+
+        return if (!result.isError) {
+            val orders = result.response
+            val updatedOrders = mutableListOf<Long>()
+            val failedOrders = mutableListOf<FailedOrder>()
+
+            orders.forEach { response ->
+                when (response) {
+                    is BatchOrderApiResponse.OrderResponse.Success -> {
+                        response.order.id?.let { updatedOrders.add(it) }
+                    }
+
+                    is BatchOrderApiResponse.OrderResponse.Error -> {
+                        failedOrders.add(
+                            FailedOrder(
+                                id = response.id,
+                                errorCode = response.error.code,
+                                errorMessage = response.error.message,
+                                errorStatus = response.error.data.status
+                            )
+                        )
+                    }
+                }
+            }
+
+            WooResult(UpdateOrdersStatusResult(updatedOrders, failedOrders))
+        } else {
+            WooResult(WooError(API_ERROR, SERVER_ERROR, result.error.message))
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductReportsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductReportsStore.kt
new file mode 100644
index 00000000000..0495e5039c9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductReportsStore.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductStockStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ProductStockItemApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsProductApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCProductReportsStore @Inject constructor(
+    private val reportsRestClient: ReportsRestClient,
+    private val coroutineEngine: CoroutineEngine,
+) {
+    companion object {
+        const val DEFAULT_PAGE_SIZE = 3
+        const val DEFAULT_PAGE = 1
+    }
+
+    suspend fun fetchProductStockReport(
+        site: SiteModel,
+        stockStatus: CoreProductStockStatus,
+        page: Int = DEFAULT_PAGE,
+        quantity: Int = DEFAULT_PAGE_SIZE
+    ): WooResult<ProductStockItems> =
+        coroutineEngine.withDefaultContext(API, this, "fetchProductStockReport") {
+            reportsRestClient.fetchProductStockReport(
+                site = site,
+                stockStatus = stockStatus.value,
+                page = page,
+                quantity = quantity
+            )
+        }.asWooResult()
+
+    suspend fun fetchProductSalesReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        productIds: List<Long>
+    ): WooResult<Array<ReportsProductApiResponse>> =
+        coroutineEngine.withDefaultContext(API, this, "fetchProductSalesReport") {
+            reportsRestClient.fetchProductSalesReport(
+                site,
+                startDate,
+                endDate,
+                productIds
+            )
+        }.asWooResult()
+
+    suspend fun fetchProductVariationsSalesReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        productVariationIds: List<Long>
+    ): WooResult<Array<ReportsProductApiResponse>> =
+        coroutineEngine.withDefaultContext(API, this, "fetchProductVariationsSalesReport") {
+            reportsRestClient.fetchProductVariationsSalesReport(
+                site,
+                startDate,
+                endDate,
+                productVariationIds
+            )
+        }.asWooResult()
+}
+
+typealias ProductStockItems = Array<ProductStockItemApiResponse>
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt
new file mode 100644
index 00000000000..d7a33be3b83
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt
@@ -0,0 +1,2194 @@
+package org.wordpress.android.fluxc.store
+
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import kotlinx.coroutines.flow.Flow
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.WCProductAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.ProductWithMetaData
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.VariationAttributes
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductComponent
+import org.wordpress.android.fluxc.model.WCProductImageModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductShippingClassModel
+import org.wordpress.android.fluxc.model.WCProductTagModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel.ProductVariantOption
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+import org.wordpress.android.fluxc.model.metadata.MetadataChanges
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+import org.wordpress.android.fluxc.model.metadata.get
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers.MappingRemoteException
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers.RemoteAddonMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.BatchProductVariationsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductStockStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductVariationMapper
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils
+import org.wordpress.android.fluxc.persistence.ProductStorageHelper
+import org.wordpress.android.fluxc.persistence.dao.AddonsDao
+import org.wordpress.android.fluxc.store.WCProductStore.ProductCategorySorting.NAME_ASC
+import org.wordpress.android.fluxc.store.WCProductStore.ProductErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.WCProductStore.ProductSorting.TITLE_ASC
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.API
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Suppress("LargeClass")
+@Singleton
+class WCProductStore @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wcProductRestClient: ProductRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val addonsDao: AddonsDao,
+    private val productStorageHelper: ProductStorageHelper,
+    private val logger: AppLogWrapper
+) : Store(dispatcher) {
+    companion object {
+        const val NUM_REVIEWS_PER_FETCH = 25
+        const val DEFAULT_PRODUCT_PAGE_SIZE = 25
+        const val DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE = 100
+        const val DEFAULT_PRODUCT_VARIATIONS_PAGE_SIZE = 25
+        const val DEFAULT_PRODUCT_SHIPPING_CLASS_PAGE_SIZE = 25
+        const val DEFAULT_PRODUCT_TAGS_PAGE_SIZE = 100
+        val DEFAULT_PRODUCT_SORTING = TITLE_ASC
+        val DEFAULT_CATEGORY_SORTING = NAME_ASC
+        const val VARIATIONS_CREATION_LIMIT = 100
+    }
+
+    sealed class IncludeType(val value: String) {
+        data object Simple : IncludeType("simple")
+        data object Variable : IncludeType("variable")
+        data object External : IncludeType("external")
+        data object Grouped : IncludeType("grouped")
+
+        companion object {
+            fun fromValue(value: String): IncludeType? = when (value) {
+                "simple" -> Simple
+                "variable" -> Variable
+                "external" -> External
+                "grouped" -> Grouped
+                else -> null
+            }
+        }
+    }
+
+    /**
+     * Defines the filter options currently supported in the app
+     */
+    enum class ProductFilterOption {
+        STOCK_STATUS, STATUS, TYPE, CATEGORY, DOWNLOADABLE;
+
+        override fun toString() = name.lowercase(Locale.US)
+    }
+
+    enum class DownloadableOptions {
+        TRUE, FALSE;
+
+        override fun toString() = name.lowercase(Locale.US)
+    }
+
+    enum class VariationFilterOption {
+        STATUS;
+
+        override fun toString() = name.lowercase(Locale.US)
+    }
+
+    enum class SkuSearchOptions {
+        Disabled, ExactSearch, PartialMatch
+    }
+
+    class FetchProductSkuAvailabilityPayload(
+        var site: SiteModel,
+        var sku: String
+    ) : Payload<BaseNetworkError>()
+
+    class FetchSingleProductPayload(
+        var site: SiteModel,
+        var remoteProductId: Long
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductsPayload(
+        var site: SiteModel,
+        var pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        var offset: Int = 0,
+        var sorting: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        var remoteProductIds: List<Long>? = null,
+        var filterOptions: Map<ProductFilterOption, String>? = null,
+        var excludedProductIds: List<Long>? = null
+    ) : Payload<BaseNetworkError>()
+
+    class SearchProductsPayload(
+        var site: SiteModel,
+        var searchQuery: String,
+        var skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        var pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        var offset: Int = 0,
+        var sorting: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        var excludedProductIds: List<Long>? = null,
+        var filterOptions: Map<ProductFilterOption, String>? = null,
+    ) : Payload<BaseNetworkError>()
+
+    class SearchProductsByGlobalUniqueIdPayload(
+        var site: SiteModel,
+        var globalUniqueId: String,
+        var pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        var offset: Int = 0,
+        var sorting: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        var excludedProductIds: List<Long>? = null,
+        var filterOptions: Map<ProductFilterOption, String>? = null,
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductVariationsPayload(
+        var site: SiteModel,
+        var remoteProductId: Long,
+        var pageSize: Int = DEFAULT_PRODUCT_VARIATIONS_PAGE_SIZE,
+        var offset: Int = 0
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductShippingClassListPayload(
+        var site: SiteModel,
+        var pageSize: Int = DEFAULT_PRODUCT_SHIPPING_CLASS_PAGE_SIZE,
+        var offset: Int = 0
+    ) : Payload<BaseNetworkError>()
+
+    class FetchSingleProductShippingClassPayload(
+        var site: SiteModel,
+        var remoteShippingClassId: Long
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductReviewsPayload(
+        var site: SiteModel,
+        var offset: Int = 0,
+        var reviewIds: List<Long>? = null,
+        var productIds: List<Long>? = null,
+        var filterByStatus: List<String>? = null
+    ) : Payload<BaseNetworkError>()
+
+    class FetchSingleProductReviewPayload(
+        var site: SiteModel,
+        var remoteReviewId: Long
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductPasswordPayload(
+        var site: SiteModel,
+        var remoteProductId: Long
+    ) : Payload<BaseNetworkError>()
+
+    class UpdateProductPasswordPayload(
+        var site: SiteModel,
+        var remoteProductId: Long,
+        var password: String
+    ) : Payload<BaseNetworkError>()
+
+    class UpdateProductReviewStatusPayload(
+        var site: SiteModel,
+        var remoteReviewId: Long,
+        var newStatus: String
+    ) : Payload<BaseNetworkError>()
+
+    class UpdateProductImagesPayload(
+        var site: SiteModel,
+        var remoteProductId: Long,
+        var imageList: List<WCProductImageModel>
+    ) : Payload<BaseNetworkError>()
+
+    class UpdateProductPayload(
+        var site: SiteModel,
+        val product: WCProductModel,
+        val metadataChanges: MetadataChanges? = null
+    ) : Payload<BaseNetworkError>()
+
+    class BatchUpdateProductsPayload(
+        val site: SiteModel,
+        val updatedProducts: List<WCProductModel>
+    ) : Payload<BaseNetworkError>()
+
+    class UpdateVariationPayload(
+        var site: SiteModel,
+        val variation: WCProductVariationModel
+    ) : Payload<BaseNetworkError>()
+
+    class BatchGenerateVariationsPayload(
+        val site: SiteModel,
+        val remoteProductId: Long,
+        val variations: List<VariationAttributes>
+    ) : Payload<BaseNetworkError>()
+
+    /**
+     * Payload used by [batchUpdateVariations] function.
+     *
+     * @param remoteProductId Id of the product.
+     * @param remoteVariationsIds Ids of variations that are going to be updated.
+     * @param modifiedProperties Map of the properties of variation that are going to be updated.
+     * Keys correspond to the names of variation properties. Values are the updated properties values.
+     */
+    class BatchUpdateVariationsPayload(
+        val site: SiteModel,
+        val remoteProductId: Long,
+        val remoteVariationsIds: Collection<Long>,
+        val modifiedProperties: Map<String, Any>
+    ) : Payload<BaseNetworkError>() {
+        /**
+         * Builder class used for instantiating [BatchUpdateVariationsPayload].
+         */
+        class Builder(
+            private val site: SiteModel,
+            private val remoteProductId: Long,
+            private val variationsIds: Collection<Long>
+        ) {
+            private val variationsModifications = mutableMapOf<String, Any>()
+
+            fun regularPrice(regularPrice: String) = apply {
+                variationsModifications["regular_price"] = regularPrice
+            }
+
+            fun salePrice(salePrice: String) = apply {
+                variationsModifications["sale_price"] = salePrice
+            }
+
+            fun startOfSale(startOfSale: String) = apply {
+                variationsModifications["date_on_sale_from"] = startOfSale
+            }
+
+            fun endOfSale(endOfSale: String) = apply {
+                variationsModifications["date_on_sale_to"] = endOfSale
+            }
+
+            fun stockQuantity(stockQuantity: Int) = apply {
+                variationsModifications["stock_quantity"] = stockQuantity
+            }
+
+            fun stockStatus(stockStatus: CoreProductStockStatus) = apply {
+                variationsModifications["stock_status"] = stockStatus
+            }
+
+            fun weight(weight: String) = apply {
+                variationsModifications["weight"] = weight
+            }
+
+            fun dimensions(length: String, width: String, height: String) = apply {
+                val dimensions = JsonObject().apply {
+                    add("length", JsonPrimitive(length))
+                    add("width", JsonPrimitive(width))
+                    add("height", JsonPrimitive(height))
+                }
+                variationsModifications["dimensions"] = dimensions
+            }
+
+            fun shippingClassId(shippingClassId: String) = apply {
+                variationsModifications["shipping_class_id"] = shippingClassId
+            }
+
+            fun shippingClassSlug(shippingClassSlug: String) = apply {
+                variationsModifications["shipping_class"] = shippingClassSlug
+            }
+
+            fun build() = BatchUpdateVariationsPayload(
+                site,
+                remoteProductId,
+                variationsIds,
+                variationsModifications
+            )
+        }
+    }
+
+    class FetchProductCategoriesPayload(
+        var site: SiteModel,
+        var pageSize: Int = DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE,
+        var offset: Int = 0,
+        var productCategorySorting: ProductCategorySorting = DEFAULT_CATEGORY_SORTING
+    ) : Payload<BaseNetworkError>()
+
+    class AddProductCategoryPayload(
+        val site: SiteModel,
+        val category: WCProductCategoryModel
+    ) : Payload<BaseNetworkError>()
+
+    class FetchProductTagsPayload(
+        var site: SiteModel,
+        var pageSize: Int = DEFAULT_PRODUCT_TAGS_PAGE_SIZE,
+        var offset: Int = 0,
+        var searchQuery: String? = null
+    ) : Payload<BaseNetworkError>()
+
+    class AddProductTagsPayload(
+        val site: SiteModel,
+        val tags: List<String>
+    ) : Payload<BaseNetworkError>()
+
+    class AddProductPayload(
+        var site: SiteModel,
+        val product: WCProductModel,
+        val metadata: Map<String, WCMetaDataValue>? = null
+    ) : Payload<BaseNetworkError>()
+
+    class DeleteProductPayload(
+        var site: SiteModel,
+        val remoteProductId: Long,
+        val forceDelete: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    enum class ProductErrorType {
+        INVALID_PRODUCT_ID,
+        INVALID_PARAM,
+        INVALID_REVIEW_ID,
+        INVALID_IMAGE_ID,
+        DUPLICATE_SKU,
+
+        // indicates duplicate term name. Currently only used when adding product categories
+        TERM_EXISTS,
+
+        // Happens if a store is running Woo 4.6 and below and tries to delete the product image
+        // from a variation. See this PR for more detail:
+        // https://github.com/woocommerce/woocommerce/pull/27299
+        INVALID_VARIATION_IMAGE_ID,
+        INVALID_MIN_MAX_QUANTITY,
+
+        PARSE_ERROR,
+        GENERIC_ERROR;
+
+        companion object {
+            private val reverseMap = values().associateBy(ProductErrorType::name)
+            fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR
+        }
+    }
+
+    class ProductError(val type: ProductErrorType = GENERIC_ERROR, val message: String = "") : OnChangedError
+
+    enum class ProductSorting {
+        TITLE_ASC,
+        TITLE_DESC,
+        DATE_ASC,
+        DATE_DESC
+    }
+
+    enum class ProductCategorySorting {
+        NAME_ASC,
+        NAME_DESC
+    }
+
+    class RemoteProductSkuAvailabilityPayload(
+        val site: SiteModel,
+        var sku: String,
+        val available: Boolean
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            sku: String,
+            available: Boolean
+        ) : this(site, sku, available) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductPayload(
+        val productWithMetaData: ProductWithMetaData,
+        val site: SiteModel
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            product: ProductWithMetaData,
+            site: SiteModel
+        ) : this(product, site) {
+            this.error = error
+        }
+    }
+
+    class RemoteVariationPayload(
+        val variation: WCProductVariationModel,
+        val site: SiteModel
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            variation: WCProductVariationModel,
+            site: SiteModel
+        ) : this(variation, site) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductPasswordPayload(
+        val remoteProductId: Long,
+        val site: SiteModel,
+        val password: String
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            remoteProductId: Long,
+            site: SiteModel,
+            password: String
+        ) : this(remoteProductId, site, password) {
+            this.error = error
+        }
+    }
+
+    class RemoteUpdatedProductPasswordPayload(
+        val remoteProductId: Long,
+        val site: SiteModel,
+        val password: String
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            remoteProductId: Long,
+            site: SiteModel,
+            password: String
+        ) : this(remoteProductId, site, password) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductListPayload(
+        val site: SiteModel,
+        val productsWithMetaData: List<ProductWithMetaData> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false,
+        val remoteProductIds: List<Long>? = null,
+        val excludedProductIds: List<Long>? = null
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel
+        ) : this(site) {
+            this.error = error
+        }
+    }
+
+    class RemoteSearchProductsPayload(
+        var site: SiteModel,
+        var searchQuery: String?,
+        var skuSearchOptions: SkuSearchOptions,
+        var globalUniqueIdSearchQuery: String?,
+        var productsWithMetaData: List<ProductWithMetaData> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false,
+        var filterOptions: Map<ProductFilterOption, String>? = null
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            query: String?,
+            skuSearchOptions: SkuSearchOptions,
+            globalUniqueIdSearchQuery: String?,
+            filterOptions: Map<ProductFilterOption, String>?
+        ) : this(
+            site = site,
+            searchQuery = query,
+            globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
+            skuSearchOptions = skuSearchOptions,
+            filterOptions = filterOptions
+        ) {
+            this.error = error
+        }
+    }
+
+    class RemoteUpdateProductImagesPayload(
+        var site: SiteModel,
+        val productWithMetaData: ProductWithMetaData
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            product: ProductWithMetaData
+        ) : this(site, product) {
+            this.error = error
+        }
+    }
+
+    class RemoteUpdateProductPayload(
+        var site: SiteModel,
+        val productWithMetaData: ProductWithMetaData
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            product: ProductWithMetaData
+        ) : this(site, product) {
+            this.error = error
+        }
+    }
+
+    class RemoteUpdateVariationPayload(
+        var site: SiteModel,
+        val variation: WCProductVariationModel
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            variation: WCProductVariationModel
+        ) : this(site, variation) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductVariationsPayload(
+        val site: SiteModel,
+        val remoteProductId: Long,
+        val variations: List<WCProductVariationModel> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            remoteProductId: Long
+        ) : this(site, remoteProductId) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductShippingClassListPayload(
+        val site: SiteModel,
+        val shippingClassList: List<WCProductShippingClassModel> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel
+        ) : this(site) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductShippingClassPayload(
+        val productShippingClassModel: WCProductShippingClassModel,
+        val site: SiteModel
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            productShippingClassModel: WCProductShippingClassModel,
+            site: SiteModel
+        ) : this(productShippingClassModel, site) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductReviewPayload(
+        val site: SiteModel,
+        val productReview: WCProductReviewModel? = null
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel
+        ) : this(site) {
+            this.error = error
+        }
+    }
+
+    class PostReviewReply(
+        val site: SiteModel,
+        val productId: RemoteId,
+        val reviewId: RemoteId,
+        val replyContent: String?
+    )
+
+    class FetchProductReviewsResponsePayload(
+        val site: SiteModel,
+        val reviews: List<WCProductReviewModel> = emptyList(),
+        val filterProductIds: List<Long>? = null,
+        val filterByStatus: List<String>? = null,
+        val canLoadMore: Boolean = false
+    ) : Payload<ProductError>() {
+        constructor(error: ProductError, site: SiteModel) : this(site) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductCategoriesPayload(
+        val site: SiteModel,
+        val categories: List<WCProductCategoryModel> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel
+        ) : this(site) {
+            this.error = error
+        }
+    }
+
+    class RemoteAddProductCategoryResponsePayload(
+        val site: SiteModel,
+        val category: WCProductCategoryModel?
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            category: WCProductCategoryModel?
+        ) : this(site, category) {
+            this.error = error
+        }
+    }
+
+    class RemoteProductTagsPayload(
+        val site: SiteModel,
+        val tags: List<WCProductTagModel> = emptyList(),
+        var offset: Int = 0,
+        var loadedMore: Boolean = false,
+        var canLoadMore: Boolean = false,
+        var searchQuery: String? = null
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel
+        ) : this(site) {
+            this.error = error
+        }
+    }
+
+    class RemoteAddProductTagsResponsePayload(
+        val site: SiteModel,
+        val tags: List<WCProductTagModel> = emptyList()
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            addedTags: List<WCProductTagModel> = emptyList()
+        ) : this(site, addedTags) {
+            this.error = error
+        }
+    }
+
+    class RemoteAddProductPayload(
+        var site: SiteModel,
+        val productWithMetaData: ProductWithMetaData
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            product: ProductWithMetaData
+        ) : this(site, product) {
+            this.error = error
+        }
+    }
+
+    class RemoteDeleteProductPayload(
+        var site: SiteModel,
+        val remoteProductId: Long
+    ) : Payload<ProductError>() {
+        constructor(
+            error: ProductError,
+            site: SiteModel,
+            remoteProductId: Long
+        ) : this(site, remoteProductId) {
+            this.error = error
+        }
+    }
+
+    // OnChanged events
+    class OnProductChanged(
+        var rowsAffected: Int,
+        var remoteProductId: Long = 0L, // only set for fetching or deleting a single product
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnVariationChanged(
+        var remoteProductId: Long = 0L,
+        var remoteVariationId: Long = 0L
+    ) : OnChanged<ProductError>()
+
+    class OnProductSkuAvailabilityChanged(
+        var sku: String,
+        var available: Boolean
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductsSearched(
+        var searchQuery: String?,
+        var isSkuSearch: SkuSearchOptions,
+        var globalUniqueIdSearchQuery: String?,
+        var searchResults: List<WCProductModel> = emptyList(),
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>()
+
+    class OnProductReviewChanged(
+        var rowsAffected: Int,
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductShippingClassesChanged(
+        var rowsAffected: Int,
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductImagesChanged(
+        var rowsAffected: Int,
+        var remoteProductId: Long
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductPasswordChanged(
+        var remoteProductId: Long,
+        var password: String?
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductUpdated(
+        var rowsAffected: Int,
+        var remoteProductId: Long
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnVariationUpdated(
+        var rowsAffected: Int,
+        var remoteProductId: Long,
+        var remoteVariationId: Long
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductCategoryChanged(
+        var rowsAffected: Int,
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductTagChanged(
+        var rowsAffected: Int,
+        var canLoadMore: Boolean = false
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    class OnProductCreated(
+        var rowsAffected: Int,
+        var remoteProductId: Long = 0L
+    ) : OnChanged<ProductError>() {
+        var causeOfChange: WCProductAction? = null
+    }
+
+    /**
+     * returns the corresponding product from the database as a [WCProductModel].
+     */
+    fun getProductByRemoteId(site: SiteModel, remoteProductId: Long): WCProductModel? =
+        ProductSqlUtils.getProductByRemoteId(site, remoteProductId)
+
+    /**
+     * returns the corresponding variation from the database as a [WCProductVariationModel].
+     */
+    fun getVariationByRemoteId(
+        site: SiteModel,
+        remoteProductId: Long,
+        remoteVariationId: Long
+    ): WCProductVariationModel? =
+        ProductSqlUtils.getVariationByRemoteId(site, remoteProductId, remoteVariationId)
+
+    /**
+     * returns true if the corresponding product exists in the database
+     */
+    fun geProductExistsByRemoteId(site: SiteModel, remoteProductId: Long) =
+        ProductSqlUtils.geProductExistsByRemoteId(site, remoteProductId)
+
+    /**
+     * returns true if the product exists with this [sku] in the database
+     */
+    fun geProductExistsBySku(site: SiteModel, sku: String) =
+        ProductSqlUtils.getProductExistsBySku(site, sku)
+
+    /**
+     * returns a list of variations for a specific product in the database
+     */
+    fun getVariationsForProduct(site: SiteModel, remoteProductId: Long): List<WCProductVariationModel> =
+        ProductSqlUtils.getVariationsForProduct(site, remoteProductId)
+
+    /**
+     * returns a list of shipping classes for a specific site in the database
+     */
+    fun getShippingClassListForSite(site: SiteModel): List<WCProductShippingClassModel> =
+        ProductSqlUtils.getProductShippingClassListForSite(site.id)
+
+    /**
+     * returns the corresponding product shipping class from the database as a [WCProductShippingClassModel].
+     */
+    fun getShippingClassByRemoteId(site: SiteModel, remoteShippingClassId: Long): WCProductShippingClassModel? =
+        ProductSqlUtils.getProductShippingClassByRemoteId(remoteShippingClassId, site.id)
+
+    /**
+     * returns a list of [WCProductModel] for the give [SiteModel] and [remoteProductIds]
+     * if it exists in the database
+     */
+    fun getProductsByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): List<WCProductModel> =
+        ProductSqlUtils.getProductsByRemoteIds(site, remoteProductIds)
+
+    /**
+     * Returns a list of [WCProductModel] for the given [SiteModel], [filterOptions] and [searchQuery].
+     * To filter by category, make sure the [filterOptions] value is the category ID in String.
+     */
+    fun getProducts(
+        site: SiteModel,
+        filterOptions: Map<ProductFilterOption, String>,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        excludedProductIds: List<Long>? = null,
+        searchQuery: String? = null,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+    ): List<WCProductModel> =
+        ProductSqlUtils.getProducts(site, filterOptions, sortType, excludedProductIds, searchQuery, skuSearchOptions)
+
+    fun getProductsForSite(site: SiteModel, sortType: ProductSorting = DEFAULT_PRODUCT_SORTING) =
+        ProductSqlUtils.getProductsForSite(site, sortType)
+
+    fun deleteProductsForSite(site: SiteModel) = ProductSqlUtils.deleteProductsForSite(site)
+
+    fun getProductReviewsForSite(site: SiteModel): List<WCProductReviewModel> =
+        ProductSqlUtils.getProductReviewsForSite(site)
+
+    fun getProductReviewsByReviewId(reviewIds: List<Long>): List<WCProductReviewModel> =
+        ProductSqlUtils.getProductReviewsByReviewIds(reviewIds)
+
+    fun getProductReviewsForProductAndSiteId(localSiteId: Int, remoteProductId: Long): List<WCProductReviewModel> =
+        ProductSqlUtils.getProductReviewsForProductAndSiteId(localSiteId, remoteProductId)
+
+    /**
+     * returns the count of products for the given [SiteModel] and [remoteProductIds]
+     * if it exists in the database
+     */
+    fun getProductCountByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): Int =
+        ProductSqlUtils.getProductCountByRemoteIds(site, remoteProductIds)
+
+    /**
+     * returns the count of virtual products for the given [SiteModel] and [remoteProductIds]
+     * if it exists in the database
+     */
+    fun getVirtualProductCountByRemoteIds(site: SiteModel, remoteProductIds: List<Long>): Int =
+        ProductSqlUtils.getVirtualProductCountByRemoteIds(site, remoteProductIds)
+
+    /**
+     * returns a list of tags for a specific site in the database
+     */
+    fun getTagsForSite(site: SiteModel): List<WCProductTagModel> =
+        ProductSqlUtils.getProductTagsForSite(site.id)
+
+    fun getProductTagsByNames(site: SiteModel, tagNames: List<String>) =
+        ProductSqlUtils.getProductTagsByNames(site.id, tagNames)
+
+    fun getProductTagByName(site: SiteModel, tagName: String) =
+        ProductSqlUtils.getProductTagByName(site.id, tagName)
+
+    fun getProductReviewByRemoteId(
+        localSiteId: Int,
+        remoteReviewId: Long
+    ): WCProductReviewModel? = ProductSqlUtils
+        .getProductReviewByRemoteId(localSiteId, remoteReviewId)
+
+    fun deleteProductReviewsForSite(site: SiteModel) = ProductSqlUtils.deleteAllProductReviewsForSite(site)
+
+    fun deleteAllProductReviews() = ProductSqlUtils.deleteAllProductReviews()
+
+    fun deleteProductImage(site: SiteModel, remoteProductId: Long, remoteMediaId: Long) =
+        ProductSqlUtils.deleteProductImage(site, remoteProductId, remoteMediaId)
+
+    fun getProductCategoriesForSite(site: SiteModel, sortType: ProductCategorySorting = DEFAULT_CATEGORY_SORTING) =
+        ProductSqlUtils.getProductCategoriesForSite(site, sortType)
+
+    fun getProductCategoryByRemoteId(site: SiteModel, remoteId: Long) =
+        ProductSqlUtils.getProductCategoryByRemoteId(site.id, remoteId)
+
+    fun getProductCategoryByNameAndParentId(
+        site: SiteModel,
+        categoryName: String,
+        parentId: Long = 0L
+    ) = ProductSqlUtils.getProductCategoryByNameAndParentId(site.id, categoryName, parentId)
+
+    @Suppress("LongMethod", "ComplexMethod")
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? WCProductAction ?: return
+        when (actionType) {
+            // remote actions
+            WCProductAction.FETCH_PRODUCT_SKU_AVAILABILITY ->
+                fetchProductSkuAvailability(action.payload as FetchProductSkuAvailabilityPayload)
+
+            WCProductAction.FETCH_PRODUCTS ->
+                fetchProducts(action.payload as FetchProductsPayload)
+
+            WCProductAction.SEARCH_PRODUCTS ->
+                searchProducts(action.payload as SearchProductsPayload)
+
+            WCProductAction.SEARCH_PRODUCTS_BY_GLOBAL_UNIQUE_ID ->
+                searchProductsByGlobalUniqueId(action.payload as SearchProductsByGlobalUniqueIdPayload)
+
+            WCProductAction.UPDATE_PRODUCT_IMAGES ->
+                updateProductImages(action.payload as UpdateProductImagesPayload)
+
+            WCProductAction.UPDATE_PRODUCT ->
+                updateProduct(action.payload as UpdateProductPayload)
+
+            WCProductAction.FETCH_SINGLE_PRODUCT_SHIPPING_CLASS ->
+                fetchProductShippingClass(action.payload as FetchSingleProductShippingClassPayload)
+
+            WCProductAction.FETCH_PRODUCT_SHIPPING_CLASS_LIST ->
+                fetchProductShippingClasses(action.payload as FetchProductShippingClassListPayload)
+
+            WCProductAction.FETCH_PRODUCT_PASSWORD ->
+                fetchProductPassword(action.payload as FetchProductPasswordPayload)
+
+            WCProductAction.UPDATE_PRODUCT_PASSWORD ->
+                updateProductPassword(action.payload as UpdateProductPasswordPayload)
+
+            WCProductAction.FETCH_PRODUCT_CATEGORIES ->
+                fetchProductCategories(action.payload as FetchProductCategoriesPayload)
+
+            WCProductAction.FETCH_PRODUCT_TAGS ->
+                fetchProductTags(action.payload as FetchProductTagsPayload)
+
+            WCProductAction.ADD_PRODUCT_TAGS ->
+                addProductTags(action.payload as AddProductTagsPayload)
+
+            WCProductAction.ADD_PRODUCT ->
+                addProduct(action.payload as AddProductPayload)
+
+            WCProductAction.DELETE_PRODUCT ->
+                deleteProduct(action.payload as DeleteProductPayload)
+
+            // remote responses
+            WCProductAction.FETCHED_PRODUCT_SKU_AVAILABILITY ->
+                handleFetchProductSkuAvailabilityCompleted(action.payload as RemoteProductSkuAvailabilityPayload)
+
+            WCProductAction.FETCHED_PRODUCTS ->
+                handleFetchProductsCompleted(action.payload as RemoteProductListPayload)
+
+            WCProductAction.SEARCHED_PRODUCTS ->
+                handleSearchProductsCompleted(action.payload as RemoteSearchProductsPayload)
+
+            WCProductAction.UPDATED_PRODUCT_IMAGES ->
+                handleUpdateProductImages(action.payload as RemoteUpdateProductImagesPayload)
+
+            WCProductAction.UPDATED_PRODUCT ->
+                handleUpdateProduct(action.payload as RemoteUpdateProductPayload)
+
+            WCProductAction.FETCHED_PRODUCT_SHIPPING_CLASS_LIST ->
+                handleFetchProductShippingClassesCompleted(action.payload as RemoteProductShippingClassListPayload)
+
+            WCProductAction.FETCHED_SINGLE_PRODUCT_SHIPPING_CLASS ->
+                handleFetchProductShippingClassCompleted(action.payload as RemoteProductShippingClassPayload)
+
+            WCProductAction.FETCHED_PRODUCT_PASSWORD ->
+                handleFetchProductPasswordCompleted(action.payload as RemoteProductPasswordPayload)
+
+            WCProductAction.UPDATED_PRODUCT_PASSWORD ->
+                handleUpdatedProductPasswordCompleted(action.payload as RemoteUpdatedProductPasswordPayload)
+
+            WCProductAction.FETCHED_PRODUCT_CATEGORIES ->
+                handleFetchProductCategories(action.payload as RemoteProductCategoriesPayload)
+
+            WCProductAction.ADDED_PRODUCT_CATEGORY ->
+                handleAddProductCategory(action.payload as RemoteAddProductCategoryResponsePayload)
+
+            WCProductAction.FETCHED_PRODUCT_TAGS ->
+                handleFetchProductTagsCompleted(action.payload as RemoteProductTagsPayload)
+
+            WCProductAction.ADDED_PRODUCT_TAGS ->
+                handleAddProductTags(action.payload as RemoteAddProductTagsResponsePayload)
+
+            WCProductAction.ADDED_PRODUCT ->
+                handleAddNewProduct(action.payload as RemoteAddProductPayload)
+
+            WCProductAction.DELETED_PRODUCT ->
+                handleDeleteProduct(action.payload as RemoteDeleteProductPayload)
+        }
+    }
+
+    fun observeProducts(
+        site: SiteModel,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        excludeSampleProducts: Boolean = false,
+        limit: Int? = null
+    ): Flow<List<WCProductModel>> = ProductSqlUtils.observeProducts(
+        site = site,
+        sortType = sortType,
+        filterOptions = filterOptions,
+        excludeSampleProducts = excludeSampleProducts,
+        limit = limit
+    )
+
+    fun observeProductsCount(
+        site: SiteModel,
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        excludeSampleProducts: Boolean = false
+    ): Flow<Long> = ProductSqlUtils.observeProductsCount(
+        site = site,
+        filterOptions = filterOptions,
+        excludeSampleProducts = excludeSampleProducts
+    )
+
+    fun observeVariations(site: SiteModel, productId: Long): Flow<List<WCProductVariationModel>> =
+        ProductSqlUtils.observeVariations(site, productId)
+
+    fun observeCategories(
+        site: SiteModel,
+        sortType: ProductCategorySorting = DEFAULT_CATEGORY_SORTING
+    ): Flow<List<WCProductCategoryModel>> =
+        ProductSqlUtils.observeCategories(site, sortType)
+
+    fun observeBundledProducts(
+        site: SiteModel,
+        remoteProductId: Long
+    ) = ProductSqlUtils.observeBundledProducts(site, remoteProductId)
+
+    suspend fun getBundledProductsCount(site: SiteModel, remoteProductId: Long): Int {
+        return ProductSqlUtils.getBundledProductsCount(site, remoteProductId)
+    }
+
+    suspend fun getCompositeProducts(site: SiteModel, remoteProductId: Long): List<WCProductComponent> {
+        return ProductSqlUtils.getCompositeProducts(site, remoteProductId)
+    }
+
+    suspend fun submitProductAttributeChanges(
+        site: SiteModel,
+        productId: Long,
+        attributes: List<WCProductModel.ProductAttribute>
+    ): WooResult<WCProductModel> =
+        coroutineEngine.withDefaultContext(API, this, "submitProductAttributes") {
+            wcProductRestClient.updateProductAttributes(site, productId, Gson().toJson(attributes))
+                .also { payload ->
+                    payload.result?.let { productStorageHelper.upsertProduct(it) }
+                }
+                .asWooResult { it.product }
+        }
+
+    suspend fun submitVariationAttributeChanges(
+        site: SiteModel,
+        productId: Long,
+        variationId: Long,
+        attributes: List<WCProductModel.ProductAttribute>
+    ): WooResult<WCProductVariationModel> =
+        coroutineEngine.withDefaultContext(API, this, "submitVariationAttributes") {
+            wcProductRestClient.updateVariationAttributes(site, productId, variationId, Gson().toJson(attributes))
+                .asWooResult()
+                .model?.asProductVariationModel()
+                ?.apply {
+                    ProductSqlUtils.insertOrUpdateProductVariation(this)
+                }
+                ?.let { WooResult(it) }
+        } ?: WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+
+    suspend fun generateEmptyVariation(
+        site: SiteModel,
+        product: WCProductModel
+    ): WooResult<WCProductVariationModel> =
+        coroutineEngine.withDefaultContext(API, this, "generateEmptyVariation") {
+            product.attributeList
+                .filter { it.variation }
+                .map { ProductVariantOption(it.id, it.name, "") }
+                .let { Gson().toJson(it) }
+                .let { wcProductRestClient.generateEmptyVariation(site, product.remoteProductId, it) }
+                .asWooResult()
+                .model?.asProductVariationModel()
+                ?.apply {
+                    ProductSqlUtils.insertOrUpdateProductVariation(this)
+                }
+                ?.let { WooResult(it) }
+                ?: WooResult(WooError(INVALID_RESPONSE, GenericErrorType.INVALID_RESPONSE))
+        }
+
+    suspend fun deleteVariation(
+        site: SiteModel,
+        productId: Long,
+        variationId: Long
+    ): WooResult<WCProductVariationModel> =
+        coroutineEngine.withDefaultContext(API, this, "deleteVariation") {
+            wcProductRestClient.deleteVariation(site, productId, variationId)
+                .asWooResult()
+                .model?.asProductVariationModel()
+                ?.apply {
+                    ProductSqlUtils.deleteVariationsForProduct(site, productId)
+                }
+                ?.let { WooResult(it) }
+                ?: WooResult(WooError(INVALID_RESPONSE, GenericErrorType.INVALID_RESPONSE))
+        }
+
+    override fun onRegister() = AppLog.d(API, "WCProductStore onRegister")
+
+    @Suppress("ForbiddenComment")
+    suspend fun fetchSingleProduct(payload: FetchSingleProductPayload): OnProductChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchSingleProduct") {
+            val result = with(payload) { wcProductRestClient.fetchSingleProduct(site, remoteProductId) }
+
+            return@withDefaultContext if (result.isError) {
+                OnProductChanged(0).also {
+                    it.error = result.error
+                    it.remoteProductId = result.productWithMetaData.product.remoteProductId
+                }
+            } else {
+                val rowsAffected = productStorageHelper.upsertProduct(result.productWithMetaData)
+
+                // TODO: 18/08/2021 @wzieba add tests
+                coroutineEngine.launch(T.DB, this, "cacheProductAddons") {
+                    val domainAddons = extractAddonsFromProductMetaData(result.productWithMetaData.metaData)
+
+                    addonsDao.cacheProductAddons(
+                        productRemoteId = result.productWithMetaData.product.remoteId,
+                        localSiteId = result.site.localId(),
+                        addons = domainAddons
+                    )
+                }
+
+                OnProductChanged(rowsAffected).also {
+                    it.remoteProductId = result.productWithMetaData.product.remoteProductId
+                }
+            }
+        }
+    }
+
+    suspend fun fetchSingleVariation(
+        site: SiteModel,
+        remoteProductId: Long,
+        remoteVariationId: Long
+    ): OnVariationChanged {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSingleVariation") {
+            val result = wcProductRestClient
+                .fetchSingleVariation(site, remoteProductId, remoteVariationId)
+
+            return@withDefaultContext if (result.isError) {
+                OnVariationChanged().also {
+                    it.error = result.error
+                    it.remoteProductId = result.variation.remoteProductId
+                    it.remoteVariationId = result.variation.remoteVariationId
+                }
+            } else {
+                ProductSqlUtils.insertOrUpdateProductVariation(result.variation)
+                OnVariationChanged().also {
+                    it.remoteProductId = result.variation.remoteProductId
+                    it.remoteVariationId = result.variation.remoteVariationId
+                }
+            }
+        }
+    }
+
+    private fun fetchProductSkuAvailability(payload: FetchProductSkuAvailabilityPayload) {
+        with(payload) { wcProductRestClient.fetchProductSkuAvailability(site, sku) }
+    }
+
+    private fun fetchProducts(payload: FetchProductsPayload) {
+        with(payload) {
+            wcProductRestClient.fetchProducts(
+                site = site,
+                pageSize = pageSize,
+                offset = offset,
+                sortType = sorting,
+                includedProductIds = remoteProductIds,
+                filterOptions = filterOptions,
+                excludedProductIds = excludedProductIds,
+                skuSearchOptions = SkuSearchOptions.Disabled
+            )
+        }
+    }
+
+    suspend fun fetchProductListSynced(site: SiteModel, productIds: List<Long>): List<WCProductModel>? {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductList") {
+            wcProductRestClient.fetchProductsWithSyncRequest(site = site, includedProductIds = productIds)
+                .result
+        }?.also {
+            productStorageHelper.upsertProducts(it)
+        }?.map { it.product }
+    }
+
+    suspend fun fetchProductCategoryListSynced(
+        site: SiteModel,
+        categoryIds: List<Long>
+    ): List<WCProductCategoryModel>? {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductCategoryList") {
+            wcProductRestClient.fetchProductsCategoriesWithSyncRequest(
+                site = site,
+                includedCategoryIds = categoryIds
+            ).result
+        }?.also {
+            ProductSqlUtils.insertOrUpdateProductCategories(it)
+        }
+    }
+
+    private fun searchProducts(payload: SearchProductsPayload) {
+        with(payload) {
+            wcProductRestClient.searchProducts(
+                site = site,
+                searchQuery = searchQuery,
+                skuSearchOptions = skuSearchOptions,
+                pageSize = pageSize,
+                offset = offset,
+                sorting = sorting,
+                excludedProductIds = excludedProductIds,
+                filterOptions = filterOptions
+            )
+        }
+    }
+
+    private fun searchProductsByGlobalUniqueId(payload: SearchProductsByGlobalUniqueIdPayload) {
+        with(payload) {
+            wcProductRestClient.searchProductsByGlobalUniqueId(
+                site = site,
+                globalUniqueIdSearchQuery = globalUniqueId,
+                pageSize = pageSize,
+                offset = offset,
+                sorting = sorting,
+                excludedProductIds = excludedProductIds,
+                filterOptions = filterOptions
+            )
+        }
+    }
+
+    suspend fun fetchProductVariations(payload: FetchProductVariationsPayload): OnProductChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductVariations") {
+            val result = with(payload) {
+                wcProductRestClient.fetchProductVariations(site, remoteProductId, pageSize, offset)
+            }
+            return@withDefaultContext if (result.isError) {
+                OnProductChanged(0, payload.remoteProductId).also { it.error = result.error }
+            } else {
+                // delete product variations for site if this is the first page of results, otherwise
+                // product variations deleted outside of the app will persist
+                if (result.offset == 0) {
+                    ProductSqlUtils.deleteVariationsForProduct(result.site, result.remoteProductId)
+                }
+
+                val rowsAffected = ProductSqlUtils.insertOrUpdateProductVariations(
+                    result.variations
+                )
+                OnProductChanged(rowsAffected, payload.remoteProductId, canLoadMore = result.canLoadMore)
+            }
+        }
+    }
+
+    private fun fetchProductShippingClass(payload: FetchSingleProductShippingClassPayload) {
+        with(payload) { wcProductRestClient.fetchSingleProductShippingClass(site, remoteShippingClassId) }
+    }
+
+    private fun fetchProductShippingClasses(payload: FetchProductShippingClassListPayload) {
+        with(payload) { wcProductRestClient.fetchProductShippingClassList(site, pageSize, offset) }
+    }
+
+    suspend fun fetchProductReviews(
+        payload: FetchProductReviewsPayload,
+        deletePreviouslyCachedReviews: Boolean
+    ): OnProductReviewChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductReviews") {
+            val response = with(payload) {
+                wcProductRestClient.fetchProductReviews(site, offset, reviewIds, productIds, filterByStatus)
+            }
+
+            val onProductReviewChanged = if (response.isError) {
+                OnProductReviewChanged(0).also { it.error = response.error }
+            } else {
+                // Clear existing product reviews if this is a fresh fetch (loadMore = false).
+                // This is the simplest way to keep our local reviews in sync with remote reviews
+                // in case of deletions or status updates.
+                if (deletePreviouslyCachedReviews) {
+                    ProductSqlUtils.deleteAllProductReviewsForSite(response.site)
+                }
+                val rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(response.reviews)
+                OnProductReviewChanged(rowsAffected, canLoadMore = response.canLoadMore)
+            }
+
+            onProductReviewChanged
+        }
+    }
+
+    suspend fun fetchSingleProductReview(payload: FetchSingleProductReviewPayload): OnProductReviewChanged {
+        return coroutineEngine.withDefaultContext(API, this, "fetchSingleProductReview") {
+            val result = wcProductRestClient.fetchProductReviewById(payload.site, payload.remoteReviewId)
+
+            return@withDefaultContext if (result.isError) {
+                OnProductReviewChanged(0).also { it.error = result.error }
+            } else {
+                val rowsAffected = result.productReview?.let {
+                    ProductSqlUtils.insertOrUpdateProductReview(it)
+                } ?: 0
+                OnProductReviewChanged(rowsAffected)
+            }
+        }
+    }
+
+    private fun fetchProductPassword(payload: FetchProductPasswordPayload) {
+        with(payload) { wcProductRestClient.fetchProductPassword(site, remoteProductId) }
+    }
+
+    private fun updateProductPassword(payload: UpdateProductPasswordPayload) {
+        with(payload) { wcProductRestClient.updateProductPassword(site, remoteProductId, password) }
+    }
+
+    suspend fun updateProductReviewStatus(site: SiteModel, reviewId: Long, newStatus: String) =
+        coroutineEngine.withDefaultContext(API, this, "updateProductReviewStatus") {
+            val result = wcProductRestClient.updateProductReviewStatus(site, reviewId, newStatus)
+
+            return@withDefaultContext if (result.isError) {
+                WooResult(result.error)
+            } else {
+                result.result?.let { review ->
+                    if (review.status == "spam" || review.status == "trash") {
+                        // Delete this review from the database
+                        ProductSqlUtils.deleteProductReview(review)
+                    } else {
+                        // Insert or update in the database
+                        ProductSqlUtils.insertOrUpdateProductReview(review)
+                    }
+                }
+                WooResult(result.result)
+            }
+        }
+
+    private fun updateProductImages(payload: UpdateProductImagesPayload) {
+        with(payload) { wcProductRestClient.updateProductImages(site, remoteProductId, imageList) }
+    }
+
+    private fun fetchProductCategories(payloadProduct: FetchProductCategoriesPayload) {
+        with(payloadProduct) {
+            wcProductRestClient.fetchProductCategories(
+                site, pageSize, offset, productCategorySorting
+            )
+        }
+    }
+
+    suspend fun addProductCategories(
+        site: SiteModel,
+        categories: List<WCProductCategoryModel>
+    ): WooResult<List<WCProductCategoryModel>> = coroutineEngine.withDefaultContext(API, this, "addProductCategories") {
+        val result = wcProductRestClient.addProductCategories(
+            site = site,
+            categories = categories
+        )
+
+        if (!result.isError) {
+            val addedCategories = result.result!!
+            if (addedCategories.size < categories.size) {
+                AppLog.w(
+                    API,
+                    "addProductCategories: not all categories were added. " +
+                            "Expected: ${categories.size}, added: ${addedCategories.size}"
+                )
+            }
+
+            addedCategories.forEach { category ->
+                ProductSqlUtils.insertOrUpdateProductCategory(category)
+            }
+        }
+
+        return@withDefaultContext result.asWooResult()
+    }
+
+    suspend fun addProductCategory(
+        site: SiteModel,
+        category: WCProductCategoryModel
+    ): WooResult<WCProductCategoryModel> = coroutineEngine.withDefaultContext(API, this, "addProductCategory") {
+        val result = wcProductRestClient.addProductCategory(
+            site = site,
+            category = category
+        )
+        if (!result.isError) {
+            val updatedCategory = result.result!!
+            ProductSqlUtils.insertOrUpdateProductCategory(updatedCategory)
+        }
+        return@withDefaultContext result.asWooResult()
+    }
+
+    suspend fun updateProductCategory(
+        site: SiteModel,
+        category: WCProductCategoryModel
+    ): WooResult<WCProductCategoryModel> = coroutineEngine.withDefaultContext(API, this, "updateProductCategory") {
+        val result = wcProductRestClient.updateProductCategory(
+            site = site,
+            category = category
+        )
+        if (!result.isError) {
+            val updatedCategory = result.result!!
+            ProductSqlUtils.insertOrUpdateProductCategory(updatedCategory)
+        }
+        return@withDefaultContext result.asWooResult()
+    }
+
+    suspend fun deleteProductCategory(site: SiteModel, remoteId: Long): WooResult<WCProductCategoryModel> =
+        coroutineEngine.withDefaultContext(API, this, "deleteProductCategory") {
+            val result = wcProductRestClient.deleteProductCategory(
+                site = site,
+                remoteId = remoteId
+            )
+            if (!result.isError) {
+                val deletedCategory = result.result!!
+                ProductSqlUtils.deleteProductCategory(deletedCategory)
+            }
+            return@withDefaultContext result.asWooResult()
+        }
+
+    private fun fetchProductTags(payload: FetchProductTagsPayload) {
+        with(payload) { wcProductRestClient.fetchProductTags(site, pageSize, offset, searchQuery) }
+    }
+
+    private fun addProductTags(payload: AddProductTagsPayload) {
+        with(payload) { wcProductRestClient.addProductTags(site, tags) }
+    }
+
+    private fun updateProduct(payload: UpdateProductPayload) {
+        with(payload) {
+            val storedProduct = getProductByRemoteId(site, product.remoteProductId)
+            wcProductRestClient.updateProduct(site, storedProduct, product, payload.metadataChanges)
+        }
+    }
+
+    suspend fun updateVariation(payload: UpdateVariationPayload): OnVariationUpdated {
+        return coroutineEngine.withDefaultContext(API, this, "updateVariation") {
+            with(payload) {
+                val storedVariation = getVariationByRemoteId(
+                    site,
+                    variation.remoteProductId,
+                    variation.remoteVariationId
+                )
+                val result: RemoteUpdateVariationPayload = wcProductRestClient.updateVariation(
+                    site,
+                    storedVariation,
+                    variation
+                )
+                return@withDefaultContext if (result.isError) {
+                    OnVariationUpdated(
+                        0,
+                        result.variation.remoteProductId,
+                        result.variation.remoteVariationId
+                    ).also { it.error = result.error }
+                } else {
+                    val rowsAffected = ProductSqlUtils.insertOrUpdateProductVariation(
+                        result.variation
+                    )
+                    OnVariationUpdated(
+                        rowsAffected,
+                        result.variation.remoteProductId,
+                        result.variation.remoteVariationId
+                    )
+                }
+            }
+        }
+    }
+
+    suspend fun batchUpdateProducts(payload: BatchUpdateProductsPayload): WooResult<List<WCProductModel>> =
+        coroutineEngine.withDefaultContext(API, this, "batchUpdateProducts") {
+            val existingProducts = ProductSqlUtils.getProductsByRemoteIds(
+                site = payload.site,
+                remoteProductIds = payload.updatedProducts.map(WCProductModel::remoteProductId)
+            )
+
+            val sortedExistingToUpdatedProducts = existingProducts
+                .sortedBy(WCProductModel::remoteProductId)
+                .zip(payload.updatedProducts.sortedBy(WCProductModel::remoteProductId))
+                .toMap()
+
+            with(payload) {
+                val result = wcProductRestClient.batchUpdateProducts(
+                    site,
+                    sortedExistingToUpdatedProducts
+                )
+                return@withDefaultContext if (result.isError) {
+                    WooResult(result.error)
+                } else {
+                    result.result?.let {
+                        productStorageHelper.upsertProducts(it)
+                    }
+                    WooResult(result.result?.map { it.product })
+                }
+            }
+        }
+
+    /**
+     * Batch create variations on the backend and save result locally.
+     * For each variant, it only receives the list of attributes. The rest of the variant properties
+     * will use the default values.
+     *
+     * @param payload Instance of [BatchGenerateVariationsPayload].
+     */
+    suspend fun batchGenerateVariations(payload: BatchGenerateVariationsPayload):
+            WooResult<BatchProductVariationsApiResponse> =
+        coroutineEngine.withDefaultContext(API, this, "batchCreateVariations") {
+            val createVariations = payload.variations.map {
+                buildMap { put("attributes", it) }
+            }
+
+            with(payload) {
+                val result: WooPayload<BatchProductVariationsApiResponse> =
+                    wcProductRestClient.batchUpdateVariations(
+                        site = site,
+                        productId = remoteProductId,
+                        createVariations = createVariations
+                    )
+
+                return@withDefaultContext if (result.isError) {
+                    WooResult(result.error)
+                } else {
+                    val generatedVariations = result.result?.createdVariations?.map { response ->
+                        response.asProductVariationModel().apply {
+                            remoteProductId = payload.remoteProductId
+                            localSiteId = payload.site.id
+                        }
+                    } ?: emptyList()
+                    ProductSqlUtils.insertOrUpdateProductVariations(generatedVariations)
+                    WooResult(result.result)
+                }
+            }
+        }
+
+    /**
+     * Batch updates variations on the backend and updates variations locally after successful request.
+     *
+     * @param payload Instance of [BatchUpdateVariationsPayload]. It can be produced using
+     * [BatchUpdateVariationsPayload.Builder] class.
+     */
+    suspend fun batchUpdateVariations(payload: BatchUpdateVariationsPayload):
+            WooResult<BatchProductVariationsApiResponse> =
+        coroutineEngine.withDefaultContext(API, this, "batchUpdateVariations") {
+            with(payload) {
+                val updateVariations: List<Map<String, Any>> = remoteVariationsIds.map { variationId ->
+                    modifiedProperties.toMutableMap()
+                        .also { properties -> properties["id"] = variationId }
+                }
+                val result: WooPayload<BatchProductVariationsApiResponse> =
+                    wcProductRestClient.batchUpdateVariations(
+                        site = site,
+                        productId = remoteProductId,
+                        updateVariations = updateVariations
+                    )
+
+                return@withDefaultContext if (result.isError) {
+                    WooResult(result.error)
+                } else {
+                    val updatedVariations = result.result?.updatedVariations?.map { response ->
+                        response.asProductVariationModel().apply {
+                            remoteProductId = payload.remoteProductId
+                            localSiteId = payload.site.id
+                        }
+                    } ?: emptyList()
+                    ProductSqlUtils.insertOrUpdateProductVariations(updatedVariations)
+                    WooResult(result.result)
+                }
+            }
+        }
+
+    suspend fun fetchProductCategories(
+        site: SiteModel,
+        offset: Int = 0,
+        pageSize: Int = DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE,
+        sortType: ProductCategorySorting = DEFAULT_CATEGORY_SORTING,
+        includedCategoryIds: List<Long> = emptyList(),
+        excludedCategoryIds: List<Long> = emptyList()
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductCategories") {
+            val response = wcProductRestClient.fetchProductsCategoriesWithSyncRequest(
+                site = site,
+                offset = offset,
+                pageSize = pageSize,
+                productCategorySorting = sortType,
+                includedCategoryIds = includedCategoryIds,
+                excludedCategoryIds = excludedCategoryIds
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    if (offset == 0 && includedCategoryIds.isEmpty() && excludedCategoryIds.isEmpty()) {
+                        ProductSqlUtils.deleteAllProductCategories()
+                    }
+                    ProductSqlUtils.insertOrUpdateProductCategories(response.result)
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(canLoadMore)
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * @return Boolean indicating whether more products can be fetched.
+     */
+    @Suppress("ComplexCondition")
+    suspend fun fetchProducts(
+        site: SiteModel,
+        offset: Int = 0,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE,
+        sortType: ProductSorting = DEFAULT_PRODUCT_SORTING,
+        includedProductIds: List<Long> = emptyList(),
+        excludedProductIds: List<Long> = emptyList(),
+        filterOptions: Map<ProductFilterOption, String> = emptyMap(),
+        includeTypes: List<IncludeType> = emptyList(),
+        forceRefresh: Boolean = true
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProducts") {
+            val response = wcProductRestClient.fetchProductsWithSyncRequest(
+                site = site,
+                offset = offset,
+                pageSize = pageSize,
+                sortType = sortType,
+                includedProductIds = includedProductIds,
+                excludedProductIds = excludedProductIds,
+                filterOptions = filterOptions,
+                includeTypes = includeTypes,
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    if (forceRefresh &&
+                        offset == 0 &&
+                        includedProductIds.isEmpty() &&
+                        excludedProductIds.isEmpty()
+                    ) {
+                        productStorageHelper.deleteProductsForSite(site)
+                    }
+
+                    productStorageHelper.upsertProducts(response.result)
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(canLoadMore)
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun searchProducts(
+        site: SiteModel,
+        searchString: String,
+        skuSearchOptions: SkuSearchOptions = SkuSearchOptions.Disabled,
+        offset: Int = 0,
+        pageSize: Int = DEFAULT_PRODUCT_PAGE_SIZE
+    ): WooResult<ProductSearchResult> {
+        return coroutineEngine.withDefaultContext(API, this, "searchProducts") {
+            val response = wcProductRestClient.fetchProductsWithSyncRequest(
+                site = site,
+                offset = offset,
+                pageSize = pageSize,
+                searchQuery = searchString,
+                skuSearchOptions = skuSearchOptions
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    productStorageHelper.upsertProducts(response.result)
+                    val productIds = response.result.map { it.product.remoteProductId }
+                    val products = if (productIds.isNotEmpty()) {
+                        ProductSqlUtils.getProductsByRemoteIds(site, productIds)
+                    } else {
+                        emptyList()
+                    }
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(ProductSearchResult(products, canLoadMore))
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun searchProductCategories(
+        site: SiteModel,
+        searchString: String,
+        offset: Int = 0,
+        pageSize: Int = DEFAULT_PRODUCT_CATEGORY_PAGE_SIZE
+    ): WooResult<ProductCategorySearchResult> {
+        return coroutineEngine.withDefaultContext(
+            API,
+            this,
+            "searchProductCategories"
+        ) {
+            val response = wcProductRestClient.fetchProductsCategoriesWithSyncRequest(
+                site = site,
+                offset = offset,
+                pageSize = pageSize,
+                searchQuery = searchString
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    ProductSqlUtils.insertOrUpdateProductCategories(response.result)
+                    val categoryIds = response.result.map { it.remoteCategoryId }
+                    val categories = if (categoryIds.isNotEmpty()) {
+                        ProductSqlUtils.getProductCategoriesByRemoteIds(site, categoryIds)
+                    } else {
+                        emptyList()
+                    }
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(ProductCategorySearchResult(categories, canLoadMore))
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * @return Boolean indicating whether more variations can be fetched.
+     */
+    suspend fun fetchProductVariations(
+        site: SiteModel,
+        productId: Long,
+        offset: Int = 0,
+        pageSize: Int = DEFAULT_PRODUCT_VARIATIONS_PAGE_SIZE,
+        includedVariationIds: List<Long> = emptyList(),
+        excludedVariationIds: List<Long> = emptyList(),
+        filterOptions: Map<VariationFilterOption, String>? = null,
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductVariations") {
+            val response = wcProductRestClient.fetchProductVariationsWithSyncRequest(
+                site = site,
+                productId = productId,
+                offset = offset,
+                pageSize = pageSize,
+                includedVariationIds = includedVariationIds,
+                excludedVariationIds = excludedVariationIds,
+                filterOptions = filterOptions
+            )
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    if (offset == 0 &&
+                        includedVariationIds.isEmpty() &&
+                        excludedVariationIds.isEmpty()
+                    ) {
+                        ProductSqlUtils.deleteVariationsForProduct(site, productId)
+                    }
+
+                    ProductSqlUtils.insertOrUpdateProductVariations(response.result)
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(canLoadMore)
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun createVariations(
+        site: SiteModel,
+        productId: RemoteId,
+        variations: List<WCProductVariationModel>,
+    ): WooResult<BatchProductVariationsApiResponse> {
+        return coroutineEngine.withDefaultContext(API, this, "createVariations") {
+            val responses = variations
+                .chunked(VARIATIONS_CREATION_LIMIT)
+                .map { chunkedVariations ->
+                    wcProductRestClient.createVariations(
+                        site,
+                        productId = productId,
+                        variations = chunkedVariations.map {
+                            ProductVariationMapper.variantModelToProductJsonBody(
+                                variationModel = null,
+                                updatedVariationModel = it
+                            )
+                        }
+                    ).asWooResult()
+                }
+                .onEach { result: WooResult<BatchProductVariationsApiResponse> ->
+                    if (!result.isError) {
+                        saveVariationsInDatabase(result, productId, site)
+                    }
+                }
+
+            val anySuccessfulResponse = responses.firstOrNull { !it.isError }
+            val anyFailureResponse = responses.firstOrNull { it.isError }
+
+            anySuccessfulResponse
+                ?: anyFailureResponse
+                ?: WooResult(error = WooError(WooErrorType.GENERIC_ERROR, NETWORK_ERROR))
+        }
+    }
+
+    suspend fun fetchProductsCount(
+        site: SiteModel,
+    ): WooResult<Long> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchProductsCount") {
+            val response = wcProductRestClient.fetchProductsTotals(site)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    WooResult(response.result.sumOf { it.total })
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    private fun saveVariationsInDatabase(
+        result: WooResult<BatchProductVariationsApiResponse>,
+        productId: RemoteId,
+        site: SiteModel
+    ) {
+        result.model
+            ?.createdVariations
+            ?.map { variationResponse ->
+                variationResponse.asProductVariationModel().apply {
+                    remoteProductId = productId.value
+                    localSiteId = site.id
+                }
+            }
+            ?.let { databaseEntities ->
+                ProductSqlUtils.insertOrUpdateProductVariations(databaseEntities)
+            }
+    }
+
+    suspend fun replyToReview(payload: PostReviewReply): WooResult<Unit> {
+        return wcProductRestClient.replyToReview(
+            site = payload.site,
+            productId = payload.productId,
+            reviewId = payload.reviewId,
+            replyContent = payload.replyContent
+        ).asWooResult()
+    }
+
+    private fun addProduct(payload: AddProductPayload) {
+        with(payload) {
+            wcProductRestClient.addProduct(site, product, payload.metadata)
+        }
+    }
+
+    private fun deleteProduct(payload: DeleteProductPayload) {
+        with(payload) {
+            wcProductRestClient.deleteProduct(site, remoteProductId, forceDelete)
+        }
+    }
+
+    private fun extractAddonsFromProductMetaData(metaData: List<WCMetaData>): List<Addon> {
+        val remoteAddons = metaData[WCMetaData.AddOnsMetadataKeys.ADDONS_METADATA_KEY]
+            ?.let { RemoteAddonDto.fromMetaDataValue(it.value) }
+
+        return remoteAddons.orEmpty()
+            .toList()
+            .mapNotNull { remoteAddonDto ->
+                try {
+                    RemoteAddonMapper.toDomain(remoteAddonDto)
+                } catch (exception: MappingRemoteException) {
+                    logger.e(API, "Exception while parsing $remoteAddonDto: ${exception.message}")
+                    null
+                }
+            }
+    }
+
+    private fun handleFetchProductSkuAvailabilityCompleted(payload: RemoteProductSkuAvailabilityPayload) {
+        val onProductSkuAvailabilityChanged = OnProductSkuAvailabilityChanged(payload.sku, payload.available)
+        if (payload.isError) {
+            onProductSkuAvailabilityChanged.also { it.error = payload.error }
+        }
+        onProductSkuAvailabilityChanged.causeOfChange = WCProductAction.FETCH_PRODUCT_SKU_AVAILABILITY
+        emitChange(onProductSkuAvailabilityChanged)
+    }
+
+    @Suppress("ForbiddenComment")
+    private fun handleFetchProductsCompleted(payload: RemoteProductListPayload) {
+        coroutineEngine.launch(T.DB, this, "handleFetchProductsCompleted") {
+            val onProductChanged: OnProductChanged
+
+            if (payload.isError) {
+                onProductChanged = OnProductChanged(0).also { it.error = payload.error }
+            } else {
+                // remove the existing products for this site if this is the first page of results
+                // or if the remoteProductIds or excludedProductIds are null, otherwise
+                // products deleted outside of the app will persist
+                if (payload.offset == 0 && payload.remoteProductIds == null && payload.excludedProductIds == null) {
+                    productStorageHelper.deleteProductsForSite(payload.site)
+                }
+
+                val rowsAffected = productStorageHelper.upsertProducts(payload.productsWithMetaData)
+                onProductChanged = OnProductChanged(rowsAffected, canLoadMore = payload.canLoadMore)
+
+                // TODO: 18/08/2021 @wzieba add tests
+                coroutineEngine.launch(T.DB, this, "cacheProductsAddons") {
+                    payload.productsWithMetaData.forEach { productWithMetaData ->
+                        val domainAddons = extractAddonsFromProductMetaData(productWithMetaData.metaData)
+
+                        addonsDao.cacheProductAddons(
+                            productRemoteId = productWithMetaData.product.remoteId,
+                            localSiteId = payload.site.localId(),
+                            addons = domainAddons
+                        )
+                    }
+                }
+            }
+
+            onProductChanged.causeOfChange = WCProductAction.FETCH_PRODUCTS
+            emitChange(onProductChanged)
+        }
+    }
+
+    private fun handleSearchProductsCompleted(payload: RemoteSearchProductsPayload) {
+        if (payload.isError) {
+            emitChange(
+                OnProductsSearched(
+                    searchQuery = payload.searchQuery,
+                    isSkuSearch = payload.skuSearchOptions,
+                    globalUniqueIdSearchQuery = payload.globalUniqueIdSearchQuery
+                )
+            )
+        } else {
+            coroutineEngine.launch(T.DB, this, "handleSearchProductsCompleted") {
+                productStorageHelper.upsertProducts(payload.productsWithMetaData)
+                emitChange(
+                    OnProductsSearched(
+                        searchQuery = payload.searchQuery,
+                        isSkuSearch = payload.skuSearchOptions,
+                        globalUniqueIdSearchQuery = payload.globalUniqueIdSearchQuery,
+                        searchResults = payload.productsWithMetaData.map { it.product },
+                        canLoadMore = payload.canLoadMore
+                    )
+                )
+            }
+        }
+    }
+
+    private fun handleFetchProductShippingClassesCompleted(payload: RemoteProductShippingClassListPayload) {
+        val onProductShippingClassesChanged = if (payload.isError) {
+            OnProductShippingClassesChanged(0).also { it.error = payload.error }
+        } else {
+            // delete product shipping class list for site if this is the first page of results, otherwise
+            // shipping class list deleted outside of the app will persist
+            if (payload.offset == 0) {
+                ProductSqlUtils.deleteProductShippingClassListForSite(payload.site)
+            }
+
+            val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClassList(payload.shippingClassList)
+            OnProductShippingClassesChanged(rowsAffected, canLoadMore = payload.canLoadMore)
+        }
+        onProductShippingClassesChanged.causeOfChange = WCProductAction.FETCH_PRODUCT_SHIPPING_CLASS_LIST
+        emitChange(onProductShippingClassesChanged)
+    }
+
+    private fun handleFetchProductShippingClassCompleted(payload: RemoteProductShippingClassPayload) {
+        val onProductShippingClassesChanged = if (payload.isError) {
+            OnProductShippingClassesChanged(0).also { it.error = payload.error }
+        } else {
+            val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClass(payload.productShippingClassModel)
+            OnProductShippingClassesChanged(rowsAffected)
+        }
+        onProductShippingClassesChanged.causeOfChange = WCProductAction.FETCH_SINGLE_PRODUCT_SHIPPING_CLASS
+        emitChange(onProductShippingClassesChanged)
+    }
+
+    private fun handleFetchProductPasswordCompleted(payload: RemoteProductPasswordPayload) {
+        val onProductPasswordChanged = if (payload.isError) {
+            OnProductPasswordChanged(payload.remoteProductId, "").also { it.error = payload.error }
+        } else {
+            OnProductPasswordChanged(payload.remoteProductId, payload.password)
+        }
+        onProductPasswordChanged.causeOfChange = WCProductAction.FETCH_PRODUCT_PASSWORD
+        emitChange(onProductPasswordChanged)
+    }
+
+    private fun handleUpdatedProductPasswordCompleted(payload: RemoteUpdatedProductPasswordPayload) {
+        val onProductPasswordUpdated = if (payload.isError) {
+            OnProductPasswordChanged(payload.remoteProductId, null).also { it.error = payload.error }
+        } else {
+            OnProductPasswordChanged(payload.remoteProductId, payload.password)
+        }
+        onProductPasswordUpdated.causeOfChange = WCProductAction.UPDATE_PRODUCT_PASSWORD
+        emitChange(onProductPasswordUpdated)
+    }
+
+    private fun handleUpdateProductImages(payload: RemoteUpdateProductImagesPayload) {
+        coroutineEngine.launch(T.DB, this, "handleUpdateProductImages") {
+            val onProductImagesChanged: OnProductImagesChanged
+
+            if (payload.isError) {
+                onProductImagesChanged = OnProductImagesChanged(
+                    0,
+                    payload.productWithMetaData.product.remoteProductId
+                ).also {
+                    it.error = payload.error
+                }
+            } else {
+                val rowsAffected = productStorageHelper.upsertProduct(payload.productWithMetaData)
+                onProductImagesChanged = OnProductImagesChanged(
+                    rowsAffected,
+                    payload.productWithMetaData.product.remoteProductId
+                )
+            }
+
+            onProductImagesChanged.causeOfChange = WCProductAction.UPDATED_PRODUCT_IMAGES
+            emitChange(onProductImagesChanged)
+        }
+    }
+
+    private fun handleUpdateProduct(payload: RemoteUpdateProductPayload) {
+        coroutineEngine.launch(T.DB, this, "handleUpdateProduct") {
+            val onProductUpdated: OnProductUpdated
+
+            if (payload.isError) {
+                onProductUpdated = OnProductUpdated(0, payload.productWithMetaData.product.remoteProductId)
+                    .also { it.error = payload.error }
+            } else {
+                val rowsAffected = productStorageHelper.upsertProduct(payload.productWithMetaData)
+                onProductUpdated = OnProductUpdated(rowsAffected, payload.productWithMetaData.product.remoteProductId)
+            }
+
+            onProductUpdated.causeOfChange = WCProductAction.UPDATED_PRODUCT
+            emitChange(onProductUpdated)
+        }
+    }
+
+    private fun handleFetchProductCategories(payload: RemoteProductCategoriesPayload) {
+        coroutineEngine.launch(T.DB, this, "handleFetchProductCategories") {
+            val onProductCategoryChanged: OnProductCategoryChanged
+
+            if (payload.isError) {
+                onProductCategoryChanged = OnProductCategoryChanged(0).also { it.error = payload.error }
+            } else {
+                // Clear existing product categories if this is a fresh fetch (loadMore = false).
+                // This is the simplest way to keep our local categories in sync with remote categories
+                // in case of deletions.
+                if (!payload.loadedMore) {
+                    ProductSqlUtils.deleteAllProductCategoriesForSite(payload.site)
+                }
+                val rowsAffected = ProductSqlUtils.insertOrUpdateProductCategories(
+                    payload.categories
+                )
+                onProductCategoryChanged = OnProductCategoryChanged(
+                    rowsAffected,
+                    canLoadMore = payload.canLoadMore
+                )
+            }
+
+            onProductCategoryChanged.causeOfChange = WCProductAction.FETCH_PRODUCT_CATEGORIES
+            emitChange(onProductCategoryChanged)
+        }
+    }
+
+    private fun handleAddProductCategory(payload: RemoteAddProductCategoryResponsePayload) {
+        coroutineEngine.launch(T.DB, this, "handleAddProductCategory") {
+            val onProductCategoryChanged: OnProductCategoryChanged
+
+            if (payload.isError) {
+                onProductCategoryChanged = OnProductCategoryChanged(0).also { it.error = payload.error }
+            } else {
+                val rowsAffected = payload.category?.let {
+                    ProductSqlUtils.insertOrUpdateProductCategory(it)
+                } ?: 0
+                onProductCategoryChanged = OnProductCategoryChanged(rowsAffected)
+            }
+
+            onProductCategoryChanged.causeOfChange = WCProductAction.ADDED_PRODUCT_CATEGORY
+            emitChange(onProductCategoryChanged)
+        }
+    }
+
+    private fun handleFetchProductTagsCompleted(payload: RemoteProductTagsPayload) {
+        val onProductTagsChanged = if (payload.isError) {
+            OnProductTagChanged(0).also { it.error = payload.error }
+        } else {
+            // delete product tags for site if this is the first page of results, otherwise
+            // tags deleted outside of the app will persist
+            if (payload.offset == 0 && payload.searchQuery.isNullOrEmpty()) {
+                ProductSqlUtils.deleteProductTagsForSite(payload.site)
+            }
+
+            val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(payload.tags)
+            OnProductTagChanged(rowsAffected, canLoadMore = payload.canLoadMore)
+        }
+        onProductTagsChanged.causeOfChange = WCProductAction.FETCH_PRODUCT_TAGS
+        emitChange(onProductTagsChanged)
+    }
+
+    private fun handleAddProductTags(payload: RemoteAddProductTagsResponsePayload) {
+        val onProductTagsChanged: OnProductTagChanged
+        if (payload.isError) {
+            onProductTagsChanged = OnProductTagChanged(0).also { it.error = payload.error }
+        } else {
+            val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(payload.tags.filter { it.name.isNotEmpty() })
+            onProductTagsChanged = OnProductTagChanged(rowsAffected)
+        }
+
+        onProductTagsChanged.causeOfChange = WCProductAction.ADDED_PRODUCT_TAGS
+        emitChange(onProductTagsChanged)
+    }
+
+    private fun handleAddNewProduct(payload: RemoteAddProductPayload) {
+        coroutineEngine.launch(T.DB, this, "handleAddNewProduct") {
+            val onProductCreated: OnProductCreated
+
+            if (payload.isError) {
+                onProductCreated = OnProductCreated(
+                    0,
+                    payload.productWithMetaData.product.remoteProductId
+                ).also { it.error = payload.error }
+            } else {
+                val rowsAffected = productStorageHelper.upsertProduct(payload.productWithMetaData)
+                onProductCreated = OnProductCreated(rowsAffected, payload.productWithMetaData.product.remoteProductId)
+            }
+
+            onProductCreated.causeOfChange = WCProductAction.ADDED_PRODUCT
+            emitChange(onProductCreated)
+        }
+    }
+
+    private fun handleDeleteProduct(payload: RemoteDeleteProductPayload) {
+        coroutineEngine.launch(T.DB, this, "handleDeleteProduct") {
+            val onProductChanged: OnProductChanged
+
+            if (payload.isError) {
+                onProductChanged = OnProductChanged(0).also { it.error = payload.error }
+            } else {
+                val rowsAffected = productStorageHelper.deleteProduct(
+                    payload.site,
+                    payload.remoteProductId
+                )
+                onProductChanged = OnProductChanged(rowsAffected, payload.remoteProductId)
+            }
+
+            onProductChanged.causeOfChange = WCProductAction.DELETED_PRODUCT
+            emitChange(onProductChanged)
+        }
+    }
+
+    suspend fun getProductWithMetaData(
+        site: SiteModel,
+        remoteProductId: Long
+    ) = productStorageHelper.getProduct(site, remoteProductId)
+
+    suspend fun getProductMetaData(
+        site: SiteModel,
+        remoteProductId: Long
+    ) = productStorageHelper.getProductMetadata(site = site, remoteProductId = remoteProductId)
+
+    data class ProductSearchResult(
+        val products: List<WCProductModel>,
+        val canLoadMore: Boolean
+    )
+
+    data class ProductCategorySearchResult(
+        val categories: List<WCProductCategoryModel>,
+        val canLoadMore: Boolean
+    )
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCRefundStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCRefundStore.kt
new file mode 100644
index 00000000000..580cee47ea8
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCRefundStore.kt
@@ -0,0 +1,125 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.refunds.RefundMapper
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds.RefundRestClient
+import org.wordpress.android.fluxc.persistence.WCRefundSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.math.BigDecimal
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCRefundStore @Inject constructor(
+    private val restClient: RefundRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val refundsMapper: RefundMapper
+) {
+    companion object {
+        // Just get everything
+        const val DEFAULT_PAGE_SIZE = 100
+        const val DEFAULT_PAGE = 1
+    }
+
+    suspend fun createAmountRefund(
+        site: SiteModel,
+        orderId: Long,
+        amount: BigDecimal,
+        reason: String = "",
+        autoRefund: Boolean = false
+    ): WooResult<WCRefundModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "createAmountRefund") {
+            val response = restClient.createRefundByAmount(
+                    site,
+                    orderId,
+                    amount.toString(),
+                    reason,
+                    autoRefund
+            )
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(refundsMapper.map(response.result))
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun createItemsRefund(
+        site: SiteModel,
+        orderId: Long,
+        reason: String = "",
+        restockItems: Boolean = true,
+        autoRefund: Boolean = false,
+        items: List<WCRefundModel.WCRefundItem>
+    ): WooResult<WCRefundModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "createItemsRefund") {
+            val response = restClient.createRefundByItems(
+                    site,
+                    orderId,
+                    reason,
+                    autoRefund,
+                    items,
+                    restockItems
+            )
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> WooResult(refundsMapper.map(response.result))
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    fun getRefund(site: SiteModel, orderId: Long, refundId: Long): WCRefundModel? =
+            WCRefundSqlUtils.selectRefund(site, orderId, refundId)?.let { refundsMapper.map(it) }
+
+    suspend fun fetchRefund(
+        site: SiteModel,
+        orderId: Long,
+        refundId: Long
+    ): WooResult<WCRefundModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchRefund") {
+            val response = restClient.fetchRefund(site, orderId, refundId)
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    WCRefundSqlUtils.insertOrUpdate(site, orderId, response.result)
+                    WooResult(refundsMapper.map(response.result))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    fun getAllRefunds(site: SiteModel, orderId: Long): List<WCRefundModel> =
+            WCRefundSqlUtils.selectAllRefunds(site, orderId).map { refundsMapper.map(it) }
+
+    suspend fun fetchAllRefunds(
+        site: SiteModel,
+        orderId: Long,
+        page: Int = DEFAULT_PAGE,
+        pageSize: Int = DEFAULT_PAGE_SIZE
+    ): WooResult<List<WCRefundModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchAllRefunds") {
+            val response = restClient.fetchAllRefunds(
+                    site,
+                    orderId,
+                    page,
+                    pageSize
+            )
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    WCRefundSqlUtils.insertOrUpdate(site, orderId, response.result.toList())
+                    WooResult(response.result.map { refundsMapper.map(it) })
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingLabelStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingLabelStore.kt
new file mode 100644
index 00000000000..2a512e665c3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingLabelStore.kt
@@ -0,0 +1,534 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.delay
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult.InvalidAddress
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult.InvalidRequest
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult.Valid
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.CustomPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.PredefinedOption
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.PredefinedOption.PredefinedPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingAccountSettings
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelCreationEligibility
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelMapper
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelPackageData
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelPaperSize
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingPackageCustoms
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult.ShippingOption
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult.ShippingPackage
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.API_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.LabelItem
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.GetPackageTypesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.GetPackageTypesResponse.FormSchema.PackageOption.PackageDefinition
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelStatusApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.UpdateSettingsApiRequest
+import org.wordpress.android.fluxc.persistence.WCShippingLabelSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.Poller
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val PURCHASE_SHIPPING_LABELS_DELAY = 2000L
+
+@Singleton
+class WCShippingLabelStore @Inject constructor(
+    private val restClient: ShippingLabelRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: WCShippingLabelMapper
+) {
+    /**
+     * returns a list of shipping labels for an order from the database
+     */
+    fun getShippingLabelsForOrder(
+        site: SiteModel,
+        orderId: Long
+    ): List<WCShippingLabelModel> =
+            WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+
+    fun getShippingLabelById(
+        site: SiteModel,
+        orderId: Long,
+        remoteShippingLabelId: Long
+    ): WCShippingLabelModel? =
+            WCShippingLabelSqlUtils.getShippingLabelById(site.id, orderId, remoteShippingLabelId)
+
+    suspend fun fetchShippingLabelsForOrder(
+        site: SiteModel,
+        orderId: Long
+    ): WooResult<List<WCShippingLabelModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchShippingLabelsForOrder") {
+            val response = restClient.fetchShippingLabelsForOrder(orderId, site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val shippingLabels = mapper.map(response.result, site)
+
+                    // delete existing shipping labels for the order before adding incoming entries
+                    WCShippingLabelSqlUtils.deleteShippingLabelsForOrder(orderId)
+                    WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+                    WooResult(shippingLabels)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun refundShippingLabelForOrder(
+        site: SiteModel,
+        orderId: Long,
+        remoteShippingLabelId: Long
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "refundShippingLabelForOrder") {
+            val response = restClient.refundShippingLabelForOrder(site, orderId, remoteShippingLabelId)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    WooResult(response.result.success)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun printShippingLabel(
+        site: SiteModel,
+        paperSize: String,
+        shippingLabelId: Long
+    ): WooResult<String> = printShippingLabels(site, paperSize, listOf(shippingLabelId))
+
+    suspend fun printShippingLabels(
+        site: SiteModel,
+        paperSize: String,
+        shippingLabelIds: List<Long>
+    ): WooResult<String> {
+        require(shippingLabelIds.isNotEmpty())
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "printShippingLabels") {
+            val response = restClient.printShippingLabels(site, paperSize, shippingLabelIds)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result?.success == true -> {
+                    WooResult(response.result.b64Content)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    fun isOrderEligibleForShippingLabelCreation(
+        site: SiteModel,
+        orderId: Long,
+        canCreatePackage: Boolean,
+        canCreatePaymentMethod: Boolean,
+        canCreateCustomsForm: Boolean
+    ): WCShippingLabelCreationEligibility? {
+        val eligibility = WCShippingLabelSqlUtils.getSLCreationEligibilityForOrder(site.id, orderId)
+                ?: return null
+
+        return if (eligibility.canCreatePackage == canCreatePackage &&
+                eligibility.canCreatePaymentMethod == canCreatePaymentMethod &&
+                eligibility.canCreateCustomsForm == canCreateCustomsForm) {
+            eligibility
+        } else {
+            null
+        }
+    }
+
+    suspend fun fetchShippingLabelCreationEligibility(
+        site: SiteModel,
+        orderId: Long,
+        canCreatePackage: Boolean,
+        canCreatePaymentMethod: Boolean,
+        canCreateCustomsForm: Boolean
+    ): WooResult<WCShippingLabelCreationEligibility> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchShippingLabelCreationEligibility") {
+            val response = restClient.checkShippingLabelCreationEligibility(
+                    site = site,
+                    orderId = orderId,
+                    canCreatePackage = canCreatePackage,
+                    canCreatePaymentMethod = canCreatePaymentMethod,
+                    canCreateCustomsForm = canCreateCustomsForm
+            )
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val eligibility = WCShippingLabelCreationEligibility().apply {
+                        this.localSiteId = site.id
+                        this.remoteOrderId = orderId
+                        this.canCreatePackage = canCreatePackage
+                        this.canCreatePaymentMethod = canCreatePaymentMethod
+                        this.canCreateCustomsForm = canCreateCustomsForm
+                        this.isEligible = response.result.isEligible
+                        this.reason = response.result.reason
+                    }
+                    WCShippingLabelSqlUtils.insertOrUpdateSLCreationEligibility(eligibility)
+
+                    WooResult(eligibility)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun verifyAddress(
+        site: SiteModel,
+        address: ShippingLabelAddress,
+        type: ShippingLabelAddress.Type
+    ): WooResult<WCAddressVerificationResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "verifyAddress") {
+            val response = restClient.verifyAddress(site, address, type)
+            return@withDefaultContext if (response.isError) {
+                WooResult(response.error.apply { message = message ?: "" })
+            } else if (response.result?.error != null) {
+                if (!response.result.error.address.isNullOrBlank()) {
+                    WooResult(InvalidAddress(response.result.error.address))
+                } else {
+                    WooResult(InvalidRequest(response.result.error.message ?: ""))
+                }
+            } else if (response.result?.suggestedAddress != null && response.result.isSuccess) {
+                WooResult(
+                        Valid(
+                                suggestedAddress = response.result.suggestedAddress,
+                                isTrivialNormalization = response.result.isTrivialNormalization
+                        )
+                )
+            } else {
+                WooResult(WooError(GENERIC_ERROR, UNKNOWN, "Unknown error"))
+            }
+        }
+    }
+
+    suspend fun getPackageTypes(
+        site: SiteModel
+    ): WooResult<WCPackagesResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "getPackageTypes") {
+            val response = restClient.getPackageTypes(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result?.isSuccess == true -> {
+                    val customPackages = getCustomPackages(response.result)
+                    val predefinedOptions = getActivePredefinedOptions(response.result)
+                    WooResult(WCPackagesResult(customPackages, predefinedOptions))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun getShippingRates(
+        site: SiteModel,
+        orderId: Long,
+        origin: ShippingLabelAddress,
+        destination: ShippingLabelAddress,
+        packages: List<ShippingLabelPackage>,
+        customsData: List<WCShippingPackageCustoms>?
+    ): WooResult<WCShippingRatesResult> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "getShippingRates") {
+            val response = restClient.getShippingRates(site, orderId, origin, destination, packages, customsData)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result?.isSuccess == true -> {
+                    val packageRates: List<ShippingPackage> = response.result.boxes.map { box ->
+                        ShippingPackage(
+                                box.key,
+                                box.value.entries.map { option ->
+                                    ShippingOption(option.key, option.value.rates)
+                                }
+                        )
+                    }
+                    WooResult(WCShippingRatesResult(packageRates))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun getAllPredefinedOptions(
+        site: SiteModel
+    ): WooResult<List<PredefinedOption>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "getAllPredefinedOptions") {
+            val response = restClient.getPackageTypes(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result?.isSuccess == true -> {
+                    WooResult(selectAllPredefinedOptions(response.result))
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    private fun selectAllPredefinedOptions(result: GetPackageTypesResponse): List<PredefinedOption> {
+        return result.formSchema.predefinedSchema.entries.map { carrier ->
+            carrier.value.map { option ->
+                val predefinedPackages = option.value.definitions.map { definition ->
+                    PredefinedPackage(
+                            id = definition.id,
+                            title = definition.name,
+                            isLetter = definition.isLetter,
+                            dimensions = definition.outerDimensions,
+                            boxWeight = definition.boxWeight ?: 0f
+                    )
+                }
+
+                PredefinedOption(
+                        title = option.value.title,
+                        carrier = carrier.key,
+                        predefinedPackages = predefinedPackages
+                )
+            } // At this step, we end up with a list of lists of PredefinedOptions
+        }.flatten() // Flat it
+    }
+
+    @Suppress("NestedBlockDepth")
+    private fun getActivePredefinedOptions(result: GetPackageTypesResponse): List<PredefinedOption> {
+        val predefinedOptions = mutableListOf<PredefinedOption>()
+        result.formSchema.predefinedSchema.entries.forEach { provider ->
+            provider.value.forEach { option ->
+                result.formData.predefinedData[provider.key]?.let { packageIds ->
+                    val predefinedPackages = getPredefinedPackages(packageIds, option.value.definitions)
+                    if (predefinedPackages.isNotEmpty()) {
+                        predefinedOptions.add(PredefinedOption(option.value.title, provider.key, predefinedPackages))
+                    }
+                }
+            }
+        }
+        return predefinedOptions
+    }
+
+    private fun getPredefinedPackages(
+        packageIds: List<String?>,
+        packageDefinitions: List<PackageDefinition>
+    ): List<PredefinedPackage> {
+        val predefinedPackages = mutableListOf<PredefinedPackage>()
+        packageIds.forEach { packageId ->
+            packageDefinitions.firstOrNull { it.id == packageId }?.let { definition ->
+                predefinedPackages.add(
+                        PredefinedPackage(
+                                id = definition.id,
+                                title = definition.name,
+                                isLetter = definition.isLetter,
+                                dimensions = definition.outerDimensions,
+                                boxWeight = definition.boxWeight ?: 0f
+                        )
+                )
+            }
+        }
+        return predefinedPackages
+    }
+
+    private fun getCustomPackages(result: GetPackageTypesResponse): List<CustomPackage> {
+        return result.formData.customData.map {
+            CustomPackage(
+                    title = it.name,
+                    isLetter = it.isLetter,
+                    dimensions = it.dimensions ?: it.outerDimensions ?: it.innerDimensions ?: "0 x 0 x 0",
+                    boxWeight = it.boxWeight ?: 0f
+            )
+        }
+    }
+
+    suspend fun getAccountSettings(
+        site: SiteModel
+    ): WooResult<WCShippingAccountSettings> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "getAccountSettings") {
+            val response = restClient.getAccountSettings(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result?.success == true -> {
+                    WooResult(
+                            WCShippingAccountSettings(
+                                    isCreatingLabelsEnabled = response.result.formData.isCreatingLabelsEnabled,
+                                    isEmailReceiptEnabled = response.result.formData.isPaymentReceiptEnabled,
+                                    paperSize = WCShippingLabelPaperSize.fromString(response.result.formData.paperSize),
+                                    canEditSettings = response.result.formMeta.canEditSettings,
+                                    canManagePayments = response.result.formMeta.canManagePayments,
+                                    storeOwnerName = response.result.formMeta.storeOwnerName,
+                                    storeOwnerUserName = response.result.formMeta.storeOwnerUserName,
+                                    storeOwnerWpcomUserName = response.result.formMeta.storeOwnerWpcomUserName,
+                                    storeOwnerWpcomEmail = response.result.formMeta.storeOwnerWpcomEmail,
+                                    selectedPaymentMethodId = response.result.formData.selectedPaymentId,
+                                    paymentMethods = response.result.formMeta.paymentMethods.orEmpty(),
+                                    lastUsedBoxId = response.result.userMeta.lastBoxId
+                            )
+                    )
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun updateAccountSettings(
+        site: SiteModel,
+        isCreatingLabelsEnabled: Boolean? = null,
+        selectedPaymentMethodId: Int? = null,
+        isEmailReceiptEnabled: Boolean? = null,
+        paperSize: WCShippingLabelPaperSize? = null
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "updateSettings") {
+            val request = UpdateSettingsApiRequest(
+                    isCreatingLabelsEnabled = isCreatingLabelsEnabled,
+                    selectedPaymentMethodId = selectedPaymentMethodId,
+                    isEmailReceiptEnabled = isEmailReceiptEnabled,
+                    paperSize = paperSize?.stringValue
+            )
+            val response = restClient.updateAccountSettings(site, request)
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result == true -> WooResult(true)
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun purchaseShippingLabels(
+        site: SiteModel,
+        orderId: Long,
+        origin: ShippingLabelAddress,
+        destination: ShippingLabelAddress,
+        packagesData: List<WCShippingLabelPackageData>,
+        customsData: List<WCShippingPackageCustoms>?,
+        emailReceipts: Boolean = false
+    ): WooResult<List<WCShippingLabelModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "purchaseShippingLabels") {
+            val response = restClient.purchaseShippingLabels(
+                    site,
+                    orderId,
+                    origin,
+                    destination,
+                    packagesData,
+                    customsData,
+                    emailReceipts
+            )
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result?.labels != null -> {
+                    delay(PURCHASE_SHIPPING_LABELS_DELAY)
+                    val labelsStatusResponse = pollShippingLabelsForPurchase(
+                            site,
+                            orderId,
+                            response.result.labels.map { it.labelId!! }
+                    )
+                    if (labelsStatusResponse.isError) {
+                        WooResult(labelsStatusResponse.error)
+                    } else {
+                        val shippingLabels = mapper.map(
+                                labelsStatusResponse.result!!,
+                                orderId,
+                                origin,
+                                destination,
+                                site
+                        )
+                        WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+                        WooResult(shippingLabels)
+                    }
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    private suspend fun pollShippingLabelsForPurchase(
+        site: SiteModel,
+        orderId: Long,
+        labelIds: List<Long>
+    ): WooPayload<ShippingLabelStatusApiResponse> {
+        val poller = Poller(delayInMs = 1000, maxRetries = 3)
+        val remainingLabels: MutableList<Long> = labelIds.toMutableList()
+        val doneLabels: MutableList<LabelItem> = mutableListOf()
+
+        val response = poller.poll(
+                request = {
+                    restClient.fetchShippingLabelsStatus(
+                            site,
+                            orderId,
+                            remainingLabels.toList()
+                    )
+                },
+                predicate = { response ->
+                    // Stop the polling if the response has an error after the retries
+                    if (response.isError || response.result!!.labels == null) return@poll true
+                    // Stop the polling if the purchase of one of the labels failed
+                    if (response.result.labels!!.any { it.status == LabelItem.STATUS_ERROR }) return@poll true
+
+                    val purchasedLabels = response.result.labels.filter { it.status == LabelItem.STATUS_PURCHASED }
+                    doneLabels.addAll(purchasedLabels)
+                    remainingLabels.removeAll { labelId ->
+                        purchasedLabels.any { it.labelId == labelId }
+                    }
+                    remainingLabels.isEmpty()
+                }
+        )
+
+        return when {
+            response.isError -> {
+                response
+            }
+            response.result?.labels?.any { it.status == LabelItem.STATUS_ERROR } == true -> {
+                WooPayload(
+                        WooError(
+                                API_ERROR,
+                                SERVER_ERROR,
+                                message = response.result.labels.first { it.status == LabelItem.STATUS_ERROR }.error
+                        )
+                )
+            }
+            else -> {
+                WooPayload(ShippingLabelStatusApiResponse(isSuccess = true, labels = doneLabels))
+            }
+        }
+    }
+
+    /**
+     * Allows creation of new custom packages, or activation of predefined packages. At least one of the
+     * [customPackages] or [predefinedPackages] parameters should be a non-empty list.
+     */
+    suspend fun createPackages(
+        site: SiteModel,
+        customPackages: List<CustomPackage> = emptyList(),
+        predefinedPackages: List<PredefinedOption> = emptyList()): WooResult<Boolean> {
+        require(!(customPackages.isEmpty() && predefinedPackages.isEmpty())) {
+            "customPackages and predefinedPackages can't both be an empty list."
+        }
+
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "createPackages") {
+            val response = restClient.createPackages(site, customPackages, predefinedPackages)
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result == true -> WooResult(true)
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingMethodsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingMethodsStore.kt
new file mode 100644
index 00000000000..593c2225219
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCShippingMethodsStore.kt
@@ -0,0 +1,88 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCShippingMethod
+import org.wordpress.android.fluxc.model.toAppModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.EMPTY_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods.ShippingMethodsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods.toAppModel
+import org.wordpress.android.fluxc.persistence.dao.ShippingMethodDao
+import org.wordpress.android.fluxc.persistence.entity.toEntity
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCShippingMethodsStore @Inject constructor(
+    private val restClient: ShippingMethodsRestClient,
+    private val shippingMethodDao: ShippingMethodDao,
+    private val coroutineEngine: CoroutineEngine
+) {
+    fun observeShippingMethods(site: SiteModel): Flow<List<WCShippingMethod>> {
+        return shippingMethodDao.observeShippingMethods(site.localId()).map { list ->
+            list.map { it.toAppModel() }
+        }
+    }
+
+    suspend fun fetchShippingMethods(site: SiteModel): WooResult<List<WCShippingMethod>> {
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this, "fetchShippingMethods"
+        ) {
+            val response = restClient.fetchShippingMethods(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val shippingMethods = response.result.map { it.toAppModel() }
+                    WooResult(shippingMethods)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun updateShippingMethods(site: SiteModel, shippingMethods:List<WCShippingMethod>){
+        val shippingMethodsEntity = shippingMethods
+            .filter { it.id.isNotEmpty()}
+            .map { it.toEntity(site.localId()) }
+        shippingMethodDao.updateShippingMethods(shippingMethodsEntity)
+    }
+
+    suspend fun getShippingMethodById(site: SiteModel, id: String): WCShippingMethod? {
+        return shippingMethodDao.getShippingMethodById(site.localId(), id)?.toAppModel()
+    }
+
+    suspend fun updateShippingMethod(site: SiteModel, shippingMethod: WCShippingMethod){
+        if(shippingMethod.id.isEmpty()) return
+        shippingMethodDao.insertShippingMethods(listOf(shippingMethod.toEntity(site.localId())))
+    }
+
+    suspend fun fetchShippingMethod(site: SiteModel, id: String): WooResult<WCShippingMethod>{
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this, "fetchShippingMethods"
+        ) {
+            val response = restClient.fetchShippingMethodsById(site, id)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val shippingMethods = response.result.toAppModel()
+                    WooResult(shippingMethods)
+                }
+                else -> WooResult(WooError(EMPTY_RESPONSE, NOT_FOUND))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCStatsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCStatsStore.kt
new file mode 100644
index 00000000000..ee70e31cf91
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCStatsStore.kt
@@ -0,0 +1,548 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.WCStatsAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.logging.FluxCCrashLoggerProvider.crashLogger
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCBundleStats
+import org.wordpress.android.fluxc.model.WCNewVisitorStatsModel
+import org.wordpress.android.fluxc.model.WCProductBundleItemReport
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.model.WCVisitorStatsSummary
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats.BundleStatsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats.OrderStatsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats.OrderStatsRestClient.OrderStatsApiUnit
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats.VisitorStatsSummaryApiResponse
+import org.wordpress.android.fluxc.persistence.WCStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.WCVisitorStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.VisitorSummaryStatsDao
+import org.wordpress.android.fluxc.persistence.entity.VisitorSummaryStatsEntity
+import org.wordpress.android.fluxc.persistence.entity.toDomainModel
+import org.wordpress.android.fluxc.store.WCStatsStore.OrderStatsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.DateUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.API
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCStatsStore @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wcOrderStatsClient: OrderStatsRestClient,
+    private val bundleStatsRestClient: BundleStatsRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val visitorSummaryStatsDao: VisitorSummaryStatsDao
+) : Store(dispatcher) {
+    companion object {
+        private const val DATE_FORMAT_DAY = "yyyy-MM-dd"
+
+        // Use WordPress's maximum per page quantity
+        private const val ORDER_REVENUE_QUANTITY = 100
+    }
+
+    enum class StatsGranularity {
+        HOURS, DAYS, WEEKS, MONTHS, YEARS;
+
+        companion object {
+            fun fromOrderStatsApiUnit(apiUnit: OrderStatsApiUnit): StatsGranularity {
+                return when (apiUnit) {
+                    OrderStatsApiUnit.HOUR -> StatsGranularity.HOURS
+                    OrderStatsApiUnit.DAY -> StatsGranularity.DAYS
+                    OrderStatsApiUnit.WEEK -> StatsGranularity.WEEKS
+                    OrderStatsApiUnit.MONTH -> StatsGranularity.MONTHS
+                    OrderStatsApiUnit.YEAR -> StatsGranularity.YEARS
+                }
+            }
+
+            fun fromString(value: String): StatsGranularity {
+                return fromOrderStatsApiUnit(OrderStatsApiUnit.valueOf(value.toUpperCase()))
+            }
+        }
+    }
+
+    /**
+     * Describes the parameters for fetching new stats for [site], up to the current day, month, or year
+     * (depending on the given [granularity], [startDate]).
+     *
+     * @param[granularity] the time interval for the requested data (days, weeks, months, years)
+     * @param[startDate] The start date of the data
+     * @param[endDate] The end date of the data
+     * @param[forced] if true, ignores any cached result and forces a refresh from the server (defaults to false)
+     */
+    class FetchRevenueStatsPayload(
+        val site: SiteModel,
+        val granularity: StatsGranularity,
+        val startDate: String,
+        val endDate: String,
+        val forced: Boolean = false,
+        val revenueRangeId: String = ""
+    ) : Payload<BaseNetworkError>()
+
+    class FetchRevenueStatsResponsePayload(
+        val site: SiteModel,
+        val granularity: StatsGranularity,
+        val stats: WCRevenueStatsModel? = null
+    ) : Payload<OrderStatsError>() {
+        constructor(error: OrderStatsError, site: SiteModel, granularity: StatsGranularity) : this(site, granularity) {
+            this.error = error
+        }
+    }
+
+    /**
+     * Describes the parameters for fetching checking if the v4 stats for [site] is supported
+     */
+    class FetchRevenueStatsAvailabilityPayload(
+        val site: SiteModel
+    ) : Payload<BaseNetworkError>()
+
+    class FetchRevenueStatsAvailabilityResponsePayload(
+        val site: SiteModel,
+        val available: Boolean = false
+    ) : Payload<OrderStatsError>() {
+        constructor(error: OrderStatsError, site: SiteModel, available: Boolean) : this(site, available) {
+            this.error = error
+        }
+    }
+
+    /**
+     * Describes the parameters for fetching visitor stats for [site], up to the current day, month, or year
+     * (depending on the given [granularity]). These classes are used exclusively for the new v4 stats API changes
+     *
+     * @param[granularity] the time units for the requested data
+     * @param[forced] if true, ignores any cached result and forces a refresh from the server
+     */
+    class FetchNewVisitorStatsPayload(
+        val site: SiteModel,
+        val granularity: StatsGranularity,
+        val startDate: String,
+        val endDate: String,
+        val forced: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    class FetchNewVisitorStatsResponsePayload(
+        val site: SiteModel,
+        val granularity: StatsGranularity,
+        val stats: WCNewVisitorStatsModel? = null
+    ) : Payload<OrderStatsError>() {
+        constructor(error: OrderStatsError, site: SiteModel, granularity: StatsGranularity) : this(site, granularity) {
+            this.error = error
+        }
+    }
+
+    class OrderStatsError(val type: OrderStatsErrorType = GENERIC_ERROR, val message: String = "") : OnChangedError
+
+    enum class OrderStatsErrorType {
+        RESPONSE_NULL,
+        INVALID_PARAM,
+        PLUGIN_NOT_ACTIVE,
+        GENERIC_ERROR;
+
+        companion object {
+            private val reverseMap = OrderStatsErrorType.values().associateBy(OrderStatsErrorType::name)
+            fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR
+        }
+    }
+
+    // OnChanged events
+    class OnWCStatsChanged(
+        val rowsAffected: Int,
+        val granularity: StatsGranularity,
+        val quantity: String? = null,
+        val date: String? = null,
+        val isCustomField: Boolean = false
+    ) : OnChanged<OrderStatsError>() {
+        var causeOfChange: WCStatsAction? = null
+    }
+
+    override fun onRegister() = AppLog.d(T.API, "WCStatsStore onRegister")
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? WCStatsAction ?: return
+        when (actionType) {
+            WCStatsAction.FETCH_REVENUE_STATS_AVAILABILITY ->
+                fetchRevenueStatsAvailability(action.payload as FetchRevenueStatsAvailabilityPayload)
+            WCStatsAction.FETCHED_REVENUE_STATS_AVAILABILITY -> handleFetchRevenueStatsAvailabilityCompleted(
+                    action.payload as FetchRevenueStatsAvailabilityResponsePayload
+            )
+            WCStatsAction.FETCH_NEW_VISITOR_STATS -> Unit // Do nothing
+        }
+    }
+
+    /**
+     * Returns the visitor data by date for the given [site] and [granularity].
+     * The returned map has the format: "2018-05-01" -> 15
+     */
+    fun getNewVisitorStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        quantity: String? = null,
+        date: String? = null,
+        isCustomField: Boolean = false
+    ): Map<String, Int> {
+        val rawStats = WCVisitorStatsSqlUtils.getNewRawVisitorStatsForSiteGranularityQuantityAndDate(
+            site, granularity, quantity, date, isCustomField
+        )
+        rawStats?.let { visitorStatsModel ->
+            val periodIndex = visitorStatsModel.getIndexForField(WCNewVisitorStatsModel.VisitorStatsField.PERIOD)
+            val fieldIndex = visitorStatsModel.getIndexForField(WCNewVisitorStatsModel.VisitorStatsField.VISITORS)
+            return if (periodIndex == -1 || fieldIndex == -1) {
+                mapOf()
+            } else {
+                getVisitorsMap(
+                    periodIndex = periodIndex,
+                    fieldIndex = fieldIndex,
+                    dataList = visitorStatsModel.dataList
+                )
+            }
+        } ?: return mapOf()
+    }
+
+    fun getNewVisitorStats(
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String,
+        site: SiteModel
+    ): Map<String, Int> {
+        val quantity = getVisitorStatsQuantity(granularity, startDate, endDate)
+        val date = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, endDate)
+        val rawStats = WCVisitorStatsSqlUtils.getNewRawVisitorStatsForSiteGranularityQuantityAndDate(
+            site, granularity, quantity.toString(), date, true
+        )
+        rawStats?.let { visitorStatsModel ->
+            val periodIndex = visitorStatsModel.getIndexForField(WCNewVisitorStatsModel.VisitorStatsField.PERIOD)
+            val fieldIndex = visitorStatsModel.getIndexForField(WCNewVisitorStatsModel.VisitorStatsField.VISITORS)
+            return if (periodIndex == -1 || fieldIndex == -1) {
+                mapOf()
+            } else {
+                getVisitorsMap(
+                    periodIndex = periodIndex,
+                    fieldIndex = fieldIndex,
+                    dataList = visitorStatsModel.dataList
+                )
+            }
+        } ?: return mapOf()
+    }
+
+    private fun getVisitorsMap(
+        periodIndex: Int, fieldIndex: Int, dataList: List<List<Any>>
+    ): Map<String, Int> {
+        return dataList.associate {
+            // Years are returned as numbers by the API, and Gson interprets them as floats - clean up the decimal
+            val period = it[periodIndex].toString().removeSuffix(".0")
+
+            // Some plugins can change the field type
+            val visitsRawValue = it[fieldIndex]
+            val visits = if (visitsRawValue is Number) {
+                visitsRawValue.toInt()
+            } else {
+                crashLogger?.recordException(
+                    exception = NumberFormatException("$visitsRawValue is not a valid number"),
+                    category = null
+                )
+                (visitsRawValue as? String)?.toDoubleOrNull()?.toInt() ?: 0
+            }
+
+            period to visits
+        }
+    }
+
+    suspend fun fetchProductBundlesStats(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        interval: String,
+    ): WooResult<WCBundleStats> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchProductBundlesStats") {
+            val response = bundleStatsRestClient.fetchBundleStats(
+                site = site,
+                startDate = startDate,
+                endDate = endDate,
+                interval = interval
+            )
+
+            when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val bundleStats = WCBundleStats(
+                        itemsSold = response.result.totals.itemsSold ?: 0,
+                        netRevenue = response.result.totals.netRevenue ?: 0.0
+                    )
+                    WooResult(bundleStats)
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, BaseRequest.GenericErrorType.UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun fetchProductBundlesReport(
+        site: SiteModel,
+        startDate: String,
+        endDate: String,
+        quantity: Int
+    ): WooResult<List<WCProductBundleItemReport>>{
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchProductBundlesReport") {
+            val response = bundleStatsRestClient.fetchBundleReport(
+                site = site,
+                startDate = startDate,
+                endDate = endDate,
+                quantity = quantity
+            )
+
+            when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val bundleStats = response.result.map { item ->
+                        WCProductBundleItemReport(
+                            name = item.extendedInfo.name ?: "",
+                            image = item.extendedInfo.image,
+                            itemsSold = item.itemsSold ?: 0,
+                            netRevenue = item.netRevenue ?: 0.0
+                        )
+                    }
+                    WooResult(bundleStats)
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, BaseRequest.GenericErrorType.UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun fetchNewVisitorStats(payload: FetchNewVisitorStatsPayload): OnWCStatsChanged {
+        if (payload.granularity == StatsGranularity.HOURS) {
+            error("Visitor stats do not support hours granularity")
+        }
+        val startDate = payload.startDate
+        val endDate = payload.endDate
+        val quantity = getVisitorStatsQuantity(payload.granularity, startDate, endDate)
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchNewVisitorStats") {
+            val result = wcOrderStatsClient.fetchNewVisitorStats(
+                    site = payload.site,
+                    granularity = payload.granularity,
+                    date = DateUtils.getDateTimeForSite(payload.site, DATE_FORMAT_DAY, endDate),
+                    quantity = quantity,
+                    force = payload.forced,
+                    startDate = startDate,
+                    endDate = endDate
+            )
+            return@withDefaultContext if (result.isError || result.stats == null) {
+                OnWCStatsChanged(0, payload.granularity).also {
+                    it.error = result.error
+                    it.causeOfChange = WCStatsAction.FETCH_NEW_VISITOR_STATS
+                }
+            } else {
+                val rowsAffected = WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(result.stats)
+                OnWCStatsChanged(
+                        rowsAffected,
+                        payload.granularity,
+                        result.stats.quantity,
+                        result.stats.date,
+                        result.stats.isCustomField
+                ).also {
+                    it.causeOfChange = WCStatsAction.FETCH_NEW_VISITOR_STATS
+                }
+            }
+        }
+    }
+
+    /**
+     * returns the quantity (how far back to go) to use when requesting visitor stats for a specific granularity
+     * and the date range
+     */
+    fun getVisitorStatsQuantity(
+        granularity: StatsGranularity,
+        startDateString: String,
+        endDateString: String
+    ): Int {
+        val startDate = DateUtils.getDateFromString(startDateString)
+        val endDate = DateUtils.getDateFromString(endDateString)
+
+        val startDateCalendar = DateUtils.getStartDateCalendar(if (startDate.before(endDate)) startDate else endDate)
+        val endDateCalendar = DateUtils.getEndDateCalendar(if (startDate.before(endDate)) endDate else startDate)
+
+        return when (granularity) {
+            StatsGranularity.DAYS -> DateUtils.getQuantityInDays(startDateCalendar, endDateCalendar)
+            StatsGranularity.WEEKS -> DateUtils.getQuantityInWeeks(startDateCalendar, endDateCalendar)
+            StatsGranularity.MONTHS -> DateUtils.getQuantityInMonths(startDateCalendar, endDateCalendar)
+            StatsGranularity.YEARS -> DateUtils.getQuantityInYears(startDateCalendar, endDateCalendar)
+            else -> error("Visitor stats do not support hours granularity")
+        }.toInt()
+    }
+
+    /**
+     * Methods to support v4 revenue api changes
+     */
+    class OnWCRevenueStatsChanged(
+        val rowsAffected: Int,
+        val granularity: StatsGranularity,
+        val startDate: String? = null,
+        val endDate: String? = null,
+        val availability: Boolean = false
+    ) : OnChanged<OrderStatsError>() {
+        var causeOfChange: WCStatsAction? = null
+    }
+
+    suspend fun fetchRevenueStats(payload: FetchRevenueStatsPayload): OnWCRevenueStatsChanged {
+        val startDate = payload.startDate
+        val endDate = payload.endDate
+
+        return coroutineEngine.withDefaultContext(API, this, "fetchRevenueStats") {
+            val result = wcOrderStatsClient.fetchRevenueStats(
+                site = payload.site,
+                granularity = payload.granularity,
+                startDate = startDate,
+                endDate = endDate,
+                perPage = ORDER_REVENUE_QUANTITY,
+                forceRefresh = payload.forced,
+                revenueRangeId = payload.revenueRangeId
+            )
+
+            with(result) {
+                return@withDefaultContext if (isError || stats == null) {
+                    OnWCRevenueStatsChanged(0, granularity)
+                        .also { it.error = error }
+                } else {
+                    val rowsAffected = WCStatsSqlUtils.insertOrUpdateRevenueStats(stats)
+                    OnWCRevenueStatsChanged(
+                        rowsAffected,
+                        granularity,
+                        stats.startDate,
+                        stats.endDate
+                    )
+                }
+            }
+        }
+    }
+
+    suspend fun fetchVisitorStatsSummary(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String,
+        forced: Boolean = false
+    ): WooResult<WCVisitorStatsSummary> {
+        fun VisitorStatsSummaryApiResponse.toDataModel() = VisitorSummaryStatsEntity(
+            localSiteId = site.localId(),
+            date = date,
+            granularity = granularity.name,
+            views = views,
+            visitors = visitors
+        )
+
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchVisitorStatsSummary") {
+            val response = wcOrderStatsClient.fetchVisitorStatsSummary(
+                site = site,
+                granularity = granularity,
+                date = date,
+                force = forced
+            )
+
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val entity = response.result.toDataModel()
+                    visitorSummaryStatsDao.insert(entity)
+
+                    WooResult(entity.toDomainModel())
+                }
+
+                else -> WooResult(WooError(WooErrorType.GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun getVisitorStatsSummary(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String
+    ): WCVisitorStatsSummary? {
+        return visitorSummaryStatsDao.getVisitorSummaryStats(site.localId(), granularity.name, date)?.toDomainModel()
+    }
+
+    /**
+     * Method to check if the v4 revenue stats api is available for this site.
+     * The startDate passed to the api is the current date
+     */
+    private fun fetchRevenueStatsAvailability(payload: FetchRevenueStatsAvailabilityPayload) {
+        val startDate = DateUtils.getStartDateForSite(payload.site, DateUtils.getStartOfCurrentDay())
+        wcOrderStatsClient.fetchRevenueStatsAvailability(payload.site, startDate)
+    }
+
+    /**
+     * Method returns a [payload] with the [Boolean] flag to indicate if the v4 revenue stats api
+     * is available for this site.
+     */
+    private fun handleFetchRevenueStatsAvailabilityCompleted(payload: FetchRevenueStatsAvailabilityResponsePayload) {
+        val onStatsChanged = with(payload) {
+            if (isError) {
+                return@with OnWCRevenueStatsChanged(
+                        0, granularity = StatsGranularity.YEARS, availability = payload.available
+                ).also { it.error = payload.error }
+            } else {
+                return@with OnWCRevenueStatsChanged(
+                        0, granularity = StatsGranularity.YEARS, availability = payload.available
+                )
+            }
+        }
+        onStatsChanged.causeOfChange = WCStatsAction.FETCH_REVENUE_STATS_AVAILABILITY
+        emitChange(onStatsChanged)
+    }
+
+    fun getGrossRevenueStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String
+    ): Map<String, Double> {
+        val rawStats = getRawRevenueStats(site, granularity, startDate, endDate)
+        return rawStats?.getIntervalList()?.map {
+            it.interval!! to it.subtotals?.totalSales!!
+        }?.toMap() ?: mapOf()
+    }
+
+    fun getOrderCountStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String
+    ): Map<String, Long> {
+        val rawStats = getRawRevenueStats(site, granularity, startDate, endDate)
+        return rawStats?.getIntervalList()?.map {
+            it.interval!! to it.subtotals?.ordersCount!!
+        }?.toMap() ?: mapOf()
+    }
+
+    fun getRawRevenueStats(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        startDate: String,
+        endDate: String
+    ): WCRevenueStatsModel? {
+        return WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site, granularity, startDate, endDate)
+    }
+
+    fun getRawRevenueStatsFromRangeId(
+        site: SiteModel,
+        revenueRangeId: String
+    ) = WCStatsSqlUtils.getRevenueStatsFromRangeId(site, revenueRangeId)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCTaxStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCTaxStore.kt
new file mode 100644
index 00000000000..e83270c146e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCTaxStore.kt
@@ -0,0 +1,103 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.taxes.TaxRateEntity
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassMapper
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.TaxRateDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.WCTaxRestClient
+import org.wordpress.android.fluxc.persistence.WCTaxSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.TaxRateDao
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCTaxStore @Inject constructor(
+    private val restClient: WCTaxRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: WCTaxClassMapper,
+    private val taxRateDao: TaxRateDao,
+) {
+    companion object {
+        const val DEFAULT_PAGE_SIZE = 100
+        const val DEFAULT_PAGE = 1
+    }
+
+    /**
+     * returns a list of tax classes for a specific site in the database
+     */
+    fun getTaxClassListForSite(site: SiteModel): List<WCTaxClassModel> =
+        WCTaxSqlUtils.getTaxClassesForSite(site.id)
+
+    suspend fun fetchTaxClassList(site: SiteModel): WooResult<List<WCTaxClassModel>> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchTaxClassList") {
+            val response = restClient.fetchTaxClassList(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val taxClassModels = response.result.map {
+                        mapper.map(it).apply { localSiteId = site.id }
+                    }
+
+                    // delete existing tax classes for site before adding incoming entries
+                    WCTaxSqlUtils.deleteTaxClassesForSite(site)
+                    WCTaxSqlUtils.insertOrUpdateTaxClasses(taxClassModels)
+                    WooResult(taxClassModels)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * returns a boolean indicating whether more Tax Rates can be fetched.
+     */
+    suspend fun fetchTaxRateList(
+        site: SiteModel,
+        page: Int = DEFAULT_PAGE,
+        pageSize: Int = DEFAULT_PAGE_SIZE
+    ): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(API, this, "fetchTaxRateList") {
+            val response = restClient.fetchTaxRateList(site, page, pageSize)
+            when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    if (page == 1) {
+                        taxRateDao.deleteAll(site.localId())
+                    }
+                    response.result.forEach { insertTaxRateToDatabase(it, site) }
+
+                    val canLoadMore = response.result.size == pageSize
+                    WooResult(canLoadMore)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    @ExperimentalCoroutinesApi
+    fun observeTaxRates(site: SiteModel): Flow<List<TaxRateEntity>> =
+        taxRateDao.observeTaxRates(site.localId()).distinctUntilChanged()
+
+    private suspend fun insertTaxRateToDatabase(dto: TaxRateDto, site: SiteModel) {
+        taxRateDao.insertOrUpdate(dto.toDataModel(site.localId()))
+    }
+
+    suspend fun getTaxRate(site: SiteModel, taxRateId: Long) =
+        taxRateDao.getTaxRate(site.localId(), RemoteId(taxRateId))
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCUserStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCUserStore.kt
new file mode 100644
index 00000000000..874db6590da
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCUserStore.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.user.WCUserMapper
+import org.wordpress.android.fluxc.model.user.WCUserModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.user.WCUserRestClient
+import org.wordpress.android.fluxc.persistence.WCUserSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCUserStore @Inject constructor(
+    private val restClient: WCUserRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: WCUserMapper
+) {
+    suspend fun fetchUserRole(site: SiteModel): WooResult<WCUserModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchUserInfo") {
+            val response = restClient.fetchUserInfo(site)
+            return@withDefaultContext when {
+                response.isError -> WooResult(response.error)
+                response.result != null -> {
+                    val user = mapper.map(response.result, site)
+                    WCUserSqlUtils.insertOrUpdateUser(user)
+                    WooResult(user)
+                }
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    fun getUserByEmail(site: SiteModel, email: String) = WCUserSqlUtils.getUserBySiteAndEmail(site.id, email)
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWearableStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWearableStore.kt
new file mode 100644
index 00000000000..a2e6ad412ed
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWearableStore.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator.ListUpdateStrategy.SUPPRESS
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * This store serves specifically for the wearable app.
+ *
+ * It should not be used in the main Woo mobile app and relies on the scenario of
+ * the Watch receiving data from the Phone instead of the Woo Store API.
+ */
+@Singleton
+class WCWearableStore @Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val wcOrderRestClient: OrderRestClient,
+    private val ordersDaoDecorator: OrdersDaoDecorator,
+    private val accessToken: AccessToken
+) {
+    fun updateToken(token: String) { accessToken.set(token) }
+
+    @Suppress("SpreadOperator")
+    suspend fun fetchOrders(
+        site: SiteModel,
+        offset: Int = 0,
+        filterByStatus: String? = null,
+        shouldStoreData: Boolean = false
+    ): OrdersForWearablesResult {
+        return coroutineEngine.withDefaultContext(API, this, "fetchOrders") {
+            val result = wcOrderRestClient.fetchOrdersSync(site, offset, filterByStatus)
+            when {
+                result.isError -> {
+                    ordersDaoDecorator.getAllOrders()
+                        .takeIf { it.isNotEmpty() }
+                        ?.let { OrdersForWearablesResult.Success(result.orders) }
+                        ?: OrdersForWearablesResult.Failure(OrderError())
+                }
+                else -> {
+                    if (shouldStoreData) {
+                        ordersDaoDecorator.deleteOrdersForSite(site.localId())
+                        insertOrders(result.orders)
+                    }
+                    OrdersForWearablesResult.Success(result.orders)
+                }
+            }
+        }
+    }
+
+    suspend fun insertOrders(orders: List<OrderEntity>) {
+        orders.forEach {
+            ordersDaoDecorator.insertOrUpdateOrder(it, SUPPRESS)
+        }
+    }
+
+    sealed class OrdersForWearablesResult {
+        data class Success(val orders: List<OrderEntity>) : OrdersForWearablesResult()
+        data class Failure(val error: OrderError) : OrdersForWearablesResult()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWooPaymentsStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWooPaymentsStore.kt
new file mode 100644
index 00000000000..3c9e45d1d73
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCWooPaymentsStore.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsRestClient
+import org.wordpress.android.fluxc.persistence.dao.WooPaymentsDepositsOverviewDao
+import org.wordpress.android.fluxc.persistence.entity.BalanceType
+import org.wordpress.android.fluxc.persistence.entity.DepositType
+import org.wordpress.android.fluxc.persistence.mappers.WooPaymentsDepositsOverviewMapper
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WCWooPaymentsStore @Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val restClient: WooPaymentsRestClient,
+    private val dao: WooPaymentsDepositsOverviewDao,
+    private val mapper: WooPaymentsDepositsOverviewMapper
+) {
+    suspend fun fetchDepositsOverview(site: SiteModel): WooPayload<WooPaymentsDepositsOverview> =
+        coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchDepositsOverview") {
+            val result = restClient.fetchDepositsOverview(site)
+            if (result.result != null) {
+                WooPayload(mapper.mapApiResponseToModel(result.result))
+            } else {
+                WooPayload(result.error)
+            }
+        }
+
+    suspend fun getDepositsOverviewAll(site: SiteModel): WooPaymentsDepositsOverview? =
+        coroutineEngine.withDefaultContext(AppLog.T.API, this, "getDepositsOverviewAll") {
+             dao.getOverviewComposed(site.localId()).let {
+                 mapper.mapEntityToModel(it)
+             }
+        }
+
+    suspend fun insertDepositsOverview(
+        site: SiteModel,
+        depositsOverview: WooPaymentsDepositsOverview
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "insertDepositsOverview") {
+        dao.insertOverviewAll(
+            localSiteId = site.localId(),
+            overviewEntity = mapper.mapModelToEntity(depositsOverview, site),
+
+            lastPaidDepositsEntities = depositsOverview.deposit?.lastPaid?.map {
+                mapper.mapModelDepositToEntity(it, site, DepositType.LAST_PAID)
+            }.orEmpty(),
+            manualDepositEntities = depositsOverview.deposit?.lastManualDeposits?.map {
+                mapper.mapModelManualDepositToEntity(it, site)
+            }.orEmpty(),
+
+            pendingBalancesEntities = depositsOverview.balance?.pending?.map {
+                mapper.mapModelBalanceToEntity(it, site, BalanceType.PENDING)
+            }.orEmpty(),
+            availableBalancesEntities = depositsOverview.balance?.available?.map {
+                mapper.mapModelBalanceToEntity(it, site, BalanceType.AVAILABLE)
+            }.orEmpty(),
+            instantBalancesEntities = depositsOverview.balance?.instant?.map {
+                mapper.mapModelBalanceToEntity(it, site, BalanceType.INSTANT)
+            }.orEmpty()
+        )
+    }
+
+    suspend fun deleteDepositsOverview(site: SiteModel) =
+        coroutineEngine.withDefaultContext(AppLog.T.API, this, "deleteDepositsOverview") {
+            dao.delete(site.localId())
+        }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WooCommerceStore.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WooCommerceStore.kt
new file mode 100644
index 00000000000..d53cdaa262e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WooCommerceStore.kt
@@ -0,0 +1,576 @@
+package org.wordpress.android.fluxc.store
+
+import android.content.Context
+import com.wellsql.generated.SiteModelTable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductSettingsModel
+import org.wordpress.android.fluxc.model.WCSSRModel
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition.LEFT
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition.LEFT_SPACE
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition.RIGHT
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition.RIGHT_SPACE
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.model.settings.WCSettingsMapper
+import org.wordpress.android.fluxc.model.taxes.TaxBasedOnSettingEntity
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooCommerceRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCApiVersionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCSystemPluginResponse.SystemPluginModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WooSystemRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.toDomainModel
+import org.wordpress.android.fluxc.persistence.PluginSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.WCProductSettingsSqlUtils
+import org.wordpress.android.fluxc.persistence.WCSettingsSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.TaxBasedOnDao
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload
+import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.WCCurrencyUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.LanguageUtils
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.absoluteValue
+
+@Singleton
+open class WooCommerceStore @Inject constructor(
+    private val appContext: Context,
+    dispatcher: Dispatcher,
+    private val coroutineEngine: CoroutineEngine,
+    private val siteStore: SiteStore,
+    private val systemRestClient: WooSystemRestClient,
+    private val wcCoreRestClient: WooCommerceRestClient,
+    private val settingsMapper: WCSettingsMapper,
+    private val siteSqlUtils: SiteSqlUtils,
+    private val accountStore: AccountStore,
+    private val taxBasedOnDao: TaxBasedOnDao,
+) : Store(dispatcher) {
+    enum class WooPlugin(val pluginName: String) {
+        WOO_CORE("woocommerce/woocommerce"),
+        WOO_SERVICES("woocommerce-services/woocommerce-services"),
+        WOO_SHIPPING("woocommerce-shipping/woocommerce-shipping"),
+        WOO_PAYMENTS("woocommerce-payments/woocommerce-payments"),
+        WOO_STRIPE_GATEWAY("woocommerce-gateway-stripe/woocommerce-gateway-stripe"),
+        WOO_SHIPMENT_TRACKING("woocommerce-shipment-tracking/woocommerce-shipment-tracking"),
+        WOO_SUBSCRIPTIONS("woocommerce-subscriptions/woocommerce-subscriptions"),
+        WOO_GIFT_CARDS("woocommerce-gift-cards/woocommerce-gift-cards"),
+        WOO_MIN_MAX_QUANTITIES("woocommerce-min-max-quantities/woocommerce-min-max-quantities"),
+        WOO_PRODUCT_BUNDLES("woocommerce-product-bundles/woocommerce-product-bundles"),
+        WOO_COMPOSITE_PRODUCTS("woocommerce-composite-products/woocommerce-composite-products"),
+        WOO_SQUARE("woocommerce-square/woocommerce-square"),
+        JETPACK("jetpack/jetpack"),
+        GOOGLE_ADS("google-listings-and-ads/google-listings-and-ads"),
+    }
+
+    companion object {
+        const val WOO_API_NAMESPACE_V1 = "wc/v1"
+        const val WOO_API_NAMESPACE_V2 = "wc/v2"
+        const val WOO_API_NAMESPACE_V3 = "wc/v3"
+    }
+
+    private val SiteModel.needsAdditionalCheckForWooInstallation
+        get() = origin == SiteModel.ORIGIN_XMLRPC || (origin == SiteModel.ORIGIN_WPCOM_REST && isJetpackCPConnected)
+
+    override fun onRegister() = AppLog.d(T.API, "WooCommerceStore onRegister")
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) = Unit // Do nothing (ignore)
+
+    suspend fun fetchWooCommerceSites(): WooResult<List<SiteModel>> {
+        val fetchResult = if (accountStore.hasAccessToken()) {
+            siteStore.fetchSites(FetchSitesPayload())
+        } else {
+            // If the user is not signed in using WordPress.com, the fetch will happen individually later
+            OnSiteChanged()
+        }
+
+        if (fetchResult.isError) {
+            emitChange(fetchResult)
+
+            return WooResult(
+                WooError(
+                    type = GENERIC_ERROR,
+                    message = fetchResult.error.message,
+                    original = UNKNOWN
+                )
+            )
+        }
+
+        // Fetch WooCommerce availability for non-Jetpack sites
+        val updatedSites = siteStore.sites
+            .filter { it.needsAdditionalCheckForWooInstallation }
+            .pmap { site ->
+                val isResultUpdated = fetchAndUpdateNonJetpackSite(site)
+                if (isResultUpdated.model == true && !fetchResult.updatedSites.contains(site)) {
+                    1
+                } else {
+                    0
+                }
+            }.sum()
+
+        val rowsAffected = fetchResult.rowsAffected + updatedSites
+
+        emitChange(OnSiteChanged(rowsAffected, fetchResult.updatedSites))
+
+        return withContext(Dispatchers.IO) { WooResult(getWooCommerceSites()) }
+    }
+
+    @Suppress("ReturnCount")
+    suspend fun fetchWooCommerceSite(site: SiteModel): WooResult<SiteModel> {
+        if (!site.isJetpackCPConnected) {
+            // The endpoint used by siteStore to fetch a single site is broken for Jetpack CP sites, so skip it for them
+            siteStore.fetchSite(site).let {
+                if (it.isError) {
+                    return WooResult(
+                        WooError(
+                            type = GENERIC_ERROR,
+                            message = it.error.message,
+                            original = UNKNOWN
+                        )
+                    )
+                }
+            }
+        }
+
+        val isSiteUpdated = if (site.needsAdditionalCheckForWooInstallation) {
+            fetchAndUpdateNonJetpackSite(site).let {
+                if (it.isError) return WooResult(it.error)
+
+                it.model!!
+            }
+        } else false
+
+        val updatedSite = withContext(Dispatchers.IO) {
+            siteStore.getSiteByLocalId(site.id)
+        } ?: return WooResult(
+            WooError(
+                type = GENERIC_ERROR,
+                message = "Site not found in the DB",
+                original = UNKNOWN
+            )
+        )
+
+        if (isSiteUpdated) {
+            emitChange(OnSiteChanged(1, listOf(updatedSite)))
+        }
+
+        return WooResult(updatedSite)
+    }
+
+    fun getWooCommerceSites(): MutableList<SiteModel> =
+        siteSqlUtils.getSitesWith(SiteModelTable.HAS_WOO_COMMERCE, true).asModel
+
+    /**
+     * Given a [SiteModel], returns its WooCommerce site settings, or null if no settings are stored for this site.
+     */
+    fun getSiteSettings(site: SiteModel): WCSettingsModel? =
+        WCSettingsSqlUtils.getSettingsForSite(site)
+
+    /**
+     * Given a [SiteModel], returns its WooCommerce product settings, or null if no settings are stored for this site.
+     */
+    open fun getProductSettings(site: SiteModel): WCProductSettingsModel? =
+        WCProductSettingsSqlUtils.getProductSettingsForSite(site)
+
+    suspend fun getTaxBasedOnSettings(site: SiteModel): TaxBasedOnSettingEntity? =
+        taxBasedOnDao.getTaxBasedOnSetting(site.localId())
+
+    /**
+     * Given a [SiteModel], returns its WooCommerce store country name,
+     * or null if no settings are stored for this site OR if country is empty/blank
+     */
+    fun getStoreCountryCode(site: SiteModel): String? {
+        val siteSettings = WCSettingsSqlUtils.getSettingsForSite(site)
+        return siteSettings?.countryCode
+    }
+
+    fun getSitePlugin(site: SiteModel, plugin: WooPlugin): SitePluginModel? {
+        return PluginSqlUtils.getSitePluginByName(site, plugin.pluginName)
+    }
+
+    suspend fun getSitePlugins(site: SiteModel, plugins: List<WooPlugin>): List<SitePluginModel> {
+        return coroutineEngine.withDefaultContext(T.DB, this, "getSitePlugins") {
+            val pluginNames = plugins.map { it.pluginName }
+            PluginSqlUtils.getSitePluginByNames(site, pluginNames)
+        }
+    }
+
+    suspend fun getSitePlugins(site: SiteModel): List<SitePluginModel> {
+        return coroutineEngine.withDefaultContext(T.DB, this, "getSitePlugins") {
+            PluginSqlUtils.getSitePlugins(site)
+        }
+    }
+
+    suspend fun fetchSitePlugins(site: SiteModel): WooResult<List<SitePluginModel>> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSitePlugins") {
+            val response = systemRestClient.fetchInstalledPlugins(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result?.plugins != null -> {
+                    val plugins = response.result.plugins.map { it.toDomainModel(site.id) }
+                    PluginSqlUtils.insertOrReplaceSitePlugins(site, plugins)
+                    WooResult(plugins)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun fetchSystemPlugins(site: SiteModel): WooResult<List<SystemPluginModel>> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSystemPlugins") {
+            val response = systemRestClient.fetchInstalledPlugins(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result?.plugins != null -> {
+                    val plugins = response.result.plugins
+                    WooResult(plugins)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    suspend fun fetchSSR(site: SiteModel): WooResult<WCSSRModel> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSSR") {
+            val response = systemRestClient.fetchSSR(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val ssr = WCSSRModel(
+                        remoteSiteId = site.siteId,
+                        environment = response.result.environment?.toString(),
+                        database = response.result.database?.toString(),
+                        activePlugins = response.result.activePlugins?.toString(),
+                        theme = response.result.theme?.toString(),
+                        settings = response.result.settings?.toString(),
+                        security = response.result.security?.toString(),
+                        pages = response.result.pages?.toString()
+                    )
+                    WooResult(ssr)
+                }
+
+                else -> WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+            }
+        }
+    }
+
+    /**
+     * Fetch additional data about non-Jetpack connected sites, and here we mean two types:
+     * 1. Jetpack CP connected sites.
+     * 2. Self-hosted sites accessed using site credentials.
+     *
+     * @return [WooResult] representing whether the result succeeded and whether the site was updated
+     */
+    @Suppress("ReturnCount")
+    private suspend fun fetchAndUpdateNonJetpackSite(site: SiteModel): WooResult<Boolean> {
+        // Fetch site metadata for Jetpack CP sites
+        val isMetadataUpdated = if (site.isJetpackCPConnected) {
+            fetchAndUpdateMetaDataFromSiteSettings(site).let {
+                if (it.isError) {
+                    return it
+                }
+                it.model!!
+            }
+        } else false
+
+        // Check Woo installation status for Jetpack CP sites and non-Jetpack sites
+        val isWooStatusUpdated = fetchAndUpdateWooCommerceAvailability(site).let {
+            if (it.isError) {
+                return it
+            }
+            it.model!!
+        }
+
+        return WooResult(isMetadataUpdated || isWooStatusUpdated)
+    }
+
+    private suspend fun fetchAndUpdateMetaDataFromSiteSettings(site: SiteModel): WooResult<Boolean> {
+        fun SiteModel.updateFromSiteSettings(response: WooSystemRestClient.WPSiteSettingsResponse) = apply {
+            name = response.title ?: name
+            description = response.description ?: description
+            url = response.url ?: url
+            showOnFront = response.showOnFront ?: showOnFront
+            pageOnFront = response.pageOnFront ?: pageOnFront
+        }
+
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchAndUpdateMetaDataFromSiteSettings") {
+            val response = systemRestClient.fetchSiteSettings(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(T.API, "fetching site settings  site ${site.siteId}")
+                    WooResult(response.error)
+                }
+
+                else -> {
+                    WooResult(response.result?.let {
+                        siteSqlUtils.insertOrUpdateSite(site.updateFromSiteSettings(it)) == 1
+                    } ?: false)
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchAndUpdateWooCommerceAvailability(site: SiteModel): WooResult<Boolean> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchAndUpdateWooCommerceAvailability") {
+            val response = systemRestClient.checkIfWooCommerceIsAvailable(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(T.API, "Checking WooCommerce availability failed for site ${site.siteId}")
+                    WooResult(response.error)
+                }
+
+                else -> {
+                    val updated = response.result?.takeIf { it != site.hasWooCommerce }?.let {
+                        site.hasWooCommerce = it
+                        siteSqlUtils.insertOrUpdateSite(site)
+                        true
+                    } ?: false
+                    WooResult(updated)
+                }
+            }
+        }
+    }
+
+    suspend fun fetchSupportedApiVersion(
+        site: SiteModel,
+        overrideRetryPolicy: Boolean = false
+    ): WooResult<WCApiVersionResponse> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSupportedWooApiVersion") {
+            val response = wcCoreRestClient.fetchSupportedWooApiVersion(site, overrideRetryPolicy)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(
+                        T.API,
+                        "Checking WooCommerce API version failed for site ${site.siteId}"
+                    )
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val namespaces = response.result.namespaces
+                    val maxWooApiVersion = namespaces?.run {
+                        find { it == WOO_API_NAMESPACE_V3 }
+                            ?: find { it == WOO_API_NAMESPACE_V2 }
+                            ?: find { it == WOO_API_NAMESPACE_V1 }
+                    }
+                    WooResult(
+                        WCApiVersionResponse(
+                            siteModel = site,
+                            apiVersion = maxWooApiVersion
+                        )
+                    )
+                }
+
+                else -> {
+                    WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+                }
+            }
+        }
+    }
+
+    suspend fun enableCoupons(site: SiteModel): Boolean {
+        return coroutineEngine.withDefaultContext(T.API, this, "enableCoupons") {
+            val response = wcCoreRestClient.enableCoupons(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(T.API, "Failed to enable coupons for ${site.siteId}")
+                    false
+                }
+
+                else -> {
+                    response.result?.let {
+                        WCSettingsSqlUtils.setCouponsEnabled(site, it)
+                        it
+                    } ?: false
+                }
+            }
+        }
+    }
+
+    suspend fun fetchSiteGeneralSettings(site: SiteModel): WooResult<WCSettingsModel> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSiteGeneralSettings") {
+            val response = wcCoreRestClient.fetchSiteSettingsGeneral(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(
+                        T.API,
+                        "Failed to fetch Woo Site settings for site ${site.siteId}"
+                    )
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val settings = settingsMapper.mapSiteSettings(response.result, site)
+                    WCSettingsSqlUtils.insertOrUpdateSettings(settings)
+
+                    WooResult(settings)
+                }
+
+                else -> {
+                    WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+                }
+            }
+        }
+    }
+
+    suspend fun fetchSiteProductSettings(site: SiteModel): WooResult<WCProductSettingsModel> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchSiteProductSettings") {
+            val response = wcCoreRestClient.fetchSiteSettingsProducts(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(
+                        T.API,
+                        "Failed to fetch Woo product settings for site ${site.siteId}"
+                    )
+                    WooResult(response.error)
+                }
+
+                response.result != null -> {
+                    val settings = settingsMapper.mapProductSettings(response.result, site)
+                    WCProductSettingsSqlUtils.insertOrUpdateProductSettings(settings)
+
+                    WooResult(settings)
+                }
+
+                else -> {
+                    WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+                }
+            }
+        }
+    }
+
+    suspend fun fetchTaxBasedOnSettings(site: SiteModel): WooResult<TaxBasedOnSettingEntity> {
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchTaxBasedOnSettings") {
+            val response = wcCoreRestClient.fetchSiteSettingsTaxBasedOn(site)
+            return@withDefaultContext when {
+                response.isError -> {
+                    AppLog.w(
+                        T.API,
+                        "Failed to fetch Woo \"tax based on\" setting for site ${site.siteId}"
+                    )
+                    WooResult(response.error)
+                }
+                response.result != null -> {
+                    val settings = settingsMapper.mapTaxBasedOnSettings(response.result, site.localId())
+                    taxBasedOnDao.insertOrUpdate(settings)
+                    WooResult(settings)
+                }
+                else -> {
+                    WooResult(WooError(GENERIC_ERROR, UNKNOWN))
+                }
+            }
+        }
+    }
+
+    /**
+     * Formats currency amounts for display based on the site's settings and the device locale.
+     *
+     * If there is no [WCSettingsModel] associated with the given [site], the [rawValue] will be returned without
+     * decimal formatting, but with the appropriate currency symbol prepended to the [rawValue].
+     *
+     * @param rawValue the amount to be formatted
+     * @param site the associated [SiteModel] - this will be used to resolve the corresponding [WCSettingsModel]
+     * @param currencyCode an optional, ISO 4217 currency code to use. If not supplied, the site's currency code
+     * will be used (obtained from the [WCSettingsModel] corresponding to the given [site]
+     * @param applyDecimalFormatting whether or not to apply decimal formatting to the value. If `false`, only the
+     * currency symbol and positioning will be applied. This is useful for values for 'pretty' display, e.g. $1.2k.
+     */
+    fun formatCurrencyForDisplay(
+        rawValue: String,
+        site: SiteModel,
+        currencyCode: String? = null,
+        applyDecimalFormatting: Boolean
+    ): String {
+        val siteSettings = getSiteSettings(site)
+
+        // Resolve the currency code to a localized symbol
+        val resolvedCurrencyCode = currencyCode?.takeIf { it.isNotEmpty() } ?: siteSettings?.currencyCode
+        val currencySymbol = resolvedCurrencyCode?.let {
+            WCCurrencyUtils.getLocalizedCurrencySymbolForCode(it, LanguageUtils.getCurrentDeviceLanguage(appContext))
+        } ?: ""
+
+        // Format the amount for display according to the site's currency settings
+        // Use absolute values - if the value is negative, it will be handled in the next step, with the currency symbol
+        val decimalFormattedValue = siteSettings?.takeIf { applyDecimalFormatting }?.let {
+            WCCurrencyUtils.formatCurrencyForDisplay(rawValue.toDoubleOrNull()?.absoluteValue ?: 0.0, it)
+        } ?: rawValue.removePrefix("-")
+
+        // Append or prepend the currency symbol according to the site's settings
+        with(StringBuilder()) {
+            if (rawValue.startsWith("-")) {
+                append("-")
+            }
+            append(
+                when (siteSettings?.currencyPosition) {
+                    null, LEFT -> "$currencySymbol$decimalFormattedValue"
+                    LEFT_SPACE -> "$currencySymbol $decimalFormattedValue"
+                    RIGHT -> "$decimalFormattedValue$currencySymbol"
+                    RIGHT_SPACE -> "$decimalFormattedValue $currencySymbol"
+                }
+            )
+            return toString()
+        }
+    }
+
+    /**
+     * Fetches the currency symbol for display based on the site's settings and the device locale.
+     *
+     * If there is no [WCSettingsModel] associated with the given [site], the [currencyCode] will be returned if
+     * available, otherwise an empty string is returned.
+     *
+     * @param site the associated [SiteModel] - this will be used to resolve the corresponding [WCSettingsModel]
+     * @param currencyCode an optional, ISO 4217 currency code to use. If not supplied, the site's currency code
+     * will be used (obtained from the [WCSettingsModel] corresponding to the given [site]
+     */
+    fun getSiteCurrency(
+        site: SiteModel,
+        currencyCode: String? = null
+    ): String {
+        val siteSettings = getSiteSettings(site)
+
+        // Resolve the currency code to a localized symbol
+        val resolvedCurrencyCode = currencyCode?.takeIf { it.isNotEmpty() } ?: siteSettings?.currencyCode
+        return resolvedCurrencyCode?.let {
+            WCCurrencyUtils.getLocalizedCurrencySymbolForCode(it, LanguageUtils.getCurrentDeviceLanguage(appContext))
+        } ?: ""
+    }
+
+    fun formatCurrencyForDisplay(
+        amount: Double,
+        site: SiteModel,
+        currencyCode: String? = null,
+        applyDecimalFormatting: Boolean
+    ): String {
+        return formatCurrencyForDisplay(amount.toString(), site, currencyCode, applyDecimalFormatting)
+    }
+
+    private suspend fun <A, B> Iterable<A>.pmap(f: suspend (A) -> B): List<B> = coroutineScope {
+        map { async { f(it) } }.awaitAll()
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/BigDecimalExt.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/BigDecimalExt.kt
new file mode 100644
index 00000000000..21852ff0fde
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/BigDecimalExt.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.utils
+
+import java.math.BigDecimal
+
+/**
+ * Returns the sum of all values produced by [selector] function applied to each element in the collection.
+ */
+public inline fun <T> Iterable<T>.sumBy(selector: (T) -> BigDecimal): BigDecimal {
+    var sum: BigDecimal = BigDecimal.ZERO
+    for (element in this) {
+        sum += selector(element)
+    }
+    return sum
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/DateUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/DateUtils.kt
new file mode 100644
index 00000000000..322a13a1c27
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/DateUtils.kt
@@ -0,0 +1,377 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+
+object DateUtils {
+    private const val DATE_FORMAT_DEFAULT = "yyyy-MM-dd"
+    private const val DATE_TIME_FORMAT_START = "yyyy-MM-dd'T'00:00:00"
+    private const val DATE_TIME_FORMAT_END = "yyyy-MM-dd'T'23:59:59"
+
+    private const val ONE_WEEK_IN_DAYS = 7
+    private const val ONE_DAY_IN_HOURS = 24
+    private const val ONE_HOUR_IN_MINUTES = 60
+    private const val ONE_MINUTE_IN_SECONDS = 60
+    private const val ONE_SECOND_IN_MILLISECONDS = 1000
+    private const val ONE_DAY_IN_MILLIS =
+        ONE_DAY_IN_HOURS * ONE_HOUR_IN_MINUTES * ONE_MINUTE_IN_SECONDS * ONE_SECOND_IN_MILLISECONDS
+
+    /**
+     * Given a [SiteModel] and a [String] compatible with [SimpleDateFormat]
+     * and a {@param dateString}
+     * returns a formatted date that accounts for the site's timezone setting.
+     *
+     */
+    fun getDateTimeForSite(
+        site: SiteModel,
+        pattern: String,
+        dateString: String?
+    ): String {
+        val currentDate = Date()
+
+        if (dateString.isNullOrEmpty()) {
+            return SiteUtils.getDateTimeForSite(site, pattern, currentDate)
+        }
+
+        /*
+         * Since only date is provided without the time,
+         * by default the time is set to the start of the day.
+         *
+         * This might cause timezone issues so getting the current time
+         * and setting this time to the date value
+         * */
+        val now = Calendar.getInstance()
+        now.time = currentDate
+
+        val date = getDateFromString(dateString)
+        val calendar = Calendar.getInstance()
+        calendar.time = date
+        calendar.add(Calendar.HOUR_OF_DAY, now.get(Calendar.HOUR_OF_DAY))
+        calendar.add(Calendar.MINUTE, now.get(Calendar.MINUTE))
+        calendar.add(Calendar.SECOND, now.get(Calendar.SECOND))
+        return SiteUtils.getDateTimeForSite(site, pattern, calendar.time)
+    }
+
+    /**
+     * returns a [Date] instance
+     * based on {@param pattern} and {@param dateString}
+     */
+    fun getDateFromString(dateString: String, pattern: String = DATE_FORMAT_DEFAULT): Date {
+        val dateFormat = SimpleDateFormat(pattern, Locale.ROOT)
+        return dateFormat.parse(dateString)
+    }
+
+    /**
+     * returns a [String] formatted
+     * based on {@param pattern} and {@param date}
+     */
+    fun formatDate(
+        pattern: String,
+        date: Date
+    ): String {
+        val dateFormat = SimpleDateFormat(pattern, Locale.ROOT)
+        return dateFormat.format(date)
+    }
+
+    /**
+     * Given a [SimpleDateFormat] instance and
+     * the [String] start date string, returns a [Calendar] instance.
+     *
+     * The start date time is set to 00:00:00
+     *
+     */
+    fun getStartDateCalendar(startDate: Date, locale: Locale = Locale.getDefault()): Calendar {
+        val cal1 = Calendar.getInstance(locale)
+        cal1.time = startDate
+        cal1.set(Calendar.HOUR_OF_DAY, 0)
+        cal1.set(Calendar.MINUTE, 0)
+        cal1.set(Calendar.SECOND, 0)
+        cal1.set(Calendar.MILLISECOND, 0)
+
+        return cal1
+    }
+
+    /**
+     * Given a [SimpleDateFormat] instance and
+     * the [String] end date string, returns a [Calendar] instance.
+     *
+     * The end date time is set to 23:59:59
+     *
+     */
+    @Suppress("MagicNumber", "ForbiddenComment")
+    fun getEndDateCalendar(endDate: Date, locale: Locale = Locale.getDefault()): Calendar {
+        val cal2 = Calendar.getInstance(locale)
+        cal2.time = endDate
+        cal2.set(Calendar.HOUR_OF_DAY, ONE_DAY_IN_HOURS - 1)
+        cal2.set(Calendar.MINUTE, ONE_HOUR_IN_MINUTES - 1)
+        cal2.set(Calendar.SECOND, ONE_MINUTE_IN_SECONDS - 1)
+        cal2.set(Calendar.MILLISECOND, 59) // TODO: (@anitaa) Why '59' instead of '999'?
+        return cal2
+    }
+
+    /**
+     * Given a [Calendar] instance for startDate and endDate,
+     * returns a quantity that is calculated based on [StatsGranularity.DAYS]
+     */
+    fun getQuantityInDays(
+        startDateCalendar: Calendar,
+        endDateCalendar: Calendar
+    ): Long {
+        val millis1 = startDateCalendar.timeInMillis
+        val millis2 = endDateCalendar.timeInMillis
+
+        val diff = Math.abs(millis2 - millis1)
+        return Math.ceil(diff / ONE_DAY_IN_MILLIS.toDouble()).toLong()
+    }
+
+    /**
+     * Given a [Calendar] instance for startDate and endDate,
+     * returns a quantity that is calculated based on [StatsGranularity.WEEKS]
+     */
+    fun getQuantityInWeeks(
+        startDateCalendar: Calendar,
+        endDateCalendar: Calendar
+    ): Long {
+        /*
+         * start date: if day of week is greater than 1: set to 1
+         * end date: if day of week is less than 7: set to 7
+         *
+         * This logic is to handle half week scenarios, for instance if the
+         * start date = 2019-01-25 and end date = 2019-01-28 - the difference
+         * in weeks should be 2 since the dates are actually in two different weeks
+         *
+         * */
+        if (startDateCalendar.get(Calendar.DAY_OF_WEEK) > 1) {
+            startDateCalendar.set(Calendar.DAY_OF_WEEK, startDateCalendar.firstDayOfWeek)
+        }
+        if (endDateCalendar.get(Calendar.DAY_OF_WEEK) < 1) {
+            endDateCalendar.set(Calendar.DAY_OF_WEEK, getConstantForLastDayOfWeek(endDateCalendar))
+        }
+
+        val diffInDays = getQuantityInDays(startDateCalendar, endDateCalendar).toDouble()
+        return Math.ceil(diffInDays / ONE_WEEK_IN_DAYS).toLong()
+    }
+
+    /**
+     * Given a [Calendar] instance for startDate and endDate,
+     * returns a quantity that is calculated based on [StatsGranularity.MONTHS]
+     */
+    fun getQuantityInMonths(
+        startDateCalendar: Calendar,
+        endDateCalendar: Calendar
+    ): Long {
+        /*
+         * start date: if day of month is greater than 1: set to 1
+         * end date: if day of month is less than the maximum day of month for that particular month:
+         * set to maximum day of month for that particular month
+         *
+         * This is to handle scenarios where the start date such as if start date = 12/31/18 and end date = 1/1/19,
+         * the default difference in months would be 1, but it should be 2 since these are two separate months
+         * */
+        if (startDateCalendar.get(Calendar.DAY_OF_MONTH) > 1) {
+            startDateCalendar.set(Calendar.DAY_OF_MONTH, 1)
+        }
+        if (endDateCalendar.get(Calendar.DAY_OF_MONTH) < endDateCalendar.getActualMaximum(Calendar.DAY_OF_MONTH)) {
+            endDateCalendar.set(Calendar.DAY_OF_MONTH, endDateCalendar.getActualMaximum(Calendar.DAY_OF_MONTH))
+        }
+
+        var diff: Long = 0
+        if (endDateCalendar.after(startDateCalendar)) {
+            while (endDateCalendar.after(startDateCalendar)) {
+                if (endDateCalendar.after(startDateCalendar)) {
+                    diff++
+                }
+                startDateCalendar.add(Calendar.MONTH, 1)
+            }
+        }
+        return Math.abs(diff)
+    }
+
+    /**
+     * Given a [Calendar] instance for startDate and endDate,
+     * returns a quantity that is calculated based on [StatsGranularity.YEARS]
+     */
+    fun getQuantityInYears(
+        startDateCalendar: Calendar,
+        endDateCalendar: Calendar
+    ): Long {
+        /*
+         * start date: if day of year is greater than 1: set to 1
+         * end date: if day of year is less than the maximum day of year for that particular year:
+         * set to maximum day of year for that particular year
+         *
+         * This is to handle scenarios where the start date such as if start date = 12/31/18 and end date = 1/1/19,
+         * the default difference in years would be 1, but it should be 2 since these are two separate years
+         * */
+        if (startDateCalendar.get(Calendar.DAY_OF_YEAR) > 1) {
+            startDateCalendar.set(Calendar.DAY_OF_YEAR, 1)
+        }
+        if (endDateCalendar.get(Calendar.DAY_OF_YEAR) < endDateCalendar.getActualMaximum(Calendar.DAY_OF_YEAR)) {
+            endDateCalendar.set(Calendar.DAY_OF_YEAR, endDateCalendar.getActualMaximum(Calendar.DAY_OF_YEAR))
+        }
+
+        var diff: Long = 0
+        if (endDateCalendar.after(startDateCalendar)) {
+            while (endDateCalendar.after(startDateCalendar)) {
+                if (endDateCalendar.after(startDateCalendar)) {
+                    diff++
+                }
+                startDateCalendar.add(Calendar.YEAR, 1)
+            }
+        }
+        return Math.abs(diff)
+    }
+
+    /**
+     * returns string of the current date
+     * in the format: YYYY-MM-dd
+     *
+     */
+    fun getCurrentDateString(): String {
+        val calendar = Calendar.getInstance()
+        calendar.time = Date()
+        val dayOfMonth = calendar.get(Calendar.DATE)
+        val year = calendar.get(Calendar.YEAR)
+        val monthOfYear = calendar.get(Calendar.MONTH)
+        return getFormattedDateString(year, monthOfYear, dayOfMonth)
+    }
+
+    /**
+     * Given a year integer, month integer, date integer,
+     * returns string in the format: YYYY-MM-dd
+     *
+     */
+    fun getFormattedDateString(year: Int, month: Int, dayOfMonth: Int): String {
+        return String.format(Locale.US, "%d-%02d-%02d", year, (month + 1), dayOfMonth)
+    }
+
+    /**
+     * Given a date string of format YYYY-MM-dd, returns a [Calendar] instance of the same
+     *
+     */
+    fun getCalendarInstance(value: String): Calendar {
+        val (year, month, day) = value.split("-").map { it.toInt() }
+        return Calendar.getInstance().apply { set(year, month - 1, day) }
+    }
+
+    /**
+     * Format the date for UTC and return as string
+     */
+    fun formatGmtAsUtcDateString(gmtVal: String): String = "${gmtVal}Z"
+
+    /**
+     * Given a [SiteModel] and a [dateString] in format yyyy-MM-dd,
+     * returns a formatted date that accounts for the site's timezone setting,
+     * in the format yyy-MM-ddThh:mm:ss with the time always set to the start of the [dateString]
+     */
+    fun getStartDateForSite(site: SiteModel, dateString: String) =
+            getDateTimeForSite(site, DATE_TIME_FORMAT_START, dateString)
+
+    /**
+     * Given a [SiteModel] and a [dateString] in format yyyy-MM-dd,
+     * returns a formatted date that accounts for the site's timezone setting,
+     * in the format yyy-MM-ddThh:mm:ss with the time always set to the end of the [dateString]
+     */
+    fun getEndDateForSite(site: SiteModel, dateString: String) =
+            getDateTimeForSite(site, DATE_TIME_FORMAT_END, dateString)
+
+    /**
+     * Given a [SiteModel],
+     * returns a formatted date that accounts for the site's timezone setting,
+     * in the format yyy-MM-ddThh:mm:ss with the time always set to the end of the
+     * current date
+     */
+    fun getEndDateForSite(site: SiteModel) = getDateTimeForSite(site, DATE_TIME_FORMAT_END, null)
+
+    fun getStartOfCurrentDay(): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        return formatDate(DATE_FORMAT_DEFAULT, cal.time)
+    }
+
+    fun getFirstDayOfCurrentWeek(cal: Calendar): String {
+        cal.set(Calendar.DAY_OF_WEEK, cal.firstDayOfWeek)
+        return formatDate(DATE_FORMAT_DEFAULT, cal.time)
+    }
+
+    fun getFirstDayOfCurrentMonth(): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH))
+        return formatDate(DATE_FORMAT_DEFAULT, cal.time)
+    }
+
+    fun getFirstDayOfCurrentYear(): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.set(Calendar.DAY_OF_YEAR, cal.getActualMinimum(Calendar.DAY_OF_YEAR))
+        return formatDate(DATE_FORMAT_DEFAULT, cal.time)
+    }
+
+    fun getFirstDayOfCurrentWeekBySite(site: SiteModel, locale: Locale = Locale.getDefault()): String {
+        val cal = Calendar.getInstance(locale)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_WEEK, cal.firstDayOfWeek)
+        return formatDate(DATE_TIME_FORMAT_START, cal.time)
+    }
+
+    fun getFirstDayOfCurrentMonthBySite(site: SiteModel): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH))
+        return formatDate(DATE_TIME_FORMAT_START, cal.time)
+    }
+
+    fun getFirstDayOfCurrentYearBySite(site: SiteModel): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_YEAR, cal.getActualMinimum(Calendar.DAY_OF_YEAR))
+        return formatDate(DATE_TIME_FORMAT_START, cal.time)
+    }
+
+    fun getLastDayOfCurrentWeekForSite(site: SiteModel, locale: Locale = Locale.getDefault()): String {
+        val cal = Calendar.getInstance(locale)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_WEEK, getConstantForLastDayOfWeek(cal))
+        return formatDate(DATE_TIME_FORMAT_END, cal.time)
+    }
+
+    fun getLastDayOfCurrentMonthForSite(site: SiteModel): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH))
+        return formatDate(DATE_TIME_FORMAT_END, cal.time)
+    }
+
+    fun getLastDayOfCurrentYearForSite(site: SiteModel): String {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.time = getCurrentDateFromSite(site)
+        cal.set(Calendar.DAY_OF_YEAR, cal.getActualMaximum(Calendar.DAY_OF_YEAR))
+        return formatDate(DATE_TIME_FORMAT_END, cal.time)
+    }
+
+    /**
+     * Returns (#Calendar.DAY_OF_WEEK) constant for last day of week.
+     */
+    fun getConstantForLastDayOfWeek(calendar: Calendar): Int {
+        val lastDay = calendar.firstDayOfWeek + (ONE_WEEK_IN_DAYS - 1)
+        return if (lastDay > ONE_WEEK_IN_DAYS) {
+            lastDay % (ONE_WEEK_IN_DAYS + 1) + 1
+        } else {
+            lastDay
+        }
+    }
+
+    /**
+     * Given a [SiteModel] instance, returns a [Date] instance for the current date
+     *
+     * The date format is in yyyy-MM-dd'T'00:00:00
+     */
+    private fun getCurrentDateFromSite(site: SiteModel): Date {
+        val dateString = SiteUtils.getCurrentDateTimeForSite(site, DATE_TIME_FORMAT_START)
+        return getDateFromString(dateString, DATE_TIME_FORMAT_START)
+    }
+
+    fun getDatePeriod(startDate: String, endDate: String) = "$startDate-$endDate"
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JetpackResponseExt.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JetpackResponseExt.kt
new file mode 100644
index 00000000000..900622e4c1e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JetpackResponseExt.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackSuccess
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+
+fun <T> JetpackResponse<T>.handleResult() =
+        when (this) {
+            is JetpackSuccess -> {
+                WooPayload(data)
+            }
+            is JetpackError -> {
+                WooPayload(error.toWooError())
+            }
+        }
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializer.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializer.kt
new file mode 100644
index 00000000000..de7cc819fbc
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializer.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonNull
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.Exception
+import java.lang.reflect.Type
+
+class JsonElementToFloatSerializerDeserializer : JsonSerializer<Float?>, JsonDeserializer<Float?> {
+    override fun serialize(
+        src: Float?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return src?.let { JsonPrimitive(it) } ?: JsonNull.INSTANCE
+    }
+
+    @Suppress("SwallowedException", "TooGenericExceptionCaught")
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Float? {
+        return try {
+            json?.asFloat
+        } catch (e: Exception) {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializer.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializer.kt
new file mode 100644
index 00000000000..76afaea1858
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializer.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonNull
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.Exception
+import java.lang.reflect.Type
+
+class JsonElementToLongSerializerDeserializer : JsonSerializer<Long?>, JsonDeserializer<Long?> {
+    override fun serialize(
+        src: Long?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return src?.let { JsonPrimitive(it) } ?: JsonNull.INSTANCE
+    }
+
+    @Suppress("SwallowedException", "TooGenericExceptionCaught")
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Long? {
+        return try {
+            json?.asLong
+        } catch (e: Exception) {
+            null
+        }
+    }
+}
+
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonUtils.kt
new file mode 100644
index 00000000000..5e4cbe68bf4
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/JsonUtils.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonElement
+
+const val EMPTY_JSON_ARRAY = "[]"
+
+fun JsonElement?.isElementNullOrEmpty(): Boolean {
+    return this?.let {
+        when{
+            this.isJsonObject -> this.asJsonObject.size() == 0
+            this.isJsonArray -> this.asJsonArray.size()== 0
+            this.isJsonPrimitive && this.asJsonPrimitive.isString -> this.asString.isEmpty()
+            this.isJsonNull -> true
+            else -> false
+        }
+    } ?: true
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/MapExt.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/MapExt.kt
new file mode 100644
index 00000000000..629f3920cb3
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/MapExt.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.utils
+
+fun <T> MutableMap<T, String>.putIfNotEmpty(vararg pairs: Pair<T, String?>) = apply {
+    pairs.forEach { pair ->
+        pair.second?.takeIf { it.isNotEmpty() }
+                ?.let { put(pair.first, it) }
+    }
+}
+
+fun <T, K> MutableMap<T, K>.putIfNotNull(vararg pairs: Pair<T, K?>) = apply {
+    pairs.forEach { pair ->
+        pair.second?.let { put(pair.first, it) }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializer.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializer.kt
new file mode 100644
index 00000000000..486bbf58569
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializer.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import java.lang.reflect.Type
+
+class NonNegativeDoubleJsonDeserializer : JsonDeserializer<Double?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Double? {
+        return try {
+            json?.asDouble?.let {
+                if (it >= 0) it else null
+            }
+        } catch (e: NumberFormatException) {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeIntJsonDeserializer.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeIntJsonDeserializer.kt
new file mode 100644
index 00000000000..7e4462026b9
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NonNegativeIntJsonDeserializer.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import java.lang.reflect.Type
+
+class NonNegativeIntJsonDeserializer : JsonDeserializer<Int?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Int? {
+        return try {
+            json?.asInt?.let {
+                if (it >= 0) it else null
+            }
+        } catch (e: NumberFormatException) {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NullStringJsonAdapter.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NullStringJsonAdapter.kt
new file mode 100644
index 00000000000..dafa98b94bd
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/NullStringJsonAdapter.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken.NULL
+import com.google.gson.stream.JsonToken.STRING
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.MalformedJsonException
+
+class NullStringJsonAdapter : TypeAdapter<String>() {
+    override fun write(out: JsonWriter, value: String?) {
+        val defaultSerializeNullValue = out.serializeNulls
+        out.serializeNulls = true
+        if (value == null) {
+            out.nullValue()
+        } else {
+            out.value(value)
+        }
+        out.serializeNulls = defaultSerializeNullValue
+    }
+
+    override fun read(input: JsonReader): String? {
+        return when (val token = input.peek()) {
+            STRING -> input.nextString()
+            NULL -> {
+                input.nextNull()
+                null
+            }
+            else -> throw MalformedJsonException("Unexpected token: $token")
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/Poller.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/Poller.kt
new file mode 100644
index 00000000000..99773e6680e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/Poller.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.utils
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+
+/**
+ * A utility class that handles polling, it allows polling a request, with a defined delay between the requests
+ * and automatic retrying on errors, the logic is as follows:
+ * 1. Invoke the request.
+ * 2. If the request fails, retry for the number of times specified by maxRetries after the specified delay
+ * 3. If the request succeeds, check the predicate against the result
+ * 4. If it's true, then return the result.
+ * 5. If it's false, repeat from 1.
+ *
+ * @param delayInMs: the delay between requests in milliseconds
+ * @param maxRetries: the maximum number of retries when an error occurs
+ */
+class Poller(private val delayInMs: Long, private val maxRetries: Int) {
+    suspend fun <T : WooPayload<*>> poll(
+        request: suspend () -> T,
+        predicate: (T) -> Boolean
+    ): T {
+        return pollInternal(request)
+                .filter { predicate.invoke(it) }
+                .first()
+    }
+
+    private suspend fun <T : WooPayload<*>> pollInternal(
+        request: suspend () -> T
+    ): Flow<T> {
+        var retries = 0
+        return flow {
+            while (retries < maxRetries) {
+                val result = request.invoke()
+                if (result.isError) {
+                    retries++
+                    if (retries == maxRetries) {
+                        emit(result)
+                    }
+                } else {
+                    retries = 0
+                    emit(result)
+                }
+                delay(delayInMs)
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializer.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializer.kt
new file mode 100644
index 00000000000..a1e4a6e3d03
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializer.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import java.lang.reflect.Type
+
+@Suppress("SwallowedException")
+class PrimitiveBooleanJsonDeserializer : JsonDeserializer<Boolean?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Boolean? {
+        return try {
+            if (json == null || json.isJsonNull) return null
+            (json as? JsonPrimitive)?.let { jsonPrimitive ->
+                when {
+                    jsonPrimitive.isBoolean -> jsonPrimitive.asBoolean
+                    jsonPrimitive.isNumber -> tryIntToBoolean(jsonPrimitive)
+                    jsonPrimitive.isString -> tryStringToBoolean(jsonPrimitive)
+                    else -> null
+                }
+            }
+        } catch (e: IllegalStateException) {
+            null
+        } catch (e: ClassCastException) {
+            null
+        } catch (e: UnsupportedOperationException) {
+            null
+        }
+    }
+
+    private fun tryIntToBoolean(json: JsonElement?): Boolean? {
+        return try {
+            return when (json?.asInt) {
+                0 -> false
+                1 -> true
+                else -> null
+            }
+        } catch (e: IllegalStateException) {
+            null
+        } catch (e: ClassCastException) {
+            null
+        } catch (e: UnsupportedOperationException) {
+            null
+        }
+    }
+
+    private fun tryStringToBoolean(json: JsonElement?): Boolean? {
+        return try {
+            val stringValue = json?.asString?.replace(" ", "") ?: return null
+            stringValue.toBooleanStrictOrNull() ?: run {
+                val intValue = stringValue.toInt()
+                val intPrimitive = JsonPrimitive(intValue)
+                tryIntToBoolean(intPrimitive)
+            }
+        } catch (e: IllegalStateException) {
+            null
+        } catch (e: ClassCastException) {
+            null
+        } catch (e: UnsupportedOperationException) {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WCCurrencyUtils.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WCCurrencyUtils.kt
new file mode 100644
index 00000000000..04c87fad45e
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WCCurrencyUtils.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Currency
+import java.util.Locale
+
+object WCCurrencyUtils {
+    /**
+     * Formats the given [rawValue] as a decimal based on the site's currency settings as stored in [siteSettings].
+     *
+     * Currency symbol and placement are not handled.
+     */
+    fun formatCurrencyForDisplay(rawValue: Double, siteSettings: WCSettingsModel, locale: Locale? = null): String {
+        return formatCurrencyForDisplay(
+            rawValue = rawValue,
+            currencyDecimalNumber = siteSettings.currencyDecimalNumber,
+            currencyDecimalSeparator = siteSettings.currencyDecimalSeparator,
+            currencyThousandSeparator = siteSettings.currencyThousandSeparator,
+            locale = locale
+        )
+    }
+
+    fun formatCurrencyForDisplay(
+        rawValue: Double,
+        currencyDecimalNumber: Int,
+        currencyDecimalSeparator: String,
+        currencyThousandSeparator: String,
+        locale: Locale? = null
+    ): String {
+        val pattern = if (currencyDecimalNumber > 0) {
+            "#,##0.${"0".repeat(currencyDecimalNumber)}"
+        } else {
+            "#,##0"
+        }
+
+        val decimalFormat = locale?.let { DecimalFormat(pattern, DecimalFormatSymbols(locale)) }
+            ?: DecimalFormat(pattern)
+
+        decimalFormat.decimalFormatSymbols = decimalFormat.decimalFormatSymbols.apply {
+            // If no decimal separator is set, keep whatever the system default is
+            currencyDecimalSeparator.takeIf { it.isNotEmpty() }?.let {
+                decimalSeparator = it[0]
+            }
+            // If no thousands separator is set, assume it's intentional and clear it in the formatter
+            currencyThousandSeparator.takeIf { it.isNotEmpty() }?.let {
+                groupingSeparator = it[0]
+            } ?: run { decimalFormat.isGroupingUsed = false }
+        }
+
+        return decimalFormat.format(rawValue)
+    }
+
+    /**
+     * Given a locale and an ISO 4217 currency code (e.g. USD), returns the currency symbol for that currency,
+     * localized to the locale.
+     *
+     * Will return the [currencyCode] if it's found not to be a valid currency code.
+     */
+    fun getLocalizedCurrencySymbolForCode(currencyCode: String, locale: Locale): String {
+        return try {
+            Currency.getInstance(currencyCode).getSymbol(locale)
+        } catch (e: IllegalArgumentException) {
+            AppLog.e(T.UTILS,
+                    "Error finding valid currency symbol for currency code [$currencyCode] in locale [$locale]", e)
+            currencyCode
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WPAPIResponseExt.kt b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WPAPIResponseExt.kt
new file mode 100644
index 00000000000..f8d4edb0f06
--- /dev/null
+++ b/libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/utils/WPAPIResponseExt.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+
+inline fun <reified T> WPAPIResponse<T>.toWooPayload(): WooPayload<T> =
+    this.toWooPayload { it }
+
+/**
+ * Converts a [WPAPIResponse] to [WooPayload] by using the provided [mapper] for the conversion.
+ *
+ * @param mapper a mapper function to map between the input and return types
+ */
+inline fun <reified T, reified R> WPAPIResponse<T>.toWooPayload(
+    mapper: (T) -> R
+): WooPayload<R> = when (this) {
+    is WPAPIResponse.Success -> {
+        val result = data
+        if (result == null) {
+            if (null !is R) {
+                WooPayload(
+                    WooError(
+                        type = WooErrorType.EMPTY_RESPONSE,
+                        original = BaseRequest.GenericErrorType.UNKNOWN,
+                        message = "Success response with empty data"
+                    )
+                )
+            } else {
+                WooPayload(null)
+            }
+        } else {
+            WooPayload(mapper(result))
+        }
+    }
+    is WPAPIResponse.Error -> WooPayload(error.toWooError())
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt
new file mode 100644
index 00000000000..ac8ee73388c
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataTest.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.JsonObject
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.ID
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.KEY
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.Companion.VALUE
+
+@RunWith(RobolectricTestRunner::class)
+class WCMetaDataTest {
+    @Test
+    fun `when all required fields are present, should return a WCMetaData`() {
+        val id = 1234L
+        val key = "this_is_the_key"
+        val value = "random value"
+
+        val metadataJson = JsonObject().apply {
+            addProperty(ID, id)
+            addProperty(KEY, key)
+            addProperty(VALUE, value)
+        }
+
+        val metadata = WCMetaData.fromJson(metadataJson)
+
+        assertThat(metadata).isNotNull
+        assertThat(metadata!!.id).isEqualTo(id)
+        assertThat(metadata.key).isEqualTo(key)
+        assertThat(metadata.value.stringValue).isEqualTo(value)
+    }
+
+    @Test
+    fun `when ID is missing, should return null`() {
+        val key = "this_is_the_key"
+        val value = "random value"
+
+        val metadataJson = JsonObject().apply {
+            addProperty(KEY, key)
+            addProperty(VALUE, value)
+        }
+
+        val metadata = WCMetaData.fromJson(metadataJson)
+
+        assertThat(metadata).isNull()
+    }
+
+    @Test
+    fun `when Key is missing, should return null`() {
+        val id = 1234L
+        val value = "random value"
+
+        val metadataJson = JsonObject().apply {
+            addProperty(ID, id)
+            addProperty(VALUE, value)
+        }
+
+        val metadata = WCMetaData.fromJson(metadataJson)
+
+        assertThat(metadata).isNull()
+    }
+
+    @Test
+    fun `when Value is missing, should return null`() {
+        val id = 1234L
+        val key = "this_is_the_key"
+
+        val metadataJson = JsonObject().apply {
+            addProperty(ID, id)
+            addProperty(KEY, key)
+        }
+
+        val metadata = WCMetaData.fromJson(metadataJson)
+
+        assertThat(metadata).isNull()
+    }
+
+    @Test
+    fun `when id is not a number, should return null`() {
+        val id = "some_id"
+
+        val metadataJson = JsonObject().apply {
+            addProperty(ID, id)
+            addProperty(KEY, "this_is_the_key")
+            addProperty(VALUE, "random value")
+        }
+
+        val metadata = WCMetaData.fromJson(metadataJson)
+        assertThat(metadata).isNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt
new file mode 100644
index 00000000000..3b37b611ace
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCMetaDataValueTest.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.model
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+
+class WCMetaDataValueTest {
+    @Test
+    fun `when given a plain string, should return a StringValue`() {
+        val string = WCMetaDataValue("string")
+        assert(string is WCMetaDataValue.StringValue)
+    }
+
+    @Test
+    fun `when given a number, should return a NumberValue`() {
+        val number = WCMetaDataValue("1")
+        assert(number is WCMetaDataValue.NumberValue)
+    }
+
+    @Test
+    fun `when given a float, should return a NumberValue`() {
+        val number = WCMetaDataValue("1.5")
+        assert(number is WCMetaDataValue.NumberValue)
+    }
+
+    @Test
+    fun `when given a boolean, should return a BooleanValue`() {
+        val boolean = WCMetaDataValue("true")
+        assert(boolean is WCMetaDataValue.BooleanValue)
+    }
+
+    @Test
+    fun `when given a JSON object, should return a JsonObjectValue`() {
+        val jsonObject = WCMetaDataValue("""{"key":"value"}""")
+        assert(jsonObject is WCMetaDataValue.JsonObjectValue)
+    }
+
+    @Test
+    fun `when given a JSON array, should return a JsonArrayValue`() {
+        val jsonArray = WCMetaDataValue("""[{"key":"value"}]""")
+        assert(jsonArray is WCMetaDataValue.JsonArrayValue)
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCProductModelTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCProductModelTest.kt
new file mode 100644
index 00000000000..625aced0e6d
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCProductModelTest.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductType
+
+class WCProductModelTest {
+    @Test
+    fun `empty attributes json array return empty array`() {
+        val attributes = JsonArray()
+
+        val sut = WCProductModel().apply {
+            this.attributes = attributes.toString()
+        }
+
+        val result = sut.getAttributeList()
+
+        Assertions.assertThat(result).isEmpty()
+    }
+
+    @Test
+    fun `json attributes without option return empty option`() {
+        val attribute = JsonObject().apply {
+            addProperty("id",1)
+            addProperty("name", "attribute name")
+            addProperty("variation", false)
+            addProperty("visible", true)
+        }
+        val attributes = JsonArray().apply {
+            add(attribute)
+        }
+
+        val sut = WCProductModel().apply {
+            this.attributes = attributes.toString()
+        }
+
+        val result = sut.getAttributeList()
+
+        Assertions.assertThat(result).isNotEmpty
+    }
+
+    @Test
+    fun `isConfigurable should return false when bundledItems is malformed JSON`() {
+        val sut = WCProductModel().apply {
+            type = CoreProductType.BUNDLE.value
+            this.bundledItems = "malformed: [#ˆ%*(!@*#ˆ%(*!#ˆ(%*!]"
+        }
+
+        val result = sut.isConfigurable
+
+        assertThat(result).isFalse
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCRevenueStatsModelTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCRevenueStatsModelTest.kt
new file mode 100644
index 00000000000..d51ccbdee50
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/model/WCRevenueStatsModelTest.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc.model
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.utils.json
+
+class WCRevenueStatsModelTest {
+    @Test
+    fun `should assign null value if number of sold items exceeds integer range`() {
+        val sut = WCRevenueStatsModel().apply {
+            total = json {
+                "num_items_sold" To "15032797007"
+            }.toString()
+        }
+
+        val total = sut.parseTotal()
+
+        assertThat(total?.itemsSold).isNull()
+    }
+
+    @Test
+    fun `should assign null value if number of sold items is negative`() {
+        val sut = WCRevenueStatsModel().apply {
+            total = json {
+                "num_items_sold" To "-123"
+            }.toString()
+        }
+
+        val total = sut.parseTotal()
+
+        assertThat(total?.itemsSold).isNull()
+    }
+
+    @Test
+    fun `should correctly parse value if number of sold items is within integer limits`() {
+        val sut = WCRevenueStatsModel().apply {
+            total = json {
+                "num_items_sold" To "123456"
+            }.toString()
+        }
+
+        val total = sut.parseTotal()
+
+        assertThat(total?.itemsSold).isEqualTo(123456)
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapperTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapperTest.kt
new file mode 100644
index 00000000000..e8b6281daf6
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/addons/mappers/RemoteAddonMapperTest.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+
+class RemoteAddonMapperTest {
+    val sut = RemoteAddonMapper
+
+    @Test
+    fun `should not throw exception for a valid dto`() {
+        sut.toDomain(VALID_ADDON_DTO)
+    }
+
+    @Test(expected = MappingRemoteException::class)
+    fun `should throw exception when type of addon dto is null`() {
+        sut.toDomain(
+            VALID_ADDON_DTO.copy(type = null)
+        )
+    }
+
+    @Test(expected = MappingRemoteException::class)
+    fun `should throw exception when title format of addon dto is null`() {
+        sut.toDomain(
+            VALID_ADDON_DTO.copy(titleFormat = null)
+        )
+    }
+
+    private companion object {
+        val VALID_ADDON_DTO = RemoteAddonDto(
+            titleFormat = RemoteAddonDto.RemoteTitleFormat.Hide,
+            descriptionEnabled = 1,
+            restrictionsType = null,
+            adjustPrice = 0,
+            priceType = null,
+            type = RemoteAddonDto.RemoteType.MultipleChoice,
+            display = RemoteAddonDto.RemoteDisplay.RadioButton,
+            name = "Add-on",
+            description = "This is a test add-on",
+            required = 1,
+            position = 0,
+            price = null,
+            min = 0,
+            max = 0,
+            options = listOf(
+                RemoteAddonDto.RemoteOption(
+                    priceType = RemoteAddonDto.RemotePriceType.FlatFee,
+                    label = "First checkbox option",
+                    price = "10"
+                ),
+                RemoteAddonDto.RemoteOption(
+                    priceType = RemoteAddonDto.RemotePriceType.FlatFee,
+                    label = "Second checkbox option",
+                    price = "20"
+                )
+            )
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapperTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapperTest.kt
new file mode 100644
index 00000000000..7bf30fb622e
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderDtoMapperTest.kt
@@ -0,0 +1,128 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.AdditionalAnswers
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.OrderEntity
+
+internal class OrderDtoMapperTest {
+    private val stripOrder: StripOrder = mock {
+        on { invoke(any()) }.then(AdditionalAnswers.returnsFirstArg<OrderEntity>())
+    }
+    private val stripOrderMetaData: StripOrderMetaData = mock()
+
+    val localSiteId = LocalOrRemoteId.LocalId(0)
+    val sut = OrderDtoMapper(stripOrder, stripOrderMetaData)
+
+    @Test
+    fun `when is_editable is NULL and the status is an editable status the order in Editable`() {
+        for (status in OrderDtoMapper.EDITABLE_STATUSES) {
+            val oldOrderDTO = getEditableOrder(
+                isEditable = null,
+                status = status
+            )
+            val (orderEntity, _) = sut.toDatabaseEntity(oldOrderDTO, localSiteId)
+            assertThat(orderEntity.isEditable).isEqualTo(true)
+        }
+    }
+
+    @Test
+    fun `when is_editable is NULL and the status is not an editable status the order is not Editable`() {
+        val oldOrderDTO = getEditableOrder(isEditable = null, status = "")
+        val (orderEntity, _) = sut.toDatabaseEntity(oldOrderDTO, localSiteId)
+        assertThat(orderEntity.isEditable).isEqualTo(false)
+    }
+
+    @Test
+    fun `when is_editable field is true the order is Editable`() {
+        val oldOrderDTO = getEditableOrder(isEditable = true, status = "")
+        val (orderEntity, _) = sut.toDatabaseEntity(oldOrderDTO, localSiteId)
+        assertThat(orderEntity.isEditable).isEqualTo(true)
+    }
+
+    @Test
+    fun `when is_editable field is false the order is not Editable`() {
+        // We only check for editable statuses if the is_editable field is null
+        for (status in OrderDtoMapper.EDITABLE_STATUSES) {
+            val oldOrderDTO = getEditableOrder(isEditable = false, status = status)
+            val (orderEntity, _) = sut.toDatabaseEntity(oldOrderDTO, localSiteId)
+            assertThat(orderEntity.isEditable).isEqualTo(false)
+        }
+    }
+
+    private fun getEditableOrder(
+        isEditable: Boolean?,
+        status: String = "auto-draft"
+    ): OrderDto {
+        val json = JsonObject().apply {
+            addProperty("status", status)
+            isEditable?.let { value -> addProperty("is_editable", value) }
+        }
+        return Gson().fromJson(json, OrderDto::class.java)
+    }
+
+    @Test
+    fun `when needs_payment is not in json the order dto needs_payment property is null`() {
+        val json = JsonObject()
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.needsPayment).isNull()
+    }
+
+    @Test
+    fun `when needs_payment is in json the order dto needs_payment property is parsed`() {
+        val json = JsonObject().apply {
+            addProperty("needs_payment", "true")
+        }
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.needsPayment).isTrue()
+    }
+
+    @Test
+    fun `when needs_processing is not in json the order dto needs_processing property is null`() {
+        val json = JsonObject()
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.needsProcessing).isNull()
+    }
+
+    @Test
+    fun `when needs_processing is in json the order dto needs_processing property is parsed`() {
+        val json = JsonObject().apply {
+            addProperty("needs_processing", "true")
+        }
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.needsProcessing).isTrue()
+    }
+
+    @Test
+    fun `given shipping_tax is absent in json when mapping then orderEntity shippingTax is empty string`() {
+        val json = JsonObject()
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.shippingTax).isEmpty()
+    }
+
+    @Test
+    fun `given shipping_tax is present in json when mapping then orderEntity shippingTax is parsed`() {
+        val json = JsonObject().apply {
+            addProperty("shipping_tax", "10.00")
+        }
+        val orderDto = Gson().fromJson(json, OrderDto::class.java)
+        val (orderEntity, _) = sut.toDatabaseEntity(orderDto, localSiteId)
+
+        assertThat(orderEntity.shippingTax).isEqualTo("10.00")
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt
new file mode 100644
index 00000000000..c7e2237e0cf
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderMetaDataTest.kt
@@ -0,0 +1,100 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+class StripOrderMetaDataTest {
+    private lateinit var sut: StripOrderMetaData
+
+    @Before
+    fun setUp() {
+        sut = StripOrderMetaData()
+    }
+
+    @Test
+    fun `when metadata contains internal keys, should remove all of them`() {
+        // Given
+        val rawMetadata = listOf(
+            WCMetaData(
+                id = 1,
+                key = "_internal key",
+                value = "internal value"
+            ),
+            WCMetaData(
+                id = 2,
+                key = "valid key",
+                value = "valid value"
+            )
+        )
+
+        // When
+        val result: List<WCMetaData> = sut(rawMetadata)
+
+        // Then
+        assertThat(result).isEqualTo(
+            listOf(
+                WCMetaData(
+                    id = 2L,
+                    key = "valid key",
+                    value = "valid value"
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `when Metadata value contains JSON and is displayable, then keep it in the list`() {
+        // Given
+        val rawMetadata = listOf(
+            WCMetaData(
+                id = 1L,
+                key = "key",
+                value = "{\"key\":\"value\"}"
+            ),
+            WCMetaData(
+                id = 2,
+                key = "valid key",
+                value = "valid value"
+            )
+        )
+
+        // When
+        val result = sut(rawMetadata)
+
+        // Then
+        assertThat(result.size).isEqualTo(2)
+    }
+
+    @Test
+    fun `when Metadata key is invalid, then remove it from the list`() {
+        // Given
+        val rawMetadata = listOf(
+            WCMetaData(
+                id = 2L,
+                key = "_internal key",
+                value = "valid value"
+            ),
+            WCMetaData(
+                id = 3L,
+                key = "valid key",
+                value = "valid value"
+            )
+        )
+
+        // When
+        val result = sut(rawMetadata)
+
+        // Then
+        assertThat(result).isEqualTo(
+            listOf(
+                WCMetaData(
+                    id = 3L,
+                    key = "valid key",
+                    value = "valid value"
+                )
+            )
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt
new file mode 100644
index 00000000000..d615e0b1839
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/StripOrderTest.kt
@@ -0,0 +1,232 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.CHARGE_ID_KEY
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.RECEIPT_URL_KEY
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderMappingConst.SHIPPING_PHONE_KEY
+import org.wordpress.android.fluxc.utils.json
+
+internal class StripOrderTest {
+    lateinit var sut: StripOrder
+
+    @Before
+    fun setUp() {
+        sut = StripOrder(Gson())
+    }
+
+    @Test
+    fun `should ignore additional members in line item`() {
+        // given
+        val lineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To 1234
+                    "name" To "iPhone"
+                    redundantMemberKey To "not needed parameter"
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(lineItems = lineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.lineItems).contains(redundantMemberKey)
+        assertThat(strippedOrder.lineItems).doesNotContain(redundantMemberKey)
+    }
+
+    @Test
+    fun `should ignore internal-only remote line item attributes if applied to metadata key`() {
+        // given
+        val internalOnlyAttributeMemberKey = "_internal_attribute_key"
+        val lineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To 1234
+                    "name" To "iPhone"
+                    "meta_data" To listOf(
+                        json {
+                            "key" To internalOnlyAttributeMemberKey
+                            "value" To "sample value"
+                        }
+                    )
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(lineItems = lineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.lineItems).contains(internalOnlyAttributeMemberKey)
+        assertThat(strippedOrder.lineItems).doesNotContain(internalOnlyAttributeMemberKey)
+    }
+
+    @Test
+    fun `should ignore additional members in shipping item`() {
+        // given
+        val shippingLineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To "1234"
+                    "method_id" To "3"
+                    redundantMemberKey To "not needed parameter"
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(shippingLines = shippingLineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.shippingLines).contains(redundantMemberKey)
+        assertThat(strippedOrder.shippingLines).doesNotContain(redundantMemberKey)
+    }
+
+    @Test
+    fun `should ignore additional members in fee item`() {
+        // given
+        val feeLineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To "1234"
+                    "totalTax" To "123$"
+                    redundantMemberKey To "not needed parameter"
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(feeLines = feeLineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.feeLines).contains(redundantMemberKey)
+        assertThat(strippedOrder.feeLines).doesNotContain(redundantMemberKey)
+    }
+
+    @Test
+    fun `should ignore additional members in tax item`() {
+        // given
+        val taxLineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To "1234"
+                    "rate_code" To "CODE"
+                    redundantMemberKey To "not needed parameter"
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(taxLines = taxLineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.taxLines).contains(redundantMemberKey)
+        assertThat(strippedOrder.taxLines).doesNotContain(redundantMemberKey)
+    }
+
+    @Test
+    fun `should drop any not needed meta data`() {
+        // given
+        val metaDataFromRemote = listOf(
+            WCMetaData(1, redundantMemberKey, "sample value"),
+            WCMetaData(2, CHARGE_ID_KEY, "sample value"),
+            WCMetaData(3, SHIPPING_PHONE_KEY, "sample value")
+        )
+        val fatModel = emptyOrder.copy(metaData = metaDataFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.metaData.map { it.key }).contains(
+            redundantMemberKey,
+            CHARGE_ID_KEY,
+            SHIPPING_PHONE_KEY
+        )
+        assertThat(strippedOrder.metaData.map { it.key }).doesNotContain(redundantMemberKey)
+            .contains(
+                CHARGE_ID_KEY,
+                SHIPPING_PHONE_KEY
+            )
+    }
+
+    @Test
+    fun `should not crash when item attribute key is empty`() {
+        // given
+        val emptyAttributeValue = "sample value"
+        val lineItemsFromRemote = JsonArray().apply {
+            add(
+                json {
+                    "id" To 1234
+                    "name" To "iPhone"
+                    "meta_data" To listOf(
+                        json {
+                            "key" To ""
+                            "value" To emptyAttributeValue
+                        }
+                    )
+                }
+            )
+        }.toString()
+        val fatModel = emptyOrder.copy(lineItems = lineItemsFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.lineItems).contains(emptyAttributeValue)
+        assertThat(strippedOrder.lineItems).contains(emptyAttributeValue)
+    }
+
+    @Test
+    fun `should filter meta data that contains "receipt_url" as key`() {
+        // given
+        val metaDataFromRemote = listOf(
+            WCMetaData(1, redundantMemberKey, "sample value"),
+            WCMetaData(2, CHARGE_ID_KEY, "sample value"),
+            WCMetaData(3, SHIPPING_PHONE_KEY, "sample value"),
+            WCMetaData(4, RECEIPT_URL_KEY, "sample value")
+        )
+
+        val fatModel = emptyOrder.copy(metaData = metaDataFromRemote)
+
+        // when
+        val strippedOrder = sut.invoke(fatModel)
+
+        // then
+        assertThat(fatModel.metaData.map { it.key }).contains(
+            redundantMemberKey,
+            CHARGE_ID_KEY,
+            SHIPPING_PHONE_KEY,
+            RECEIPT_URL_KEY
+        )
+        assertThat(strippedOrder.metaData.map { it.key })
+            .contains(
+                CHARGE_ID_KEY,
+                SHIPPING_PHONE_KEY,
+                RECEIPT_URL_KEY
+            )
+    }
+
+    companion object {
+        const val redundantMemberKey = "not_needed_parameter"
+
+        val emptyOrder = OrderEntity(
+            localSiteId = LocalOrRemoteId.LocalId(0),
+            orderId = 0
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClientTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClientTest.kt
new file mode 100644
index 00000000000..238c631d3e5
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClientTest.kt
@@ -0,0 +1,197 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.store.WCProductStore
+import org.wordpress.android.fluxc.utils.initCoroutineEngine
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class ProductRestClientTest {
+    lateinit var sut: ProductRestClient
+
+    private val productId = 5L
+    private val site = SiteModel()
+    private val wooNetwork: WooNetwork = mock() {
+        onBlocking {
+            executePostGsonRequest(
+                any(), any(), eq(BatchProductApiResponse::class.java), any()
+            )
+        } doReturn WPAPIResponse.Success(null)
+    }
+    private val wpComNetwork: WPComNetwork = mock()
+
+    @Before fun setUp() {
+        sut = ProductRestClient(mock(), wooNetwork, wpComNetwork, initCoroutineEngine(), mock(), mock())
+    }
+
+    @Test
+    fun `send only updated parameters with id if products differ`() = runBlockingTest {
+        // given
+        val product = WCProductModel(productId.toInt()).apply {
+            remoteProductId = productId
+            status = "unchanged status"
+        }
+        val bodyCaptor = argumentCaptor<Map<String, Any>> { }
+
+        // when
+        sut.batchUpdateProducts(
+            site,
+            mapOf(
+                product.withRegularPrice("20") to product.withRegularPrice("10")
+            )
+        )
+
+        // then
+        verify(wooNetwork).executePostGsonRequest(
+            site = eq(site),
+            path = eq(WOOCOMMERCE.products.batch.pathV3),
+            clazz = eq(BatchProductApiResponse::class.java),
+            body = bodyCaptor.capture()
+        )
+        assertThat(bodyCaptor.allValues).hasSize(1)
+        assertThat(bodyCaptor.firstValue).isEqualTo(
+            mapOf(
+                ("update" to listOf(
+                    mapOf<String, Any>(
+                        ("id" to productId), ("regular_price" to "10")
+                    )
+                ))
+            )
+        )
+    }
+
+    @Test
+    fun `do not send any properties if entities do not differ`() = runBlockingTest {
+        // given
+        val productA = WCProductModel(2).apply {
+            remoteProductId = 2
+            status = "unchanged status"
+        }
+        val productB = WCProductModel(3).apply {
+            remoteProductId = 3
+            status = "other, unchanged status"
+        }
+        val bodyCaptor = argumentCaptor<Map<String, Any>> { }
+
+        // when
+        sut.batchUpdateProducts(
+            site,
+            mapOf(
+                productA to productA,
+                productB to productB,
+            )
+        )
+
+        // then
+        verify(wooNetwork, never()).executePostGsonRequest(
+            site = eq(site),
+            path = eq(WOOCOMMERCE.products.batch.pathV3),
+            clazz = eq(BatchProductApiResponse::class.java),
+            body = bodyCaptor.capture()
+        )
+    }
+
+    @Test
+    fun `when fetch products called with exact sku search, then correct params is used for network call`() {
+        runBlockingTest {
+            sut.fetchProducts(
+                site = site,
+                searchQuery = "test query",
+                skuSearchOptions = WCProductStore.SkuSearchOptions.ExactSearch
+            )
+            val argumentCaptor = argumentCaptor<MutableMap<String, String>>()
+            verify(wooNetwork).executeGetGsonRequest(
+                any(),
+                any(),
+                clazz = eq(Array<ProductApiResponse>::class.java),
+                params = argumentCaptor.capture(),
+                enableCaching = any(),
+                cacheTimeToLive = any(),
+                forced = any(),
+                requestTimeout = any(),
+                retries = any()
+            )
+
+            assertThat(argumentCaptor.firstValue.getOrDefault("sku", null)).isEqualTo(
+                "test query"
+            )
+            assertThat(argumentCaptor.firstValue.getOrDefault("search_sku", null)).isNull()
+        }
+    }
+
+    @Test
+    fun `when fetch products called with partial sku search, then correct params is used for network call`() {
+        runBlockingTest {
+            sut.fetchProducts(
+                site = site,
+                searchQuery = "test query",
+                skuSearchOptions = WCProductStore.SkuSearchOptions.PartialMatch
+            )
+            val argumentCaptor = argumentCaptor<MutableMap<String, String>>()
+            verify(wooNetwork).executeGetGsonRequest(
+                any(),
+                any(),
+                clazz = eq(Array<ProductApiResponse>::class.java),
+                params = argumentCaptor.capture(),
+                enableCaching = any(),
+                cacheTimeToLive = any(),
+                forced = any(),
+                requestTimeout = any(),
+                retries = any()
+            )
+
+            assertThat(argumentCaptor.firstValue.getOrDefault("search_sku", null)).isEqualTo(
+                "test query"
+            )
+        }
+    }
+
+    @Test
+    fun `when fetch products called with the global unique id, then correct params is used for network call`() {
+        runBlockingTest {
+            val globalUniqueIdSearchQuery = "test global unique id"
+            sut.fetchProducts(
+                site = site,
+                globalUniqueIdSearchQuery = globalUniqueIdSearchQuery
+            )
+            val argumentCaptor = argumentCaptor<MutableMap<String, String>>()
+            verify(wooNetwork).executeGetGsonRequest(
+                any(),
+                any(),
+                clazz = eq(Array<ProductApiResponse>::class.java),
+                params = argumentCaptor.capture(),
+                enableCaching = any(),
+                cacheTimeToLive = any(),
+                forced = any(),
+                requestTimeout = any(),
+                retries = any()
+            )
+
+            assertThat(argumentCaptor.firstValue.getOrDefault("global_unique_id", null)).isEqualTo(
+                globalUniqueIdSearchQuery
+            )
+        }
+    }
+
+    private fun WCProductModel.withRegularPrice(newRegularPrice: String): WCProductModel =
+        copy().apply {
+            remoteProductId = this@withRegularPrice.remoteProductId
+            regularPrice = newRegularPrice
+        }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
new file mode 100644
index 00000000000..a76141ba6fe
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductMetaDataTest.kt
@@ -0,0 +1,197 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.Gson
+import com.google.gson.JsonPrimitive
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData.AddOnsMetadataKeys
+import org.wordpress.android.fluxc.model.metadata.WCMetaDataValue
+import org.wordpress.android.fluxc.model.WCProductModel.SubscriptionMetadataKeys
+
+class StripProductMetaDataTest {
+    private val gson = Gson()
+    private val sut = StripProductMetaData()
+
+    private val notOnlySupportedMetadata = gson.fromJson(metaDataJson, Array<WCMetaData>::class.java).toList()
+
+    @Test
+    fun `when filtering metadata, then remove unsupported keys and values`() {
+        val result = sut.invoke(notOnlySupportedMetadata)
+
+        result.forEach { metaData ->
+            Assertions.assertThat(metaData).isNotNull
+            Assertions.assertThat(
+                metaData.key in StripProductMetaData.SUPPORTED_KEYS ||
+                    !metaData.isJson
+            ).isTrue()
+        }
+    }
+
+    @Test
+    fun `when metadata contains a supported key with a NOT EMPTY value, then value is kept`() {
+        val supportedKey = StripProductMetaData.SUPPORTED_KEYS.first()
+        val value = "valid"
+
+        val metadata = getOneItemMetadata(supportedKey, value)
+        val result = sut.invoke(listOf(metadata))
+
+        val resultItem = result.first()
+        Assertions.assertThat(result).isNotNull
+        Assertions.assertThat(resultItem.key).isEqualTo(supportedKey)
+        Assertions.assertThat(resultItem.valueAsString).isEqualTo(value)
+    }
+
+    @Test
+    fun `assert no regression in subscription metadata`() {
+        Assertions.assertThat(StripProductMetaData.SUPPORTED_KEYS)
+            .containsAll(SubscriptionMetadataKeys.ALL_KEYS)
+    }
+
+    @Test
+    fun `assert no regression in add-ons metadata`() {
+        Assertions.assertThat(StripProductMetaData.SUPPORTED_KEYS)
+            .contains(AddOnsMetadataKeys.ADDONS_METADATA_KEY)
+    }
+
+    private fun getOneItemMetadata(itemKey: String, itemValue: String?) = WCMetaData(
+        id = 0,
+        key = itemKey,
+        value = WCMetaDataValue.fromJsonElement(JsonPrimitive(itemValue))
+    )
+
+    companion object {
+        private val metaDataJson = """
+        [
+          {
+            "id": 11749,
+            "key": "_wpcom_is_markdown",
+            "value": "1"
+          },
+          {
+            "id": 11750,
+            "key": "_last_editor_used_jetpack",
+            "value": "classic-editor"
+          },
+          {
+            "id": 11754,
+            "key": "_product_addons",
+            "value": [{
+                    "id": 11773,
+                    "key": "_wc_gla_sync_status",
+                    "value": "synced"
+                  },
+                  {
+                    "id": 11774,
+                    "key": "group_of_quantity",
+                    "value": ""
+                  }]
+          },
+          {
+            "id": 11755,
+            "key": "_product_addons_exclude_global",
+            "value": "1"
+          },
+          {
+            "id": 11772,
+            "key": "_wc_gla_visibility",
+            "value": "sync-and-show"
+          },
+          {
+            "id": 11773,
+            "key": "_wc_gla_sync_status",
+            "value": "synced"
+          },
+          {
+            "id": 11774,
+            "key": "group_of_quantity",
+            "value": ""
+          },
+          {
+            "id": 11775,
+            "key": "minimum_allowed_quantity",
+            "value": ""
+          },
+          {
+            "id": 11776,
+            "key": "maximum_allowed_quantity",
+            "value": ""
+          },
+          {
+            "id": 11777,
+            "key": "minmax_do_not_count",
+            "value": "no"
+          },
+          {
+            "id": 11778,
+            "key": "minmax_cart_exclude",
+            "value": "no"
+          },
+          {
+            "id": 11779,
+            "key": "minmax_category_group_of_exclude",
+            "value": "no"
+          },
+          {
+            "id": 11780,
+            "key": "_wcsatt_disabled",
+            "value": "yes"
+          },
+          {
+            "id": 11781,
+            "key": "_subscription_one_time_shipping",
+            "value": "no"
+          },
+          {
+            "id": 11782,
+            "key": "_wcsatt_force_subscription",
+            "value": "no"
+          },
+          {
+            "id": 11785,
+            "key": "_subscription_downloads_ids",
+            "value": ""
+          },
+          {
+            "id": 11786,
+            "key": "minimum_allowed_quantity",
+            "value": "40"
+          },
+          {
+            "id": 11787,
+            "key": "_wc_pre_orders_fee",
+            "value": ""
+          },
+          {
+            "id": 11788,
+            "key": "_wpas_done_all",
+            "value": "1"
+          },
+          {
+            "id": 11909,
+            "key": "_wc_gla_mc_status",
+            "value": "not_synced"
+          },
+          {
+            "id": 12406,
+            "key": "_wc_gla_synced_at",
+            "value": "1686193267"
+          },
+          {
+            "id": 12407,
+            "key": "_wc_gla_google_ids",
+            "value": {
+              "US": "online:en:US:gla_418"
+            }
+          },
+          {
+            "key": "_satt_data",
+            "value": {
+              "subscription_schemes": []
+            }
+          }
+        ]
+    """.trimIndent()
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt
new file mode 100644
index 00000000000..c9ec0eb3549
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/StripProductVariationMetaDataTest.kt
@@ -0,0 +1,212 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.model.StripProductVariationMetaData
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+
+class StripProductVariationMetaDataTest {
+    private val gson = Gson()
+    private val sut = StripProductVariationMetaData(gson)
+
+    @Test
+    fun `when metadata contains not supported keys, then NOT supported keys are stripped`() {
+        val result = sut.invoke(notOnlySupportedMetadata)
+        val jsonResult = gson.fromJson(result, JsonArray::class.java)
+
+        jsonResult.map { it as? JsonObject }.forEach { jsonObject ->
+            assertThat(jsonObject).isNotNull
+            assertThat(jsonObject?.get(WCMetaData.KEY)?.asString)
+                .isIn(StripProductVariationMetaData.SUPPORTED_KEYS)
+        }
+    }
+
+    @Test
+    fun `when metadata contains a supported key with a NULL value, then strip the supported key`() {
+        val supportedKey = StripProductVariationMetaData.SUPPORTED_KEYS.first()
+        val value: String? = null
+
+        val metadata = getOneItemMetadata(supportedKey, value)
+        val result = sut.invoke(metadata)
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when metadata contains a supported key with a EMPTY value, then strip the supported key`() {
+        val supportedKey = StripProductVariationMetaData.SUPPORTED_KEYS.first()
+        val value = ""
+
+        val metadata = getOneItemMetadata(supportedKey, value)
+        val result = sut.invoke(metadata)
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when metadata contains a supported key with a NOT EMPTY value, then value is kept`() {
+        val supportedKey = StripProductVariationMetaData.SUPPORTED_KEYS.first()
+        val value = "valid"
+
+        val metadata = getOneItemMetadata(supportedKey, value)
+        val result = sut.invoke(metadata)
+
+        val jsonResult = gson.fromJson(result, JsonArray::class.java)
+        val resultItem = jsonResult[0] as JsonObject
+        assertThat(result).isNotNull
+        assertThat(resultItem[WCMetaData.KEY].asString).isEqualTo(supportedKey)
+        assertThat(resultItem[WCMetaData.VALUE].asString).isEqualTo(value)
+    }
+
+    @Test
+    fun `when metadata is null, then null is return`() {
+        val result = sut.invoke(null)
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when metadata is empty, then null is return`() {
+        val result = sut.invoke("")
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when metadata contains a supported key with an ARRAY value, then value is kept`() {
+        val supportedKey = StripProductVariationMetaData.SUPPORTED_KEYS.first()
+        val value = JsonArray().apply {
+            add("Value 1")
+            add("Value 2")
+        }
+        val item = JsonObject().apply {
+            addProperty(WCMetaData.KEY, supportedKey)
+            add(WCMetaData.VALUE, value)
+        }
+        val jsonArray = JsonArray().apply { add(item) }
+        val metadata = gson.toJson(jsonArray)
+
+        val result = sut.invoke(metadata)
+
+        val jsonResult = gson.fromJson(result, JsonArray::class.java)
+        val resultItem = jsonResult[0] as JsonObject
+        assertThat(result).isNotNull
+        assertThat(resultItem[WCMetaData.KEY].asString).isEqualTo(supportedKey)
+        assertThat(resultItem[WCMetaData.VALUE].asJsonArray).isEqualTo(value)
+    }
+
+    private fun getOneItemMetadata(itemKey: String, itemValue: String?): String {
+        val item = JsonObject().apply {
+            addProperty(WCMetaData.KEY, itemKey)
+            itemValue?.let {
+                addProperty(WCMetaData.VALUE, it)
+            } ?: add(WCMetaData.VALUE, null)
+        }
+        val jsonArray = JsonArray().apply {
+            add(item)
+        }
+
+        return gson.toJson(jsonArray)
+    }
+
+    private val notOnlySupportedMetadata = """
+        [
+          {
+            "id": 4464,
+            "key": "_subscription_period",
+            "value": "week"
+          },
+          {
+            "id": 4465,
+            "key": "_subscription_period_interval",
+            "value": "1"
+          },
+          {
+            "id": 4466,
+            "key": "_subscription_length",
+            "value": "0"
+          },
+          {
+            "id": 4467,
+            "key": "_subscription_trial_period",
+            "value": "month"
+          },
+          {
+            "id": 4674,
+            "key": "_not_supported_metadata",
+            "value": "product"
+          },
+          {
+            "id": 4678,
+            "key": "not_supported_metadata",
+            "value": "no"
+          },
+          {
+            "id": 4679,
+            "key": "variation_group_of_quantity",
+            "value": ""
+          },
+          {
+            "id": 4680,
+            "key": "variation_minimum_allowed_quantity",
+            "value": ""
+          },
+          {
+            "id": 4681,
+            "key": "variation_maximum_allowed_quantity",
+            "value": ""
+          },
+          {
+            "id": 4682,
+            "key": "variation_minmax_do_not_count",
+            "value": "no"
+          },
+          {
+            "id": 4683,
+            "key": "variation_minmax_cart_exclude",
+            "value": "no"
+          },
+          {
+            "id": 4684,
+            "key": "variation_minmax_category_group_of_exclude",
+            "value": "no"
+          },
+          {
+            "id": 4685,
+            "key": "_subscription_sign_up_fee",
+            "value": "0"
+          },
+          {
+            "id": 4686,
+            "key": "_subscription_price",
+            "value": "5"
+          },
+          {
+            "id": 4687,
+            "key": "_subscription_trial_length",
+            "value": "0"
+          },
+          {
+            "id": 4688,
+            "key": "_subscription_payment_sync_date",
+            "value": "0"
+          },
+          {
+            "id": 4726,
+            "key": "_wcpay_product_hash",
+            "value": "ece89db348e4ba7b4cfd7a0bd37dd178"
+          },
+          {
+            "id": 4727,
+            "key": "_wcpay_product_id_test",
+            "value": "prod_NEJorUIqZTYOjW"
+          },
+          {
+            "id": 8955,
+            "key": "_wc_gla_mc_status",
+            "value": "not_synced"
+          }
+        ]
+    """.trimIndent()
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/AddonsDaoTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/AddonsDaoTest.kt
new file mode 100644
index 00000000000..46d6a950266
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/AddonsDaoTest.kt
@@ -0,0 +1,142 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalPriceType
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalTitleFormat
+import org.wordpress.android.fluxc.persistence.entity.AddonEntity.LocalType
+import org.wordpress.android.fluxc.persistence.entity.AddonOptionEntity
+import org.wordpress.android.fluxc.persistence.entity.AddonWithOptions
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupEntity
+import org.wordpress.android.fluxc.persistence.entity.GlobalAddonGroupWithAddons
+
+@RunWith(RobolectricTestRunner::class)
+internal class AddonsDaoTest {
+    private lateinit var database: WCAndroidDatabase
+    private lateinit var sut: AddonsDao
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Application>()
+        database = Room.inMemoryDatabaseBuilder(context, WCAndroidDatabase::class.java)
+                .allowMainThreadQueries()
+                .build()
+        sut = database.addonsDao
+    }
+
+    @Test
+    fun `save and retrieve global add-on`(): Unit = runBlocking {
+        val expectedGlobalAddonGroupEntity = getSampleGlobalAddonGroupWithAddons(DB_GENERATED_ID_IN_FIRST_ITERATION)
+
+        sut.cacheGroups(
+                globalAddonGroups = listOf(TEST_GLOBAL_ADDON_GROUP_DTO),
+                localSiteId = TEST_SITE_ID
+        )
+
+        val resultFromDatabase = sut.observeGlobalAddonsForSite(TEST_SITE_ID).first()
+        assertThat(resultFromDatabase).containsOnly(expectedGlobalAddonGroupEntity)
+    }
+
+    @Test
+    fun `caching global addon groups doesn't duplicate entities`(): Unit = runBlocking {
+        val expectedGlobalAddonGroupEntity = getSampleGlobalAddonGroupWithAddons(DB_GENERATED_ID_IN_SECOND_ITERATION)
+
+        sut.cacheGroups(
+                globalAddonGroups = listOf(TEST_GLOBAL_ADDON_GROUP_DTO),
+                localSiteId = TEST_SITE_ID
+        )
+        sut.cacheGroups(
+                globalAddonGroups = listOf(TEST_GLOBAL_ADDON_GROUP_DTO),
+                localSiteId = TEST_SITE_ID
+        )
+
+        val resultFromDatabase = sut.observeGlobalAddonsForSite(TEST_SITE_ID).first()
+        assertThat(resultFromDatabase).containsOnly(expectedGlobalAddonGroupEntity)
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+
+    private companion object {
+        const val DB_GENERATED_ID_IN_FIRST_ITERATION = 1L
+        const val DB_GENERATED_ID_IN_SECOND_ITERATION = 2L
+        val TEST_SITE_ID = LocalId(5)
+
+        fun getSampleGlobalAddonGroupWithAddons(autoGeneratedId: Long): GlobalAddonGroupWithAddons {
+            return GlobalAddonGroupWithAddons(
+                    group = GlobalAddonGroupEntity(
+                            globalGroupLocalId = autoGeneratedId,
+                            name = "Test Group",
+                            restrictedCategoriesIds = emptyList(),
+                            localSiteId = TEST_SITE_ID
+                    ),
+                    addons = listOf(
+                            AddonWithOptions(
+                                    addon = AddonEntity(
+                                            addonLocalId = autoGeneratedId,
+                                            globalGroupLocalId = autoGeneratedId,
+                                            type = LocalType.Checkbox,
+                                            name = "Test Addon name",
+                                            titleFormat = LocalTitleFormat.Heading,
+                                            description = "Test",
+                                            required = false,
+                                            position = 4
+                                    ),
+                                    options = listOf(
+                                            AddonOptionEntity(
+                                                    addonLocalId = autoGeneratedId,
+                                                    addonOptionLocalId = autoGeneratedId,
+                                                    priceType = LocalPriceType.FlatFee,
+                                                    label = "Test label",
+                                                    price = "Test price",
+                                                    image = null
+                                            )
+                                    )
+                            )
+                    )
+
+            )
+        }
+
+        val TEST_GLOBAL_ADDON_GROUP_DTO = GlobalAddonGroup(
+                name = "Test Group",
+                restrictedCategoriesIds = GlobalAddonGroup.CategoriesRestriction.AllProductsCategories,
+                addons = listOf(
+                        Addon.Checkbox(
+                                titleFormat = Addon.TitleFormat.Heading,
+                                description = "Test",
+                                name = "Test Addon name",
+                                required = false,
+                                position = 4,
+                                options = listOf(
+                                        Addon.HasOptions.Option(
+                                                price = Addon.HasAdjustablePrice.Price.Adjusted(
+                                                        priceType = PriceType.FlatFee,
+                                                        value = "Test price"
+                                                ),
+                                                label = "Test label",
+                                                image = null
+                                        )
+                                )
+                        )
+                )
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/CouponsDaoTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/CouponsDaoTest.kt
new file mode 100644
index 00000000000..e8d7247166d
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/CouponsDaoTest.kt
@@ -0,0 +1,159 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity
+import java.io.IOException
+import org.assertj.core.api.Assertions.assertThat
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.persistence.entity.CouponEmailEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity.DiscountType.Percent
+import org.wordpress.android.fluxc.persistence.entity.CouponWithEmails
+import java.math.BigDecimal
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+class CouponsDaoTest {
+    private lateinit var couponsDao: CouponsDao
+    private lateinit var db: WCAndroidDatabase
+
+    private val coupon = generateCouponEntity()
+    private val email = CouponEmailEntity(
+        couponId = coupon.id,
+        localSiteId = coupon.localSiteId,
+        email = "test@test.com"
+    )
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Application>()
+        db = Room.inMemoryDatabaseBuilder(context, WCAndroidDatabase::class.java)
+            .allowMainThreadQueries()
+            .build()
+        couponsDao = db.couponsDao
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    fun `test coupon insert and update`(): Unit = runBlocking {
+        // when
+        couponsDao.insertOrUpdateCoupon(coupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+        var observedCoupon = couponsDao.observeCoupons(coupon.localSiteId).first()
+
+        // then
+        val expected = CouponWithEmails(coupon, listOf(email))
+        assertThat(observedCoupon.first()).isEqualTo(expected)
+
+        // when
+        val newCoupon = coupon.copy(description = "Updated", usageLimit = 2)
+        val newExpected = CouponWithEmails(newCoupon, listOf(email))
+        couponsDao.insertOrUpdateCoupon(newCoupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+        observedCoupon = couponsDao.observeCoupons(coupon.localSiteId).first()
+
+        // then
+        assertThat(observedCoupon.first()).isEqualTo(newExpected)
+    }
+
+    @Test
+    fun `test specific observation when it is not in the DB`(): Unit = runBlocking {
+        // when
+        couponsDao.insertOrUpdateCoupon(coupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+        val observedCoupon = couponsDao.observeCoupon(LocalId(1), RemoteId( coupon.id.value + 1))
+
+        // then
+        assertThat(observedCoupon.first()).isNull()
+    }
+
+    @Test
+    fun `test specific observation when it is present in the DB`(): Unit = runBlocking {
+        // when
+        couponsDao.insertOrUpdateCoupon(coupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+        val observedCoupon = couponsDao.observeCoupon(LocalId(1), coupon.id)
+
+        var expected = CouponWithEmails(coupon, listOf(email))
+        assertThat(observedCoupon.first()).isEqualTo(expected)
+
+        // when
+        val newCoupon = coupon.copy(description = "Updated", usageLimit = 2)
+        expected = CouponWithEmails(newCoupon, listOf(email))
+        couponsDao.insertOrUpdateCoupon(newCoupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+
+        // then
+        assertThat(observedCoupon.first()).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test coupon delete`(): Unit = runBlocking {
+        // when
+        val coupon = generateCouponEntity()
+        val email = CouponEmailEntity(
+            couponId = coupon.id,
+            localSiteId = coupon.localSiteId,
+            email = "test@test.com"
+        )
+        couponsDao.insertOrUpdateCoupon(coupon)
+        couponsDao.insertOrUpdateCouponEmail(email)
+        var observedCoupons = couponsDao.observeCoupons(coupon.localSiteId).first()
+        var emailCount = couponsDao.getEmailCount(coupon.localSiteId, coupon.id)
+
+        // then
+        assertThat(observedCoupons.size).isEqualTo(1)
+        assertThat(emailCount).isEqualTo(1)
+
+        // when
+        couponsDao.deleteCoupon(coupon.localSiteId, coupon.id)
+        observedCoupons = couponsDao.observeCoupons(coupon.localSiteId).first()
+        emailCount = couponsDao.getEmailCount(coupon.localSiteId, coupon.id)
+
+        // then
+        assertThat(observedCoupons.size).isEqualTo(0)
+        assertThat(emailCount).isEqualTo(0)
+    }
+
+    companion object {
+        fun generateCouponEntity() = CouponEntity(
+            id = RemoteId(1),
+            localSiteId = LocalId(1),
+            amount = BigDecimal(5),
+            code = "code",
+            dateCreated = "2007-04-05T14:30Z",
+            dateCreatedGmt = "2007-04-05T14:30Z",
+            dateModified = "2007-04-05T14:30Z",
+            dateModifiedGmt = "2007-04-05T14:30Z",
+            discountType = Percent,
+            description = "Description",
+            dateExpires = "2008-04-05T14:30Z",
+            dateExpiresGmt = "2008-04-05T14:30Z",
+            usageCount = 0,
+            isForIndividualUse = true,
+            usageLimit = 3,
+            usageLimitPerUser = 1,
+            limitUsageToXItems = 5,
+            isShippingFree = false,
+            areSaleItemsExcluded = true,
+            minimumAmount = BigDecimal(1),
+            maximumAmount = BigDecimal(10)
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/FakeTransactionExecutor.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/FakeTransactionExecutor.kt
new file mode 100644
index 00000000000..9314ac9b470
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/FakeTransactionExecutor.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import org.wordpress.android.fluxc.persistence.TransactionExecutor
+
+object FakeTransactionExecutor : TransactionExecutor {
+    override suspend fun <R> executeInTransaction(block: suspend () -> R): R = block()
+
+    override fun <R> runInTransaction(block: () -> R): R = block()
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecoratorTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecoratorTest.kt
new file mode 100644
index 00000000000..8c05b0270ff
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/OrdersDaoDecoratorTest.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+
+@RunWith(RobolectricTestRunner::class)
+class OrdersDaoDecoratorTest {
+    private lateinit var sut: OrdersDaoDecorator
+    private lateinit var database: WCAndroidDatabase
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Application>()
+        database = Room.inMemoryDatabaseBuilder(context, WCAndroidDatabase::class.java)
+                .allowMainThreadQueries()
+                .build()
+        sut = OrdersDaoDecorator(mock(), database.ordersDao)
+    }
+
+    @Test
+    fun testInsertAndUpdateOrder() {
+        runBlocking {
+            // when
+            val initialOrder = generateSampleOrder(42)
+            sut.insertOrUpdateOrder(initialOrder)
+            val site = SiteModel().apply { id = initialOrder.localSiteId.value }
+
+            // then
+            assertThat(sut.getOrdersForSite(site.localId())).containsExactly(initialOrder)
+
+            // when
+            val updatedOrder = initialOrder
+                .copy(status = "processing", customerNote = "please gift wrap")
+                .also { sut.insertOrUpdateOrder(it) }
+
+            // then
+            assertThat(sut.getOrdersForSite(site.localId())).containsExactly(updatedOrder)
+        }
+    }
+
+    @Test
+    fun testGetOrdersForSite() {
+        runBlocking {
+            generateSampleOrder(3, CoreOrderStatus.PROCESSING.value).let { sut.insertOrUpdateOrder(it) }
+            generateSampleOrder(4, CoreOrderStatus.ON_HOLD.value).let { sut.insertOrUpdateOrder(it) }
+            generateSampleOrder(5, CoreOrderStatus.CANCELLED.value).let { sut.insertOrUpdateOrder(it) }
+            val site = SiteModel().apply { id = TEST_LOCAL_SITE_ID }
+
+            // Test getting orders without specifying a status
+            val storedOrders = sut.getOrdersForSite(site.localId())
+            assertThat(storedOrders).hasSize(3)
+
+            // Test pulling orders with a single status specified
+            val processingOrders = sut.getOrdersForSite(site.localId(), listOf(CoreOrderStatus.PROCESSING.value))
+            assertThat(processingOrders).hasSize(1)
+
+            // Test pulling orders with multiple statuses specified
+            val mixStatusOrders = sut.getOrdersForSite(
+                site.localId(),
+                listOf(CoreOrderStatus.ON_HOLD.value, CoreOrderStatus.CANCELLED.value)
+            )
+            assertThat(mixStatusOrders).hasSize(2)
+        }
+    }
+
+    @Test
+    fun testDeleteOrdersForSite() {
+        runBlocking {
+            generateSampleOrder(1).let { sut.insertOrUpdateOrder(it) }
+            generateSampleOrder(2).let { sut.insertOrUpdateOrder(it) }
+            val site = SiteModel().apply { id = TEST_LOCAL_SITE_ID }
+
+            val storedOrders = sut.getOrdersForSite(site.localId())
+            assertThat(storedOrders).hasSize(2)
+
+            sut.deleteOrdersForSite(site.localId())
+
+            val deletedOrders = sut.getOrdersForSite(site.localId())
+            assertThat(deletedOrders).isEmpty()
+        }
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+
+    private companion object {
+        const val TEST_LOCAL_SITE_ID = 6
+
+        fun generateSampleOrder(
+            orderId: Long,
+            orderStatus: String = CoreOrderStatus.PROCESSING.value
+        ) = OrderEntity(
+                orderId = orderId,
+                localSiteId = LocalId(TEST_LOCAL_SITE_ID),
+                status = orderStatus
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDaoTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDaoTest.kt
new file mode 100644
index 00000000000..deabe291676
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/ShippingMethodDaoTest.kt
@@ -0,0 +1,97 @@
+package org.wordpress.android.fluxc.persistence.dao
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.entity.ShippingMethodEntity
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+class ShippingMethodDaoTest {
+    private lateinit var shippingMethodDao: ShippingMethodDao
+    private lateinit var db: WCAndroidDatabase
+
+    private val defaultSiteId = LocalId(1)
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Application>()
+        db = Room.inMemoryDatabaseBuilder(context, WCAndroidDatabase::class.java)
+            .allowMainThreadQueries()
+            .build()
+        shippingMethodDao = db.shippingMethodDao
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    fun `test insert shipping methods`(): Unit = runBlocking {
+        // when
+        val shippingMethods = List(3) { id -> generateShippingMethodEntity("method$id") }
+        shippingMethodDao.insertShippingMethods(shippingMethods)
+        val observedShippingMethods =
+            shippingMethodDao.observeShippingMethods(defaultSiteId).first()
+
+        // then
+        Assertions.assertThat(shippingMethods).isEqualTo(observedShippingMethods)
+    }
+
+    @Test
+    fun `test get shipping method by id`(): Unit = runBlocking {
+        // when
+        val shippingMethodId = "successId"
+        val notFoundId = "notFoundId"
+        val shippingMethods = listOf(generateShippingMethodEntity(id = shippingMethodId))
+        shippingMethodDao.insertShippingMethods(shippingMethods)
+        val success = shippingMethodDao.getShippingMethodById(defaultSiteId, shippingMethodId)
+        val fail = shippingMethodDao.getShippingMethodById(defaultSiteId, notFoundId)
+
+        // then
+        Assertions.assertThat(success).isNotNull
+        Assertions.assertThat(success!!.id).isEqualTo(shippingMethodId)
+        Assertions.assertThat(fail).isNull()
+    }
+
+    @Test
+    fun `test update shipping methods`(): Unit = runBlocking {
+        // when
+        val startShippingMethods = List(3) { id ->
+            generateShippingMethodEntity("method$id")
+        }
+        val updatedShippingMethods = List(3) { id ->
+            generateShippingMethodEntity("updatedMethod$id")
+        }
+        shippingMethodDao.insertShippingMethods(startShippingMethods)
+        shippingMethodDao.updateShippingMethods(updatedShippingMethods)
+        val observedShippingMethods =
+            shippingMethodDao.observeShippingMethods(defaultSiteId).first()
+        // then
+        Assertions.assertThat(updatedShippingMethods).isEqualTo(observedShippingMethods)
+    }
+
+    private fun generateShippingMethodEntity(
+        id: String,
+        siteId: LocalId = defaultSiteId,
+        title: String = "title for $id"
+    ): ShippingMethodEntity = ShippingMethodEntity(
+        localSiteId = siteId,
+        id = id,
+        title = title
+    )
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt
new file mode 100644
index 00000000000..b2bfc824aca
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/MetaDataStoreTest.kt
@@ -0,0 +1,150 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.test.runTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameter
+import org.junit.runners.Parameterized.Parameters
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StripProductMetaData
+import org.wordpress.android.fluxc.model.metadata.MetaDataParentItemType
+import org.wordpress.android.fluxc.model.metadata.UpdateMetadataRequest
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.metadata.MetaDataRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.StripOrderMetaData
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.entity.MetaDataEntity
+
+@RunWith(Parameterized::class)
+class MetaDataStoreTest {
+    private lateinit var metaDataStore: MetaDataStore
+    private val metaDataRestClient: MetaDataRestClient = mock()
+    private val metaDataDao: MetaDataDao = mock()
+    private val stripProductMetaData = StripProductMetaData()
+    private val stripOrderMetaData = StripOrderMetaData()
+
+    @Parameter
+    lateinit var parentItemType: MetaDataParentItemType
+
+    private val site = SiteModel()
+
+    @Before
+    fun setUp() {
+        metaDataStore = MetaDataStore(
+            metaDataRestClient = metaDataRestClient,
+            metaDataDao = metaDataDao,
+            stripProductMetaData = stripProductMetaData,
+            stripOrderMetaData = stripOrderMetaData
+        )
+    }
+
+    @Test
+    fun `when updating order metadata successfully, then persist metadata`() = runTest {
+        val request = UpdateMetadataRequest(
+            parentItemId = 1,
+            parentItemType = parentItemType,
+            insertedMetadata = listOf(WCMetaData(0, "key", "value"))
+        )
+        val payload = WooPayload(
+            listOf(
+                WCMetaData(1, "key", "value"),
+                WCMetaData(2, "_key", "value2") // should be stripped
+            )
+        )
+        whenever(metaDataRestClient.updateMetaData(site, request)).thenReturn(payload)
+
+        val result = metaDataStore.updateMetaData(site, request)
+
+        assertThat(result).isEqualTo(WooResult(Unit))
+        verify(metaDataDao).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = parentItemType.stripper(payload.result!!).map {
+                MetaDataEntity.fromDomainModel(it, site.localId(), 1, parentItemType)
+            }
+        )
+    }
+
+    @Test
+    fun `when refreshing metadata succeeds, then persist metadata`() = runTest {
+        val payload = WooPayload(
+            listOf(
+                WCMetaData(1, "key", "value"),
+                WCMetaData(2, "_key", "value2") // should be stripped
+            )
+        )
+        whenever(metaDataRestClient.fetchMetaData(site, 1, parentItemType))
+            .thenReturn(payload)
+
+        val result = metaDataStore.refreshMetaData(site, 1, parentItemType)
+
+        assertThat(result).isEqualTo(WooResult(Unit))
+        verify(metaDataDao).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = parentItemType.stripper(payload.result!!).map {
+                MetaDataEntity.fromDomainModel(it, site.localId(), 1, parentItemType)
+            }
+        )
+    }
+
+    @Test
+    fun `when updating metadata fails, then do not persist metadata`() = runTest {
+        val request = UpdateMetadataRequest(
+            parentItemId = 1,
+            parentItemType = parentItemType,
+            insertedMetadata = listOf(WCMetaData(0, "key", "value"))
+        )
+        val error = WooError(type = WooErrorType.GENERIC_ERROR, original = GenericErrorType.UNKNOWN)
+        whenever(metaDataRestClient.updateMetaData(site, request)).thenReturn(WooPayload(error))
+
+        val result = metaDataStore.updateMetaData(site, request)
+
+        assertThat(result).isEqualTo(WooResult<Unit>(error))
+        verify(metaDataDao, never()).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = emptyList()
+        )
+    }
+
+    @Test
+    fun `when refreshing metadata fails, then do not persist metadata`() = runTest {
+        val error = WooError(type = WooErrorType.GENERIC_ERROR, original = GenericErrorType.UNKNOWN)
+        whenever(metaDataRestClient.fetchMetaData(site, 1, parentItemType))
+            .thenReturn(WooPayload(error))
+
+        val result = metaDataStore.refreshMetaData(site, 1, parentItemType)
+
+        assertThat(result).isEqualTo(WooResult<Unit>(error))
+        verify(metaDataDao, never()).updateMetaData(
+            parentItemId = 1,
+            localSiteId = site.localId(),
+            metaData = emptyList()
+        )
+    }
+
+    private val MetaDataParentItemType.stripper
+        get() = when (this) {
+            MetaDataParentItemType.ORDER -> stripOrderMetaData::invoke
+            MetaDataParentItemType.PRODUCT -> stripProductMetaData::invoke
+        }
+
+    companion object {
+        @JvmStatic
+        @Parameters
+        fun data() = MetaDataParentItemType.entries
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/OrderUpdateStoreTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/OrderUpdateStoreTest.kt
new file mode 100644
index 00000000000..99d9318071c
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/OrderUpdateStoreTest.kt
@@ -0,0 +1,564 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.order.FeeLineTaxStatus
+import org.wordpress.android.fluxc.model.order.OrderAddress
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Billing
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto.Shipping
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderChanged
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderError
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.EMPTY_BILLING_EMAIL
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType.INVALID_PARAM
+import org.wordpress.android.fluxc.store.WCOrderStore.RemoteOrderPayload
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult.OptimisticUpdateResult
+import org.wordpress.android.fluxc.store.WCOrderStore.UpdateOrderResult.RemoteUpdateResult
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import kotlin.coroutines.EmptyCoroutineContext
+
+@ExperimentalCoroutinesApi
+class OrderUpdateStoreTest {
+    private lateinit var sut: OrderUpdateStore
+    private lateinit var orderRestClient: OrderRestClient
+
+    private val siteSqlUtils: SiteSqlUtils = mock {
+        on { getSiteWithLocalId(any()) } doReturn site
+    }
+    private val orderSqlUtils: OrderSqlUtils = mock()
+    private val ordersDaoDecorator: OrdersDaoDecorator = mock {
+        onBlocking { getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID) } doReturn initialOrder
+    }
+    private val metaDataDao: MetaDataDao = mock()
+
+    fun setUp(setMocks: suspend () -> Unit) = runBlocking {
+        setMocks.invoke()
+        sut = OrderUpdateStore(
+                coroutineEngine = CoroutineEngine(
+                        EmptyCoroutineContext,
+                        mock()
+                ),
+                wcOrderRestClient = orderRestClient,
+                ordersDaoDecorator = ordersDaoDecorator,
+                siteSqlUtils = siteSqlUtils,
+                orderSqlUtils = orderSqlUtils,
+                metaDataDao = metaDataDao
+        )
+    }
+
+//    Updating customer notes
+
+    @Test
+    fun `should optimistically update order customer notes`(): Unit = runBlocking {
+        // given
+        val updatedOrder = initialOrder.copy(
+                customerNote = UPDATED_CUSTOMER_NOTE
+        )
+
+        setUp {
+            orderRestClient = mock {
+                onBlocking { updateCustomerOrderNote(initialOrder, site, UPDATED_CUSTOMER_NOTE) }.doReturn(
+                        RemoteOrderPayload.Updating(
+                                updatedOrder,
+                                site
+                        )
+                )
+            }
+            whenever(ordersDaoDecorator.getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID)).thenReturn(
+                    initialOrder
+            )
+        }
+
+        // when
+        val results = sut.updateCustomerOrderNote(
+                orderId = TEST_REMOTE_ORDER_ID,
+                site = site,
+                newCustomerNote = UPDATED_CUSTOMER_NOTE
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(OnOrderChanged())
+        )
+        verify(ordersDaoDecorator).insertOrUpdateOrder(argThat {
+            customerNote == UPDATED_CUSTOMER_NOTE
+        }, any())
+    }
+
+    @Test
+    fun `should revert local customer notes update if remote update failed`(): Unit = runBlocking {
+        // given
+        val specificOrderError = "order error"
+        setUp {
+            orderRestClient = mock {
+                onBlocking { updateCustomerOrderNote(initialOrder, site, UPDATED_CUSTOMER_NOTE) }.doReturn(
+                        RemoteOrderPayload.Updating(
+                                error = OrderError(message = specificOrderError),
+                                initialOrder,
+                                site
+                        )
+                )
+            }
+            whenever(ordersDaoDecorator.getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID)).thenReturn(
+                    initialOrder
+            )
+        }
+
+        // when
+        val results = sut.updateCustomerOrderNote(
+                orderId = initialOrder.orderId,
+                site = site,
+                newCustomerNote = UPDATED_CUSTOMER_NOTE
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(
+                        OnOrderChanged(
+                                orderError = OrderError(message = specificOrderError)
+                        )
+                )
+        )
+
+        verify(ordersDaoDecorator).insertOrUpdateOrder(argThat {
+            customerNote == INITIAL_CUSTOMER_NOTE
+        }, any())
+    }
+
+    @Test
+    fun `should emit optimistic update failure if order not found when updating status`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock()
+            whenever(ordersDaoDecorator.getOrder(any(), any())).thenReturn(null)
+        }
+
+        // when
+        val results = sut.updateCustomerOrderNote(
+                orderId = initialOrder.orderId,
+                site = site,
+                newCustomerNote = UPDATED_CUSTOMER_NOTE
+        ).toList()
+
+        // then
+        assertThat(results).containsExactly(
+                OptimisticUpdateResult(
+                        event = OnOrderChanged(
+                                orderError = OrderError(
+                                        message = "Order with id ${initialOrder.orderId} not found"
+                                )
+                        )
+                )
+        )
+
+        verifyNoInteractions(orderRestClient)
+    }
+
+    //    Updating addresses
+    @Test
+    fun `should optimistically update shipping and billing addresses`(): Unit = runBlocking {
+        // given
+        val updatedOrder = initialOrder.copy(
+                shippingFirstName = UPDATED_SHIPPING_FIRST_NAME,
+                billingFirstName = UPDATED_BILLING_FIRST_NAME
+        )
+
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateBothOrderAddresses(
+                            initialOrder,
+                            site,
+                            emptyShippingDto.copy(first_name = UPDATED_SHIPPING_FIRST_NAME),
+                            emptyBillingDto.copy(first_name = UPDATED_BILLING_FIRST_NAME)
+                    )
+                } doReturn (RemoteOrderPayload.Updating(updatedOrder, site))
+            }
+        }
+
+        // when
+        val results = sut.updateBothOrderAddresses(
+                orderId = initialOrder.orderId,
+                localSiteId = site.localId(),
+                shippingAddress = emptyShipping.copy(firstName = UPDATED_SHIPPING_FIRST_NAME),
+                billingAddress = emptyBilling.copy(firstName = UPDATED_BILLING_FIRST_NAME)
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(OnOrderChanged())
+        )
+        verify(ordersDaoDecorator).insertOrUpdateOrder(argThat {
+            shippingFirstName == UPDATED_SHIPPING_FIRST_NAME &&
+                    billingFirstName == UPDATED_BILLING_FIRST_NAME
+        }, any())
+    }
+
+    @Test
+    fun `should optimistically update shipping address`(): Unit = runBlocking {
+        // given
+        val updatedOrder = initialOrder.copy(
+                shippingFirstName = UPDATED_SHIPPING_FIRST_NAME
+        )
+
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateShippingAddress(
+                            initialOrder,
+                            site,
+                            emptyShippingDto.copy(first_name = UPDATED_SHIPPING_FIRST_NAME)
+                    )
+                } doReturn (RemoteOrderPayload.Updating(updatedOrder, site))
+            }
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                orderId = initialOrder.orderId,
+                localSiteId = site.localId(),
+                newAddress = emptyShipping.copy(firstName = UPDATED_SHIPPING_FIRST_NAME)
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(OnOrderChanged())
+        )
+        verify(ordersDaoDecorator).insertOrUpdateOrder(argThat {
+            shippingFirstName == UPDATED_SHIPPING_FIRST_NAME
+        }, any())
+    }
+
+    @Test
+    fun `should revert local shipping address update if remote update failed`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateShippingAddress(
+                            initialOrder, site, emptyShippingDto.copy(first_name = UPDATED_SHIPPING_FIRST_NAME)
+                    )
+                }.doReturn(
+                        RemoteOrderPayload.Updating(
+                                error = OrderError(),
+                                initialOrder,
+                                site
+                        )
+                )
+            }
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                initialOrder.orderId,
+                site.localId(),
+                newAddress = emptyShipping.copy(firstName = UPDATED_SHIPPING_FIRST_NAME)
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(
+                        OnOrderChanged(
+                                orderError = OrderError(type = GENERIC_ERROR)
+                        )
+                )
+        )
+
+        verify(ordersDaoDecorator).insertOrUpdateOrder(argThat {
+            shippingFirstName == INITIAL_SHIPPING_FIRST_NAME
+        }, any())
+    }
+
+    @Test
+    fun `should emit optimistic update failure if order not found on updating shipping address`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock()
+            whenever(ordersDaoDecorator.getOrder(any(), any())).thenReturn(null)
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                initialOrder.orderId,
+                site.localId(),
+                newAddress = emptyShipping.copy(firstName = UPDATED_SHIPPING_FIRST_NAME)
+        ).toList()
+
+        // then
+        assertThat(results).containsExactly(
+                OptimisticUpdateResult(
+                        OnOrderChanged(
+                                orderError = OrderError(
+                                        message = "Order with id ${initialOrder.orderId} not found"
+                                )
+                        )
+                )
+        )
+        verifyNoInteractions(orderRestClient)
+    }
+
+    @Test
+    fun `should emit optimistic update failure if site not found on updating shipping address`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock()
+            whenever(siteSqlUtils.getSiteWithLocalId(any())).thenReturn(null)
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                initialOrder.orderId,
+                site.localId(),
+                newAddress = emptyShipping.copy(firstName = UPDATED_SHIPPING_FIRST_NAME)
+        ).toList()
+
+        // then
+        assertThat(results).containsExactly(
+                OptimisticUpdateResult(
+                        event = OnOrderChanged(
+                                orderError = OrderError(
+                                        message = "Site with local id ${initialOrder.localSiteId} not found"
+                                )
+                        )
+                )
+        )
+
+        verifyNoInteractions(orderRestClient)
+    }
+
+    @Test
+    fun `should emit empty billing email address if its likely that that's the error`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateBillingAddress(
+                            initialOrder, site, emptyBillingDto
+                    )
+                }.doReturn(
+                        RemoteOrderPayload.Updating(
+                                error = OrderError(type = INVALID_PARAM),
+                                initialOrder,
+                                site
+                        )
+                )
+            }
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                initialOrder.orderId,
+                site.localId(),
+                newAddress = emptyBilling
+        ).toList()
+
+        // then
+        assertThat(results[1].event.error.type).isEqualTo(EMPTY_BILLING_EMAIL)
+    }
+
+    @Test
+    fun `should not emit empty billing email address if its not likely that that's the error`(): Unit = runBlocking {
+        // given
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateBillingAddress(
+                            initialOrder, site, emptyBillingDto.copy(email = "custom@mail.com")
+                    )
+                }.doReturn(
+                        RemoteOrderPayload.Updating(
+                                error = OrderError(type = GENERIC_ERROR),
+                                initialOrder,
+                                site
+                        )
+                )
+            }
+        }
+
+        // when
+        val results = sut.updateOrderAddress(
+                initialOrder.orderId,
+                site.localId(),
+                newAddress = emptyBilling.copy(email = "custom@mail.com")
+        ).toList()
+
+        // then
+        assertThat(results[1].event.error.type).isEqualTo(GENERIC_ERROR)
+    }
+
+//      Simple payments
+
+    @Test
+    fun `should create simple payment with correct amount, tax status, and order status`(): Unit = runBlocking {
+        // given
+        val newOrder = initialOrder.copy(
+                status = SIMPLE_PAYMENT_ORDER_STATUS.statusKey,
+                customerNote = SIMPLE_PAYMENT_CUSTOMER_NOTE,
+                feeLines = OrderUpdateStore.generateSimplePaymentFeeLineJson(
+                        SIMPLE_PAYMENT_AMOUNT,
+                        SIMPLE_PAYMENT_IS_TAXABLE,
+                        SIMPLE_PAYMENT_FEE_ID
+                ).toString()
+        )
+
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    createOrder(any(), any(), anyOrNull())
+                }.doReturn(
+                    WooPayload(newOrder)
+                )
+            }
+        }
+
+        // when
+        val result = sut.createSimplePayment(
+            site,
+            SIMPLE_PAYMENT_AMOUNT,
+            SIMPLE_PAYMENT_IS_TAXABLE,
+            SIMPLE_PAYMENT_ORDER_STATUS,
+            SIMPLE_PAYMENT_CUSTOMER_NOTE,
+        )
+
+        // then
+        assertThat(result.isError).isFalse()
+        assertThat(result.model).isNotNull
+        assertThat(result.model!!.getFeeLineList()).hasSize(1)
+        assertThat(result.model!!.getFeeLineList()[0].total).isEqualTo(SIMPLE_PAYMENT_AMOUNT)
+        assertThat(result.model!!.getFeeLineList()[0].taxStatus!!.value).isEqualTo(SIMPLE_PAYMENT_TAX_STATUS)
+        assertThat(result.model!!.status).isEqualTo(SIMPLE_PAYMENT_ORDER_STATUS.statusKey)
+        assertThat(result.model!!.customerNote).isEqualTo(SIMPLE_PAYMENT_CUSTOMER_NOTE)
+    }
+
+    @Test
+    fun `should optimistically update simple payment`(): Unit = runBlocking {
+        // given
+        val updatedOrder = initialOrder.copy(
+                customerNote = SIMPLE_PAYMENT_CUSTOMER_NOTE,
+                billingEmail = SIMPLE_PAYMENT_BILLING_EMAIL,
+                feeLines = OrderUpdateStore.generateSimplePaymentFeeLineJson(
+                        SIMPLE_PAYMENT_AMOUNT,
+                        SIMPLE_PAYMENT_IS_TAXABLE,
+                        SIMPLE_PAYMENT_FEE_ID
+                ).toString()
+        )
+
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    updateOrder(any(), any(), any())
+                }.doReturn(
+                    WooPayload(updatedOrder)
+                )
+            }
+            whenever(ordersDaoDecorator.getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID)).thenReturn(
+                    updatedOrder
+            )
+        }
+
+        // when
+        val results = sut.updateSimplePayment(
+                site = site,
+                orderId = TEST_REMOTE_ORDER_ID,
+                amount = SIMPLE_PAYMENT_AMOUNT,
+                customerNote = SIMPLE_PAYMENT_CUSTOMER_NOTE,
+                billingEmail = SIMPLE_PAYMENT_BILLING_EMAIL,
+                isTaxable = SIMPLE_PAYMENT_IS_TAXABLE
+        ).toList()
+
+        // then
+        assertThat(results).hasSize(2).containsExactly(
+                OptimisticUpdateResult(OnOrderChanged()),
+                RemoteUpdateResult(OnOrderChanged())
+        )
+        ordersDaoDecorator.getOrder(TEST_REMOTE_ORDER_ID, TEST_LOCAL_SITE_ID)?.let { order ->
+            assertThat(order.billingEmail).isEqualTo(SIMPLE_PAYMENT_BILLING_EMAIL)
+            assertThat(order.customerNote).isEqualTo(SIMPLE_PAYMENT_CUSTOMER_NOTE)
+            assertThat(order.getFeeLineList()).hasSize(1)
+            assertThat(order.getFeeLineList()[0].total).isEqualTo(SIMPLE_PAYMENT_AMOUNT)
+        }
+    }
+
+    @Test
+    fun `should delete local copy of order when delete request succeeds`(): Unit = runBlocking {
+        setUp {
+            orderRestClient = mock {
+                onBlocking {
+                    deleteOrder(any(), any(), any())
+                }.doReturn(
+                    WooPayload(Unit)
+                )
+            }
+        }
+
+        sut.deleteOrder(
+            site = site,
+            orderId = TEST_REMOTE_ORDER_ID
+        )
+
+        verify(ordersDaoDecorator).deleteOrder(site.localId(), TEST_REMOTE_ORDER_ID)
+        verify(orderSqlUtils).deleteOrderSummaryById(site, TEST_REMOTE_ORDER_ID)
+        verify(metaDataDao).deleteMetaData(site.localId(), TEST_REMOTE_ORDER_ID)
+    }
+
+    private companion object {
+        const val TEST_REMOTE_ORDER_ID = 321L
+        val TEST_LOCAL_SITE_ID = LocalId(654)
+        const val INITIAL_CUSTOMER_NOTE = "original customer note"
+        const val UPDATED_CUSTOMER_NOTE = "updated customer note"
+        const val INITIAL_SHIPPING_FIRST_NAME = "original shipping first name"
+        const val UPDATED_SHIPPING_FIRST_NAME = "updated shipping first name"
+        const val UPDATED_BILLING_FIRST_NAME = "updated billing first name"
+
+        const val SIMPLE_PAYMENT_FEE_ID = 1L
+        const val SIMPLE_PAYMENT_AMOUNT = "10.00"
+        const val SIMPLE_PAYMENT_CUSTOMER_NOTE = "Simple payment customer note"
+        const val SIMPLE_PAYMENT_BILLING_EMAIL = "example@example.com"
+        const val SIMPLE_PAYMENT_IS_TAXABLE = true
+        val SIMPLE_PAYMENT_ORDER_STATUS = WCOrderStatusModel(CoreOrderStatus.PROCESSING.value)
+        val SIMPLE_PAYMENT_TAX_STATUS = FeeLineTaxStatus.Taxable.value
+
+        val initialOrder = OrderEntity(
+                orderId = TEST_REMOTE_ORDER_ID,
+                localSiteId = TEST_LOCAL_SITE_ID,
+                customerNote = INITIAL_CUSTOMER_NOTE,
+                shippingFirstName = INITIAL_SHIPPING_FIRST_NAME
+        )
+
+        val site = SiteModel().apply {
+            id = TEST_LOCAL_SITE_ID.value
+        }
+
+        val emptyShipping = OrderAddress.Shipping("", "", "", "", "", "", "", "", "", "")
+        val emptyBilling = OrderAddress.Billing("", "", "", "", "", "", "", "", "", "", "")
+        val emptyShippingDto = Shipping("", "", "", "", "", "", "", "", "", "")
+        val emptyBillingDto = Billing("", "", "", "", "", "", "", "", "", null, "")
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/ProvideAddonsIntegrationTests.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/ProvideAddonsIntegrationTests.kt
new file mode 100644
index 00000000000..b2a450c83c4
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/ProvideAddonsIntegrationTests.kt
@@ -0,0 +1,620 @@
+package org.wordpress.android.fluxc.store
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.Dispatchers.Default
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.domain.Addon
+import org.wordpress.android.fluxc.domain.Addon.CustomText.Restrictions
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.Adjusted.PriceType
+import org.wordpress.android.fluxc.domain.Addon.HasAdjustablePrice.Price.NotAdjusted
+import org.wordpress.android.fluxc.domain.Addon.MultipleChoice.Display
+import org.wordpress.android.fluxc.domain.Addon.TitleFormat
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.AllProductsCategories
+import org.wordpress.android.fluxc.domain.GlobalAddonGroup.CategoriesRestriction.SpecifiedProductCategories
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteDisplay.RadioButton
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.FlatFee
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.PercentageBased
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteRestrictionsType.Email
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat.Heading
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat.Hide
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteTitleFormat.Label
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.Checkbox
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomPrice
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomText
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.CustomTextArea
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.FileUpload
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.InputMultiplier
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.MultipleChoice
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.AddOnsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.dto.AddOnGroupDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.addons.mappers.RemoteGlobalAddonGroupMapper
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.dao.AddonsDao
+import org.wordpress.android.fluxc.persistence.mappers.FromDatabaseAddonGroupMapper
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog.T.API
+
+@RunWith(RobolectricTestRunner::class)
+class ProvideAddonsIntegrationTests {
+    private lateinit var sut: WCAddonsStore
+
+    private lateinit var database: WCAndroidDatabase
+    private lateinit var dao: AddonsDao
+    private lateinit var restClient: AddOnsRestClient
+    private lateinit var coroutineEngine: CoroutineEngine
+    private lateinit var logger: AppLogWrapper
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Application>()
+
+        logger = mock()
+        database = Room.inMemoryDatabaseBuilder(context, WCAndroidDatabase::class.java)
+                .allowMainThreadQueries()
+                .build()
+        dao = database.addonsDao
+        restClient = mock()
+        coroutineEngine = CoroutineEngine(
+                context = Default,
+                appLog = logger
+        )
+
+        sut = WCAddonsStore(
+                restClient = restClient,
+                coroutineEngine = coroutineEngine,
+                dao = dao,
+                remoteGlobalAddonGroupMapper = RemoteGlobalAddonGroupMapper(logger),
+                fromDatabaseAddonGroupMapper = FromDatabaseAddonGroupMapper(logger),
+                logger = logger
+        )
+    }
+
+    @Test
+    fun `should map CustomText add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Heading,
+                                            descriptionEnabled = 0,
+                                            restrictionsType = Email,
+                                            adjustPrice = 1,
+                                            priceType = FlatFee,
+                                            type = CustomText,
+                                            name = "CustomText",
+                                            description = "",
+                                            required = 1,
+                                            position = 5,
+                                            min = 2,
+                                            max = 5,
+                                            price = "100$"
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.CustomText(
+                            name = "CustomText",
+                            titleFormat = TitleFormat.Heading,
+                            description = null,
+                            required = true,
+                            position = 5,
+                            price = Addon.HasAdjustablePrice.Price.Adjusted(
+                                    priceType = PriceType.FlatFee,
+                                    value = "100$"
+                            ),
+                            restrictions = Restrictions.Email,
+                            characterLength = 2L..5L
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map CustomTextArea add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Hide,
+                                            descriptionEnabled = 1,
+                                            adjustPrice = 1,
+                                            priceType = PercentageBased,
+                                            type = CustomTextArea,
+                                            name = "CustomTextArea",
+                                            description = "Description",
+                                            required = 0,
+                                            position = 3,
+                                            min = 0,
+                                            max = 0,
+                                            price = "5"
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.CustomTextArea(
+                            name = "CustomTextArea",
+                            titleFormat = TitleFormat.Hide,
+                            description = "Description",
+                            required = false,
+                            position = 3,
+                            price = Addon.HasAdjustablePrice.Price.Adjusted(
+                                    priceType = PriceType.PercentageBased,
+                                    value = "5"
+                            ),
+                            characterLength = null
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map FileUpload add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Heading,
+                                            descriptionEnabled = 0,
+                                            adjustPrice = 0,
+                                            type = FileUpload,
+                                            name = "FileUpload",
+                                            description = "",
+                                            required = 1,
+                                            position = 1,
+                                            min = 0,
+                                            max = 0,
+                                            price = "100$"
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.FileUpload(
+                            name = "FileUpload",
+                            titleFormat = TitleFormat.Heading,
+                            description = null,
+                            required = true,
+                            position = 1,
+                            price = NotAdjusted
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map InputMultiplier add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Label,
+                                            descriptionEnabled = 0,
+                                            adjustPrice = 0,
+                                            type = InputMultiplier,
+                                            name = "InputMultiplier",
+                                            description = "",
+                                            required = 1,
+                                            position = 1,
+                                            min = 0,
+                                            max = 10,
+                                            price = "100$"
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.InputMultiplier(
+                            name = "InputMultiplier",
+                            titleFormat = TitleFormat.Label,
+                            description = null,
+                            required = true,
+                            position = 1,
+                            price = NotAdjusted,
+                            quantityRange = 0L..10L
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map CustomPrice add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Label,
+                                            descriptionEnabled = 1,
+                                            adjustPrice = 0,
+                                            type = CustomPrice,
+                                            name = "CustomPrice",
+                                            description = "Description",
+                                            required = 1,
+                                            position = 0,
+                                            min = 0,
+                                            max = 10,
+                                            price = "100$"
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.CustomPrice(
+                            name = "CustomPrice",
+                            titleFormat = TitleFormat.Label,
+                            description = "Description",
+                            required = true,
+                            position = 0,
+                            priceRange = 0L..10L
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map MultipleChoice add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Label,
+                                            descriptionEnabled = 1,
+                                            adjustPrice = 0,
+                                            type = MultipleChoice,
+                                            display = RadioButton,
+                                            name = "MultipleChoice",
+                                            description = "Description",
+                                            required = 1,
+                                            position = 0,
+                                            min = 0,
+                                            max = 10,
+                                            price = "100$",
+                                            options = listOf(
+                                                    RemoteAddonDto.RemoteOption(
+                                                            priceType = FlatFee,
+                                                            label = "Test option",
+                                                            price = "10"
+                                                    )
+                                            )
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.MultipleChoice(
+                            name = "MultipleChoice",
+                            titleFormat = TitleFormat.Label,
+                            display = Display.RadioButton,
+                            description = "Description",
+                            required = true,
+                            position = 0,
+                            options = listOf(
+                                    Addon.HasOptions.Option(
+                                            price = Adjusted(
+                                                    priceType = PriceType.FlatFee,
+                                                    value = "10"
+                                            ),
+                                            label = "Test option",
+                                            image = null
+                                    )
+                            )
+                    )
+            )
+        }
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun `should map Checkbox add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Label,
+                                            descriptionEnabled = 1,
+                                            adjustPrice = 0,
+                                            type = Checkbox,
+                                            name = "MultipleChoice",
+                                            description = "Description",
+                                            required = 1,
+                                            position = 0,
+                                            min = 0,
+                                            max = 10,
+                                            price = "100$",
+                                            options = listOf(
+                                                    RemoteAddonDto.RemoteOption(
+                                                            priceType = FlatFee,
+                                                            label = "First checkbox option",
+                                                            price = "10"
+                                                    ),
+                                                    RemoteAddonDto.RemoteOption(
+                                                            priceType = FlatFee,
+                                                            label = "Second checkbox option",
+                                                            price = "5"
+                                                    )
+                                            )
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.Checkbox(
+                            name = "MultipleChoice",
+                            titleFormat = TitleFormat.Label,
+                            description = "Description",
+                            required = true,
+                            position = 0,
+                            options = listOf(
+                                    Addon.HasOptions.Option(
+                                            price = Adjusted(
+                                                    priceType = PriceType.FlatFee,
+                                                    value = "10"
+                                            ),
+                                            label = "First checkbox option",
+                                            image = null
+                                    ),
+                                    Addon.HasOptions.Option(
+                                            price = Adjusted(
+                                                    priceType = PriceType.FlatFee,
+                                                    value = "5"
+                                            ),
+                                            label = "Second checkbox option",
+                                            image = null
+                                    )
+                            )
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should map Heading add-on`() {
+        runBlocking {
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                    RemoteAddonDto(
+                                            titleFormat = Hide,
+                                            descriptionEnabled = 1,
+                                            adjustPrice = 0,
+                                            type = RemoteType.Heading,
+                                            name = "Heading",
+                                            description = "Heading description",
+                                            required = 1,
+                                            position = 1,
+                                            min = 0,
+                                            max = 0
+                                    )
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first().first()).isEqualTo(
+                    Addon.Heading(
+                            name = "Heading",
+                            titleFormat = TitleFormat.Hide,
+                            description = "Heading description",
+                            required = true,
+                            position = 1
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `should not allow to map MultipleChoice Add-on without display property`() {
+        runBlocking {
+            val testedDto = RemoteAddonDto(
+                titleFormat = Label,
+                descriptionEnabled = 1,
+                adjustPrice = 0,
+                type = MultipleChoice,
+                name = "sample",
+                description = "Description",
+                required = 1,
+                position = 0,
+                min = 0,
+                max = 10,
+                price = "100$",
+                options = listOf(
+                    RemoteAddonDto.RemoteOption(
+                        priceType = FlatFee,
+                        label = "Test option",
+                        price = "10"
+                    )
+                )
+            )
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                testedDto
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first()).isEmpty()
+            verify(logger).e(
+                API,
+                "Exception while parsing $testedDto: MultipleChoice add-on type has to have `display` defined."
+            )
+        }
+    }
+
+    @Test
+    fun `should not allow to map CustomText Add-on without restrictions property`() {
+        runBlocking {
+            val testedDto = RemoteAddonDto(
+                titleFormat = Heading,
+                descriptionEnabled = 0,
+                restrictionsType = null,
+                adjustPrice = 1,
+                priceType = FlatFee,
+                type = CustomText,
+                name = "sample",
+                description = "",
+                required = 1,
+                position = 5,
+                min = 2,
+                max = 5,
+                price = "100$"
+            )
+            whenever(restClient.fetchGlobalAddOnGroups(any())).thenReturn(
+                    WooPayload(
+                            result = groupWith(
+                                testedDto
+                            )
+                    )
+            )
+
+            sut.fetchAllGlobalAddonsGroups(siteModel)
+
+            assertThat(sut.observeAllAddonsForProduct(siteModel, product).first()).isEmpty()
+            verify(logger).e(
+                API,
+                "Exception while parsing $testedDto: CustomText Add-on has to have restrictions defined."
+            )
+        }
+    }
+
+    @Test
+    fun `should provide only applicable add-on for a given product`() {
+        runBlocking {
+            // given
+            val basicAddon = Addon.Heading(
+                    name = "test",
+                    titleFormat = TitleFormat.Label,
+                    description = null,
+                    required = false,
+                    position = 1
+            )
+
+            val productSpecificAddon = basicAddon.copy(name = "Product-specific add-on")
+            val allCategoriesAddon = basicAddon.copy(name = "Add-on for all categories")
+            val addonForTestProductCategory = basicAddon.copy(name = "Add-on applied to category of the test product")
+            val addonNotForTestProductCategory =
+                    basicAddon.copy(name = "Add-on NOT applied to category of the test product")
+
+            dao.cacheProductAddons(
+                    productRemoteId = product.remoteId,
+                    localSiteId = siteModel.localId(),
+                    addons = listOf(productSpecificAddon)
+            )
+
+            dao.cacheGroups(
+                    localSiteId = siteModel.localId(),
+                    globalAddonGroups = listOf(
+                            GlobalAddonGroup(
+                                    name = "Group for all categories",
+                                    restrictedCategoriesIds = AllProductsCategories,
+                                    addons = listOf(allCategoriesAddon)
+                            ),
+                            GlobalAddonGroup(
+                                    name = "Group for category of the test product",
+                                    restrictedCategoriesIds = SpecifiedProductCategories(
+                                            listOf(testProductCategoryId)
+                                    ),
+                                    addons = listOf(addonForTestProductCategory)
+                            ),
+                            GlobalAddonGroup(
+                                    name = "Group for category of NOT the test product",
+                                    restrictedCategoriesIds = SpecifiedProductCategories(
+                                            listOf(10)
+                                    ),
+                                    addons = listOf(addonNotForTestProductCategory)
+                            )
+                    )
+            )
+
+            // when
+            val addonsForTestProduct = sut.observeAllAddonsForProduct(siteModel, product).first()
+
+            // then
+            assertThat(addonsForTestProduct).containsExactlyInAnyOrder(
+                    productSpecificAddon, allCategoriesAddon, addonForTestProductCategory
+            ).doesNotContain(addonNotForTestProductCategory)
+        }
+    }
+
+    private fun groupWith(vararg remoteAddons: RemoteAddonDto): List<AddOnGroupDto> {
+        return listOf(
+                AddOnGroupDto(
+                        id = 0,
+                        name = "test",
+                        categoryIds = null,
+                        addons = remoteAddons.toList()
+                )
+        )
+    }
+
+    companion object {
+        const val testProductCategoryId = 9L
+
+        val siteModel = SiteModel().apply {
+            siteId = 1
+        }
+
+        val product = WCProductModel().apply {
+            // language=JSON
+            categories = """
+                        [
+                          {
+                            "id": $testProductCategoryId
+                          }
+                        ]
+                    """.trimIndent()
+        }
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCGoogleStoreTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCGoogleStoreTest.kt
new file mode 100644
index 00000000000..e96fc61c57d
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCGoogleStoreTest.kt
@@ -0,0 +1,173 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsCampaignMapper
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsProgramTotals
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsPrograms
+import org.wordpress.android.fluxc.model.google.WCGoogleAdsProgramsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.GoogleAdsCampaignDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.GoogleAdsTotalsDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleAdsProgramsDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.google.WCGoogleRestClient
+import org.wordpress.android.fluxc.store.WCGoogleStore.TotalsType.CLICKS
+import org.wordpress.android.fluxc.store.WCGoogleStore.TotalsType.SALES
+import org.wordpress.android.fluxc.utils.initCoroutineEngine
+
+@ExperimentalCoroutinesApi
+class WCGoogleStoreTest {
+    @Mock
+    lateinit var restClient: WCGoogleRestClient
+
+    @Mock
+    lateinit var wcGoogleAdsCampaignMapper: WCGoogleAdsCampaignMapper
+
+    private lateinit var wcGoogleStore: WCGoogleStore
+    private val siteModel = SiteModel()
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.openMocks(this)
+        wcGoogleStore = WCGoogleStore(
+            restClient = restClient,
+            coroutineEngine = initCoroutineEngine(),
+            campaignMapper = wcGoogleAdsCampaignMapper,
+            programsMapper = WCGoogleAdsProgramsMapper()
+        )
+    }
+
+    @Test
+    fun `when programs response is a single page, then return the data directly`() = runBlockingTest {
+        // Given
+        val mockPrograms = createProgramsPage()
+        val expectedModel = WCGoogleAdsProgramsMapper().mapToModel(mockPrograms)
+
+        whenever(restClient.fetchAllPrograms(
+            siteModel,
+            "2020-01-01",
+            "2020-12-31",
+            "sales,clicks",
+            "sales",
+            null
+        )).thenReturn(WooPayload(mockPrograms))
+
+        // When
+        val result = wcGoogleStore.fetchAllPrograms(
+            site = siteModel,
+            startDate = "2020-01-01",
+            endDate = "2020-12-31",
+            totals = listOf(SALES, CLICKS)
+        )
+
+        // Then
+        assertFalse(result.isError)
+        assertNotNull(result.model)
+        assertEquals(result.model, expectedModel)
+    }
+
+    @Test
+    fun `when programs response is paginated, requested everything and return the sum`() = runBlockingTest  {
+        // Given
+        val mapper = WCGoogleAdsProgramsMapper()
+        val firstPage = createProgramsPage(pageNumber = 1, hasNextPage = true)
+        val pageTwo = createProgramsPage(pageNumber = 2)
+        val mappedFirstPage = mapper.mapToModel(firstPage)
+        val mappedSecondPage = mapper.mapToModel(pageTwo)
+        val expectedModel = listOf(mappedFirstPage, mappedSecondPage).let { pages ->
+            WCGoogleAdsPrograms(
+                campaigns = pages.flatMap { it.campaigns.orEmpty() },
+                intervals = pages.flatMap { it.intervals.orEmpty() },
+                totals = WCGoogleAdsProgramTotals(
+                    sales = pages.sumOf { it.totals?.sales ?: 0.0 },
+                    spend = pages.sumOf { it.totals?.spend ?: 0.0 },
+                    clicks = pages.sumOf { it.totals?.clicks ?: 0.0 },
+                    impressions = pages.sumOf { it.totals?.impressions ?: 0.0 },
+                    conversions = pages.sumOf { it.totals?.conversions ?: 0.0 }
+                )
+
+            )
+        }
+
+        whenever(restClient.fetchAllPrograms(
+            siteModel,
+            "2020-01-01",
+            "2020-12-31",
+            "sales,clicks",
+            "sales",
+            null
+        )).thenReturn(WooPayload(firstPage))
+
+        whenever(restClient.fetchAllPrograms(
+            siteModel,
+            "2020-01-01",
+            "2020-12-31",
+            "sales,clicks",
+            "sales",
+            "nextPageToken"
+        )).thenReturn(WooPayload(pageTwo))
+
+        // When
+        val result = wcGoogleStore.fetchAllPrograms(
+            site = siteModel,
+            startDate = "2020-01-01",
+            endDate = "2020-12-31",
+            totals = listOf(SALES, CLICKS)
+        )
+
+        // Then
+        assertFalse(result.isError)
+        assertNotNull(result.model)
+        assertEquals(result.model, expectedModel)
+    }
+
+    private fun createProgramsPage(
+        pageNumber: Int = 1,
+        hasNextPage: Boolean = false
+    ) = WCGoogleAdsProgramsDTO(
+        campaigns = listOf(
+            GoogleAdsCampaignDTO(
+                id = pageNumber.toLong(),
+                name = "campaign${pageNumber}",
+                status = "enabled",
+                subtotals = GoogleAdsTotalsDTO(
+                    sales = pageNumber * 100.0,
+                    spend = pageNumber * 100.0,
+                    impressions = pageNumber * 100.0,
+                    clicks = pageNumber * 100.0,
+                    conversions = pageNumber * 100.0
+                )
+            ),
+            GoogleAdsCampaignDTO(
+                id = (pageNumber + 1).toLong(),
+                name = "campaign${pageNumber + 1}",
+                status = "enabled",
+                subtotals = GoogleAdsTotalsDTO(
+                    sales = pageNumber * 200.0,
+                    spend = pageNumber * 200.0,
+                    impressions = pageNumber * 200.0,
+                    clicks = pageNumber * 200.0,
+                    conversions = pageNumber * 200.0
+                )
+            )
+        ),
+        intervals = emptyList(),
+        totals = GoogleAdsTotalsDTO(
+            sales = pageNumber * 100.0,
+            spend = pageNumber * 100.0,
+            impressions = pageNumber * 100.0,
+            clicks = pageNumber * 100.0,
+            conversions = pageNumber * 100.0
+        ),
+        nextPageToken = if (hasNextPage) "nextPageToken" else null
+    )
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCShippingMethodsStoreTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCShippingMethodsStoreTest.kt
new file mode 100644
index 00000000000..b256625f308
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCShippingMethodsStoreTest.kt
@@ -0,0 +1,143 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCShippingMethod
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.EMPTY_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods.ShippingMethodsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippingsmethods.ShippingMethodsRestClient.ShippingMethodDto
+import org.wordpress.android.fluxc.persistence.dao.ShippingMethodDao
+import org.wordpress.android.fluxc.utils.initCoroutineEngine
+
+@ExperimentalCoroutinesApi
+class WCShippingMethodsStoreTest {
+    private lateinit var sut: WCShippingMethodsStore
+    private val shippingMethodsRestClient: ShippingMethodsRestClient = mock()
+    private val shippingMethodDao: ShippingMethodDao = mock()
+    private val coroutineEngine = initCoroutineEngine()
+    private val defaultSiteModel = SiteModel().apply { siteId = 1L }
+
+    @Before
+    fun setup() {
+        sut = WCShippingMethodsStore(
+            restClient = shippingMethodsRestClient,
+            shippingMethodDao = shippingMethodDao,
+            coroutineEngine = coroutineEngine
+        )
+    }
+
+    @Test
+    fun `when shipping method id is not empty, then the shipping method can be updated`() =
+        runBlockingTest {
+            val shippingMethod = WCShippingMethod(id = "methodId", title = "methodTitle")
+
+            sut.updateShippingMethod(defaultSiteModel, shippingMethod)
+
+            verify(shippingMethodDao).insertShippingMethods(any())
+        }
+
+    @Test
+    fun `when shipping method id is empty, then the shipping method CAN'T be updated`() =
+        runBlockingTest {
+            val shippingMethod = WCShippingMethod(id = "", title = "methodTitle")
+
+            sut.updateShippingMethod(defaultSiteModel, shippingMethod)
+
+            verify(shippingMethodDao, never()).insertShippingMethods(any())
+        }
+
+    @Test
+    fun `when fetch shipping method success, then response is expected`() = runBlockingTest {
+        val methodId = "methodId"
+        val methodTitle = "Random Title"
+        val expected = WCShippingMethod(methodId, methodTitle)
+
+        val response = ShippingMethodDto(id = methodId, title = methodTitle)
+        whenever(shippingMethodsRestClient.fetchShippingMethodsById(defaultSiteModel, methodId))
+            .doReturn(WooPayload(response))
+
+        val result = sut.fetchShippingMethod(defaultSiteModel, methodId)
+
+        assertThat(result.isError).isFalse()
+        assertThat(result.model).isNotNull
+        assertThat(result.model).isEqualTo(expected)
+    }
+
+    @Test
+    fun `when fetch shipping method is null, then response is error`() = runBlockingTest {
+        val methodId = "methodId"
+        whenever(shippingMethodsRestClient.fetchShippingMethodsById(defaultSiteModel, methodId))
+            .doReturn(WooPayload(null))
+
+        val result = sut.fetchShippingMethod(defaultSiteModel, methodId)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.model).isNull()
+    }
+
+    @Test
+    fun `when fetch shipping method fails, then response is error`() = runBlockingTest {
+        val methodId = "methodId"
+        val error = WooError(EMPTY_RESPONSE, NOT_FOUND)
+        whenever(shippingMethodsRestClient.fetchShippingMethodsById(defaultSiteModel, methodId))
+            .doReturn(WooPayload(error))
+
+        val result = sut.fetchShippingMethod(defaultSiteModel, methodId)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.model).isNull()
+    }
+
+    @Test
+    fun `when fetch shipping methods success, then response is expected`() = runBlockingTest {
+        val methodId = "methodId"
+        val methodTitle = "Random Title"
+        val expected = listOf(WCShippingMethod(methodId, methodTitle))
+
+        val response = listOf(ShippingMethodDto(methodId, methodTitle))
+        whenever(shippingMethodsRestClient.fetchShippingMethods(defaultSiteModel))
+            .doReturn(WooPayload(response))
+
+        val result = sut.fetchShippingMethods(defaultSiteModel)
+
+        assertThat(result.isError).isFalse()
+        assertThat(result.model).isNotNull
+        assertThat(result.model).isEqualTo(expected)
+    }
+
+    @Test
+    fun `when fetch shipping methods is null, then response is error`() = runBlockingTest {
+        whenever(shippingMethodsRestClient.fetchShippingMethods(defaultSiteModel))
+            .doReturn(WooPayload(null))
+
+        val result = sut.fetchShippingMethods(defaultSiteModel)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.model).isNull()
+    }
+
+    @Test
+    fun `when fetch shipping methods fails, then response is error`() = runBlockingTest {
+        val error = WooError(EMPTY_RESPONSE, NOT_FOUND)
+        whenever(shippingMethodsRestClient.fetchShippingMethods(defaultSiteModel))
+            .doReturn(WooPayload(error))
+
+        val result = sut.fetchShippingMethods(defaultSiteModel)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.model).isNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/CoroutineEngineUtils.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/CoroutineEngineUtils.kt
new file mode 100644
index 00000000000..fa9b6834371
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/CoroutineEngineUtils.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.fluxc.utils
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.runBlocking
+import org.mockito.Mockito.lenient
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+
+fun initCoroutineEngine() = runBlocking {
+    val coroutineEngine = mock<CoroutineEngine>()
+    lenient().doAnswer {
+        return@doAnswer runBlocking {
+            it.getArgument<(suspend CoroutineScope.() -> Any)>(3).invoke(this)
+        }
+    }.whenever(coroutineEngine).withDefaultContext(
+            any(),
+            any(),
+            any(),
+            any<(suspend CoroutineScope.() -> Any)>()
+    )
+    lenient().doAnswer {
+        it.getArgument<(() -> Any)>(3).invoke()
+    }.whenever(coroutineEngine).run(
+            any(),
+            any(),
+            any(),
+            any<(() -> Any)>()
+    )
+    lenient().doAnswer {
+        runBlocking {
+            it.getArgument<(suspend CoroutineScope.() -> Any)>(3).invoke(this)
+        }
+        return@doAnswer mock<Job>()
+    }.whenever(coroutineEngine).launch(
+            any(),
+            any(),
+            any(),
+            any<(suspend CoroutineScope.() -> Any)>()
+    )
+    lenient().doAnswer {
+        return@doAnswer runBlocking {
+            flow { it.getArgument<(suspend FlowCollector<Any>.() -> Unit)>(3).invoke(this) }
+        }
+    }.whenever(coroutineEngine).flowWithDefaultContext(
+            any(),
+            any(),
+            any(),
+            any<(suspend FlowCollector<Any>.() -> Unit)>()
+    )
+    coroutineEngine
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializerTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializerTest.kt
new file mode 100644
index 00000000000..5c94de78904
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToFloatSerializerDeserializerTest.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.Gson
+import com.google.gson.JsonPrimitive
+import com.google.gson.annotations.JsonAdapter
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+
+class JsonElementToFloatSerializerDeserializerTest {
+    private val sut = JsonElementToFloatSerializerDeserializer()
+
+    @Test
+    fun `when value is true then null value is returned`() {
+        val jsonElement = JsonPrimitive(true)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is a valid string number then the value is returned`() {
+        val value = 12345f
+        val valueString = value.toString()
+        val jsonElement = JsonPrimitive(valueString)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `when value is an invalid string number then null is returned`() {
+        val jsonElement = JsonPrimitive("12345_test")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is different number format then the value is parsed to long and returned`() {
+        val value = 12345f
+        val valueLong = value.toLong()
+        val jsonElement = JsonPrimitive(valueLong)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `test serialization deserialization`() {
+        val gson = Gson()
+        val value = 12345f
+        val json = gson.toJson(TestData(value))
+        val deserialized = gson.fromJson(json, TestData::class.java)
+        assertThat(deserialized.value).isEqualTo(value)
+    }
+
+    data class TestData(
+        @JsonAdapter(JsonElementToFloatSerializerDeserializer::class)
+        val value: Float
+    )
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializerTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializerTest.kt
new file mode 100644
index 00000000000..0075538825c
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonElementToLongSerializerDeserializerTest.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.Gson
+import com.google.gson.JsonPrimitive
+import com.google.gson.annotations.JsonAdapter
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+
+class JsonElementToLongSerializerDeserializerTest {
+    private val sut = JsonElementToLongSerializerDeserializer()
+
+    @Test
+    fun `when value is true then null value is returned`() {
+        val jsonElement = JsonPrimitive(true)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is a valid string number then the value is returned`() {
+        val value = 12345L
+        val valueString = value.toString()
+        val jsonElement = JsonPrimitive(valueString)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `when value is an invalid string number then the value is returned`() {
+        val jsonElement = JsonPrimitive("12345_test")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is different number format then the value is parsed to long and returned`() {
+        val value = 12345L
+        val valueInt = value.toDouble()
+        val jsonElement = JsonPrimitive(valueInt)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `test serialization deserialization`() {
+        val gson = Gson()
+        val value = 12345L
+        val json = gson.toJson(TestData(value))
+        val deserialized = gson.fromJson(json, TestData::class.java)
+        assertThat(deserialized.value).isEqualTo(value)
+    }
+
+    data class TestData(
+        @JsonAdapter(JsonElementToLongSerializerDeserializer::class)
+        val value: Long
+    )
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectBuilder.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectBuilder.kt
new file mode 100644
index 00000000000..cbab51be452
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectBuilder.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import java.util.ArrayDeque
+import java.util.Deque
+
+internal fun json(build: JsonObjectBuilder.() -> Unit): JsonObject {
+    return JsonObjectBuilder().json(build)
+}
+
+internal class JsonObjectBuilder {
+    private val deque: Deque<JsonObject> = ArrayDeque()
+
+    fun json(build: JsonObjectBuilder.() -> Unit): JsonObject {
+        deque.push(JsonObject())
+        this.build()
+        return deque.pop()
+    }
+
+    infix fun String.To(value: Int) {
+        deque.peek().addProperty(this, value)
+    }
+
+    infix fun String.To(value: String) {
+        deque.peek().addProperty(this, value)
+    }
+
+    infix fun String.To(value: JsonElement) {
+        deque.peek().add(this, value)
+    }
+
+    infix fun String.To(value: Collection<JsonElement>) {
+        deque.peek().add(
+                this,
+                JsonArray().apply {
+                    value.forEach { item -> add(item) }
+                }
+        )
+    }
+
+    infix fun String.To(value: IntArray) {
+        deque.peek().add(this,
+                JsonArray().apply {
+                    value.forEach { item ->
+                        add(item)
+                    }
+                }
+        )
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializerTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializerTest.kt
new file mode 100644
index 00000000000..08808e45290
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NonNegativeDoubleJsonDeserializerTest.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonPrimitive
+import org.assertj.core.api.Assertions
+import org.junit.Test
+
+class NonNegativeDoubleJsonDeserializerTest {
+    private val sut = NonNegativeDoubleJsonDeserializer()
+
+    @Test
+    fun `when value is true then null value is returned`() {
+        val jsonElement = JsonPrimitive(true)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is a valid string number then the value is returned`() {
+        val value = 12345.0
+        val valueString = value.toString()
+        val jsonElement = JsonPrimitive(valueString)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `when value is an invalid string number then the value is returned`() {
+        val jsonElement = JsonPrimitive("12345_test")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is less than 0 then null value is returned`() {
+        val value = -5.0
+        val jsonElement = JsonPrimitive(value)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is greater than 0 then the value is returned`() {
+        val value = 12345.0
+        val jsonElement = JsonPrimitive(value)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isEqualTo(value)
+    }
+
+    @Test
+    fun `when value is different number format then the value is parsed to double and returned`() {
+        val value = 12345.0
+        val valueInt = value.toInt()
+        val jsonElement = JsonPrimitive(valueInt)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        Assertions.assertThat(result).isEqualTo(value)
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NullStringJsonAdapterTests.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NullStringJsonAdapterTests.kt
new file mode 100644
index 00000000000..e16a7f636ac
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/NullStringJsonAdapterTests.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.Gson
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+
+class NullStringJsonAdapterTests {
+    data class Example(
+        @JsonAdapter(NullStringJsonAdapter::class, nullSafe = false)
+        @SerializedName("an_id")
+        val id: String?
+    )
+
+    private val gson = Gson()
+
+    @Test
+    fun `when passing null in json, then it should be deserialized to null value`() {
+        val json = """{
+            "an_id": null
+            }"""
+
+        val example = gson.fromJson(json, Example::class.java)
+
+        assertThat(example.id).isNull()
+    }
+
+    @Test
+    fun `when serializing a null value, then it should be exposed to the json`() {
+        val example = Example(null)
+
+        val json = gson.toJson(example)
+
+        assertThat(json).contains(""""an_id":null""")
+    }
+
+    @Test
+    fun `when passing non-null value in json, then it should be deserialized to the correct value`() {
+        val json = """{
+            "an_id": "some_id"
+            }"""
+
+        val example = gson.fromJson(json, Example::class.java)
+
+        assertThat(example.id).isEqualTo("some_id")
+    }
+
+    @Test
+    fun `when serializing a non-null value, then it should be correctly serialized`() {
+        val example = Example("some_id")
+
+        val json = gson.toJson(example)
+
+        assertThat(json).contains(""""an_id":"some_id"""")
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializerTest.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializerTest.kt
new file mode 100644
index 00000000000..ae46948ead1
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/PrimitiveBooleanJsonDeserializerTest.kt
@@ -0,0 +1,176 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonNull
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+
+class PrimitiveBooleanJsonDeserializerTest {
+    private val sut = PrimitiveBooleanJsonDeserializer()
+
+    @Test
+    fun `when value is true then true value is returned`() {
+        val jsonElement = JsonPrimitive(true)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is false then false value is returned`() {
+        val jsonElement = JsonPrimitive(false)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is 0 then false value is returned`() {
+        val jsonElement = JsonPrimitive(0)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is 1 then true value is returned`() {
+        val jsonElement = JsonPrimitive(1)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is a number and is not 1 then null value is returned`() {
+        val jsonElement = JsonPrimitive(189)
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is a string number and is 1 then true value is returned`() {
+        val jsonElement = JsonPrimitive("1")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is a string number and is 0 then false value is returned`() {
+        val jsonElement = JsonPrimitive("0")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is a string number and is 1 with spaces then true value is returned`() {
+        val jsonElement = JsonPrimitive("  1 ")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is a string number and is 0 with spaces then false value is returned`() {
+        val jsonElement = JsonPrimitive(" 0  ")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is a string boolean and is true then true value is returned`() {
+        val jsonElement = JsonPrimitive("true")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is a string boolean and is false then false value is returned`() {
+        val jsonElement = JsonPrimitive("false")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is a string boolean and is true with spaces then true value is returned`() {
+        val jsonElement = JsonPrimitive(" true  ")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isTrue
+    }
+
+    @Test
+    fun `when value is a string boolean and is false with spaces then false value is returned`() {
+        val jsonElement = JsonPrimitive("  false ")
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isFalse
+    }
+
+    @Test
+    fun `when value is not valid then null is returned`() {
+        val jsonElement = JsonObject()
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when value is null then null is returned`() {
+        val jsonElement = JsonNull.INSTANCE
+        val result = sut.deserialize(
+            json = jsonElement,
+            typeOfT = null,
+            context = null
+        )
+        assertThat(result).isNull()
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/WPAPIResponseExtTests.kt b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/WPAPIResponseExtTests.kt
new file mode 100644
index 00000000000..ec7af6e7397
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/utils/WPAPIResponseExtTests.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.utils
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.toWooError
+
+class WPAPIResponseExtTests {
+    @Test
+    fun `given a null response with success status, when converting, then return an error`() {
+        val response = WPAPIResponse.Success<String>(null)
+
+        val result = response.toWooPayload { "Got response: $it" }
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(WooErrorType.EMPTY_RESPONSE)
+        assertThat(result.error.original).isEqualTo(BaseRequest.GenericErrorType.UNKNOWN)
+        assertThat(result.error.message).isEqualTo("Success response with empty data")
+    }
+
+    @Test
+    fun `given a null response and nullable type, when converting, then return null wrapped in success`() {
+        val response = WPAPIResponse.Success<String>(null)
+
+        val result = response.toWooPayload<String, String?> { "Got response: $it" }
+
+        assertThat(result.isError).isFalse
+        assertThat(result.result).isEqualTo(null)
+    }
+
+    @Test
+    fun `given a non-null success response, when converting, then map the types`() {
+        val response = WPAPIResponse.Success("message")
+
+        val result = response.toWooPayload { it.hashCode() }
+
+        assertThat(result.isError).isFalse
+        assertThat(result.result).isEqualTo("message".hashCode())
+    }
+
+    @Test
+    fun `given an error, when converting, then map the error type`() {
+        val error = WPAPINetworkError(BaseNetworkError(BaseRequest.GenericErrorType.SERVER_ERROR))
+        val response = WPAPIResponse.Error<String>(error)
+
+        val result = response.toWooPayload { it.hashCode() }
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(error.toWooError().type)
+        assertThat(result.error.original).isEqualTo(error.toWooError().original)
+        assertThat(result.error.message).isEqualTo(error.toWooError().message)
+    }
+
+    @Test
+    fun `given invalid coupon error, when converting, then map the error type`() {
+        val error = WPAPINetworkError(
+            BaseNetworkError(BaseRequest.GenericErrorType.UNKNOWN),
+            "woocommerce_rest_invalid_coupon"
+        )
+        val response = WPAPIResponse.Error<String>(error)
+
+        val result = response.toWooPayload { it.hashCode() }
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(WooErrorType.INVALID_COUPON)
+    }
+}
diff --git a/libs/fluxc-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/libs/fluxc-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/libs/fluxc-processor/.gitignore b/libs/fluxc-processor/.gitignore
new file mode 100644
index 00000000000..796b96d1c40
--- /dev/null
+++ b/libs/fluxc-processor/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/libs/fluxc-processor/build.gradle b/libs/fluxc-processor/build.gradle
new file mode 100644
index 00000000000..f5834e63f6c
--- /dev/null
+++ b/libs/fluxc-processor/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+    id "java"
+    alias(sharedLibs.plugins.automattic.publishToS3)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
+    withJavadocJar()
+}
+
+dependencies {
+    implementation fluxcAnnotationsProjectDependency
+    implementation sharedLibs.google.autoService
+    annotationProcessor sharedLibs.google.autoService
+    implementation sharedLibs.squareup.javapoet
+}
+
+project.afterEvaluate {
+    publishing {
+        publications {
+            FluxCProcessorPublication(MavenPublication) {
+                from components.java
+
+                groupId "org.wordpress.fluxc"
+                artifactId "fluxc-processor"
+                // version is set by 'publish-to-s3' plugin
+            }
+        }
+   }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/ActionProcessor.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/ActionProcessor.java
new file mode 100644
index 00000000000..9c21c060fe9
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/ActionProcessor.java
@@ -0,0 +1,122 @@
+package org.wordpress.android.fluxc.processor;
+
+import com.google.auto.service.AutoService;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.AnnotationConfig;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.ActionBuilder;
+import org.wordpress.android.fluxc.annotations.action.NoPayload;
+
+import java.io.IOException;
+import java.util.Set;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.Messager;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
+
+import static java.util.Collections.singleton;
+import static javax.lang.model.SourceVersion.latestSupported;
+
+@SuppressWarnings("unused")
+@SupportedAnnotationTypes("org.wordpress.android.fluxc.annotations.ActionEnum")
+@AutoService(Processor.class)
+public class ActionProcessor extends AbstractProcessor {
+    private Filer mFiler;
+    private Messager mMessager;
+
+    @Override
+    public void init(ProcessingEnvironment processingEnv) {
+        super.init(processingEnv);
+        mFiler = processingEnv.getFiler();
+        mMessager = processingEnv.getMessager();
+    }
+
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        return singleton(ActionEnum.class.getCanonicalName());
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return latestSupported();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        for (Element actionElement : roundEnv.getElementsAnnotatedWith(ActionEnum.class)) {
+            AnnotatedActionEnum annotatedActionEnum = new AnnotatedActionEnum(actionElement);
+            createActionBuilderClass(actionElement, annotatedActionEnum);
+        }
+
+        return true;
+    }
+
+    private String createActionBuilderClass(Element tableElement, AnnotatedActionEnum annotatedActionEnum) {
+        String genClassName = annotatedActionEnum.getBuilderName() + "Builder";
+
+        TypeSpec.Builder builderClassBuilder = TypeSpec.classBuilder(genClassName)
+                .addModifiers(Modifier.FINAL, Modifier.PUBLIC)
+                .superclass(ActionBuilder.class);
+
+        for (AnnotatedAction annotatedAction : annotatedActionEnum.getActions()) {
+            MethodSpec method;
+            ParameterizedTypeName returnType;
+            boolean hasPayload =
+                    !annotatedAction.getPayloadType().toString().equals(TypeName.get(NoPayload.class).toString());
+
+            if (hasPayload) {
+                // Create builder method for Action with a prescribed payload type
+                returnType = ParameterizedTypeName.get(ClassName.get(Action.class),
+                        TypeName.get(annotatedAction.getPayloadType()));
+
+                method = MethodSpec.methodBuilder(CodeGenerationUtils.getActionBuilderMethodName(annotatedAction))
+                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                        .returns(returnType)
+                        .addParameter(TypeName.get(annotatedAction.getPayloadType()), "payload")
+                        .addStatement("return new $T<>($T.$L, $N)", Action.class, tableElement.asType(),
+                                annotatedAction.getActionName(), "payload")
+                        .build();
+            } else {
+                // Create builder method for Action with no payload
+                returnType = ParameterizedTypeName.get(Action.class, Void.class);
+
+                method = MethodSpec.methodBuilder(CodeGenerationUtils.getActionBuilderMethodName(annotatedAction))
+                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                        .returns(returnType)
+                        .addStatement("return $L($T.$L)", "generateNoPayloadAction", tableElement.asType(),
+                                annotatedAction.getActionName())
+                        .build();
+            }
+            builderClassBuilder.addMethod(method);
+        }
+
+        TypeSpec builderClass = builderClassBuilder.build();
+
+        JavaFile javaFile = JavaFile.builder(AnnotationConfig.PACKAGE, builderClass)
+                .build();
+
+        try {
+            javaFile.writeTo(mFiler);
+        } catch (IOException e) {
+            mMessager.printMessage(Diagnostic.Kind.ERROR, "Failed to create file: " + e.getMessage());
+        }
+
+        return AnnotationConfig.PACKAGE + "." + genClassName;
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedAction.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedAction.java
new file mode 100644
index 00000000000..3280978cf62
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedAction.java
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.processor;
+
+import org.wordpress.android.fluxc.annotations.Action;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.TypeMirror;
+
+/**
+ * Blueprint for an {@link Action}-annotated action after processing.
+ */
+public class AnnotatedAction {
+    private String mActionName;
+    private TypeMirror mPayloadType;
+
+    public AnnotatedAction(Element typeElement, Action actionAnnotation) {
+        mActionName = typeElement.getSimpleName().toString();
+        try {
+            actionAnnotation.payloadType();
+        } catch (MirroredTypeException e) {
+            mPayloadType = e.getTypeMirror();
+        }
+    }
+
+    public String getActionName() {
+        return mActionName;
+    }
+
+    public TypeMirror getPayloadType() {
+        return mPayloadType;
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedActionEnum.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedActionEnum.java
new file mode 100644
index 00000000000..be987eb407a
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/AnnotatedActionEnum.java
@@ -0,0 +1,41 @@
+package org.wordpress.android.fluxc.processor;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.lang.model.element.Element;
+
+/**
+ * Blueprint for an {@link ActionEnum}-annotated enum after processing.
+ */
+public class AnnotatedActionEnum {
+    private String mBuilderName;
+    private List<AnnotatedAction> mActions = new ArrayList<>();
+
+    public AnnotatedActionEnum(Element typeElement) {
+        ActionEnum actionEnumAnnotation = typeElement.getAnnotation(ActionEnum.class);
+        String userDefinedName = actionEnumAnnotation.name();
+        mBuilderName = userDefinedName.equals("") ? typeElement.getSimpleName().toString() : userDefinedName;
+
+        for (Element enumElement : typeElement.getEnclosedElements()) {
+            Action actionAnnotation = enumElement.getAnnotation(Action.class);
+
+            if (actionAnnotation == null) {
+                continue;
+            }
+            mActions.add(new AnnotatedAction(enumElement, actionAnnotation));
+        }
+    }
+
+    public String getBuilderName() {
+        return mBuilderName;
+    }
+
+    public List<AnnotatedAction> getActions() {
+        return Collections.unmodifiableList(mActions);
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/CodeGenerationUtils.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/CodeGenerationUtils.java
new file mode 100644
index 00000000000..f893218a0f0
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/CodeGenerationUtils.java
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.processor;
+
+public class CodeGenerationUtils {
+    public static String getActionBuilderMethodName(AnnotatedAction annotatedAction) {
+        return "new" + CodeGenerationUtils.toCamelCase(annotatedAction.getActionName()) + "Action";
+    }
+
+    public static String toCamelCase(String string) {
+        String[] parts = string.split("_");
+        String camelCaseString = "";
+        for (String part : parts) {
+            camelCaseString = camelCaseString + capitalize(part);
+        }
+        return camelCaseString;
+    }
+
+    public static String capitalize(String string) {
+        return string.substring(0, 1).toUpperCase() + string.substring(1).toLowerCase();
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/EndpointProcessor.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/EndpointProcessor.java
new file mode 100644
index 00000000000..ea9122c6029
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/EndpointProcessor.java
@@ -0,0 +1,193 @@
+package org.wordpress.android.fluxc.processor;
+
+import com.google.auto.service.AutoService;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.TypeSpec;
+
+import org.wordpress.android.fluxc.annotations.AnnotationConfig;
+import org.wordpress.android.fluxc.annotations.endpoint.EndpointNode;
+import org.wordpress.android.fluxc.annotations.endpoint.EndpointTreeGenerator;
+import org.wordpress.android.fluxc.annotations.endpoint.JPAPIEndpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WCWPAPIEndpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WPAPIEndpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WPComEndpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WPComV2Endpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WPComV3Endpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.WPOrgAPIEndpoint;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+import javax.tools.StandardLocation;
+
+import static javax.lang.model.SourceVersion.latestSupported;
+
+@SuppressWarnings("unused")
+@AutoService(Processor.class)
+public class EndpointProcessor extends AbstractProcessor {
+    private static final String WPCOMREST_ENDPOINT_FILE = "wp-com-endpoints.txt";
+    private static final String WPCOMV2_ENDPOINT_FILE = "wp-com-v2-endpoints.txt";
+    private static final String WPCOMV3_ENDPOINT_FILE = "wp-com-v3-endpoints.txt";
+    private static final String XMLRPC_ENDPOINT_FILE = "xmlrpc-endpoints.txt";
+    private static final String WPAPI_ENDPOINT_FILE = "wp-api-endpoints.txt";
+    private static final String WPORG_API_ENDPOINT_FILE = "wporg-api-endpoints.txt";
+    private static final String JPAPI_ENDPOINT_FILE = "jp-api-endpoints.txt";
+
+    // Plugin endpoints
+    private static final String WPORG_API_WC_ENDPOINT_FILE = "wc-wp-api-endpoints.txt";
+
+    private static final Pattern WPCOMREST_VARIABLE_ENDPOINT_PATTERN = Pattern.compile("\\$");
+    private static final Pattern WPAPI_VARIABLE_ENDPOINT_PATTERN = Pattern.compile("^<.*>");
+    private static final Pattern WPORG_API_VARIABLE_ENDPOINT_PATTERN = Pattern.compile("^\\{.*\\}");
+    private static final Pattern WCAPI_VARIABLE_ENDPOINT_PATTERN = WPAPI_VARIABLE_ENDPOINT_PATTERN;
+    private static final Pattern JPAPI_VARIABLE_ENDPOINT_PATTERN = WPAPI_VARIABLE_ENDPOINT_PATTERN;
+
+    private static final Map<String, List<String>> XML_RPC_ALIASES;
+
+    static {
+        XML_RPC_ALIASES = new HashMap<>();
+        List<String> editPostAliases = new ArrayList<>();
+        editPostAliases.add("EDIT_MEDIA");
+        XML_RPC_ALIASES.put("wp.editPost", editPostAliases);
+
+        List<String> deletePostAliases = new ArrayList<>();
+        deletePostAliases.add("DELETE_MEDIA");
+        XML_RPC_ALIASES.put("wp.deletePost", deletePostAliases);
+
+        List<String> getUsersBlogsAliases = new ArrayList<>();
+        getUsersBlogsAliases.add("GET_USERS_SITES");
+        XML_RPC_ALIASES.put("wp.getUsersBlogs", getUsersBlogsAliases);
+    }
+
+    private Filer mFiler;
+
+    @Override
+    public void init(ProcessingEnvironment processingEnv) {
+        mFiler = processingEnv.getFiler();
+
+        try {
+            String outputPath = mFiler.getResource(StandardLocation.CLASS_OUTPUT, "", "tmp").getName();
+            String fs = File.separator;
+            if (outputPath.contains(fs + "fluxc" + fs + "build")) {
+                generateWPCOMRESTEndpointFile();
+                generateWPCOMV2EndpointFile();
+                generateWPCOMV3EndpointFile();
+                generateXMLRPCEndpointFile();
+                generateWPAPIEndpointFile();
+                generateWPORGAPIEndpointFile();
+                generateJPAPIEndpointFile();
+            } else if (outputPath.contains(fs + "plugins" + fs + "woocommerce" + fs + "build" + fs)) {
+                generateWCWPAPIPluginEndpointFile();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return latestSupported();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        return true;
+    }
+
+    private void generateWPCOMRESTEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPCOMREST_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WPCOMREST", WPComEndpoint.class,
+                WPCOMREST_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateWPCOMV2EndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPCOMV2_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WPCOMV2", WPComV2Endpoint.class,
+                WPCOMREST_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateWPCOMV3EndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPCOMV3_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WPCOMV3", WPComV3Endpoint.class,
+                WPCOMREST_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateXMLRPCEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(XMLRPC_ENDPOINT_FILE);
+        // read inputStream into byte array since we will have to use it twice
+        byte[] fileContent = new byte[inputStream.available()];
+        inputStream.read(fileContent);
+
+        EndpointNode rootNode = EndpointTreeGenerator.process(new ByteArrayInputStream(fileContent));
+        TypeSpec endpointClass = XMLRPCPoet.generate(new ByteArrayInputStream(fileContent), "XMLRPC", XML_RPC_ALIASES);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateWPAPIEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPAPI_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WPAPI", WPAPIEndpoint.class,
+                WPAPI_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateWCWPAPIPluginEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPORG_API_WC_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WOOCOMMERCE", WCWPAPIEndpoint.class,
+                WCAPI_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateWPORGAPIEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(WPORG_API_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "WPORGAPI", WPOrgAPIEndpoint.class,
+                WPORG_API_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void generateJPAPIEndpointFile() throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(JPAPI_ENDPOINT_FILE);
+        EndpointNode rootNode = EndpointTreeGenerator.process(inputStream);
+
+        TypeSpec endpointClass = RESTPoet.generate(rootNode, "JPAPI", JPAPIEndpoint.class,
+                JPAPI_VARIABLE_ENDPOINT_PATTERN);
+        writeEndpointClassToFile(endpointClass);
+    }
+
+    private void writeEndpointClassToFile(TypeSpec endpointClass) throws IOException {
+        JavaFile javaFile = JavaFile.builder(AnnotationConfig.PACKAGE_ENDPOINTS, endpointClass)
+                                    .indent("    ")
+                                    .build();
+
+        javaFile.writeTo(mFiler);
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/RESTPoet.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/RESTPoet.java
new file mode 100644
index 00000000000..4df227b30f0
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/RESTPoet.java
@@ -0,0 +1,277 @@
+package org.wordpress.android.fluxc.processor;
+
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+
+import org.wordpress.android.fluxc.annotations.Endpoint;
+import org.wordpress.android.fluxc.annotations.endpoint.EndpointNode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.lang.model.element.Modifier;
+
+public class RESTPoet {
+    private static final String[] JAVA_KEYWORDS = {
+            "new", "abstract", "assert", "boolean",
+            "break", "byte", "case", "catch", "char", "class", "const",
+            "continue", "default", "do", "double", "else", "extends", "false",
+            "final", "finally", "float", "for", "goto", "if", "implements",
+            "import", "instanceof", "int", "interface", "long", "native",
+            "null", "package", "private", "protected", "public",
+            "return", "short", "static", "strictfp", "super", "switch",
+            "synchronized", "this", "throw", "throws", "transient", "true",
+            "try", "void", "volatile", "while"
+    };
+
+    private static TypeName sBaseEndpointClass;
+    private static Pattern sVariableEndpointPattern;
+
+    public static TypeSpec generate(EndpointNode rootNode, String fileName, Class baseEndpointClass,
+                                    Pattern variableEndpointPattern) {
+        sBaseEndpointClass = ClassName.get(baseEndpointClass);
+        sVariableEndpointPattern = variableEndpointPattern;
+
+        TypeSpec.Builder wpcomRestBuilder = TypeSpec.classBuilder(fileName)
+                .addModifiers(Modifier.PUBLIC);
+
+        for (EndpointNode endpoint : rootNode.getChildren()) {
+            addEndpointToBuilder(endpoint, wpcomRestBuilder);
+        }
+
+        return wpcomRestBuilder.build();
+    }
+
+    private static void addEndpointToBuilder(EndpointNode endpointNode, TypeSpec.Builder classBuilder) {
+        Matcher variableEndpointMatcher = sVariableEndpointPattern.matcher(endpointNode.getLocalEndpoint());
+
+        if (variableEndpointMatcher.find()) {
+            processVariableEndpointNode(endpointNode, classBuilder);
+        } else {
+            processStaticEndpointNode(endpointNode, classBuilder);
+        }
+    }
+
+    private static void processStaticEndpointNode(EndpointNode endpointNode, TypeSpec.Builder classBuilder) {
+        String endpointName = endpointNode.getCleanEndpointName();
+        String javaSafeEndpointName = underscoreIfJavaKeyword(endpointName);
+
+        if (!endpointNode.hasChildren()) {
+            // Build annotated accessor field for the static endpoint
+            FieldSpec.Builder endpointFieldBuilder = FieldSpec.builder(sBaseEndpointClass, javaSafeEndpointName)
+                    .addModifiers(Modifier.PUBLIC)
+                    .addAnnotation(AnnotationSpec.builder(Endpoint.class)
+                            .addMember("value", "$S", endpointNode.getFullEndpoint())
+                            .build());
+
+            if (endpointNode.getParent().isRoot()) {
+                endpointFieldBuilder.addModifiers(Modifier.STATIC)
+                        .initializer("new $T($S)", sBaseEndpointClass, "/" + endpointNode.getLocalEndpoint());
+            } else {
+                endpointFieldBuilder
+                        .initializer("new $T(getEndpoint() + $S)", sBaseEndpointClass, endpointNode.getLocalEndpoint());
+            }
+
+            classBuilder.addField(endpointFieldBuilder.build());
+        } else {
+            // Build constant String defining the local endpoint for this class
+            FieldSpec endpointField = FieldSpec.builder(String.class, endpointName.toUpperCase(Locale.US) + "_ENDPOINT")
+                    .addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
+                    .initializer("$S", endpointNode.getLocalEndpoint())
+                    .build();
+
+            MethodSpec endpointConstructor = MethodSpec.constructorBuilder()
+                    .addModifiers(Modifier.PRIVATE)
+                    .addParameter(String.class, "previousEndpoint")
+                    .addStatement("super($L + $L)", "previousEndpoint", endpointField.name)
+                    .build();
+
+            TypeSpec.Builder endpointClassBuilder = TypeSpec.classBuilder(capitalize(endpointName) + "Endpoint")
+                    .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                    .superclass(sBaseEndpointClass)
+                    .addField(endpointField)
+                    .addMethod(endpointConstructor);
+
+            TypeName endpointClassName = ClassName.get("", capitalize(endpointName) + "Endpoint");
+
+            // Build annotated accessor field for the static endpoint
+            FieldSpec.Builder endpointFieldBuilder = FieldSpec.builder(endpointClassName, javaSafeEndpointName)
+                    .addModifiers(Modifier.PUBLIC)
+                    .addAnnotation(AnnotationSpec.builder(Endpoint.class)
+                            .addMember("value", "$S", endpointNode.getFullEndpoint())
+                            .build());
+
+            if (endpointNode.getParent().isRoot()) {
+                endpointFieldBuilder.addModifiers(Modifier.STATIC)
+                        .initializer("new $T($S)", endpointClassName, "/");
+            } else {
+                endpointFieldBuilder
+                        .initializer("new $T(getEndpoint())", endpointClassName);
+            }
+
+            for (EndpointNode childEndpoint : endpointNode.getChildren()) {
+                addEndpointToBuilder(childEndpoint, endpointClassBuilder);
+            }
+
+            classBuilder.addField(endpointFieldBuilder.build())
+                    .addType(endpointClassBuilder.build());
+        }
+    }
+
+    private static void processVariableEndpointNode(EndpointNode endpointNode, TypeSpec.Builder classBuilder) {
+        String endpointName = endpointNode.getCleanEndpointName();
+
+        if (!endpointNode.hasChildren()) {
+            // Build annotated accessor method for variable endpoint and add it to the class
+            List<MethodSpec> endpointMethods = generateEndpointMethods(endpointNode, sBaseEndpointClass);
+
+            for (MethodSpec endpointMethod : endpointMethods) {
+                classBuilder.addMethod(endpointMethod);
+            }
+        } else {
+            String innerClassName;
+            if (endpointNode.getParent().getCleanEndpointName().equals(endpointName)) {
+                // Special rule for situations like '.../media/$media_ID/` where the inner class needs to be renamed
+                innerClassName = capitalize(endpointName) + "Item" + "Endpoint";
+            } else {
+                innerClassName = capitalize(endpointName) + "Endpoint";
+            }
+
+            TypeSpec.Builder endpointClassBuilder = TypeSpec.classBuilder(innerClassName)
+                    .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                    .superclass(sBaseEndpointClass);
+
+            // Add a constructor for each type this endpoint accepts (usually long)
+            for (Class endpointType : getVariableEndpointTypes(endpointNode)) {
+                String variableName = endpointName;
+                if (endpointType.equals(long.class) && !endpointName.toLowerCase(Locale.US).endsWith("id")) {
+                    variableName = endpointName + "Id";
+                }
+
+                MethodSpec.Builder endpointConstructorBuilder = MethodSpec.constructorBuilder()
+                        .addModifiers(Modifier.PRIVATE)
+                        .addParameter(String.class, "previousEndpoint")
+                        .addParameter(endpointType, variableName);
+
+                if (endpointNode.getLocalEndpoint().contains(":")) {
+                    // Special case for endpoints of type '/item:$item/'
+                    endpointConstructorBuilder.addStatement("super($L, $S + $L)", "previousEndpoint",
+                            endpointName + ":", variableName);
+                } else {
+                    endpointConstructorBuilder.addStatement("super($L, $L)", "previousEndpoint", variableName);
+                }
+                endpointClassBuilder.addMethod(endpointConstructorBuilder.build());
+            }
+
+            TypeName endpointClassName = ClassName.get("", innerClassName);
+
+            // Build annotated accessor method for variable endpoint
+            List<MethodSpec> endpointMethods = generateEndpointMethods(endpointNode, endpointClassName);
+
+            for (EndpointNode childEndpoint : endpointNode.getChildren()) {
+                addEndpointToBuilder(childEndpoint, endpointClassBuilder);
+            }
+
+            for (MethodSpec endpointMethod : endpointMethods) {
+                classBuilder.addMethod(endpointMethod);
+            }
+
+            classBuilder.addType(endpointClassBuilder.build());
+        }
+    }
+
+    private static List<MethodSpec> generateEndpointMethods(EndpointNode endpointNode, TypeName endpointClassName) {
+        List<MethodSpec> endpointMethods = new ArrayList<>();
+
+        for (Class endpointType : getVariableEndpointTypes(endpointNode)) {
+            String endpointName = endpointNode.getCleanEndpointName();
+
+            String methodName = endpointName;
+            if (endpointNode.getParent().getCleanEndpointName().equals(endpointName)) {
+                // Special rule for situations like '.../media/$media_ID/`
+                methodName = "item";
+            }
+
+            String variableName = endpointName;
+            if (endpointType.equals(long.class) && !endpointName.toLowerCase(Locale.US).endsWith("id")) {
+                variableName = endpointName + "Id";
+            }
+
+            MethodSpec.Builder endpointMethodBuilder = MethodSpec.methodBuilder(methodName)
+                    .addModifiers(Modifier.PUBLIC)
+                    .returns(endpointClassName)
+                    .addParameter(endpointType, variableName)
+                    .addAnnotation(AnnotationSpec.builder(Endpoint.class)
+                            .addMember("value", "$S", endpointNode.getFullEndpoint())
+                            .build());
+
+            if (endpointNode.getParent().isRoot()) {
+                if (endpointNode.getLocalEndpoint().contains(":") && !endpointNode.hasChildren()) {
+                    // Special case for endpoints of type '/item:$item/'
+                    // (the case with children is covered in the constructor, not here)
+                    endpointMethodBuilder.addModifiers(Modifier.STATIC)
+                            .addStatement("return new $T($S, $S + $L)", endpointClassName, "/",
+                                    endpointName + ":", variableName);
+                } else {
+                    endpointMethodBuilder.addModifiers(Modifier.STATIC)
+                            .addStatement("return new $T($S, $L)", endpointClassName, "/", variableName);
+                }
+            } else {
+                if (endpointNode.getLocalEndpoint().contains(":") && !endpointNode.hasChildren()) {
+                    // Special case for endpoints of type '/item:$item/'
+                    // (the case with children is covered in the constructor, not here)
+                    endpointMethodBuilder
+                            .addStatement("return new $T(getEndpoint(), $S + $L)", endpointClassName,
+                                    endpointName + ":", variableName);
+                } else {
+                    endpointMethodBuilder
+                            .addStatement("return new $T(getEndpoint(), $L)", endpointClassName, variableName);
+                }
+            }
+            endpointMethods.add(endpointMethodBuilder.build());
+        }
+
+        return endpointMethods;
+    }
+
+    private static String capitalize(String endpoint) {
+        return endpoint.substring(0, 1).toUpperCase(Locale.US) + endpoint.substring(1);
+    }
+
+    private static String underscoreIfJavaKeyword(String string) {
+        for (String keyword : JAVA_KEYWORDS) {
+            if (string.equals(keyword)) {
+                return string + "_";
+            }
+        }
+        return string;
+    }
+
+    private static List<Class> getVariableEndpointTypes(EndpointNode endpointNode) {
+        List<Class> endpointTypes = new ArrayList<>();
+
+        for (String endpointType : endpointNode.getEndpointTypes()) {
+            switch (endpointType) {
+                case "String":
+                    endpointTypes.add(String.class);
+                    break;
+                case "long":
+                    endpointTypes.add(long.class);
+                    break;
+            }
+        }
+
+        if (endpointTypes.isEmpty()) {
+            endpointTypes.add(long.class);
+        }
+
+        return endpointTypes;
+    }
+}
diff --git a/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/XMLRPCPoet.java b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/XMLRPCPoet.java
new file mode 100644
index 00000000000..66c888f7cda
--- /dev/null
+++ b/libs/fluxc-processor/src/main/java/org/wordpress/android/fluxc/processor/XMLRPCPoet.java
@@ -0,0 +1,75 @@
+package org.wordpress.android.fluxc.processor;
+
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeSpec;
+
+import org.wordpress.android.fluxc.annotations.Endpoint;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.lang.model.element.Modifier;
+
+public class XMLRPCPoet {
+    public static TypeSpec generate(InputStream inputStream, String fileName, Map<String, List<String>> aliases)
+            throws IOException {
+        TypeSpec.Builder xmlrpcBuilder = TypeSpec.enumBuilder(fileName)
+                .addModifiers(Modifier.PUBLIC)
+                .addField(String.class, "mEndpoint", Modifier.PRIVATE, Modifier.FINAL);
+
+        MethodSpec xmlrpcConstructor = MethodSpec.constructorBuilder()
+                .addParameter(String.class, "endpoint")
+                .addStatement("mEndpoint = endpoint")
+                .build();
+
+        xmlrpcBuilder.addMethod(xmlrpcConstructor);
+
+        MethodSpec xmlrpcToString = MethodSpec.methodBuilder("toString")
+                .addModifiers(Modifier.PUBLIC)
+                .returns(String.class)
+                .addStatement("return $L", "mEndpoint")
+                .addAnnotation(Override.class)
+                .build();
+
+        xmlrpcBuilder.addMethod(xmlrpcToString);
+
+        BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+
+        String fullEndpoint;
+        while ((fullEndpoint = in.readLine()) != null) {
+            if (fullEndpoint.length() == 0) {
+                continue;
+            }
+            String endpointName = fullEndpoint.split("\\.")[1];
+            String enumName = endpointName.replaceAll("([a-z])([A-Z]+)", "$1_$2").toUpperCase(Locale.US);
+
+            xmlrpcBuilder.addEnumConstant(enumName, TypeSpec.anonymousClassBuilder("$S", fullEndpoint)
+                    .addAnnotation(AnnotationSpec.builder(Endpoint.class)
+                            .addMember("value", "$S", fullEndpoint)
+                            .build())
+                    .build());
+        }
+
+        // Add endpoint aliases
+        for (String endpoint : aliases.keySet()) {
+            for (String alias : aliases.get(endpoint)) {
+                xmlrpcBuilder.addEnumConstant(alias, TypeSpec.anonymousClassBuilder("$S", endpoint)
+                        .addAnnotation(AnnotationSpec.builder(Endpoint.class)
+                                .addMember("value", "$S", endpoint)
+                                .build())
+                        .build());
+            }
+        }
+
+        in.close();
+
+        return xmlrpcBuilder.build();
+    }
+}
diff --git a/libs/fluxc-processor/src/main/resources/jp-api-endpoints.txt b/libs/fluxc-processor/src/main/resources/jp-api-endpoints.txt
new file mode 100644
index 00000000000..afdbec62886
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/jp-api-endpoints.txt
@@ -0,0 +1,4 @@
+/module/stats/active
+/connection/url
+/connection/data
+/jitm
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wc-wp-api-endpoints.txt b/libs/fluxc-processor/src/main/resources/wc-wp-api-endpoints.txt
new file mode 100644
index 00000000000..cbd1823df5c
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wc-wp-api-endpoints.txt
@@ -0,0 +1,131 @@
+/orders/
+/orders/<id>/
+/orders/<id>/notes/
+/orders/<id>/shipment-trackings/
+/orders/<id>/shipment-trackings/<tracking>#String/
+/orders/<id>/shipment-trackings/providers/
+/orders/<id>/receipt/
+/orders/<id>/actions/send_order_details
+/orders/batch
+
+/products/<id>/
+/products/<id>/variations/
+/products/<id>/variations/<variation_id>
+/products/<id>/variations/batch
+/products/
+/products/batch
+/products/shipping_classes
+/products/shipping_classes/<id>/
+/products/attributes/
+/products/attributes/<attribute_id>
+/products/attributes/<attribute_id>/terms
+/products/attributes/<attribute_id>/terms/<term_id>
+
+/products/reviews/
+/products/reviews/<id>/
+
+/products/categories/
+/products/categories/<id>/
+/products/categories/batch/
+
+/products/tags/
+/products/tags/<id>/
+/products/tags/batch/
+
+
+
+/product-add-ons/
+
+/customers/<id>
+/customers/
+/customers/<id>/downloads
+
+/reports/customers
+
+/reports/orders/totals/
+/reports/products/totals/
+/reports/revenue/stats/
+
+/reports/bundles/
+/reports/bundles/stats/
+
+/reports/giftcards/used/stats/
+
+/reports/stock/
+
+/settings/general/
+/settings/products/
+/settings/<group_id>#String/<id>#String
+
+/orders/<id>/refunds
+/orders/<id>/refunds/<refund_id>
+
+/payment_gateways
+/payment_gateways/<gateway_id>#String
+
+/payments/connection_tokens
+/payments/orders/<id>/capture_terminal_payment
+/payments/accounts
+/payments/charges/<charge_id>#String/
+
+/payments/terminal/locations/store
+
+/payments/transactions/summary
+
+/payments/deposits/overview-all
+
+/wc_stripe/account/summary
+/wc_stripe/terminal/locations/store
+/wc_stripe/orders/<order_id>/create_customer
+/wc_stripe/connection_tokens
+/wc_stripe/orders/<order_id>/capture_terminal_payment
+/wc_stripe/charges/<charge_id>#String/
+
+/taxes
+/taxes/classes/
+
+/connect/label/print
+/connect/label/<order_id>/
+/connect/label/<order_id>/rates
+/connect/label/<order_id>/<shippingLabels>#String
+/connect/label/<order_id>/<shippingLabelId>/refund
+/connect/label/<order_id>/creation_eligibility
+
+/connect/normalize-address
+/connect/packages
+
+/connect/account/settings
+
+/leaderboards
+/leaderboards/products
+
+/data/countries
+/system_status
+
+/tracker
+
+/coupons
+/coupons/<id>
+/reports/coupons
+
+/admin/notes
+/admin/notes/<note_id>/action/<action_id>
+/admin/notes/delete/<note_id>
+/admin/notes/delete/all
+
+/onboarding/tasks
+
+/subscriptions/
+/subscriptions/<id>/
+
+/reports/products
+/reports/variations
+
+/options
+
+/shipping_methods
+/shipping_methods/<id>#String
+
+/gla/ads/connection
+/gla/ads/campaigns
+/gla/ads/reports/programs
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wp-api-endpoints.txt b/libs/fluxc-processor/src/main/resources/wp-api-endpoints.txt
new file mode 100644
index 00000000000..67f7489d02f
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wp-api-endpoints.txt
@@ -0,0 +1,22 @@
+/posts/
+/posts/<id>/
+
+/pages/
+/pages/<id>/
+
+/media/
+/media/<id>/
+
+/comments/
+/comments/<id>/
+
+/settings/
+
+/users/
+/users/me/
+/users/me/application-passwords
+/users/me/application-passwords/<uuid>#String
+/users/me/application-passwords/introspect
+
+/plugins/
+/plugins/<name>#String
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wp-com-endpoints.txt b/libs/fluxc-processor/src/main/resources/wp-com-endpoints.txt
new file mode 100644
index 00000000000..95a446444db
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wp-com-endpoints.txt
@@ -0,0 +1,164 @@
+/auth/send-login-email/
+/auth/send-signup-email/
+
+/connect/site-info/
+
+/devices/new/
+/devices/$deviceId#String/delete/
+
+/geo/
+
+/is-available/blog/
+/is-available/email/
+/is-available/username/
+
+/jetpack-blogs/
+/jetpack-blogs/$site/rest-api/
+
+/me/
+/me/domain-contact-information/
+/me/settings/
+/me/sites/
+/me/sites/features
+/me/send-verification-email/
+/me/social-login/connect/
+/me/username/
+/me/account/close/
+
+/me/transactions/supported-countries/
+/me/transactions/
+/me/shopping-cart/$site
+/me/shopping-cart/no-site
+
+/me/account/close
+
+/me/notifications/settings/
+
+/notifications/
+/notifications/$note_id
+/notifications/seen/
+/notifications/read/
+
+/read/feed/
+/read/feed/$feed_url_or_id#long,String
+/read/following/mine
+/read/site/$site#String/comment_email_subscriptions/$action#String
+/read/site/$site#String/post_email_subscriptions/$action#String
+/read/site/$site#String/post_email_subscriptions/update
+
+/all-domains
+
+/domains/suggestions
+/domains/supported-countries/
+/domains/supported-states/$countryCode#String
+/domains/$domainName#String/is-available
+/domains/$domainName#String/price
+
+/meta/external-media/pexels
+/sites/$site/external-media-upload
+
+/sites/
+/sites/$site/delete
+/sites/$site/exports/start
+/sites/$site/post-formats/
+/sites/$site/roles
+/sites/new/
+
+/sites/$site/automated-transfers/eligibility
+/sites/$site/automated-transfers/initiate
+/sites/$site/automated-transfers/status
+
+/sites/$site/comments/
+/sites/$site/comments/$comment_ID
+/sites/$site/comments/$comment_ID/delete
+/sites/$site/comments/$comment_ID/likes/
+/sites/$site/comments/$comment_ID/likes/new
+/sites/$site/comments/$comment_ID/likes/mine/delete
+/sites/$site/comments/$comment_ID/replies/new
+
+/sites/$site/media/
+/sites/$site/media/$media_ID/
+/sites/$site/media/$media_ID/delete/
+/sites/$site/media/new/
+
+/sites/$site/plans/
+
+/sites/$site/domains/primary/
+
+/sites/$site/plugins
+/sites/$site/plugins/$name#String
+/sites/$site/plugins/$name#String/delete
+/sites/$site/plugins/$slug#String/install
+/sites/$site/plugins/$name#String/update
+
+/sites/$site/posts/
+/sites/$site/posts/$post_ID/
+/sites/$site/posts/$post_ID/autosave/
+/sites/$site/posts/$post_ID/delete/
+/sites/$site/posts/$post_ID/likes/
+/sites/$site/posts/$post_ID/restore/
+/sites/$site/posts/$post_ID/replies/new
+/sites/$site/posts/new/
+/sites/$site/posts/slug:$post_slug#String/
+
+/sites/$site/stats/visits
+
+/sites/$site/taxonomies/$taxonomy#String/terms/
+/sites/$site/taxonomies/$taxonomy#String/terms/new/
+/sites/$site/taxonomies/$taxonomy#String/terms/slug:$slug#String/
+/sites/$site/taxonomies/$taxonomy#String/terms/slug:$slug#String/delete/
+
+/themes
+/sites/$site/themes/mine
+/sites/$site/themes/$theme_ID#String/delete
+/sites/$site/themes/$theme_ID#String/install
+
+/sites/$siteUrl#String
+
+/sites/$site/mobile-quick-start
+
+/sites/$site/stats
+/sites/$site/stats/visits
+/sites/$site/stats/top-posts
+/sites/$site/stats/referrers
+/sites/$site/stats/referrers/spam/new
+/sites/$site/stats/referrers/spam/delete
+/sites/$site/stats/clicks
+/sites/$site/stats/country-views
+/sites/$site/stats/top-authors
+/sites/$site/stats/video-plays
+/sites/$site/stats/comments
+/sites/$site/stats/followers
+/sites/$site/stats/comment-followers
+/sites/$site/stats/tags
+/sites/$site/stats/publicize
+/sites/$site/stats/search-terms
+/sites/$site/stats/insights
+/sites/$site/stats/summary
+/sites/$site/stats/posts
+/sites/$site/stats/post/$post_ID
+/sites/$site/stats/streak
+/sites/$site/stats/file-downloads
+/sites/$site/stats/subscribers
+/sites/$site/stats/emails/summary
+
+/sites/$site/post/$post_ID/diffs
+/sites/$site/page/$post_ID/diffs
+
+/sites/$site/homepage
+
+/sites/$site/ecommerce-trial/add/$plan_slug#String
+
+/users/new/
+/users/social/new
+/users/$emailOrUsername#String/auth-options
+
+/activity-log/$site/rewind/to/$rewind_ID#String
+
+/jetpack-install/$site#String
+
+/encrypted-logging
+
+/products
+
+/plans
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wp-com-v2-endpoints.txt b/libs/fluxc-processor/src/main/resources/wp-com-v2-endpoints.txt
new file mode 100644
index 00000000000..4932ecf3529
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wp-com-v2-endpoints.txt
@@ -0,0 +1,81 @@
+/plugins/featured
+
+/read/sites/$site#String/notification-subscriptions/$action#String
+
+/sites/$site/dashboard/cards-data
+
+/sites/$site/activity
+/sites/$site/activity/count/group
+/sites/$site/rewind
+/sites/$site/rewind/downloads
+/sites/$site/rewind/downloads/$download_id
+
+/sites/$site/scan
+/sites/$site/scan/enqueue
+/sites/$site/scan/threat/$threat_id
+/sites/$site/alerts/fix
+/sites/$site/alerts/$threat_id
+/sites/$site/scan/history
+
+/sites/$site/rewind/capabilities
+
+/sites/$site/gutenberg
+
+/sites/$site/atomic-auth-proxy/read-access-cookies
+
+/sites/$site/stats/orders/
+/sites/$site/stats/top-earners
+
+/sites/$site/block-layouts
+/common-block-layouts
+/common-starter-site-designs
+
+/sites/$site/xposts
+
+/sites/$site/blogging-prompts
+
+/sites/$site/wordads/dsp/api/v1/search/campaigns/site
+
+/sites/$site/wordads/dsp/api/v1.1/targeting/languages
+/sites/$site/wordads/dsp/api/v1.1/targeting/locations
+/sites/$site/wordads/dsp/api/v1.1/targeting/devices
+/sites/$site/wordads/dsp/api/v1.1/targeting/page-topics
+/sites/$site/wordads/dsp/api/v1.1/suggestions
+/sites/$site/wordads/dsp/api/v1.1/forecast
+/sites/$site/wordads/dsp/api/v1.1/payment-methods
+/sites/$site/wordads/dsp/api/v1.1/campaigns
+/sites/$site/wordads/dsp/api/v1.1/campaigns/objectives
+
+/sites/$site/launch
+
+/sites/$site/jetpack-ai/completions
+
+/sites/$site/jetpack-openai-query/jwt
+/text-completion
+
+/sites/$site/jetpack-social
+
+/users/username/suggestions/
+
+/segments
+
+/plans/mobile
+
+/mobile/feature-announcements/
+/mobile/feature-flags/
+/mobile/migration
+/mobile/remote-config
+
+/me/gutenberg/
+
+/experiments/$version#String/assignments/$platform#String
+
+/auth/qr-code/validate
+/auth/qr-code/authenticate
+
+/iap/products
+/iap/orders
+
+/jetpack-ai-transcription
+/jetpack-ai-query
+/sites/$site/jetpack-ai/ai-assistant-feature
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wp-com-v3-endpoints.txt b/libs/fluxc-processor/src/main/resources/wp-com-v3-endpoints.txt
new file mode 100644
index 00000000000..bf6ea0e44c3
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wp-com-v3-endpoints.txt
@@ -0,0 +1 @@
+/sites/$site/blogging-prompts
\ No newline at end of file
diff --git a/libs/fluxc-processor/src/main/resources/wporg-api-endpoints.txt b/libs/fluxc-processor/src/main/resources/wporg-api-endpoints.txt
new file mode 100644
index 00000000000..5cebcdb6738
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/wporg-api-endpoints.txt
@@ -0,0 +1,2 @@
+/plugins/info/{version}#String/
+/plugins/info/{version}#String/{slug}#String
diff --git a/libs/fluxc-processor/src/main/resources/xmlrpc-endpoints.txt b/libs/fluxc-processor/src/main/resources/xmlrpc-endpoints.txt
new file mode 100644
index 00000000000..00ed4e69dea
--- /dev/null
+++ b/libs/fluxc-processor/src/main/resources/xmlrpc-endpoints.txt
@@ -0,0 +1,23 @@
+wp.getProfile
+wp.getOptions
+wp.getPostFormats
+wp.getUsersBlogs
+wp.getMediaLibrary
+wp.getMediaItem
+wp.getPost
+wp.getPosts
+wp.newPost
+wp.editPost
+wp.deletePost
+wp.getTerm
+wp.getTerms
+wp.newTerm
+wp.deleteTerm
+wp.editTerm
+wp.uploadFile
+wp.newComment
+wp.getComment
+wp.getComments
+wp.deleteComment
+wp.editComment
+system.listMethods
diff --git a/libs/fluxc-tests/src/test/java/android/text/TextUtils.java b/libs/fluxc-tests/src/test/java/android/text/TextUtils.java
new file mode 100644
index 00000000000..536ba9a91b1
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/android/text/TextUtils.java
@@ -0,0 +1,32 @@
+package android.text;
+
+import java.util.Iterator;
+
+/**
+ * Allows unit tests to call methods that rely on {@link android.text.TextUtils} without requiring mocks
+ * of the Android framework (i.e., no need to use Robolectric).
+ */
+public class TextUtils {
+    /**
+     * Duplicates {@link android.text.TextUtils#isEmpty(CharSequence)}.
+     */
+    public static boolean isEmpty(CharSequence str) {
+        return str == null || str.length() == 0;
+    }
+
+    /**
+     * Duplicates {@link android.text.TextUtils#join(CharSequence, Iterable)}.
+     */
+    public static String join(CharSequence delimiter, Iterable tokens) {
+        StringBuilder sb = new StringBuilder();
+        Iterator<?> it = tokens.iterator();
+        if (it.hasNext()) {
+            sb.append(it.next());
+            while (it.hasNext()) {
+                sb.append(delimiter);
+                sb.append(it.next());
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/CoroutinesTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/CoroutinesTestUtils.kt
new file mode 100644
index 00000000000..83b81894a41
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/CoroutinesTestUtils.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+fun <T> test(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T) {
+    runBlocking(context, block)
+}
+
+val TEST_SCOPE = CoroutineScope(Dispatchers.Unconfined)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/JsonLoaderUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/JsonLoaderUtils.kt
new file mode 100644
index 00000000000..0af62395b1d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/JsonLoaderUtils.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc
+
+import com.google.gson.Gson
+
+object JsonLoaderUtils {
+    fun <T> String.jsonFileAs(clazz: Class<T>) =
+            UnitTestUtils.getStringFromResourceFile(
+                    this@JsonLoaderUtils::class.java,
+                    this
+            )?.let { Gson().fromJson(it, clazz) }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/PayloadTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/PayloadTest.java
new file mode 100644
index 00000000000..a8b055cc258
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/PayloadTest.java
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+
+public class PayloadTest {
+    private class CloneablePayload extends Payload<BaseNetworkError> implements Cloneable {
+        @Override
+        public CloneablePayload clone() {
+            try {
+                return (CloneablePayload) super.clone();
+            } catch (CloneNotSupportedException e) {
+                throw new AssertionError(); // Can't happen
+            }
+        }
+    }
+
+    @Test
+    public void testClone() {
+        // Cloning default (no error) payload
+        CloneablePayload errorlessPayload = new CloneablePayload();
+
+        CloneablePayload errorlessClone = errorlessPayload.clone();
+
+        assertFalse(errorlessPayload == errorlessClone);
+        assertNull(errorlessPayload.error);
+        assertNull(errorlessClone.error);
+
+        // Cloning payload with error field
+        CloneablePayload errorPayload = new CloneablePayload();
+
+        errorPayload.error = new BaseNetworkError(BaseRequest.GenericErrorType.SERVER_ERROR);
+
+        CloneablePayload errorClone = errorPayload.clone();
+
+        assertFalse(errorPayload == errorClone);
+
+        // The error field should be cloned
+        assertNotEquals(errorClone.error, errorPayload.error);
+        assertEquals(errorClone.error.type, errorPayload.error.type);
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/SingleStoreWellSqlConfigForTests.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/SingleStoreWellSqlConfigForTests.java
new file mode 100644
index 00000000000..b7f1e787e85
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/SingleStoreWellSqlConfigForTests.java
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.WellTableManager;
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.TableClass;
+
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SingleStoreWellSqlConfigForTests extends WellSqlConfig {
+    private List<Class<? extends Identifiable>> mStoreClassList;
+
+    public SingleStoreWellSqlConfigForTests(Context context, Class<? extends Identifiable> token) {
+        super(context);
+        mStoreClassList = new ArrayList<>();
+        mStoreClassList.add(token);
+    }
+
+    public SingleStoreWellSqlConfigForTests(Context context, Class<? extends Identifiable> token,
+                                            @AddOn String... addOns) {
+        super(context, addOns);
+        mStoreClassList = new ArrayList<>();
+        mStoreClassList.add(token);
+    }
+
+    public SingleStoreWellSqlConfigForTests(Context context, List<Class<? extends Identifiable>> tokens,
+                                            @AddOn String... addOns) {
+        super(context, addOns);
+        mStoreClassList = tokens;
+    }
+
+    @Override
+    public String getDbName() {
+        return "test-fluxc";
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db, WellTableManager helper) {
+        for (Class<? extends Identifiable> clazz : mStoreClassList) {
+            helper.createTable(clazz);
+        }
+    }
+
+    /**
+     * Drop and create all tables
+     */
+    @Override
+    public void reset() {
+        SQLiteDatabase db = WellSql.giveMeWritableDb();
+        for (Class<? extends Identifiable> clazz : mStoreClassList) {
+            TableClass table = getTable(clazz);
+            db.execSQL("DROP TABLE " + table.getTableName());
+            db.execSQL(table.createStatement());
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/TestSiteSqlUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/TestSiteSqlUtils.kt
new file mode 100644
index 00000000000..0eb32eb0a88
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/TestSiteSqlUtils.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc
+
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+
+object TestSiteSqlUtils {
+    val siteSqlUtils = SiteSqlUtils()
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/UnitTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/UnitTestUtils.java
new file mode 100644
index 00000000000..49609181230
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/UnitTestUtils.java
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc;
+
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class UnitTestUtils {
+    public static final int DEFAULT_TIMEOUT_MS = 30000;
+
+    public static void waitFor(long milliseconds) {
+        try {
+            Thread.sleep(milliseconds);
+        } catch (InterruptedException e) {
+            AppLog.e(T.API, "Thread interrupted");
+        }
+    }
+
+    public static void waitForNetworkCall() {
+        waitFor(DEFAULT_TIMEOUT_MS);
+    }
+
+    public static String getStringFromResourceFile(Class clazz, String filename) {
+        try {
+            InputStream is = clazz.getClassLoader().getResourceAsStream(filename);
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+            StringBuilder buffer = new StringBuilder();
+            String lineString;
+
+            while ((lineString = bufferedReader.readLine()) != null) {
+                buffer.append(lineString);
+            }
+
+            bufferedReader.close();
+            return buffer.toString();
+        } catch (IOException e) {
+            AppLog.e(T.TESTS, "Could not load response JSON file.");
+            return null;
+        }
+    }
+}
+
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/WellSqlTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/WellSqlTestUtils.java
new file mode 100644
index 00000000000..708be2fb4cd
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/WellSqlTestUtils.java
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.AccountModel;
+
+public class WellSqlTestUtils {
+    public static void setupWordPressComAccount() {
+        AccountModel account = new AccountModel();
+        account.setUserId(20151021);
+        account.setUserName("fluxc");
+        account.setEmail("flux@capacitorsrus.co");
+
+        WellSql.insert(account).execute();
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountModelTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountModelTest.java
new file mode 100644
index 00000000000..2d20d3b56b7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountModelTest.java
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.account;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.AccountModel;
+
+public class AccountModelTest {
+    @Before
+    public void setUp() {
+    }
+
+    @Test
+    public void testEquals() {
+        AccountModel testAccount = getTestAccount();
+        AccountModel testAccount2 = getTestAccount();
+        Assert.assertFalse(testAccount.equals(new Object()));
+        Assert.assertNotNull(testAccount);
+        testAccount2.setUserId(testAccount.getUserId() + 1);
+        Assert.assertFalse(testAccount.equals(testAccount2));
+        testAccount2.setUserId(testAccount.getUserId());
+        Assert.assertTrue(testAccount.equals(testAccount2));
+    }
+
+    @Test
+    public void testCopyOnlyAccountAttributes() {
+        AccountModel testAccount = getTestAccount();
+        AccountModel copyAccount = getTestAccount();
+        copyAccount.setUserName("copyUsername");
+        copyAccount.setUserId(testAccount.getUserId() + 1);
+        copyAccount.setDisplayName("copyDisplayName");
+        copyAccount.setProfileUrl("copyProfileUrl");
+        copyAccount.setAvatarUrl("copyAvatarUrl");
+        copyAccount.setPrimarySiteId(testAccount.getPrimarySiteId() + 1);
+        copyAccount.setSiteCount(testAccount.getSiteCount() + 1);
+        copyAccount.setVisibleSiteCount(testAccount.getVisibleSiteCount() + 1);
+        copyAccount.setEmail("copyEmail");
+        copyAccount.setPendingEmailChange(!testAccount.getPendingEmailChange());
+        copyAccount.setTwoStepEnabled(!testAccount.getTwoStepEnabled());
+        copyAccount.setTracksOptOut(!testAccount.getTracksOptOut());
+        Assert.assertFalse(copyAccount.equals(testAccount));
+        testAccount.copyAccountAttributes(copyAccount);
+        Assert.assertFalse(copyAccount.equals(testAccount));
+        copyAccount.setPendingEmailChange(testAccount.getPendingEmailChange());
+        copyAccount.setTwoStepEnabled(testAccount.getTwoStepEnabled());
+        copyAccount.setTracksOptOut(testAccount.getTracksOptOut());
+        Assert.assertTrue(copyAccount.equals(testAccount));
+    }
+
+    @Test
+    public void testCopyOnlyAccountSettingsAttributes() {
+        AccountModel testAccount = getTestAccount();
+        AccountModel copyAccount = getTestAccount();
+        copyAccount.setUserName("copyUsername");
+        copyAccount.setPrimarySiteId(testAccount.getPrimarySiteId() + 1);
+        copyAccount.setFirstName("copyFirstName");
+        copyAccount.setLastName("copyLastName");
+        copyAccount.setAboutMe("copyAboutMe");
+        copyAccount.setDate("copyDate");
+        copyAccount.setNewEmail("copyNewEmail");
+        copyAccount.setPendingEmailChange(!testAccount.getPendingEmailChange());
+        copyAccount.setTwoStepEnabled(!testAccount.getTwoStepEnabled());
+        copyAccount.setTracksOptOut(!testAccount.getTracksOptOut());
+        copyAccount.setUsernameCanBeChanged(!testAccount.getUsernameCanBeChanged());
+        copyAccount.setWebAddress("copyWebAddress");
+        copyAccount.setUserId(testAccount.getUserId() + 1);
+        Assert.assertFalse(copyAccount.equals(testAccount));
+        testAccount.copyAccountSettingsAttributes(copyAccount);
+        Assert.assertFalse(copyAccount.equals(testAccount));
+        copyAccount.setUserId(testAccount.getUserId());
+        Assert.assertTrue(copyAccount.equals(testAccount));
+    }
+
+    private AccountModel getTestAccount() {
+        AccountModel testModel = new AccountModel();
+        testModel.setId(1);
+        testModel.setUserId(2);
+        return testModel;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountSqlUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountSqlUtilsTest.java
new file mode 100644
index 00000000000..7273a811cec
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountSqlUtilsTest.java
@@ -0,0 +1,132 @@
+package org.wordpress.android.fluxc.account;
+
+import android.content.ContentValues;
+import android.content.Context;
+
+import com.wellsql.generated.AccountModelTable;
+import com.yarolegovich.wellsql.WellSql;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.persistence.AccountSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccountSqlUtilsTest {
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, AccountModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testInsertNullAccount() {
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(null));
+        Assert.assertTrue(AccountSqlUtils.getAllAccounts().isEmpty());
+    }
+
+    @Test
+    public void testInsertAndRetrieveAccount() {
+        AccountModel testAccount = getTestAccount();
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        AccountModel dbAccount = AccountSqlUtils.getAccountByLocalId(testAccount.getId());
+        Assert.assertNotNull(dbAccount);
+        Assert.assertEquals(testAccount, dbAccount);
+    }
+
+    @Test
+    public void testUpdateAccount() {
+        AccountModel testAccount = getTestAccount();
+        testAccount.setUserName("test0");
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        testAccount.setUserName("test1");
+        Assert.assertEquals(1, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        AccountModel dbAccount = AccountSqlUtils.getAccountByLocalId(testAccount.getId());
+        Assert.assertEquals(testAccount, dbAccount);
+    }
+
+    @Test
+    public void testUpdateSpecificFields() {
+        AccountModel testAccount = getTestAccount();
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        String testAboutMe = "New About Me";
+        String testEmail = "newEmail";
+        ContentValues testFields = new ContentValues();
+        testFields.put(AccountModelTable.ABOUT_ME, testAboutMe);
+        testFields.put(AccountModelTable.EMAIL, testEmail);
+        testFields.put(AccountModelTable.USERNAME_CAN_BE_CHANGED, true);
+        Assert.assertEquals(1, AccountSqlUtils.updateAccount(testAccount.getId(), testFields));
+        AccountModel dbAccount = AccountSqlUtils.getAccountByLocalId(testAccount.getId());
+        Assert.assertNotNull(dbAccount);
+        Assert.assertTrue(dbAccount.getUsernameCanBeChanged());
+        Assert.assertEquals(dbAccount.getAboutMe(), testAboutMe);
+        Assert.assertEquals(dbAccount.getEmail(), testEmail);
+    }
+
+    @Test
+    public void testGetAllAccounts() {
+        AccountModel testAccount0 = getTestAccount();
+        AccountModel testAccount1 = getTestAccount();
+        testAccount1.setId(testAccount0.getId() + 1);
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateAccount(testAccount0, testAccount0.getId()));
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateAccount(testAccount1, testAccount1.getId()));
+        List<AccountModel> allAccounts = AccountSqlUtils.getAllAccounts();
+        Assert.assertNotNull(allAccounts);
+        Assert.assertEquals(2, allAccounts.size());
+    }
+
+    @Test
+    public void getDefaultAccount() {
+        AccountModel testAccount = getTestAccount();
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        AccountModel defaultAccount = AccountSqlUtils.getDefaultAccount();
+        Assert.assertNotNull(defaultAccount);
+        Assert.assertEquals(testAccount.getUserId(), defaultAccount.getUserId());
+    }
+
+    @Test
+    public void testDeleteAccount() {
+        AccountModel testAccount = getTestAccount();
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        Assert.assertEquals(1, AccountSqlUtils.deleteAccount(testAccount));
+        Assert.assertNull(AccountSqlUtils.getAccountByLocalId(testAccount.getId()));
+    }
+
+    @Test
+    public void testUpdateUsername() {
+        String firstName = "firstName";
+        String usernameBeforeChange = "usernameBeforeChange";
+        String usernameAfterChange = "usernameAfterChange";
+        AccountModel testAccount = getTestAccount();
+        testAccount.setFirstName(firstName);
+        testAccount.setUserName(usernameBeforeChange);
+        // Insert the account
+        Assert.assertEquals(0, AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount));
+        // Update username
+        Assert.assertEquals(1, AccountSqlUtils.updateUsername(testAccount, usernameAfterChange));
+        AccountModel defaultAccount = AccountSqlUtils.getDefaultAccount();
+        // verify the first name is not changed - any field except for username
+        Assert.assertEquals(firstName, defaultAccount.getFirstName());
+        // verify the username is updated
+        Assert.assertEquals(usernameAfterChange, defaultAccount.getUserName());
+    }
+
+    private AccountModel getTestAccount() {
+        AccountModel testModel = new AccountModel();
+        testModel.setId(1);
+        testModel.setUserId(2);
+        return testModel;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountStoreTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountStoreTest.java
new file mode 100644
index 00000000000..75be3d6fb76
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/account/AccountStoreTest.java
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.account;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator;
+import org.wordpress.android.fluxc.persistence.AccountSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticatePayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType;
+
+import java.lang.reflect.Method;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccountStoreTest {
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(mContext, AccountModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testLoadAccount() {
+        AccountModel testAccount = new AccountModel();
+        testAccount.setPrimarySiteId(100);
+        testAccount.setAboutMe("testAboutMe");
+        AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount);
+        AccountStore testStore = new AccountStore(new Dispatcher(), getMockRestClient(),
+                getMockSelfHostedEndpointFinder(), getMockAuthenticator(), getMockAccessToken(true));
+        Assert.assertEquals(testAccount, testStore.getAccount());
+    }
+
+    @Test
+    public void testHasAccessToken() {
+        AccountStore testStore = new AccountStore(new Dispatcher(), getMockRestClient(),
+                getMockSelfHostedEndpointFinder(), getMockAuthenticator(), getMockAccessToken(true));
+        Assert.assertTrue(testStore.hasAccessToken());
+        testStore = new AccountStore(new Dispatcher(), getMockRestClient(), getMockSelfHostedEndpointFinder(),
+                getMockAuthenticator(), getMockAccessToken(false));
+        Assert.assertFalse(testStore.hasAccessToken());
+    }
+
+    @Test
+    public void testIsSignedIn() {
+        AccountModel testAccount = new AccountModel();
+        testAccount.setVisibleSiteCount(0);
+        AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount);
+        AccountStore testStore = new AccountStore(new Dispatcher(), getMockRestClient(),
+                getMockSelfHostedEndpointFinder(), getMockAuthenticator(), getMockAccessToken(false));
+        Assert.assertFalse(testStore.hasAccessToken());
+        testAccount.setVisibleSiteCount(1);
+        AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount);
+        testStore = new AccountStore(new Dispatcher(), getMockRestClient(), getMockSelfHostedEndpointFinder(),
+                getMockAuthenticator(), getMockAccessToken(true));
+        Assert.assertTrue(testStore.hasAccessToken());
+    }
+
+    @Test
+    public void testSignOut() throws Exception {
+        AccountModel testAccount = new AccountModel();
+        AccessToken testToken = new AccessToken(mContext);
+        testToken.set("TESTTOKEN");
+        testAccount.setUserId(24);
+        AccountSqlUtils.insertOrUpdateDefaultAccount(testAccount);
+        AccountStore testStore = new AccountStore(new Dispatcher(), getMockRestClient(),
+                getMockSelfHostedEndpointFinder(), getMockAuthenticator(), testToken);
+        Assert.assertTrue(testStore.hasAccessToken());
+        // Signout is private (and it should remain private)
+        Method privateMethod = AccountStore.class.getDeclaredMethod("signOut");
+        privateMethod.setAccessible(true);
+        privateMethod.invoke(testStore);
+        Assert.assertFalse(testStore.hasAccessToken());
+        Assert.assertNull(AccountSqlUtils.getAccountByLocalId(testAccount.getId()));
+    }
+
+    @Test
+    public void testPayloadIsError() throws Exception {
+        // AuthenticateErrorPayload masks the error field of its superclass (Payload)
+        AuthenticateErrorPayload payload1 = new AuthenticateErrorPayload(AuthenticationErrorType.GENERIC_ERROR);
+        Assert.assertTrue(payload1.isError());
+        payload1.error = null;
+        Assert.assertFalse(payload1.isError());
+
+        AuthenticatePayload payload2 = new AuthenticatePayload("", "");
+        Assert.assertFalse(payload2.isError());
+        payload2.error = new BaseNetworkError(GenericErrorType.NETWORK_ERROR);
+        Assert.assertTrue(payload2.isError());
+    }
+
+    private AccountRestClient getMockRestClient() {
+        return Mockito.mock(AccountRestClient.class);
+    }
+
+    private Authenticator getMockAuthenticator() {
+        return Mockito.mock(Authenticator.class);
+    }
+
+    private AccessToken getMockAccessToken(boolean exists) {
+        AccessToken mock = Mockito.mock(AccessToken.class);
+        Mockito.when(mock.exists()).thenReturn(exists);
+        return mock;
+    }
+
+    private SelfHostedEndpointFinder getMockSelfHostedEndpointFinder() {
+        return Mockito.mock(SelfHostedEndpointFinder.class);
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt
new file mode 100644
index 00000000000..3bbe93c21ab
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentSqlUtilsTest.kt
@@ -0,0 +1,411 @@
+package org.wordpress.android.fluxc.comment
+
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.CommentStatus.ALL
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.COMMENT_LIKE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.CommentSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import java.util.ArrayList
+import java.util.Date
+
+@RunWith(RobolectricTestRunner::class)
+class CommentSqlUtilsTest {
+    val site = SiteModel().apply {
+        id = 1
+        siteId = 2
+    }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.getApplication().applicationContext
+        val config: WellSqlConfig = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                    CommentModel::class.java,
+                    LikeModel::class.java
+                )
+        )
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `removeDeletedComments correctly removes deleted comments with mixed statuses from mixed list`() {
+        val commentsInDb = generateCommentModels(60, ALL) // timestamp from 60 to 1
+        val remoteComments = generateCommentModels(33, ALL, 28) // timestamp from 60 to 28
+
+        // remove 3 comments from the middle so we will get 30 comments in the list
+        remoteComments.removeIf { it.remoteCommentId == 55L }
+        remoteComments.removeIf { it.remoteCommentId == 45L }
+        remoteComments.removeIf { it.remoteCommentId == 35L }
+
+        commentsInDb.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(60)
+
+        val numCommentsDeleted = CommentSqlUtils.removeCommentGaps(site, remoteComments, 30, 0, APPROVED, UNAPPROVED)
+        val cleanedComments = CommentSqlUtils.getCommentsForSite(
+                site,
+                SelectQuery.ORDER_DESCENDING,
+                APPROVED,
+                UNAPPROVED
+        )
+
+        Assertions.assertThat(numCommentsDeleted).isEqualTo(3)
+        Assertions.assertThat(cleanedComments.size).isEqualTo(57)
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 55L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 45L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 35L }).isNull()
+    }
+
+    @Test
+    fun `removeDeletedComments correctly removes deleted comments with one status from mixed list`() {
+        val commentsInDb = generateCommentModels(60, ALL) // timestamp from 60 to 1
+
+        commentsInDb.find { it.remoteCommentId == 55L }?.status = APPROVED.toString()
+        commentsInDb.find { it.remoteCommentId == 45L }?.status = APPROVED.toString()
+        commentsInDb.find { it.remoteCommentId == 35L }?.status = APPROVED.toString()
+
+        val remoteComments = generateCommentModels(33, APPROVED, 28) // timestamp from 60 to 28
+        // remove 3 comments from the middle so we will get 30 comments in the list
+        remoteComments.removeIf { it.remoteCommentId == 55L }
+        remoteComments.removeIf { it.remoteCommentId == 45L }
+        remoteComments.removeIf { it.remoteCommentId == 35L }
+
+        commentsInDb.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(60)
+
+        val numCommentsDeleted = CommentSqlUtils.removeCommentGaps(site, remoteComments, 30, 0, APPROVED)
+        val cleanedComments = CommentSqlUtils.getCommentsForSite(
+                site,
+                SelectQuery.ORDER_DESCENDING,
+                ALL
+        )
+
+        Assertions.assertThat(numCommentsDeleted).isEqualTo(3)
+        Assertions.assertThat(cleanedComments.size).isEqualTo(57)
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 55L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 45L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 35L }).isNull()
+    }
+
+    @Test
+    fun `removeDeletedComments removes comments from start, end and the middle of DB`() {
+        val commentsInDb = generateCommentModels(65, ALL)
+        val remoteComments = generateCommentModels(25, ALL, 4)
+
+        // 3 comments are missing from the middle
+        remoteComments.removeIf { it.remoteCommentId == 7L }
+        remoteComments.removeIf { it.remoteCommentId == 15L }
+        remoteComments.removeIf { it.remoteCommentId == 20L }
+
+        commentsInDb.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(65)
+
+        val numCommentsDeleted = CommentSqlUtils.removeCommentGaps(
+                site,
+                remoteComments,
+                30,
+                0,
+                APPROVED,
+                UNAPPROVED
+        )
+        val cleanedComments = CommentSqlUtils.getCommentsForSite(
+                site,
+                SelectQuery.ORDER_DESCENDING,
+                APPROVED,
+                UNAPPROVED
+        )
+        // from 65 comments in DB we expect to have only 22 remote comments (remove first 3, 3 from the middle and all
+        // the comments that go after last comment in remoteComments
+        Assertions.assertThat(numCommentsDeleted).isEqualTo(43)
+        Assertions.assertThat(cleanedComments.size).isEqualTo(22)
+        remoteComments.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 7L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 15L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 20L }).isNull()
+    }
+
+    @Test
+    fun `removeDeletedComments trims deleted comments from bottom of DB when reaching the end of dataset`() {
+        val commentsInDb = generateCommentModels(60, ALL)
+        val remoteComments = generateCommentModels(30, ALL)
+
+        remoteComments.removeLast()
+        remoteComments.removeLast()
+        remoteComments.removeLast()
+
+        commentsInDb.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(60)
+
+        // simulate loading more comments
+        val numCommentsDeleted = CommentSqlUtils.removeCommentGaps(
+                site,
+                remoteComments,
+                30,
+                30,
+                APPROVED,
+                UNAPPROVED
+        )
+        val cleanedComments = CommentSqlUtils.getCommentsForSite(
+                site,
+                SelectQuery.ORDER_DESCENDING,
+                APPROVED,
+                UNAPPROVED
+        )
+
+        Assertions.assertThat(numCommentsDeleted).isEqualTo(3) // we remove comment 1,2 and 3
+        Assertions.assertThat(cleanedComments.size).isEqualTo(57)
+        remoteComments.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(57)
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 1L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 2L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 3L }).isNull()
+    }
+
+    @Test
+    fun `removeDeletedComments trims deleted comments from the top of DB when beginning of dataset excludes them`() {
+        val commentsInDb = generateCommentModels(50, ALL)
+        val remoteComments = generateCommentModels(50, ALL)
+
+        // exclude first 3 comments
+        remoteComments.removeFirst()
+        remoteComments.removeFirst()
+        remoteComments.removeFirst()
+
+        commentsInDb.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(50)
+
+        val numCommentsDeleted = CommentSqlUtils.removeCommentGaps(site, remoteComments, 30, 0, ALL)
+        val cleanedComments = CommentSqlUtils.getCommentsForSite(
+                site,
+                SelectQuery.ORDER_DESCENDING,
+                APPROVED,
+                UNAPPROVED
+        )
+
+        Assertions.assertThat(numCommentsDeleted).isEqualTo(3)
+        Assertions.assertThat(cleanedComments.size).isEqualTo(47)
+        remoteComments.forEach {
+            CommentSqlUtils.insertOrUpdateComment(it)
+        }
+
+        Assertions.assertThat(
+                CommentSqlUtils.getCommentsForSite(
+                        site,
+                        SelectQuery.ORDER_DESCENDING,
+                        APPROVED,
+                        UNAPPROVED
+                ).size
+        )
+                .isEqualTo(47)
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 50L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 49L }).isNull()
+        Assertions.assertThat(cleanedComments.find { it.remoteCommentId == 48L }).isNull()
+    }
+
+    @Test
+    fun `insertOrUpdateCommentLikes insert a new like`() {
+        val siteId = 100L
+        val commentId = 1000L
+
+        val localLike = createLike(siteId, commentId)
+
+        CommentSqlUtils.insertOrUpdateCommentLikes(siteId, commentId, localLike)
+
+        val commentLikes = CommentSqlUtils.getCommentLikesByCommentId(siteId, commentId)
+        Assertions.assertThat(commentLikes).hasSize(1)
+        Assertions.assertThat(commentLikes[0].isEqual(localLike)).isTrue
+    }
+
+    @Test
+    fun `insertOrUpdateCommentLikes update a changed like`() {
+        val siteId = 100L
+        val commentId = 1000L
+
+        val localLike = createLike(siteId, commentId)
+        val localLikeChanged = createLike(siteId, commentId).apply {
+            likerSiteUrl = "https://likerSiteUrl.wordpress.com"
+        }
+
+        CommentSqlUtils.insertOrUpdateCommentLikes(siteId, commentId, localLike)
+
+        var commentLikes = CommentSqlUtils.getCommentLikesByCommentId(siteId, commentId)
+        Assertions.assertThat(commentLikes).hasSize(1)
+        Assertions.assertThat(commentLikes[0].isEqual(localLike)).isTrue
+
+        CommentSqlUtils.insertOrUpdateCommentLikes(siteId, commentId, localLikeChanged)
+
+        commentLikes = CommentSqlUtils.getCommentLikesByCommentId(siteId, commentId)
+        Assertions.assertThat(commentLikes).hasSize(1)
+        Assertions.assertThat(commentLikes[0].isEqual(localLike)).isFalse
+        Assertions.assertThat(commentLikes[0].isEqual(localLikeChanged)).isTrue
+    }
+
+    @Test
+    fun `deleteCommentLikesAndPurgeExpired deletes currently fetched data`() {
+        val siteId = 100L
+        val commentId = 1000L
+
+        val localLike = createLike(siteId, commentId)
+
+        CommentSqlUtils.insertOrUpdateCommentLikes(siteId, commentId, localLike)
+        var postLikes = CommentSqlUtils.getCommentLikesByCommentId(siteId, commentId)
+        Assertions.assertThat(postLikes).hasSize(1)
+
+        CommentSqlUtils.deleteCommentLikesAndPurgeExpired(siteId, commentId)
+        postLikes = CommentSqlUtils.getCommentLikesByCommentId(siteId, commentId)
+        Assertions.assertThat(postLikes).isEmpty()
+    }
+
+    @Test
+    fun `deleteCommentLikesAndPurgeExpired delete data older than threshold`() {
+        val siteId = 100L
+        val commentId = 1000L
+
+        val siteCommentList = listOf(
+                Triple(101L, 1000L, Date().time),
+                Triple(101L, 1001L, Date().time - LikeModel.TIMESTAMP_THRESHOLD / 2),
+                Triple(101L, 1002L, Date().time - LikeModel.TIMESTAMP_THRESHOLD * 2),
+                Triple(101L, 1003L, Date().time - LikeModel.TIMESTAMP_THRESHOLD * 2)
+        )
+
+        val expectedSizeList = listOf(1, 1, 0, 0)
+
+        val likeList = mutableListOf<LikeModel>()
+
+        for (sitePostTriple: Triple<Long, Long, Long> in siteCommentList) {
+            likeList.add(createLike(sitePostTriple.first, sitePostTriple.second, sitePostTriple.third))
+        }
+
+        for (like: LikeModel in likeList) {
+            CommentSqlUtils.insertOrUpdateCommentLikes(siteId, commentId, like)
+        }
+
+        CommentSqlUtils.deleteCommentLikesAndPurgeExpired(siteId, commentId)
+
+        siteCommentList.forEachIndexed { index, element ->
+            Assertions.assertThat(CommentSqlUtils.getCommentLikesByCommentId(element.first, element.second))
+                    .hasSize(expectedSizeList[index])
+        }
+    }
+
+    private fun generateCommentModels(num: Int, status: CommentStatus, startId: Int = 1): ArrayList<CommentModel> {
+        val commentModels = ArrayList<CommentModel>()
+        for (i in 0 until num) {
+            val comment = CommentModel()
+            comment.remoteCommentId = startId + i.toLong()
+            comment.publishedTimestamp = startId + i.toLong()
+            comment.localSiteId = site.id
+            comment.remoteSiteId = site.siteId
+            if (status == ALL) {
+                comment.status = if (i % 2 == 0) APPROVED.toString() else UNAPPROVED.toString()
+            } else {
+                comment.status = status.toString()
+            }
+            commentModels.add(comment)
+        }
+        commentModels.reverse() // we usually receive comments starting from more recent
+        return commentModels
+    }
+
+    private fun createLike(siteId: Long, commentId: Long, timeStamp: Long = Date().time) = LikeModel().apply {
+        type = COMMENT_LIKE.typeName
+        remoteSiteId = siteId
+        remoteItemId = commentId
+        likerId = 2000L
+        likerName = "likerName"
+        likerLogin = "likerLogin"
+        likerAvatarUrl = "likerAvatarUrl"
+        likerBio = "likerBio"
+        likerSiteId = 3000L
+        likerSiteUrl = "likerSiteUrl"
+        preferredBlogId = 4000L
+        preferredBlogName = "preferredBlogName"
+        preferredBlogUrl = "preferredBlogUrl"
+        preferredBlogBlavatarUrl = "preferredBlogBlavatarUrl"
+        dateLiked = "2020-04-04 11:22:34"
+        timestampFetched = timeStamp
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentStoreUnitTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentStoreUnitTest.java
new file mode 100644
index 00000000000..63fe956783f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comment/CommentStoreUnitTest.java
@@ -0,0 +1,273 @@
+package org.wordpress.android.fluxc.comment;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.CommentStatus;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.persistence.CommentSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+@RunWith(RobolectricTestRunner.class)
+public class CommentStoreUnitTest {
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.getApplication().getApplicationContext();
+        WellSqlConfig config = new WellSqlConfig(appContext);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testGetCommentBySiteAndRemoteId() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+        long remoteCommentId = 42;
+
+        // Init Comment Model
+        CommentModel commentModel = new CommentModel();
+        commentModel.setContent("Best ponies come from the future.");
+        commentModel.setLocalSiteId(siteModel.getId());
+        commentModel.setRemoteCommentId(remoteCommentId);
+        CommentSqlUtils.insertOrUpdateComment(commentModel);
+
+        // Get comment by site and remote id
+        CommentModel queriedComment = CommentSqlUtils.getCommentBySiteAndRemoteId(siteModel, remoteCommentId);
+        if (queriedComment != null) {
+            assertEquals("Best ponies come from the future.", queriedComment.getContent());
+        } else {
+            fail("Failed to instantiate new comment model!");
+        }
+    }
+
+    @Test
+    public void testMultiGetCommentBySiteAndRemoteId() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        // Get comment by site and remote id
+        CommentModel queriedComment = CommentSqlUtils.getCommentBySiteAndRemoteId(siteModel, 10);
+        if (queriedComment != null) {
+            assertEquals("Pony #10", queriedComment.getContent());
+        } else {
+            fail("Failed to instantiate new comment model!");
+        }
+
+        // Get comment by site and remote id
+        queriedComment = CommentSqlUtils.getCommentBySiteAndRemoteId(siteModel, 11);
+        if (queriedComment != null) {
+            assertEquals("Pony #11", queriedComment.getContent());
+        } else {
+            fail("Failed to instantiate new comment model!");
+        }
+
+        // Get comment by site and remote id
+        queriedComment = CommentSqlUtils.getCommentBySiteAndRemoteId(siteModel, 12);
+        if (queriedComment != null) {
+            assertEquals("Pony #12", queriedComment.getContent());
+        } else {
+            fail("Failed to instantiate new comment model!");
+        }
+    }
+
+    @Test
+    public void testFailToGetCommentBySiteAndRemoteId() {
+        assertNull(CommentSqlUtils.getCommentBySiteAndRemoteId(new SiteModel(), 42));
+    }
+
+
+    @Test
+    public void testGetCommentBySiteAscendingOrder() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+        insertTestComments(siteModel);
+
+        List<CommentModel> ascComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.ALL);
+        CommentModel previousComment = ascComments.get(0);
+        for (CommentModel comment : ascComments.subList(1, ascComments.size())) {
+            Date d0 = DateTimeUtils.dateFromIso8601(previousComment.getDatePublished());
+            Date d1 = DateTimeUtils.dateFromIso8601(comment.getDatePublished());
+            assertTrue("ascending comment list seems incorrectly ordered", d0.before(d1));
+            previousComment = comment;
+        }
+    }
+
+    @Test
+    public void testGetCommentBySiteDescendingOrder() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+        insertTestComments(siteModel);
+
+        List<CommentModel> ascComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_DESCENDING,
+                CommentStatus.ALL);
+        CommentModel previousComment = ascComments.get(0);
+        for (CommentModel comment : ascComments.subList(1, ascComments.size())) {
+            Date d0 = DateTimeUtils.dateFromIso8601(previousComment.getDatePublished());
+            Date d1 = DateTimeUtils.dateFromIso8601(comment.getDatePublished());
+            assertTrue("descending comment list seems incorrectly ordered", d1.before(d0));
+            previousComment = comment;
+        }
+    }
+
+    @Test
+    public void testGetCommentsBySingleStatus() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        // Get APPROVED comments
+        List<CommentModel> queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.APPROVED);
+        assertEquals(8, queriedComments.size());
+
+        // Get TRASH comments
+        queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.TRASH);
+        assertEquals(1, queriedComments.size());
+
+        // Get ALL comments
+        queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING, CommentStatus.ALL);
+        assertEquals(15, queriedComments.size());
+    }
+
+    @Test
+    public void testGetCommentsByMultipleStatuses() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        // Get APPROVED, UNAPPROVED and SPAM comments
+        List<CommentModel> queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.APPROVED, CommentStatus.SPAM, CommentStatus.UNAPPROVED);
+        assertEquals(14, queriedComments.size());
+
+        // Get SPAM and UNAPPROVED comments
+        queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.SPAM, CommentStatus.UNAPPROVED);
+        assertEquals(6, queriedComments.size());
+    }
+
+    @Test
+    public void testGetCommentCountBySingleStatus() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        // Get APPROVED count
+        assertEquals(8, CommentSqlUtils.getCommentsCountForSite(siteModel, CommentStatus.APPROVED));
+
+        // Get TRASH count
+        assertEquals(1, CommentSqlUtils.getCommentsCountForSite(siteModel, CommentStatus.TRASH));
+
+        // Get ALL comments
+        assertEquals(15, CommentSqlUtils.getCommentsCountForSite(siteModel, CommentStatus.ALL));
+    }
+
+    @Test
+    public void testGetCommentCountByMultipleStatuses() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        // Get SPAM and UNAPPROVED comments
+        assertEquals(6, CommentSqlUtils.getCommentsCountForSite(siteModel, CommentStatus.SPAM,
+                CommentStatus.UNAPPROVED));
+
+        // Get ALL (and SPAM) comments
+        assertEquals(15, CommentSqlUtils.getCommentsCountForSite(siteModel, CommentStatus.SPAM, CommentStatus.ALL));
+    }
+
+    @Test
+    public void testRemoveAllComments() {
+        SiteModel site1 = new SiteModel();
+        site1.setId(21);
+        insertTestComments(site1);
+
+        SiteModel site2 = new SiteModel();
+        site2.setId(22);
+        insertTestComments(site2);
+
+        // Make sure the comments are inserted successfully before
+        assertEquals(15, CommentSqlUtils.getCommentsCountForSite(site1, CommentStatus.ALL));
+        assertEquals(15, CommentSqlUtils.getCommentsCountForSite(site2, CommentStatus.ALL));
+
+        CommentSqlUtils.deleteAllComments();
+
+        // Test if all the comments are deleted successfully
+        assertEquals(0, CommentSqlUtils.getCommentsCountForSite(site1, CommentStatus.ALL));
+        assertEquals(0, CommentSqlUtils.getCommentsCountForSite(site2, CommentStatus.ALL));
+    }
+
+    private void insertTestComments(SiteModel siteModel) {
+        // Init Comment Models
+        insertNewComment(siteModel, "Pony #10", 10, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #11", 11, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #12", 12, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #13", 13, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #14", 14, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #15", 15, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #16", 16, CommentStatus.APPROVED);
+        insertNewComment(siteModel, "Pony #17", 17, CommentStatus.APPROVED);
+
+        insertNewComment(siteModel, "Pony #20", 20, CommentStatus.UNAPPROVED);
+        insertNewComment(siteModel, "Pony #21", 21, CommentStatus.UNAPPROVED);
+        insertNewComment(siteModel, "Pony #22", 22, CommentStatus.UNAPPROVED);
+        insertNewComment(siteModel, "Pony #23", 23, CommentStatus.UNAPPROVED);
+
+        insertNewComment(siteModel, "Pony #30", 30, CommentStatus.SPAM);
+        insertNewComment(siteModel, "Pony #31", 31, CommentStatus.SPAM);
+
+        insertNewComment(siteModel, "Pony #40", 40, CommentStatus.TRASH);
+    }
+
+    private void insertNewComment(SiteModel site, String content, long remoteId, CommentStatus status) {
+        CommentModel commentModel = new CommentModel();
+        commentModel.setLocalSiteId(site.getId());
+        commentModel.setContent(content);
+        commentModel.setRemoteCommentId(remoteId);
+        commentModel.setStatus(status.toString());
+        commentModel.setDatePublished(DateTimeUtils.iso8601FromTimestamp(new Random().nextInt()));
+        commentModel.setUrl("https://www.wordpress.com");
+        CommentSqlUtils.insertOrUpdateComment(commentModel);
+    }
+
+    @Test
+    public void testGetCommentsIncludeURL() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(21);
+
+        insertTestComments(siteModel);
+
+        List<CommentModel> queriedComments = CommentSqlUtils.getCommentsForSite(siteModel, SelectQuery.ORDER_ASCENDING,
+                CommentStatus.APPROVED, CommentStatus.SPAM, CommentStatus.UNAPPROVED);
+        for (CommentModel commentModel : queriedComments) {
+            assertNotNull(commentModel.getUrl());
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsStoreTest.kt
new file mode 100644
index 00000000000..3238a0458c4
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsStoreTest.kt
@@ -0,0 +1,762 @@
+package org.wordpress.android.fluxc.comments
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.CommentStatus.DELETED
+import org.wordpress.android.fluxc.model.CommentStatus.SPAM
+import org.wordpress.android.fluxc.model.CommentStatus.TRASH
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.common.comments.CommentsApiPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentLikeWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentsRestClient
+import org.wordpress.android.fluxc.network.xmlrpc.comment.CommentsXMLRPCClient
+import org.wordpress.android.fluxc.persistence.comments.CommentEntityList
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.CommentsStore
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.CommentsActionData
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.CommentsActionEntityIds
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.PagingData
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class CommentsStoreTest {
+    @Mock lateinit var restClient: CommentsRestClient
+    @Mock lateinit var xmlRpcClient: CommentsXMLRPCClient
+    @Mock lateinit var commentsDao: CommentsDao
+    @Mock lateinit var mapper: CommentsMapper
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var appLogWrapper: AppLogWrapper
+
+    private lateinit var commentsStore: CommentsStore
+    private val commentError = CommentError(GENERIC_ERROR, "")
+
+    @Before
+    fun setUp() {
+        commentsStore = CommentsStore(
+                commentsRestClient = restClient,
+                commentsXMLRPCClient = xmlRpcClient,
+                commentsDao = commentsDao,
+                commentsMapper = mapper,
+                coroutineEngine = initCoroutineEngine(),
+                dispatcher = dispatcher,
+                appLogWrapper = appLogWrapper
+        )
+        whenever(site.id).thenReturn(SITE_LOCAL_ID)
+        whenever(site.isUsingWpComRestApi).thenReturn(true)
+
+        test {
+            whenever(commentsDao.removeGapsFromTheTop(any(), any(), any(), any())).thenReturn(0)
+            whenever(commentsDao.removeGapsFromTheBottom(any(), any(), any(), any())).thenReturn(0)
+            whenever(commentsDao.removeGapsFromTheMiddle(any(), any(), any(), any(), any())).thenReturn(0)
+        }
+    }
+
+    @Test
+    fun `getCommentsForSite returns comments from cache`() = test {
+        commentsStore.getCommentsForSite(
+                site = site,
+                orderByDateAscending = false,
+                limit = -1,
+                statuses = listOf(APPROVED).toTypedArray()
+        )
+
+        verify(commentsDao, times(1)).getCommentsByLocalSiteId(
+                site.id,
+                listOf(APPROVED.toString()),
+                -1,
+                false
+        )
+    }
+
+    @Test
+    fun `fetchComments returns fetched ids for WPCom`() = test {
+        val comments = getDefaultCommentList()
+        whenever(restClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(comments))
+        whenever(commentsDao.insertOrUpdateComment(any())).thenReturn(10)
+
+        val result = commentsStore.fetchComments(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED
+        )
+
+        verify(restClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat((result.data as CommentsActionEntityIds).entityIds.size).isEqualTo(comments.size)
+    }
+
+    @Test
+    fun `fetchComments returns fetched ids for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comments = getDefaultCommentList()
+        whenever(xmlRpcClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(comments))
+        whenever(commentsDao.insertOrUpdateComment(any())).thenReturn(10)
+
+        val result = commentsStore.fetchComments(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED
+        )
+
+        verify(xmlRpcClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat((result.data as CommentsActionEntityIds).entityIds.size).isEqualTo(comments.size)
+    }
+
+    @Test
+    fun `fetchComments returns error on failure`() = test {
+        whenever(restClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.fetchComments(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED
+        )
+
+        verify(restClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `fetchComment returns fetched comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.fetchComment(any(), any())).thenReturn(CommentsApiPayload(comment))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `fetchComment returns fetched comment for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first()
+        whenever(xmlRpcClient.fetchComment(any(), any())).thenReturn(CommentsApiPayload(comment))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(xmlRpcClient, times(1)).fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `fetchComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.fetchComment(any(), any())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `createNewComment returns new comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.createNewComment(any(), anyLong(), anyOrNull())).thenReturn(CommentsApiPayload(comment))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.createNewComment(
+                site = site,
+                comment
+        )
+
+        verify(restClient, times(1)).createNewComment(
+                site = site,
+                remotePostId = comment.remotePostId,
+                content = comment.content
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `createNewComment returns new comment for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first()
+        whenever(xmlRpcClient.createNewComment(any(), anyLong(), any())).thenReturn(CommentsApiPayload(comment))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.createNewComment(
+                site = site,
+                comment
+        )
+
+        verify(xmlRpcClient, times(1)).createNewComment(
+                site = site,
+                remotePostId = comment.remotePostId,
+                comment = comment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `createNewComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.createNewComment(any(), anyLong(), anyOrNull()))
+                .thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.createNewComment(
+                site = site,
+                comment
+        )
+
+        verify(restClient, times(1)).createNewComment(
+                site = site,
+                remotePostId = comment.remotePostId,
+                content = comment.content
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `createNewReply returns new reply for WPCom`() = test {
+        val comment = getDefaultCommentList().first()
+        val reply = comment.copy(id = comment.id + 1, content = "this is a reply")
+        whenever(restClient.createNewReply(any(), anyLong(), anyOrNull())).thenReturn(CommentsApiPayload(reply))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(reply))
+
+        val result = commentsStore.createNewReply(
+                site = site,
+                comment,
+                reply
+        )
+
+        verify(restClient, times(1)).createNewReply(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                replayContent = reply.content
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first().content).isEqualTo(reply.content)
+    }
+
+    @Test
+    fun `createNewReply returns new reply for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first()
+        val reply = comment.copy(id = comment.id + 1, content = "this is a reply")
+        whenever(xmlRpcClient.createNewReply(any(), any(), any())).thenReturn(CommentsApiPayload(reply))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(reply))
+
+        val result = commentsStore.createNewReply(
+                site = site,
+                comment,
+                reply
+        )
+
+        verify(xmlRpcClient, times(1)).createNewReply(
+                site = site,
+                comment = comment,
+                reply = reply
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first().content).isEqualTo(reply.content)
+    }
+
+    @Test
+    fun `createNewReply returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        val reply = comment.copy(id = comment.id + 1, content = "this is a reply")
+        whenever(restClient.createNewReply(any(), anyLong(), anyOrNull())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.createNewReply(
+                site = site,
+                comment = comment,
+                reply = reply
+        )
+
+        verify(restClient, times(1)).createNewReply(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                replayContent = reply.content
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `pushComment returns updated comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first().copy(id = 220)
+        val commentFromEndpoint = comment.copy(id = 0)
+        whenever(restClient.pushComment(any(), any())).thenReturn(CommentsApiPayload(commentFromEndpoint))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.pushComment(
+                site = site,
+                comment
+        )
+
+        verify(restClient, times(1)).pushComment(
+                site = site,
+                comment = comment
+        )
+        verify(commentsDao, times(1)).insertOrUpdateCommentForResult(
+                comment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `pushComment returns updated comment for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first().copy(id = 220)
+        val commentFromEndpoint = comment.copy(id = 0)
+        whenever(xmlRpcClient.pushComment(any(), any())).thenReturn(CommentsApiPayload(commentFromEndpoint))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.pushComment(
+                site = site,
+                comment
+        )
+
+        verify(xmlRpcClient, times(1)).pushComment(
+                site = site,
+                comment = comment
+        )
+        verify(commentsDao, times(1)).insertOrUpdateCommentForResult(
+                comment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `pushComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.pushComment(any(), any())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.pushComment(
+                site = site,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).pushComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `updateEditComment returns updated comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first().copy(id = 220)
+        val commentFromEndpoint = comment.copy(id = 0)
+        whenever(restClient.updateEditComment(any(), any())).thenReturn(CommentsApiPayload(commentFromEndpoint))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.updateEditComment(
+                site = site,
+                comment
+        )
+
+        verify(restClient, times(1)).updateEditComment(
+                site = site,
+                comment = comment
+        )
+        verify(commentsDao, times(1)).insertOrUpdateCommentForResult(
+                comment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `updateEditComment returns updated comment for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first().copy(id = 220)
+        val commentFromEndpoint = comment.copy(id = 0)
+        whenever(xmlRpcClient.updateEditComment(any(), any())).thenReturn(CommentsApiPayload(commentFromEndpoint))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(comment))
+
+        val result = commentsStore.updateEditComment(
+                site = site,
+                comment
+        )
+
+        verify(xmlRpcClient, times(1)).updateEditComment(
+                site = site,
+                comment = comment
+        )
+        verify(commentsDao, times(1)).insertOrUpdateCommentForResult(
+                comment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(comment)
+    }
+
+    @Test
+    fun `updateEditComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.updateEditComment(any(), any())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.updateEditComment(
+                site = site,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).updateEditComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `deleteComment returns updated comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first()
+        val commentApiResponse = comment.copy(status = DELETED.toString(), id = 0)
+        whenever(restClient.deleteComment(any(), anyLong())).thenReturn(CommentsApiPayload(commentApiResponse))
+        whenever(commentsDao.deleteComment(any())).thenReturn(1)
+
+        val result = commentsStore.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        val deletedComment = commentApiResponse.copy(id = comment.id)
+
+        verify(commentsDao, times(1)).deleteComment(
+                deletedComment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(deletedComment)
+    }
+
+    @Test
+    fun `deleteComment returns updated comment for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first().copy(status = TRASH.toString())
+        val commentApiResponse = comment.copy(status = DELETED.toString(), id = 0)
+        whenever(xmlRpcClient.deleteComment(any(), anyLong())).thenReturn(CommentsApiPayload(commentApiResponse))
+        whenever(commentsDao.deleteComment(any())).thenReturn(1)
+
+        val result = commentsStore.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(xmlRpcClient, times(1)).deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        val deletedComment = commentApiResponse.copy(id = comment.id)
+
+        verify(commentsDao, times(1)).deleteComment(
+                deletedComment
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(deletedComment)
+    }
+
+    @Test
+    fun `deleteComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first()
+        whenever(restClient.deleteComment(any(), anyLong())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment
+        )
+
+        verify(restClient, times(1)).deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `likeComment returns updated comment for WPCom`() = test {
+        val comment = getDefaultCommentList().first().copy(id = 220, iLike = false)
+        val commentApiResponse = comment.copy(iLike = true)
+        whenever(restClient.likeComment(any(), anyLong(), anyBoolean())).thenReturn(CommentsApiPayload(
+                CommentLikeWPComRestResponse().apply { i_like = true }
+        ))
+        whenever(commentsDao.insertOrUpdateCommentForResult(any())).thenReturn(listOf(commentApiResponse))
+
+        val result = commentsStore.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment,
+                isLike = commentApiResponse.iLike
+        )
+
+        verify(restClient, times(1)).likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                isLike = commentApiResponse.iLike
+
+        )
+        verify(commentsDao, times(1)).insertOrUpdateCommentForResult(
+                commentApiResponse
+        )
+
+        assertThat((result.data as CommentsActionData).comments.first()).isEqualTo(commentApiResponse)
+    }
+
+    @Test
+    fun `likeComment give error for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comment = getDefaultCommentList().first().copy(id = 220, iLike = false)
+        val commentApiResponse = comment.copy(iLike = true)
+
+        val result = commentsStore.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment,
+                isLike = commentApiResponse.iLike
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `likeComment returns error on failure`() = test {
+        val comment = getDefaultCommentList().first().copy(id = 220, iLike = false)
+        val commentApiResponse = comment.copy(iLike = true)
+        whenever(restClient.likeComment(any(), anyLong(), anyBoolean())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment = comment,
+                isLike = commentApiResponse.iLike
+        )
+
+        verify(restClient, times(1)).likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                isLike = commentApiResponse.iLike
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    @Test
+    fun `fetchCommentsPage returns fetched paging data for WPCom`() = test {
+        val comments = getDefaultCommentList()
+        whenever(restClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(comments))
+        whenever(commentsDao.appendOrUpdateComments(any())).thenReturn(comments.size)
+        whenever(commentsDao.getCommentsByLocalSiteId(anyInt(), any(), anyInt(), anyBoolean())).thenReturn(comments)
+
+        val result = commentsStore.fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED,
+                cacheStatuses = listOf(APPROVED)
+        )
+
+        verify(restClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        verify(commentsDao, times(1)).getCommentsByLocalSiteId(
+                localSiteId = site.id,
+                statuses = listOf(APPROVED.toString()),
+                limit = 0 + comments.size,
+                orderAscending = false
+        )
+
+        assertThat((result.data as PagingData).comments).isEqualTo(comments)
+    }
+
+    @Test
+    fun `fetchCommentsPage returns fetched paging data for Self-Hosted`() = test {
+        whenever(site.isUsingWpComRestApi).thenReturn(false)
+        val comments = getDefaultCommentList()
+        whenever(xmlRpcClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(comments))
+        whenever(commentsDao.appendOrUpdateComments(any())).thenReturn(comments.size)
+        whenever(commentsDao.getCommentsByLocalSiteId(anyInt(), any(), anyInt(), anyBoolean())).thenReturn(comments)
+
+        val result = commentsStore.fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED,
+                cacheStatuses = listOf(APPROVED)
+        )
+
+        verify(xmlRpcClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        verify(commentsDao, times(1)).getCommentsByLocalSiteId(
+                localSiteId = site.id,
+                statuses = listOf(APPROVED.toString()),
+                limit = 0 + comments.size,
+                orderAscending = false
+        )
+
+        assertThat((result.data as PagingData).comments).isEqualTo(comments)
+    }
+
+    @Test
+    fun `fetchCommentsPage returns error on failure`() = test {
+        whenever(restClient.fetchCommentsPage(any(), any(), any(), any())).thenReturn(CommentsApiPayload(commentError))
+
+        val result = commentsStore.fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                networkStatusFilter = APPROVED,
+                cacheStatuses = listOf(APPROVED)
+        )
+
+        verify(restClient, times(1)).fetchCommentsPage(
+                site = site,
+                number = NUMBER_PER_PAGE,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(result.isError).isTrue
+    }
+
+    private fun getDefaultComment() = CommentEntity(
+            id = 1,
+            remoteCommentId = 10,
+            remotePostId = 100,
+            authorId = 1_000,
+            localSiteId = 10_000,
+            remoteSiteId = 100_000,
+            authorUrl = null,
+            authorName = null,
+            authorEmail = null,
+            authorProfileImageUrl = null,
+            postTitle = null,
+            status = APPROVED.toString(),
+            datePublished = null,
+            publishedTimestamp = 1_000_000,
+            content = null,
+            url = null,
+            hasParent = false,
+            parentId = 10_000_000,
+            iLike = false
+    )
+
+    private fun getDefaultCommentList(): CommentEntityList {
+        val comment = getDefaultComment()
+        return listOf(
+                comment.copy(
+                        id = 1,
+                        remoteCommentId = 10,
+                        datePublished = "2021-07-24T00:51:43+02:00",
+                        status = APPROVED.toString()
+                ),
+                comment.copy(
+                        id = 2,
+                        remoteCommentId = 20,
+                        datePublished = "2021-07-24T00:52:43+02:00",
+                        status = UNAPPROVED.toString()
+                ),
+                comment.copy(
+                        id = 3,
+                        remoteCommentId = 30,
+                        datePublished = "2021-07-24T00:53:43+02:00",
+                        status = APPROVED.toString()
+                ),
+                comment.copy(
+                        id = 4,
+                        remoteCommentId = 40,
+                        datePublished = "2021-07-24T00:54:43+02:00",
+                        status = SPAM.toString()
+                )
+        )
+    }
+
+    companion object {
+        private const val SITE_LOCAL_ID = 200
+        private const val NUMBER_PER_PAGE = 30
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsXMLRPCClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsXMLRPCClientTest.kt
new file mode 100644
index 00000000000..38d920fa354
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/comments/CommentsXMLRPCClientTest.kt
@@ -0,0 +1,443 @@
+package org.wordpress.android.fluxc.comments
+
+import com.android.volley.NetworkResponse
+import com.android.volley.RequestQueue
+import com.android.volley.Response
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.HTTPAuthManager
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder
+import org.wordpress.android.fluxc.network.xmlrpc.comment.CommentsXMLRPCClient
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.utils.CommentErrorUtilsWrapper
+import org.wordpress.android.fluxc.utils.DateTimeUtilsWrapper
+import java.util.concurrent.CountDownLatch
+
+@RunWith(RobolectricTestRunner::class)
+class CommentsXMLRPCClientTest {
+    private lateinit var dispatcher: Dispatcher
+    private lateinit var requestQueue: RequestQueue
+    private lateinit var userAgent: UserAgent
+    private lateinit var httpAuthManager: HTTPAuthManager
+    private lateinit var commentsMapper: CommentsMapper
+    private lateinit var commentErrorUtilsWrapper: CommentErrorUtilsWrapper
+    private lateinit var site: SiteModel
+
+    private lateinit var xmlRpcClient: CommentsXMLRPCClient
+    private var mockedResponse = ""
+    private var countDownLatch: CountDownLatch? = null
+
+    @Before
+    @Suppress("UNCHECKED_CAST")
+    fun setUp() {
+        dispatcher = Mockito.mock(Dispatcher::class.java)
+        requestQueue = Mockito.mock(RequestQueue::class.java)
+        userAgent = Mockito.mock(UserAgent::class.java)
+        httpAuthManager = Mockito.mock(HTTPAuthManager::class.java)
+        commentErrorUtilsWrapper = Mockito.mock(CommentErrorUtilsWrapper::class.java)
+        commentsMapper = CommentsMapper(DateTimeUtilsWrapper())
+        site = Mockito.mock(SiteModel::class.java)
+
+        doAnswer { invocation ->
+            val request = invocation.arguments[0] as XMLRPCRequest
+            try {
+                val requestClass = Class.forName(
+                        "org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest"
+                ) as Class<XMLRPCRequest>
+                // Reflection code equivalent to:
+                // Object o = request.parseNetworkResponse(data)
+                val parseNetworkResponse = requestClass.getDeclaredMethod(
+                        "parseNetworkResponse",
+                        NetworkResponse::class.java
+                )
+                parseNetworkResponse.isAccessible = true
+                val nr = NetworkResponse(mockedResponse.toByteArray())
+                val o = parseNetworkResponse.invoke(request, nr) as Response<Any>
+                // Reflection code equivalent to:
+                // request.deliverResponse(o)
+                val deliverResponse = requestClass.getDeclaredMethod("deliverResponse", Any::class.java)
+                deliverResponse.isAccessible = true
+                deliverResponse.invoke(request, o.result)
+            } catch (e: Exception) {
+                Assert.assertTrue("Unexpected exception: $e", false)
+            }
+            countDownLatch?.countDown()
+            null
+        }.whenever(requestQueue).add<Any>(any())
+
+        xmlRpcClient = CommentsXMLRPCClient(
+                dispatcher = dispatcher,
+                requestQueue = requestQueue,
+                userAgent = userAgent,
+                httpAuthManager = httpAuthManager,
+                commentErrorUtilsWrapper = commentErrorUtilsWrapper,
+                xmlrpcRequestBuilder = XMLRPCRequestBuilder(),
+                commentsMapper = commentsMapper
+        )
+
+        whenever(site.selfHostedSiteId).thenReturn(SITE_ID)
+        whenever(site.username).thenReturn("username")
+        whenever(site.password).thenReturn("password")
+        whenever(site.xmlRpcUrl).thenReturn("https://self-hosted/xmlrpc.php")
+    }
+
+    @Test
+    fun `fetchCommentsPage returns fetched page`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><array><data>
+            <value><struct><member><name>date_created_gmt</name><value><dateTime.iso8601>20210727T23:56:21
+            </dateTime.iso8601></value></member><member><name>user_id</name><value><string>1</string>
+            </value></member><member><name>comment_id</name><value><string>44</string></value></member>
+            <member><name>parent</name><value><string>41</string></value></member><member><name>status</name>
+            <value><string>hold</string></value></member><member><name>content</name><value><string>
+            this is a content example</string></value></member><member><name>link</name><value><string>
+            http://test-debug/index.php/2021/04/01/happy-monday/#comment-44</string></value>
+            </member><member><name>post_id</name><value><string>367</string></value></member>
+            <member><name>post_title</name><value><string>happy-monday</string></value></member>
+            <member><name>author</name><value><string>authorname</string></value></member><member>
+            <name>author_url</name><value><string></string></value></member><member><name>author_email</name>
+            <value><string>authorname@mydomain.com</string></value></member><member><name>author_ip
+            </name><value><string>111.222.333.444</string></value></member><member><name>type
+            </name><value><string></string></value></member></struct></value></data>
+            </array></value></param></params></methodResponse>
+        """
+
+        val payload = xmlRpcClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response).isNotEmpty
+    }
+
+    @Test
+    fun `fetchCommentsPage returns error on API fail`() = test {
+        mockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse><params><param><value>
+            <string>error</string>
+            </value></param></params></methodResponse>
+        """
+
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any())).thenReturn(CommentError(GENERIC_ERROR, ""))
+
+        val payload = xmlRpcClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isTrue
+    }
+
+    @Test
+    fun `fetchCommentsPage returns error without crashing when username is null`() = test {
+        mockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+                            <methodResponse>
+                              <fault>
+                                <value>
+                                  <struct>
+                                    <member>
+                                      <name>faultCode</name>
+                                      <value><int>403</int></value>
+                                    </member>
+                                    <member>
+                                      <name>faultString</name>
+                                      <value><string>Incorrect username or password.</string></value>
+                                    </member>
+                                  </struct>
+                                </value>
+                              </fault>
+                            </methodResponse>
+        """
+
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any())).thenReturn(CommentError(GENERIC_ERROR, ""))
+        whenever(site.username).thenReturn(null)
+
+        val payload = xmlRpcClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isTrue
+    }
+
+    @Test
+    fun `fetchCommentsPage returns error without crashing when password is null`() = test {
+        mockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+                            <methodResponse>
+                              <fault>
+                                <value>
+                                  <struct>
+                                    <member>
+                                      <name>faultCode</name>
+                                      <value><int>403</int></value>
+                                    </member>
+                                    <member>
+                                      <name>faultString</name>
+                                      <value><string>Incorrect username or password.</string></value>
+                                    </member>
+                                  </struct>
+                                </value>
+                              </fault>
+                            </methodResponse>
+        """
+
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any())).thenReturn(CommentError(GENERIC_ERROR, ""))
+        whenever(site.password).thenReturn(null)
+
+        val payload = xmlRpcClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isTrue
+    }
+
+    @Test
+    fun `pushComment returns pushed comment`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <boolean>1</boolean>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+
+        val payload = xmlRpcClient.pushComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response).isEqualTo(comment)
+    }
+
+    @Test
+    fun `updateEditComment returns pushed comment`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <boolean>1</boolean>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+
+        val payload = xmlRpcClient.updateEditComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response).isEqualTo(comment)
+    }
+
+    @Test
+    @Suppress("MaxLineLength")
+    fun `fetchComment returns fetched comment`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <struct>
+              <member><name>date_created_gmt</name><value><dateTime.iso8601>20210727T20:33:41</dateTime.iso8601></value></member>
+              <member><name>user_id</name><value><string>44</string></value></member>
+              <member><name>comment_id</name><value><string>34</string></value></member>
+              <member><name>parent</name><value><string>33</string></value></member>
+              <member><name>status</name><value><string>approve</string></value></member>
+              <member><name>content</name><value><string>test1000</string></value></member>
+              <member><name>link</name><value><string>http://test-debug.org/index.php/2021/04/01/no-jp/#comment-34</string></value></member>
+              <member><name>post_id</name><value><string>367</string></value></member>
+              <member><name>post_title</name><value><string>no jp</string></value></member>
+              <member><name>author</name><value><string>authorname</string></value></member>
+              <member><name>author_url</name><value><string></string></value></member>
+              <member><name>author_email</name><value><string>authorname@mydomain.com</string></value></member>
+              <member><name>author_ip</name><value><string>111.111.111.111</string></value></member>
+              <member><name>type</name><value><string></string></value></member>
+            </struct>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+
+        val payload = xmlRpcClient.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response).isEqualTo(comment)
+    }
+
+    @Test
+    fun `fetchComment returns error on API fail`() = test {
+        mockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse><params><param><value>
+            <string>error</string>
+            </value></param></params></methodResponse>
+        """
+
+        val comment = getDefaultComment()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any())).thenReturn(CommentError(GENERIC_ERROR, ""))
+
+        val payload = xmlRpcClient.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isTrue
+    }
+
+    @Test
+    fun `deleteComment returns no comment`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <boolean>1</boolean>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+
+        val payload = xmlRpcClient.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response).isNull()
+    }
+
+    @Test
+    fun `createNewReply returns updated reply`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <int>56</int>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+        val reply = comment.copy(content = "new reply content")
+
+        val payload = xmlRpcClient.createNewReply(
+                site = site,
+                comment = comment,
+                reply = reply
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response is CommentEntity).isTrue
+        assertThat((payload.response as CommentEntity).remoteCommentId).isEqualTo(56)
+    }
+
+    @Test
+    fun `createNewComment returns updated comment`() = test {
+        mockedResponse = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <methodResponse>
+              <params>
+                <param>
+                  <value>
+                  <int>56</int>
+                  </value>
+                </param>
+              </params>
+            </methodResponse>
+        """
+
+        val comment = getDefaultComment()
+
+        val payload = xmlRpcClient.createNewComment(
+                site = site,
+                remotePostId = 100,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(payload.response is CommentEntity).isTrue
+        assertThat((payload.response as CommentEntity).remoteCommentId).isEqualTo(56)
+    }
+
+    private fun getDefaultComment() = CommentEntity(
+            id = 0,
+            remoteCommentId = 34,
+            remotePostId = 367,
+            authorId = 44,
+            localSiteId = 0,
+            remoteSiteId = 200,
+            authorUrl = "",
+            authorName = "authorname",
+            authorEmail = "authorname@mydomain.com",
+            authorProfileImageUrl = null,
+            postTitle = "no jp",
+            status = "approved",
+            datePublished = "2021-07-27T20:33:41+00:00",
+            publishedTimestamp = 0,
+            content = "test1000",
+            url = "http://test-debug.org/index.php/2021/04/01/no-jp/#comment-34",
+            hasParent = true,
+            parentId = 33,
+            iLike = false
+    )
+
+    companion object {
+        private const val SITE_ID = 200L
+        private const val PAGE_LEN = 30
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/CommentsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/CommentsMapperTest.kt
new file mode 100644
index 00000000000..564422e7777
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/CommentsMapperTest.kt
@@ -0,0 +1,226 @@
+package org.wordpress.android.fluxc.common
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentParent
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.Author
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.Post
+import org.wordpress.android.fluxc.persistence.comments.CommentEntityList
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.utils.DateTimeUtilsWrapper
+import java.util.Date
+
+class CommentsMapperTest {
+    private val dateTimeUtilsWrapper: DateTimeUtilsWrapper = mock()
+    private val mapper = CommentsMapper(dateTimeUtilsWrapper)
+
+    @Test
+    fun `xmlrpc dto is converted to entity`() {
+        val comment = getDefaultComment(false).copy(
+                authorProfileImageUrl = null,
+                datePublished = "2021-07-29T21:29:27+00:00"
+        )
+        val site = SiteModel().apply {
+            id = comment.localSiteId
+            selfHostedSiteId = comment.remoteSiteId
+        }
+        val xmlRpcDto = comment.toXmlRpcDto()
+
+        whenever(dateTimeUtilsWrapper.timestampFromIso8601(any())).thenReturn(comment.publishedTimestamp)
+        whenever(dateTimeUtilsWrapper.iso8601UTCFromDate(any())).thenReturn(comment.datePublished)
+        val mappedEntity = mapper.commentXmlRpcDTOToEntity(xmlRpcDto, site)
+
+        assertThat(mappedEntity).isEqualTo(comment)
+    }
+
+    @Test
+    fun `xmlrpc dto list is converted to entity list`() {
+        val commentList = getDefaultCommentList(false).map { it.copy(
+            id = 0,
+            authorProfileImageUrl = null
+        ) }
+        val site = SiteModel().apply {
+            id = commentList.first().localSiteId
+            selfHostedSiteId = commentList.first().remoteSiteId
+        }
+        val xmlRpcDtoList = commentList.map { it.toXmlRpcDto() }
+
+        whenever(dateTimeUtilsWrapper.timestampFromIso8601(any())).thenReturn(commentList.first().publishedTimestamp)
+        whenever(dateTimeUtilsWrapper.iso8601UTCFromDate(any())).thenReturn(commentList.first().datePublished)
+
+        val mappedEntityList = mapper.commentXmlRpcDTOToEntityList(xmlRpcDtoList.toTypedArray(), site)
+
+        assertThat(mappedEntityList).isEqualTo(commentList)
+    }
+
+    @Test
+    fun `dto is converted to entity`() {
+        val comment = getDefaultComment(true).copy(datePublished = "2021-07-29T21:29:27+00:00")
+        val site = SiteModel().apply {
+            id = comment.localSiteId
+            siteId = comment.remoteSiteId
+        }
+        val commentDto = comment.toDto()
+
+        whenever(dateTimeUtilsWrapper.timestampFromIso8601(any())).thenReturn(comment.publishedTimestamp)
+        val mappedEntity = mapper.commentDtoToEntity(commentDto, site)
+
+        assertThat(mappedEntity).isEqualTo(comment)
+    }
+
+    @Test
+    fun `entity is converted to model`() {
+        val comment = getDefaultComment(true).copy(datePublished = "2021-07-29T21:29:27+00:00")
+        val commentModel = comment.toModel()
+
+        val mappedModel = mapper.commentEntityToLegacyModel(comment)
+
+        assertModelsEqual(mappedModel, commentModel)
+    }
+
+    @Test
+    fun `model is converted to entity`() {
+        val comment = getDefaultComment(true).copy(datePublished = "2021-07-29T21:29:27+00:00")
+        val commentModel = comment.toModel()
+
+        val mappedEntity = mapper.commentLegacyModelToEntity(commentModel)
+
+        assertThat(mappedEntity).isEqualTo(comment)
+    }
+
+    @Suppress("ComplexMethod")
+    private fun assertModelsEqual(mappedModel: CommentModel, commentModel: CommentModel): Boolean {
+        return mappedModel.id == commentModel.id &&
+        mappedModel.remoteCommentId == commentModel.remoteCommentId &&
+        mappedModel.remotePostId == commentModel.remotePostId &&
+        mappedModel.authorId == commentModel.authorId &&
+        mappedModel.localSiteId == commentModel.localSiteId &&
+        mappedModel.remoteSiteId == commentModel.remoteSiteId &&
+        mappedModel.authorUrl == commentModel.authorUrl &&
+        mappedModel.authorName == commentModel.authorName &&
+        mappedModel.authorEmail == commentModel.authorEmail &&
+        mappedModel.authorProfileImageUrl == commentModel.authorProfileImageUrl &&
+        mappedModel.postTitle == commentModel.postTitle &&
+        mappedModel.status == commentModel.status &&
+        mappedModel.datePublished == commentModel.datePublished &&
+        mappedModel.publishedTimestamp == commentModel.publishedTimestamp &&
+        mappedModel.content == commentModel.content &&
+        mappedModel.url == commentModel.url &&
+        mappedModel.hasParent == commentModel.hasParent &&
+        mappedModel.parentId == commentModel.parentId &&
+        mappedModel.iLike == commentModel.iLike
+    }
+
+    private fun CommentEntity.toDto(): CommentWPComRestResponse {
+        val entity = this
+        return CommentWPComRestResponse().apply {
+            ID = entity.remoteCommentId
+            URL = entity.url ?: ""
+            author = Author().apply {
+                ID = entity.authorId
+                URL = entity.authorUrl ?: ""
+                avatar_URL = entity.authorProfileImageUrl ?: ""
+                email = entity.authorEmail ?: ""
+                name = entity.authorName ?: ""
+            }
+            content = entity.content ?: ""
+            date = entity.datePublished ?: ""
+            i_like = entity.iLike
+            parent = CommentParent().apply {
+                ID = entity.parentId
+            }
+            post = Post().apply {
+                type = "post"
+                title = entity.postTitle ?: ""
+                link = "https://public-api.wordpress.com/rest/v1.1/sites/185464053/posts/85"
+                ID = entity.remotePostId
+            }
+            status = entity.status ?: ""
+        }
+    }
+
+    private fun CommentEntity.toModel(): CommentModel {
+        val entity = this
+        return CommentModel().apply {
+            id = entity.id.toInt()
+            remoteCommentId = entity.remoteCommentId
+            remotePostId = entity.remotePostId
+            authorId = entity.authorId
+            localSiteId = entity.localSiteId
+            remoteSiteId = entity.remoteSiteId
+            authorUrl = entity.authorUrl
+            authorName = entity.authorName
+            authorEmail = entity.authorEmail
+            authorProfileImageUrl = entity.authorProfileImageUrl
+            postTitle = entity.postTitle
+            status = entity.status ?: ""
+            datePublished = entity.datePublished ?: ""
+            publishedTimestamp = entity.publishedTimestamp
+            content = entity.content ?: ""
+            url = entity.authorProfileImageUrl ?: ""
+            hasParent = entity.hasParent
+            parentId = entity.parentId
+            iLike = entity.iLike
+        }
+    }
+
+    private fun CommentEntity.toXmlRpcDto(): HashMap<*, *> {
+        return hashMapOf<String, Any?>(
+                "parent" to this.parentId.toString(),
+                "post_title" to this.postTitle,
+                "author" to this.authorName,
+                "link" to this.url,
+                "date_created_gmt" to Date(),
+                "comment_id" to this.remoteCommentId.toString(),
+                "content" to this.content,
+                "author_url" to this.authorUrl,
+                "post_id" to this.remotePostId,
+                "user_id" to this.authorId,
+                "author_email" to this.authorEmail,
+                "status" to this.status
+        )
+    }
+
+    private fun getDefaultComment(withEmpty: Boolean): CommentEntity {
+        return CommentEntity(
+                id = 0L,
+                remoteCommentId = 10L,
+                remotePostId = 100L,
+                authorId = 44L,
+                localSiteId = 10_000,
+                remoteSiteId = 100_000L,
+                authorUrl = if (withEmpty) "" else "https://test-debug-site.wordpress.com",
+                authorName = if (withEmpty) "" else "authorname",
+                authorEmail = if (withEmpty) "" else "email@wordpress.com",
+                authorProfileImageUrl = if (withEmpty) "" else "https://gravatar.com/avatar/111222333",
+                postTitle = if (withEmpty) "" else "again",
+                status = APPROVED.toString(),
+                datePublished = if (withEmpty) "" else "2021-05-12T15:10:40+02:00",
+                publishedTimestamp = 1_000_000,
+                content = if (withEmpty) "" else "content example",
+                url = if (withEmpty) "" else "https://test-debug-site.wordpress.com/2021/02/25/again/#comment-137",
+                hasParent = true,
+                parentId = 1_000L,
+                iLike = false
+        )
+    }
+
+    @Suppress("SameParameterValue")
+    private fun getDefaultCommentList(withEmpty: Boolean): CommentEntityList {
+        val comment = getDefaultComment(withEmpty)
+        return listOf(
+                comment.copy(id = 1L, remoteCommentId = 10L, datePublished = "2021-07-24T00:51:43+02:00"),
+                comment.copy(id = 2L, remoteCommentId = 20L, datePublished = "2021-07-24T00:51:43+02:00"),
+                comment.copy(id = 3L, remoteCommentId = 30L, datePublished = "2021-07-24T00:51:43+02:00"),
+                comment.copy(id = 4L, remoteCommentId = 40L, datePublished = "2021-07-24T00:51:43+02:00")
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/LikesUtilsProviderTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/LikesUtilsProviderTest.kt
new file mode 100644
index 00000000000..b88c5d3fb85
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/common/LikesUtilsProviderTest.kt
@@ -0,0 +1,118 @@
+package org.wordpress.android.fluxc.common
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.model.LikeModel.LikeType
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikesUtilsProvider
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import java.util.Date
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class LikesUtilsProviderTest {
+    private val likesUtilsProvider = LikesUtilsProvider()
+    private val postSqlUtils = PostSqlUtils()
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `getPageOffsetParams returns empty params map when no data`() {
+        val siteId = 100L
+        val itemId = 1000L
+        val params = likesUtilsProvider.getPageOffsetParams(POST_LIKE, siteId, itemId)
+
+        assertThat(params).isEmpty()
+    }
+
+    @Test
+    fun `getPageOffsetParams returns oldest date liked and user id for pagination API`() {
+        val siteId = 100L
+        val itemId = 1000L
+
+        val likedTimestampList = listOf(
+                Pair(2000L, "2020-04-04 21:20:00"),
+                Pair(2001L, "2020-04-04 21:21:00"),
+                Pair(2002L, "2020-04-04 21:22:00")
+        )
+
+        likedTimestampList.forEach {
+            postSqlUtils.insertOrUpdatePostLikes(
+                    siteId,
+                    itemId,
+                    createLike(POST_LIKE, siteId, itemId, it.first, it.second)
+            )
+        }
+        val params = likesUtilsProvider.getPageOffsetParams(POST_LIKE, siteId, itemId)
+
+        assertThat(params).hasSize(2)
+        assertThat(params!!["before"]).isEqualTo(likedTimestampList.first().second)
+        assertThat(params!!["exclude[]"]).isEqualTo(likedTimestampList.first().first.toString())
+    }
+
+    @Test
+    fun `getPageOffsetParams returns oldest date liked and list of user ids for pagination API when dates overlap`() {
+        val siteId = 100L
+        val itemId = 1000L
+
+        val likedTimestampList = listOf(
+                Pair(2000L, "2020-04-04 21:20:00"),
+                Pair(2001L, "2020-04-04 21:20:00"),
+                Pair(2002L, "2020-04-04 21:20:00"),
+                Pair(2003L, "2020-04-04 21:22:00"),
+                Pair(2004L, "2020-04-04 21:23:00")
+        )
+
+        likedTimestampList.forEach {
+            postSqlUtils.insertOrUpdatePostLikes(
+                    siteId,
+                    itemId,
+                    createLike(POST_LIKE, siteId, itemId, it.first, it.second)
+            )
+        }
+        val params = likesUtilsProvider.getPageOffsetParams(POST_LIKE, siteId, itemId)
+
+        assertThat(params).hasSize(2)
+        assertThat(params!!["before"]).isEqualTo(likedTimestampList.first().second)
+        val excludedUserIds = likedTimestampList.map {
+            it.first
+        }.toList().take(3)
+
+        assertThat(params!!["exclude[]"]).isEqualTo(excludedUserIds.joinToString(separator = "&exclude[]="))
+    }
+
+    private fun createLike(likeType: LikeType, siteId: Long, postId: Long, userId: Long, dateLikedString: String) =
+            LikeModel().apply {
+                type = likeType.typeName
+                remoteSiteId = siteId
+                remoteItemId = postId
+                likerId = userId
+                likerName = "likerName"
+                likerLogin = "likerLogin"
+                likerAvatarUrl = "likerAvatarUrl"
+                likerBio = "likerBio"
+                likerSiteId = 3000L
+                likerSiteUrl = "likerSiteUrl"
+                preferredBlogId = 4000L
+                preferredBlogName = "preferredBlogName"
+                preferredBlogUrl = "preferredBlogUrl"
+                preferredBlogBlavatarUrl = "preferredBlogBlavatarUrl"
+                dateLiked = dateLikedString
+                timestampFetched = Date().time
+            }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/BloggingPromptDateConverterTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/BloggingPromptDateConverterTest.kt
new file mode 100644
index 00000000000..25efad2c8d0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/BloggingPromptDateConverterTest.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.converters
+
+import org.junit.Assert
+import org.junit.Test
+import org.wordpress.android.fluxc.persistence.coverters.BloggingPromptDateConverter
+
+class BloggingPromptDateConverterTest {
+    @Test
+    fun testBloggingPromptDateStringToDateObject() {
+        val converter = BloggingPromptDateConverter()
+
+        val date = "2022-05-01"
+
+        // A string date converted to Date and back should be unaltered
+        val result = converter.stringToDate(date)
+        Assert.assertEquals(date, converter.dateToString(result))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/StringListConverterTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/StringListConverterTest.kt
new file mode 100644
index 00000000000..8e6e8dbba7d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/converters/StringListConverterTest.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.converters
+
+import org.junit.Assert
+import org.junit.Test
+import org.wordpress.android.fluxc.persistence.coverters.StringListConverter
+
+class StringListConverterTest {
+    @Test
+    fun testStringToListToStringConversion() {
+        val converter = StringListConverter()
+
+        val string = "apple,banana,1"
+
+        // A string converted to list and back should be unaltered
+        val result = converter.stringToList(string)
+        Assert.assertEquals(string, converter.listToString(result))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/encryptedlog/EncryptedLogSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/encryptedlog/EncryptedLogSqlUtilsTest.kt
new file mode 100644
index 00000000000..080e2d8a5cc
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/encryptedlog/EncryptedLogSqlUtilsTest.kt
@@ -0,0 +1,183 @@
+package org.wordpress.android.fluxc.encryptedlog
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLog
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogModel
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.FAILED
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.QUEUED
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.UPLOADING
+import org.wordpress.android.fluxc.persistence.EncryptedLogSqlUtils
+import java.io.File
+import java.time.temporal.ChronoUnit.SECONDS
+import java.util.Date
+import java.util.UUID
+import kotlin.random.Random
+
+private const val TEST_UUID = "TEST_UUID"
+private const val TEST_FILE_PATH = "TEST_FILE_PATH"
+
+@RunWith(RobolectricTestRunner::class)
+class EncryptedLogSqlUtilsTest {
+    private lateinit var sqlUtils: EncryptedLogSqlUtils
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(appContext, EncryptedLogModel::class.java)
+        WellSql.init(config)
+        config.reset()
+
+        sqlUtils = EncryptedLogSqlUtils()
+    }
+
+    @Test
+    fun `test insert encrypted log`() {
+        // Assert that there are no encrypted logs with the test uuid
+        assertThat(getTestEncryptedLogFromDB()).isNull()
+
+        // Insert an encrypted log with uuid
+        val logToBeInserted = createTestEncryptedLog()
+        sqlUtils.insertOrUpdateEncryptedLog(logToBeInserted)
+
+        // Assert that the encrypted log from the DB is the same as the one we inserted
+        val log = getTestEncryptedLogFromDB()
+        assertThat(log).isEqualToComparingFieldByField(logToBeInserted)
+    }
+
+    @Test
+    fun `test insert multiple encrypted logs`() {
+        // Assert that there are no encrypted logs with the test uuid
+        assertThat(getTestEncryptedLogFromDB()).isNull()
+
+        // Insert an encrypted log with uuid
+        val uuidList = (1..5).map { "uuid-prefix-$it" }
+        val logsToBeInserted = uuidList.map {
+            createTestEncryptedLog(uuid = it)
+        }
+        sqlUtils.insertOrUpdateEncryptedLogs(logsToBeInserted)
+
+        // Assert that the encrypted logs from the DB is the same as the ones we inserted
+        uuidList.forEachIndexed { index, uuid ->
+            val log = getTestEncryptedLogFromDB(uuid)
+            assertThat(log).isEqualToComparingFieldByField(logsToBeInserted[index])
+        }
+    }
+
+    @Test
+    fun `test update encrypted log`() {
+        // Insert an initial encrypted log
+        val initialLog = createTestEncryptedLog()
+        sqlUtils.insertOrUpdateEncryptedLog(initialLog)
+        assertThat(getTestEncryptedLogFromDB()).isEqualToComparingFieldByField(initialLog)
+
+        // Create a copy of the encrypted log by changing its upload state (which will be the common usage)
+        val newUploadState = EncryptedLogUploadState.UPLOADING
+        val updatedLog = initialLog.copy(uploadState = newUploadState)
+        sqlUtils.insertOrUpdateEncryptedLog(updatedLog)
+
+        // Assert that the encrypted log in the DB is the one with the correct upload state
+        val updatedLogFromDB = getTestEncryptedLogFromDB()
+        assertThat(requireNotNull(updatedLogFromDB?.uploadState)).isEqualTo(newUploadState)
+        // This verifies the expected state as well but separating the initial assertion is valuable to show intent
+        assertThat(updatedLogFromDB).isEqualToComparingFieldByField(updatedLog)
+    }
+
+    @Test
+    fun `test delete encrypted log`() {
+        // Insert an initial encrypted log
+        val initialLog = createTestEncryptedLog()
+        sqlUtils.insertOrUpdateEncryptedLog(initialLog)
+        assertThat(getTestEncryptedLogFromDB()).isEqualToComparingFieldByField(initialLog)
+
+        // Delete the encrypted log
+        sqlUtils.deleteEncryptedLogs(listOf(initialLog))
+
+        // Assert that the encrypted log no longer exists
+        assertThat(getTestEncryptedLogFromDB()).isNull()
+    }
+
+    @Test
+    fun `test get uploading encrypted logs`() {
+        // Insert an encrypted log with uuid
+        val logToBeInserted = createTestEncryptedLog(uploadState = UPLOADING)
+        sqlUtils.insertOrUpdateEncryptedLog(logToBeInserted)
+
+        // Assert that the encrypted log from the DB is the same as the one we inserted
+        val uploadingEncryptedLogs = sqlUtils.getUploadingEncryptedLogs()
+        assertThat(uploadingEncryptedLogs).hasSize(1)
+        assertThat(uploadingEncryptedLogs.first()).isEqualToComparingFieldByField(logToBeInserted)
+    }
+
+    @Test
+    fun `test uploading encrypted logs count for empty DB`() {
+        assertThat(sqlUtils.getNumberOfUploadingEncryptedLogs()).isEqualTo(0)
+    }
+
+    @Test
+    fun `test uploading encrypted logs for random number`() {
+        Random.nextInt(100).let { numberOfLogs ->
+            repeat(numberOfLogs) {
+                sqlUtils.insertOrUpdateEncryptedLog(
+                        createTestEncryptedLog(
+                                uuid = UUID.randomUUID().toString(),
+                                uploadState = UPLOADING
+                        )
+                )
+            }
+            assertThat(sqlUtils.getNumberOfUploadingEncryptedLogs()).isEqualTo(numberOfLogs.toLong())
+        }
+    }
+
+    @Test
+    fun `test get encrypted logs for upload includes QUEUED logs`() {
+        sqlUtils.insertOrUpdateEncryptedLog(createTestEncryptedLog(uploadState = QUEUED))
+
+        assertThat(sqlUtils.getEncryptedLogsForUpload()).isNotEmpty
+    }
+
+    @Test
+    fun `test get encrypted logs for upload includes FAILED logs`() {
+        sqlUtils.insertOrUpdateEncryptedLog(createTestEncryptedLog(uploadState = FAILED))
+
+        assertThat(sqlUtils.getEncryptedLogsForUpload()).isNotEmpty
+    }
+
+    @Test
+    fun `test get encrypted logs for upload does not include UPLOADING logs`() {
+        sqlUtils.insertOrUpdateEncryptedLog(createTestEncryptedLog(uploadState = UPLOADING))
+
+        assertThat(sqlUtils.getEncryptedLogsForUpload()).isEmpty()
+    }
+
+    @Test
+    fun `test get encrypted logs for upload is in correct order`() {
+        sqlUtils.insertOrUpdateEncryptedLog(createTestEncryptedLog(uploadState = FAILED))
+        sqlUtils.insertOrUpdateEncryptedLog(createTestEncryptedLog(uploadState = QUEUED))
+
+        // Queued logs should be uploaded before the failed ones
+        assertThat(sqlUtils.getEncryptedLogsForUpload().firstOrNull()?.uploadState).isEqualTo(QUEUED)
+    }
+
+    private fun getTestEncryptedLogFromDB(uuid: String = TEST_UUID) = sqlUtils.getEncryptedLog(uuid)
+
+    private fun createTestEncryptedLog(
+        uuid: String = TEST_UUID,
+        filePath: String = TEST_FILE_PATH,
+        dateCreated: Date = Date(),
+        uploadState: EncryptedLogUploadState = QUEUED
+    ) = EncryptedLog(
+            uuid = uuid,
+            file = File(filePath),
+            // Bypass the annoying milliseconds comparison issue
+            dateCreated = Date.from(dateCreated.toInstant().truncatedTo(SECONDS)),
+            uploadState = uploadState
+    )
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/EndpointNodeTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/EndpointNodeTest.java
new file mode 100644
index 00000000000..dc5f07bbe32
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/EndpointNodeTest.java
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.endpoints;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.annotations.endpoint.EndpointNode;
+import org.wordpress.android.fluxc.annotations.endpoint.EndpointTreeGenerator;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class EndpointNodeTest {
+    @Test
+    public void testEndpointNodeSetup() {
+        EndpointNode root = new EndpointNode("/sites/");
+        EndpointNode childNode = new EndpointNode("$site/");
+        EndpointNode grandchildNode = new EndpointNode("posts/");
+
+        childNode.addChild(grandchildNode);
+        root.addChild(childNode);
+
+        assertEquals("posts/", root.getChildren().get(0).getChildren().get(0).getLocalEndpoint());
+
+        assertEquals("/sites/", grandchildNode.getRoot().getLocalEndpoint());
+        assertEquals(root, grandchildNode.getParent().getParent());
+        assertEquals("$site/", grandchildNode.getParent().getLocalEndpoint());
+        assertEquals("/sites/$site/posts/", grandchildNode.getFullEndpoint());
+    }
+
+    @Test
+    public void testGetCleanEndpointName() {
+        EndpointNode node = new EndpointNode("$post_ID/");
+        assertEquals("post", node.getCleanEndpointName());
+
+        EndpointNode nodeWithType = new EndpointNode("$taxonomy#String/");
+        assertEquals("taxonomy", nodeWithType.getCleanEndpointName());
+
+        EndpointNode emptyNode = new EndpointNode("");
+        assertEquals("", emptyNode.getCleanEndpointName());
+    }
+
+    @Test
+    public void testGetEndpointTypes() {
+        EndpointNode typedNode = new EndpointNode("$taxonomy#String/");
+        assertEquals(1, typedNode.getEndpointTypes().size());
+        assertEquals("String", typedNode.getEndpointTypes().get(0));
+
+        EndpointNode normalNode = new EndpointNode("$post_ID/");
+        assertTrue(normalNode.getEndpointTypes().isEmpty());
+    }
+
+    @Test
+    public void testEndpointTreeGenerator() throws IOException {
+        File temp = File.createTempFile("endpoints", ".txt");
+        temp.deleteOnExit();
+
+        // An empty file should return a root EndpointNode with no children
+        EndpointNode endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertFalse(endpointTree.hasChildren());
+
+        // An empty file (except for a newline) should return a root EndpointNode with no children
+        BufferedWriter out = new BufferedWriter(new FileWriter(temp));
+        out.newLine();
+        out.close();
+
+        endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertFalse(endpointTree.hasChildren());
+
+        // A series of nested endpoints should be processed correctly as a single branch
+        out = new BufferedWriter(new FileWriter(temp));
+        out.write("/sites/");
+        out.newLine();
+        out.write("/sites/$site/");
+        out.newLine();
+        out.write("/sites/$site/posts");
+        out.close();
+
+        endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertEquals(1, endpointTree.getChildren().size());
+        assertEquals("/sites/$site/posts/",
+                endpointTree.getChildren().get(0).getChildren().get(0).getChildren().get(0).getFullEndpoint());
+
+        // A duplicate endpoint entry should be ignored
+        out = new BufferedWriter(new FileWriter(temp));
+        out.write("/sites/");
+        out.newLine();
+        out.write("/sites/$site/");
+        out.newLine();
+        out.write("/sites/$site/posts");
+        out.newLine();
+        out.write("/sites/");
+        out.close();
+
+        endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertEquals(1, endpointTree.getChildren().size());
+        assertEquals("/sites/$site/posts/",
+                endpointTree.getChildren().get(0).getChildren().get(0).getChildren().get(0).getFullEndpoint());
+
+        // A single nested endpoint should be processed as nested nodes
+        out = new BufferedWriter(new FileWriter(temp));
+        out.write("/sites/$site/posts");
+        out.close();
+
+        endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertEquals(1, endpointTree.getChildren().size());
+        assertEquals("/sites/$site/posts/",
+                endpointTree.getChildren().get(0).getChildren().get(0).getChildren().get(0).getFullEndpoint());
+
+        // Two separate top-level endpoints should be processed correctly
+        out = new BufferedWriter(new FileWriter(temp));
+        out.write("/sites/");
+        out.newLine();
+        out.write("/me/");
+        out.close();
+
+        endpointTree = EndpointTreeGenerator.process(new FileInputStream(temp));
+
+        assertEquals(2, endpointTree.getChildren().size());
+        assertEquals("/", endpointTree.getLocalEndpoint());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WCWPAPIEndpointTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WCWPAPIEndpointTest.kt
new file mode 100644
index 00000000000..81737d30322
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WCWPAPIEndpointTest.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.endpoints
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import kotlin.test.assertEquals
+
+@RunWith(RobolectricTestRunner::class)
+class WCWPAPIEndpointTest {
+    @Test
+    fun testAllEndpoints() {
+        // Orders
+        assertEquals("/orders/", WOOCOMMERCE.orders.endpoint)
+    }
+
+    @Test
+    fun testAllUrls() {
+        // Orders
+        assertEquals("/wc/v3/orders/", WOOCOMMERCE.orders.pathV3)
+    }
+
+    @Test
+    fun testRevenueStatsUrl() {
+        assertEquals("/wc-analytics/reports/revenue/stats/", WOOCOMMERCE.reports.revenue.stats.pathV4Analytics)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPAPIEndpointTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPAPIEndpointTest.java
new file mode 100644
index 00000000000..5a5c9e6f7b9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPAPIEndpointTest.java
@@ -0,0 +1,49 @@
+package org.wordpress.android.fluxc.endpoints;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI;
+
+import static org.junit.Assert.assertEquals;
+
+public class WPAPIEndpointTest {
+    @Test
+    public void testAllEndpoints() {
+        // Posts
+        assertEquals("/posts/", WPAPI.posts.getEndpoint());
+        assertEquals("/posts/56/", WPAPI.posts.id(56).getEndpoint());
+
+        // Pages
+        assertEquals("/pages/", WPAPI.pages.getEndpoint());
+        assertEquals("/pages/56/", WPAPI.pages.id(56).getEndpoint());
+
+        // Media
+        assertEquals("/media/", WPAPI.media.getEndpoint());
+        assertEquals("/media/56/", WPAPI.media.id(56).getEndpoint());
+
+        // Comments
+        assertEquals("/comments/", WPAPI.comments.getEndpoint());
+        assertEquals("/comments/56/", WPAPI.comments.id(56).getEndpoint());
+
+        // Settings
+        assertEquals("/settings/", WPAPI.settings.getEndpoint());
+
+        // Users
+        assertEquals("/users/", WPAPI.users.getEndpoint());
+        assertEquals("/users/me/", WPAPI.users.me.getEndpoint());
+
+        // Plugins
+        assertEquals("/plugins/", WPAPI.plugins.getEndpoint());
+        assertEquals("/plugins/jetpack/jetpack/", WPAPI.plugins.name("jetpack/jetpack").getEndpoint());
+    }
+
+    @Test
+    public void testUrls() {
+        assertEquals("wp/v2/posts/", WPAPI.posts.getUrlV2());
+        assertEquals("wp/v2/pages/", WPAPI.pages.getUrlV2());
+        assertEquals("wp/v2/media/", WPAPI.media.getUrlV2());
+        assertEquals("wp/v2/comments/", WPAPI.comments.getUrlV2());
+        assertEquals("wp/v2/users/", WPAPI.users.getUrlV2());
+        assertEquals("wp/v2/users/me/", WPAPI.users.me.getUrlV2());
+        assertEquals("wp/v2/plugins/", WPAPI.plugins.getUrlV2());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComEndpointTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComEndpointTest.java
new file mode 100644
index 00000000000..e7b9dc37351
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComEndpointTest.java
@@ -0,0 +1,84 @@
+package org.wordpress.android.fluxc.endpoints;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+
+import static org.junit.Assert.assertEquals;
+
+public class WPComEndpointTest {
+    @Test
+    public void testAllEndpoints() {
+        // Sites
+        assertEquals("/sites/", WPCOMREST.sites.getEndpoint());
+        assertEquals("/sites/new/", WPCOMREST.sites.new_.getEndpoint());
+        assertEquals("/sites/56/", WPCOMREST.sites.site(56).getEndpoint());
+        assertEquals("/sites/56/post-formats/", WPCOMREST.sites.site(56).post_formats.getEndpoint());
+
+        assertEquals("/sites/mysite.wordpress.com/", WPCOMREST.sites.siteUrl("mysite.wordpress.com").getEndpoint());
+
+        // Sites - Posts
+        assertEquals("/sites/56/posts/", WPCOMREST.sites.site(56).posts.getEndpoint());
+        assertEquals("/sites/56/posts/78/", WPCOMREST.sites.site(56).posts.post(78).getEndpoint());
+        assertEquals("/sites/56/posts/78/delete/", WPCOMREST.sites.site(56).posts.post(78).delete.getEndpoint());
+        assertEquals("/sites/56/posts/78/restore/", WPCOMREST.sites.site(56).posts.post(78).restore.getEndpoint());
+        assertEquals("/sites/56/posts/new/", WPCOMREST.sites.site(56).posts.new_.getEndpoint());
+        assertEquals("/sites/56/posts/slug:fluxc/", WPCOMREST.sites.site(56).posts.slug("fluxc").getEndpoint());
+
+        // Sites - Media
+        assertEquals("/sites/56/media/", WPCOMREST.sites.site(56).media.getEndpoint());
+        assertEquals("/sites/56/media/78/", WPCOMREST.sites.site(56).media.item(78).getEndpoint());
+        assertEquals("/sites/56/media/78/delete/", WPCOMREST.sites.site(56).media.item(78).delete.getEndpoint());
+        assertEquals("/sites/56/media/new/", WPCOMREST.sites.site(56).media.new_.getEndpoint());
+
+        // Plugins
+        assertEquals("/sites/56/plugins/", WPCOMREST.sites.site(56).plugins.getEndpoint());
+        assertEquals("/sites/56/plugins/akismet/", WPCOMREST.sites.site(56).plugins.name("akismet").getEndpoint());
+        assertEquals("/sites/56/plugins/akismet/install/", WPCOMREST.sites.site(56).plugins.slug("akismet")
+                .install.getEndpoint());
+        assertEquals("/sites/56/plugins/akismet/delete/", WPCOMREST.sites.site(56).plugins.name("akismet")
+                .delete.getEndpoint());
+
+        // Sites - Taxonomies
+        assertEquals("/sites/56/taxonomies/category/terms/",
+                WPCOMREST.sites.site(56).taxonomies.taxonomy("category").terms.getEndpoint());
+        assertEquals("/sites/56/taxonomies/category/terms/new/",
+                WPCOMREST.sites.site(56).taxonomies.taxonomy("category").terms.new_.getEndpoint());
+        assertEquals("/sites/56/taxonomies/category/terms/slug:fluxc/",
+                WPCOMREST.sites.site(56).taxonomies.taxonomy("category").terms.slug("fluxc").getEndpoint());
+        assertEquals("/sites/56/taxonomies/post_tag/terms/",
+                WPCOMREST.sites.site(56).taxonomies.taxonomy("post_tag").terms.getEndpoint());
+        assertEquals("/sites/56/taxonomies/post_tag/terms/new/",
+                WPCOMREST.sites.site(56).taxonomies.taxonomy("post_tag").terms.new_.getEndpoint());
+
+        // Me
+        assertEquals("/me/", WPCOMREST.me.getEndpoint());
+        assertEquals("/me/settings/", WPCOMREST.me.settings.getEndpoint());
+        assertEquals("/me/sites/", WPCOMREST.me.sites.getEndpoint());
+        assertEquals("/me/username/", WPCOMREST.me.username.getEndpoint());
+
+        // Users
+        assertEquals("/users/new/", WPCOMREST.users.new_.getEndpoint());
+        assertEquals("/users/new/", WPCOMREST.users.new_.getEndpoint());
+
+        // Availability
+        assertEquals("/is-available/email/", WPCOMREST.is_available.email.getEndpoint());
+        assertEquals("/is-available/username/", WPCOMREST.is_available.username.getEndpoint());
+        assertEquals("/is-available/blog/", WPCOMREST.is_available.blog.getEndpoint());
+
+        // Magic link email sender
+        assertEquals("/auth/send-login-email/", WPCOMREST.auth.send_login_email.getEndpoint());
+        assertEquals("/auth/send-signup-email/", WPCOMREST.auth.send_signup_email.getEndpoint());
+
+        assertEquals("/read/feed/56/", WPCOMREST.read.feed.feed_url_or_id(56).getEndpoint());
+        assertEquals("/read/feed/somewhere.site/", WPCOMREST.read.feed.feed_url_or_id("somewhere.site").getEndpoint());
+    }
+
+    @Test
+    public void testUrls() {
+        assertEquals("https://public-api.wordpress.com/rest/v1/sites/", WPCOMREST.sites.getUrlV1());
+        assertEquals("https://public-api.wordpress.com/rest/v1.1/sites/", WPCOMREST.sites.getUrlV1_1());
+        assertEquals("https://public-api.wordpress.com/rest/v1.2/sites/", WPCOMREST.sites.getUrlV1_2());
+        assertEquals("https://public-api.wordpress.com/rest/v1.3/sites/", WPCOMREST.sites.getUrlV1_3());
+        assertEquals("https://public-api.wordpress.com/is-available/email/", WPCOMREST.is_available.email.getUrlV0());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV2EndpointTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV2EndpointTest.java
new file mode 100644
index 00000000000..d8a96565f40
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV2EndpointTest.java
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.endpoints;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2;
+
+public class WPComV2EndpointTest {
+    @Test
+    public void testAllEndpoints() {
+        // Users
+        assertEquals("/users/username/suggestions/", WPCOMV2.users.username.suggestions.getEndpoint());
+        assertEquals("/plugins/featured/", WPCOMV2.plugins.featured.getEndpoint());
+
+        // Sites - Jetpack Social
+        assertEquals("/sites/56/jetpack-social/", WPCOMV2.sites.site(56).jetpack_social.getEndpoint());
+    }
+
+    @Test
+    public void testUrls() {
+        assertEquals("https://public-api.wordpress.com/wpcom/v2/users/username/suggestions/",
+                WPCOMV2.users.username.suggestions.getUrl());
+        assertEquals("https://public-api.wordpress.com/wpcom/v2/sites/56/jetpack-social/",
+                WPCOMV2.sites.site(56).jetpack_social.getUrl());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV3EndpointTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV3EndpointTest.kt
new file mode 100644
index 00000000000..56598c75b34
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPComV3EndpointTest.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.endpoints
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV3
+
+class WPComV3EndpointTest {
+    @Test
+    fun testAllEndpoints() {
+        assertThat("/sites/123/blogging-prompts/")
+            .isEqualTo(WPCOMV3.sites.site(123).blogging_prompts.endpoint)
+    }
+
+    @Test
+    fun testUrls() {
+        assertThat("https://public-api.wordpress.com/wpcom/v3/sites/123/blogging-prompts/")
+            .isEqualTo(WPCOMV3.sites.site(123).blogging_prompts.url)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPOrgAPIEndpointTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPOrgAPIEndpointTest.java
new file mode 100644
index 00000000000..3a7a145dff8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/endpoints/WPOrgAPIEndpointTest.java
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.endpoints;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.generated.endpoint.WPORGAPI;
+
+import static org.junit.Assert.assertEquals;
+
+public class WPOrgAPIEndpointTest {
+    @Test
+    public void testAllEndpoints() {
+        // Plugins info
+        assertEquals("/plugins/info/1.0/akismet/", WPORGAPI.plugins.info.version("1.0").slug("akismet").getEndpoint());
+        assertEquals("/plugins/info/1.1/", WPORGAPI.plugins.info.version("1.1").getEndpoint());
+    }
+
+    @Test
+    public void testUrls() {
+        assertEquals("https://api.wordpress.org/plugins/info/1.0/akismet.json",
+                WPORGAPI.plugins.info.version("1.0").slug("akismet").getUrl());
+        assertEquals("https://api.wordpress.org/plugins/info/1.1/",
+                WPORGAPI.plugins.info.version("1.1").getUrl());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/example/utils/ArrayUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/example/utils/ArrayUtilsTest.kt
new file mode 100644
index 00000000000..154ce6fcc09
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/example/utils/ArrayUtilsTest.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.example.utils
+
+import org.assertj.core.api.Assertions.assertThat
+
+import org.junit.Test
+
+class ArrayUtilsTest {
+    /* CONTAINS */
+
+    @Test
+    fun `given valid string, when checking contains start of array, then the result is true`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.contains(stringArray, "three")
+
+        assertThat(result).isEqualTo(true)
+    }
+
+    @Test
+    fun `given valid string, when checking contains middle of array, then the result is true`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.contains(stringArray, "one")
+
+        assertThat(result).isEqualTo(true)
+    }
+
+    @Test
+    fun `given valid string, when checking contains end of array, then the result is true`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.contains(stringArray, "five")
+
+        assertThat(result).isEqualTo(true)
+    }
+
+    @Test
+    fun `given invalid string, when checking contains of array, then the result is false`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.contains(stringArray, "ottff")
+
+        assertThat(result).isEqualTo(false)
+    }
+
+    /* INDEX OF */
+
+    @Test
+    fun `given valid string, when getting the index start of array, then the result is the expected one`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.indexOf(stringArray, "three")
+
+        assertThat(result).isEqualTo(2)
+    }
+
+    @Test
+    fun `given valid string, when getting the index middle of array, then the result is the expected one`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.indexOf(stringArray, "one")
+
+        assertThat(result).isEqualTo(0)
+    }
+
+    @Test
+    fun `given valid string, when getting the index end of array, then the result is the expected one`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.indexOf(stringArray, "five")
+
+        assertThat(result).isEqualTo(4)
+    }
+
+    @Test
+    fun `given invalid string, when getting the index of array, then the resulting index is minus one`() {
+        val stringArray = arrayOf("one", "two", "three", "four", "five")
+
+        val result = ArrayUtils.indexOf(stringArray, "ottff")
+
+        assertThat(result).isEqualTo(-1)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/AssignmentsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/AssignmentsTest.kt
new file mode 100644
index 00000000000..ea764f27959
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/AssignmentsTest.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.experiments
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.experiments.Assignments
+import org.wordpress.android.fluxc.model.experiments.AssignmentsModel
+import org.wordpress.android.fluxc.model.experiments.Variation.Control
+import org.wordpress.android.fluxc.model.experiments.Variation.Treatment
+import java.lang.System.currentTimeMillis
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class AssignmentsTest {
+    @Test
+    fun `is stale if expiry time is before or equal current time`() {
+        val now = currentTimeMillis()
+        val oneHourAgo = now - ONE_HOUR_IN_SECONDS * 1000
+        val assignments = Assignments(emptyMap(), ONE_HOUR_IN_SECONDS, Date(oneHourAgo))
+        assertThat(assignments.isStale(Date(now))).isTrue
+    }
+
+    @Test
+    fun `is not stale if expiry time is after current time`() {
+        val now = currentTimeMillis()
+        val oneHourFromNow = now + ONE_HOUR_IN_SECONDS * 1000
+        val assignments = Assignments(emptyMap(), ONE_HOUR_IN_SECONDS, Date(oneHourFromNow))
+        assertThat(assignments.isStale(Date(now))).isFalse
+    }
+
+    @Test
+    fun `variation is control if experiment is not found`() {
+        val model = AssignmentsModel(mapOf("test_experiment" to "treatment"))
+        val assignments = Assignments.fromModel(model)
+        val variation = assignments.getVariationForExperiment("other_experiment")
+        assertThat(variation).isInstanceOf(Control::class.java)
+    }
+
+    @Test
+    fun `null variation is mapped to control type`() {
+        val model = AssignmentsModel(mapOf("test_experiment" to null))
+        val assignments = Assignments.fromModel(model)
+        val variation = assignments.getVariationForExperiment("test_experiment")
+        assertThat(variation).isInstanceOf(Control::class.java)
+    }
+
+    @Test
+    fun `treatment variation is mapped to treatment type with correct name`() {
+        val model = AssignmentsModel(mapOf("test_experiment" to "treatment_name"))
+        val assignments = Assignments.fromModel(model)
+        val variation = assignments.getVariationForExperiment("test_experiment")
+        assertThat(variation).isEqualTo(Treatment("treatment_name"))
+    }
+
+    companion object {
+        private const val ONE_HOUR_IN_SECONDS = 3600
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/ExperimentStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/ExperimentStoreTest.kt
new file mode 100644
index 00000000000..eced5820d0e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/experiments/ExperimentStoreTest.kt
@@ -0,0 +1,107 @@
+package org.wordpress.android.fluxc.experiments
+
+import android.content.SharedPreferences
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.inOrder
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.experiments.Assignments
+import org.wordpress.android.fluxc.model.experiments.AssignmentsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.experiments.ExperimentRestClient
+import org.wordpress.android.fluxc.store.ExperimentStore
+import org.wordpress.android.fluxc.store.ExperimentStore.Companion.EXPERIMENT_ASSIGNMENTS_KEY
+import org.wordpress.android.fluxc.store.ExperimentStore.FetchedAssignmentsPayload
+import org.wordpress.android.fluxc.store.ExperimentStore.OnAssignmentsFetched
+import org.wordpress.android.fluxc.store.ExperimentStore.Platform.CALYPSO
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class ExperimentStoreTest {
+    @Mock private lateinit var experimentRestClient: ExperimentRestClient
+    @Mock private lateinit var preferenceUtils: PreferenceUtilsWrapper
+    @Mock private lateinit var sharedPreferences: SharedPreferences
+    @Mock private lateinit var sharedPreferencesEditor: SharedPreferences.Editor
+
+    private lateinit var experimentStore: ExperimentStore
+
+    @Before
+    fun setUp() {
+        whenever(preferenceUtils.getFluxCPreferences()).thenReturn(sharedPreferences)
+        whenever(sharedPreferences.edit()).thenReturn(sharedPreferencesEditor)
+        whenever(sharedPreferencesEditor.putString(any(), any())).thenReturn(sharedPreferencesEditor)
+
+        experimentStore = ExperimentStore(experimentRestClient, preferenceUtils, initCoroutineEngine())
+    }
+
+    @Test
+    fun `fetch assignments emits correct event when successful`() = test {
+        whenever(experimentRestClient.fetchAssignments(defaultPlatform, emptyList())).thenReturn(successfulPayload)
+
+        val onAssignmentsFetched = experimentStore.fetchAssignments(defaultPlatform, emptyList())
+
+        assertThat(onAssignmentsFetched).isEqualTo(OnAssignmentsFetched(successfulAssignments))
+    }
+
+    @Test
+    fun `fetch assignments stores result locally when successful`() = test {
+        whenever(experimentRestClient.fetchAssignments(defaultPlatform, emptyList())).thenReturn(successfulPayload)
+
+        experimentStore.fetchAssignments(defaultPlatform, emptyList())
+
+        verify(sharedPreferences).edit()
+        inOrder(sharedPreferencesEditor).apply {
+            verify(sharedPreferencesEditor).putString(EXPERIMENT_ASSIGNMENTS_KEY, successfulModelJson)
+            verify(sharedPreferencesEditor).apply()
+        }
+    }
+
+    @Test
+    fun `get cached assignments returns last fetch result when existent`() {
+        whenever(sharedPreferences.getString(EXPERIMENT_ASSIGNMENTS_KEY, null)).thenReturn(successfulModelJson)
+
+        val cachedAssignments = experimentStore.getCachedAssignments()
+
+        assertThat(cachedAssignments).isNotNull
+        assertThat(cachedAssignments).isEqualTo(successfulAssignments)
+    }
+
+    @Test
+    fun `get cached assignments returns null when no fetch results were stored`() {
+        whenever(sharedPreferences.getString(EXPERIMENT_ASSIGNMENTS_KEY, null)).thenReturn(null)
+
+        val cachedAssignments = experimentStore.getCachedAssignments()
+
+        assertThat(cachedAssignments).isNull()
+    }
+
+    companion object {
+        val defaultPlatform = CALYPSO
+
+        private val successfulVariations = mapOf(
+                "experiment_one" to null,
+                "experiment_two" to "treatment",
+                "experiment_three" to "other"
+        )
+
+        private val successfulModel = AssignmentsModel(successfulVariations, 3600, 1604964458273)
+
+        const val successfulModelJson = "{\"variations\":{" +
+                "\"experiment_one\":null," +
+                "\"experiment_two\":\"treatment\"," +
+                "\"experiment_three\":\"other\"}," +
+                "\"ttl\":3600," +
+                "\"fetchedAt\":1604964458273}"
+
+        val successfulPayload = FetchedAssignmentsPayload(successfulModel)
+
+        val successfulAssignments = Assignments.fromModel(successfulModel)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/jetpacktunnel/JetpackTunnelGsonRequestTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/jetpacktunnel/JetpackTunnelGsonRequestTest.kt
new file mode 100644
index 00000000000..0fa424ae77c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/jetpacktunnel/JetpackTunnelGsonRequestTest.kt
@@ -0,0 +1,143 @@
+package org.wordpress.android.fluxc.jetpacktunnel
+
+import android.net.Uri
+import com.google.gson.Gson
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequest
+import org.wordpress.android.util.UrlUtils
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+@RunWith(RobolectricTestRunner::class)
+class JetpackTunnelGsonRequestTest {
+    companion object {
+        private const val DUMMY_SITE_ID = 567L
+    }
+
+    private val gson by lazy { Gson() }
+
+    @Test
+    fun testCreateGetRequest() {
+        val url = "/"
+        val params = mapOf("context" to "view")
+
+        val request = JetpackTunnelGsonRequest.buildGetRequest(url, DUMMY_SITE_ID, params,
+                Any::class.java,
+                { _: Any? -> },
+                WPComErrorListener { _ -> },
+                {}
+        )
+
+        // Verify that the request was built and wrapped as expected
+        assertEquals(WPCOMREST.jetpack_blogs.site(DUMMY_SITE_ID).rest_api.urlV1_1, UrlUtils.removeQuery(request?.url))
+        val parsedUri = Uri.parse(request?.url)
+        assertEquals(3, parsedUri.queryParameterNames.size)
+        assertEquals("/&_method=get", parsedUri.getQueryParameter("path"))
+        assertEquals("{\"context\":\"view\"}", parsedUri.getQueryParameter("query"))
+        assertEquals("true", parsedUri.getQueryParameter("json"))
+
+        // The wrapped GET request should have no body
+        val bodyField = request!!::class.java.superclass.getDeclaredField("mBody")
+        bodyField.isAccessible = true
+        assertNull(bodyField.get(request))
+    }
+
+    @Test
+    fun testCreatePostRequest() {
+        val url = "/wp/v2/settings/"
+
+        val requestBody = mapOf<String, Any>("title" to "New Title", "description" to "New Description")
+
+        val request = JetpackTunnelGsonRequest.buildPostRequest(url, DUMMY_SITE_ID, requestBody,
+                Any::class.java,
+                { _: Any? -> },
+                WPComErrorListener { _ -> }
+        )
+
+        // Verify that the request was built and wrapped as expected
+        assertEquals(WPCOMREST.jetpack_blogs.site(DUMMY_SITE_ID).rest_api.urlV1_1, UrlUtils.removeQuery(request?.url))
+        val parsedUri = Uri.parse(request?.url)
+        assertEquals(0, parsedUri.queryParameterNames.size)
+        val body = String(request?.body!!)
+        val generatedBody = gson.fromJson(body, HashMap<String, String>()::class.java)
+        assertEquals(3, generatedBody.size)
+        assertEquals("/wp/v2/settings/&_method=post", generatedBody["path"])
+        assertEquals("true", generatedBody["json"])
+        assertEquals("{\"title\":\"New Title\",\"description\":\"New Description\"}", generatedBody["body"])
+    }
+
+    @Test
+    fun testCreatePutRequest() {
+        val url = "/wp/v2/settings/"
+
+        val requestBody = mapOf<String, Any>("title" to "New Title", "description" to "New Description")
+
+        val request = JetpackTunnelGsonRequest.buildPutRequest(url, DUMMY_SITE_ID, requestBody,
+                Any::class.java,
+                { _: Any? -> },
+                WPComErrorListener { _ -> }
+        )
+
+        // Verify that the request was built and wrapped as expected
+        assertEquals(WPCOMREST.jetpack_blogs.site(DUMMY_SITE_ID).rest_api.urlV1_1, UrlUtils.removeQuery(request?.url))
+        val parsedUri = Uri.parse(request?.url)
+        assertEquals(0, parsedUri.queryParameterNames.size)
+        val body = String(request?.body!!)
+        val generatedBody = gson.fromJson(body, HashMap<String, String>()::class.java)
+        assertEquals(3, generatedBody.size)
+        assertEquals("/wp/v2/settings/&_method=put", generatedBody["path"])
+        assertEquals("true", generatedBody["json"])
+        assertEquals("{\"title\":\"New Title\",\"description\":\"New Description\"}", generatedBody["body"])
+    }
+
+    @Test
+    fun testCreatePatchRequest() {
+        val url = "/wp/v2/settings/"
+
+        val requestBody = mapOf<String, Any>("title" to "New Title", "description" to "New Description")
+
+        val request = JetpackTunnelGsonRequest.buildPatchRequest(url, DUMMY_SITE_ID, requestBody,
+                Any::class.java,
+                { _: Any? -> },
+                WPComErrorListener { _ -> }
+        )
+
+        // Verify that the request was built and wrapped as expected
+        assertEquals(WPCOMREST.jetpack_blogs.site(DUMMY_SITE_ID).rest_api.urlV1_1, UrlUtils.removeQuery(request?.url))
+        val parsedUri = Uri.parse(request?.url)
+        assertEquals(0, parsedUri.queryParameterNames.size)
+        val body = String(request?.body!!)
+        val generatedBody = gson.fromJson(body, HashMap<String, String>()::class.java)
+        assertEquals(3, generatedBody.size)
+        assertEquals("/wp/v2/settings/&_method=patch", generatedBody["path"])
+        assertEquals("true", generatedBody["json"])
+        assertEquals("{\"title\":\"New Title\",\"description\":\"New Description\"}", generatedBody["body"])
+    }
+
+    @Test
+    fun testCreateDeleteRequest() {
+        val url = "/wp/v2/posts/6"
+        val params = mapOf("force" to "true")
+
+        val request = JetpackTunnelGsonRequest.buildDeleteRequest(url, DUMMY_SITE_ID, params,
+                Any::class.java,
+                { _: Any? -> },
+                WPComErrorListener { _ -> }
+        )
+
+        // Verify that the request was built and wrapped as expected
+        assertEquals(WPCOMREST.jetpack_blogs.site(DUMMY_SITE_ID).rest_api.urlV1_1, UrlUtils.removeQuery(request?.url))
+        val parsedUri = Uri.parse(request?.url)
+        assertEquals(0, parsedUri.queryParameterNames.size)
+        val body = String(request?.body!!)
+        val generatedBody = gson.fromJson(body, HashMap<String, String>()::class.java)
+        assertEquals(3, generatedBody.size)
+        assertEquals("{\"force\":\"true\"}", generatedBody["body"])
+        assertEquals("/wp/v2/posts/6&_method=delete", generatedBody["path"])
+        assertEquals("true", generatedBody["json"])
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceRangeTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceRangeTest.kt
new file mode 100644
index 00000000000..2ee547f00fd
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceRangeTest.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.fluxc.list
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameters
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSource
+import org.wordpress.android.fluxc.model.list.datasource.ListItemDataSourceInterface
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNotNull
+
+private const val IS_LIST_FULLY_FETCHED = false
+private val MOCKED_GET_ITEM_IDENTIFIERS_RESULT = listOf(1L, 3L, 5L)
+
+internal data class InternalPagedListDataSourceRangeTestCase(
+    val startPosition: Int,
+    val endPosition: Int,
+    val isValid: Boolean,
+    val message: String? = null
+)
+
+@RunWith(Parameterized::class)
+internal class InternalPagedListDataSourceRangeTest(
+    private val testCase: InternalPagedListDataSourceRangeTestCase
+) {
+    companion object {
+        @JvmStatic
+        @Parameters
+        fun testCases(): List<InternalPagedListDataSourceRangeTestCase> =
+                listOf(
+                        InternalPagedListDataSourceRangeTestCase(
+                                startPosition = 0,
+                                endPosition = 1,
+                                isValid = true
+                        ),
+                        InternalPagedListDataSourceRangeTestCase(
+                                startPosition = 0,
+                                endPosition = 0,
+                                isValid = false,
+                                message = "End position can't be 0"
+                        ),
+                        InternalPagedListDataSourceRangeTestCase(
+                                startPosition = -1,
+                                endPosition = 0,
+                                isValid = false,
+                                message = "Start position can't be less than 0"
+                        ),
+                        InternalPagedListDataSourceRangeTestCase(
+                                startPosition = 1,
+                                endPosition = 0,
+                                isValid = false,
+                                message = "Start position can't be more than end position"
+                        ),
+                        InternalPagedListDataSourceRangeTestCase(
+                                startPosition = 1,
+                                endPosition = MOCKED_GET_ITEM_IDENTIFIERS_RESULT.size + 1,
+                                isValid = false,
+                                message = "End position can't be more than the total size"
+                        )
+                )
+    }
+
+    @Test
+    fun `test range`() {
+        val getItemsInRange = {
+            createDataSource().getItemsInRange(testCase.startPosition, testCase.endPosition)
+        }
+        if (testCase.isValid) {
+            val items = getItemsInRange()
+            assertNotNull(items, testCase.message)
+        } else {
+            assertFailsWith(IllegalArgumentException::class, testCase.message) {
+                getItemsInRange()
+            }
+        }
+    }
+
+    private fun createDataSource(): InternalPagedListDataSource<TestListDescriptor, Long, TestPagedListResultType> {
+        val itemDataSource = mock<ListItemDataSourceInterface<TestListDescriptor, Long, TestPagedListResultType>>()
+        whenever(itemDataSource.getItemIdentifiers(any(), any(), eq(IS_LIST_FULLY_FETCHED))).thenReturn(
+                MOCKED_GET_ITEM_IDENTIFIERS_RESULT
+        )
+        return InternalPagedListDataSource(
+                listDescriptor = mock(),
+                remoteItemIds = mock(),
+                isListFullyFetched = IS_LIST_FULLY_FETCHED,
+                itemDataSource = itemDataSource
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceTest.kt
new file mode 100644
index 00000000000..92ec74b66a2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/InternalPagedListDataSourceTest.kt
@@ -0,0 +1,96 @@
+package org.wordpress.android.fluxc.list
+
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSource
+import org.wordpress.android.fluxc.model.list.datasource.ListItemDataSourceInterface
+import kotlin.test.assertEquals
+
+private const val NUMBER_OF_ITEMS = 71
+private const val IS_LIST_FULLY_FETCHED = false
+private val testListDescriptor = TestListDescriptor()
+private val testStartAndEndPosition = Pair(5, 10)
+
+internal class InternalPagedListDataSourceTest {
+    private val remoteItemIds = mock<List<RemoteId>>()
+    private val mockIdentifiers = mock<List<TestListIdentifier>>()
+    private val mockItemDataSource = mock<ListItemDataSourceInterface<TestListDescriptor, TestListIdentifier, String>>()
+
+    @Before
+    fun setup() {
+        whenever(remoteItemIds.size).thenReturn(NUMBER_OF_ITEMS)
+        whenever(mockIdentifiers.size).thenReturn(NUMBER_OF_ITEMS)
+        val mockSublist = mock<List<TestListIdentifier>>()
+        whenever(mockIdentifiers.subList(any(), any())).thenReturn(mockSublist)
+
+        whenever(
+                mockItemDataSource.getItemIdentifiers(
+                        listDescriptor = testListDescriptor,
+                        remoteItemIds = remoteItemIds,
+                        isListFullyFetched = IS_LIST_FULLY_FETCHED
+                )
+        ).thenReturn(mockIdentifiers)
+    }
+
+    /**
+     * Tests that item identifiers are cached when a new instance of [InternalPagedListDataSource] is created.
+     *
+     * Caching the item identifiers is how we ensure that this component will provide consistent data to
+     * `PositionalDataSource` so it's very important that we have this test. Since we don't have access to
+     * `InternalPagedListDataSource.itemIdentifiers` private property, we have to test the internal implementation
+     * which is more likely to break. However, in this specific case, we DO want the test to break if the internal
+     * implementation changes.
+     */
+    @Test
+    fun `init calls getItemIdentifiers`() {
+        createInternalPagedListDataSource(mockItemDataSource)
+
+        verify(mockItemDataSource).getItemIdentifiers(eq(testListDescriptor), any(), any())
+    }
+
+    @Test
+    fun `total size uses getItemIdentifiers' size`() {
+        val internalDataSource = createInternalPagedListDataSource(mockItemDataSource)
+        assertEquals(
+                NUMBER_OF_ITEMS, internalDataSource.totalSize, "InternalPagedListDataSource should not change the" +
+                "number of items in a list and should propagate that to its ListItemDataSourceInterface"
+        )
+    }
+
+    @Test
+    fun `getItemsInRange creates the correct sublist of the identifiers`() {
+        val internalDataSource = createInternalPagedListDataSource(mockItemDataSource)
+
+        val (startPosition, endPosition) = testStartAndEndPosition
+        internalDataSource.getItemsInRange(startPosition, endPosition)
+
+        verify(mockIdentifiers).subList(startPosition, endPosition)
+    }
+
+    @Test
+    fun `getItemsInRange propagates the call to getItemsAndFetchIfNecessary correctly`() {
+        val internalDataSource = createInternalPagedListDataSource(dataSource = mockItemDataSource)
+
+        val (startPosition, endPosition) = testStartAndEndPosition
+        internalDataSource.getItemsInRange(startPosition, endPosition)
+
+        verify(mockItemDataSource).getItemsAndFetchIfNecessary(eq(testListDescriptor), any())
+    }
+
+    private fun createInternalPagedListDataSource(
+        dataSource: TestListItemDataSource
+    ): TestInternalPagedListDataSource {
+        return InternalPagedListDataSource(
+                listDescriptor = testListDescriptor,
+                remoteItemIds = remoteItemIds,
+                isListFullyFetched = IS_LIST_FULLY_FETCHED,
+                itemDataSource = dataSource
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListDescriptorUnitTestCase.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListDescriptorUnitTestCase.kt
new file mode 100644
index 00000000000..370f2856ed7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListDescriptorUnitTestCase.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.list
+
+import org.wordpress.android.fluxc.list.post.assertDifferentTypeIdentifiers
+import org.wordpress.android.fluxc.list.post.assertDifferentUniqueIdentifiers
+import org.wordpress.android.fluxc.list.post.assertSameTypeIdentifiers
+import org.wordpress.android.fluxc.list.post.assertSameUniqueIdentifiers
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+
+internal class ListDescriptorUnitTestCase<T : ListDescriptor>(
+    val typeIdentifierReason: String,
+    val uniqueIdentifierReason: String,
+    val descriptor1: T,
+    val descriptor2: T,
+    val shouldHaveSameTypeIdentifier: Boolean,
+    val shouldHaveSameUniqueIdentifier: Boolean
+) {
+    fun testTypeIdentifier() {
+        if (shouldHaveSameTypeIdentifier) {
+            assertSameTypeIdentifiers(
+                    reason = typeIdentifierReason,
+                    descriptor1 = descriptor1,
+                    descriptor2 = descriptor2
+            )
+        } else {
+            assertDifferentTypeIdentifiers(
+                    reason = typeIdentifierReason,
+                    descriptor1 = descriptor1,
+                    descriptor2 = descriptor2
+            )
+        }
+    }
+
+    fun testUniqueIdentifier() {
+        if (shouldHaveSameUniqueIdentifier) {
+            assertSameUniqueIdentifiers(
+                    reason = uniqueIdentifierReason,
+                    descriptor1 = descriptor1,
+                    descriptor2 = descriptor2
+            )
+        } else {
+            assertDifferentUniqueIdentifiers(
+                    reason = uniqueIdentifierReason,
+                    descriptor1 = descriptor1,
+                    descriptor2 = descriptor2
+            )
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListItemSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListItemSqlUtilsTest.kt
new file mode 100644
index 00000000000..277dbafba7d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListItemSqlUtilsTest.kt
@@ -0,0 +1,280 @@
+package org.wordpress.android.fluxc.list
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListItemModel
+import org.wordpress.android.fluxc.model.list.ListModel
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForRestSite
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForXmlRpcSite
+import org.wordpress.android.fluxc.persistence.ListItemSqlUtils
+import org.wordpress.android.fluxc.persistence.ListSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@RunWith(RobolectricTestRunner::class)
+class ListItemSqlUtilsTest {
+    private lateinit var listSqlUtils: ListSqlUtils
+    private lateinit var listItemSqlUtils: ListItemSqlUtils
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+
+        listSqlUtils = ListSqlUtils()
+        listItemSqlUtils = ListItemSqlUtils()
+    }
+
+    @Test
+    fun testInsertItemList() {
+        // Insert an item list for the passed in [ListDescriptor] and assert that it's inserted correctly
+        generateInsertAndAssertListItems(PostListDescriptorForRestSite(testSite()))
+    }
+
+    @Test
+    fun testGetListItemsCount() {
+        val count = 17
+        val testList = generateInsertAndAssertListItems(
+                listDescriptor = PostListDescriptorForRestSite(testSite()),
+                count = count
+        )
+        assertEquals(count.toLong(), listItemSqlUtils.getListItemsCount(testList.id))
+    }
+
+    @Test
+    fun testListIdForeignKeyCascadeDelete() {
+        val listDescriptor = PostListDescriptorForRestSite(testSite())
+        val testList = generateInsertAndAssertListItems(listDescriptor)
+
+        /**
+         * 1. Delete the inserted list
+         * 2. Verify that deleting the list also deletes the inserted [ListItemModel]s due to foreign key restriction
+         */
+        listSqlUtils.deleteList(listDescriptor)
+        assertEquals(0, listItemSqlUtils.getListItems(testList.id).size)
+    }
+
+    @Test
+    fun testDeleteItem() {
+        val testRemoteItemId = 1245L // value doesn't matter
+        val listDescriptor1 = PostListDescriptorForRestSite(testSite(123))
+        val listDescriptor2 = PostListDescriptorForXmlRpcSite(testSite(124))
+
+        /**
+         * 1. Insert a test list for 2 different list descriptors.
+         * 2. Generate and insert a [ListItemModel] for both lists
+         * 3. Verify that the [ListItemModel] was inserted correctly
+         */
+        val testLists = listOf(listDescriptor1, listDescriptor2).map { insertTestList(it) }
+        val itemList = testLists.map { ListItemModel(it.id, testRemoteItemId) }
+        listItemSqlUtils.insertItemList(itemList)
+        testLists.forEach { list ->
+            assertEquals(1, listItemSqlUtils.getListItems(list.id).size)
+        }
+
+        /**
+         * 1. Delete [ListItemModel]s for which [ListItemModel.remoteItemId] == `testRemoteItemId`
+         * 2. Verify that [ListItemModel]s from both lists are deleted
+         */
+        listItemSqlUtils.deleteItem(testLists.map { it.id }, testRemoteItemId)
+        testLists.forEach {
+            assertEquals(0, listItemSqlUtils.getListItems(it.id).size)
+        }
+    }
+
+    @Test
+    fun testDeleteItems() {
+        /**
+         * 1. Insert a test list with default number of items and assert that its inserted correctly
+         * 2. Delete all items for a list
+         * 3. Verify that list items is empty
+         */
+        val testList = generateInsertAndAssertListItems(PostListDescriptorForRestSite(testSite()))
+        listItemSqlUtils.deleteItems(testList.id)
+        assertEquals(0, listItemSqlUtils.getListItems(testList.id).size)
+    }
+
+    @Test
+    fun testDeleteItemsFromLists() {
+        /**
+         * 1. Create 20 lists and 300 items for these lists
+         * 2. Insert the lists and the items in the DB
+         * 3. Verify that they are inserted correctly
+         */
+        val listIds = (1..20).toList()
+        val lists = listIds.map { insertTestList(PostListDescriptorForRestSite(testSite(it))) }
+        val items = (1..300L).mapIndexed { index, itemId ->
+            ListItemModel(listId = listIds[index % listIds.size], remoteItemId = itemId)
+        }
+        listItemSqlUtils.insertItemList(items)
+        items.groupBy { it.listId }.forEach { listId, insertedItems ->
+            assertEquals(insertedItems.size, listItemSqlUtils.getListItems(listId).size)
+        }
+
+        /**
+         * 1. Pick 100 items to delete and 10 lists to delete from
+         * 2. Delete the combination of selected lists and items
+         * 3. If a list is picked to be deleted from, verify that remaining items don't contain items that should be
+         * deleted.
+         * 4. Verify that the remaining items are unchanged for lists that are not picked to be deleted from.
+         */
+        val remoteItemIdsToDelete = items.map { it.remoteItemId }.take(100)
+        val listIdsToDeleteFrom = lists.map { it.id }.take(10)
+        listItemSqlUtils.deleteItemsFromLists(listIdsToDeleteFrom, remoteItemIdsToDelete)
+        items.groupBy { it.listId }.forEach { (listId, itemList) ->
+            val remainingItems = listItemSqlUtils.getListItems(listId)
+            if (listIdsToDeleteFrom.contains(listId)) {
+                assertFalse(remainingItems.any { remoteItemIdsToDelete.contains(it.remoteItemId) })
+            } else {
+                assertTrue {
+                    // `contains` approach wouldn't work here since the `id` fields might be different
+                    itemList.zip(remainingItems).fold(true) { acc, (first, second) ->
+                        acc && first.listId == second.listId && first.remoteItemId == second.remoteItemId
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testDeleteItemFromTooManyLists() {
+        /**
+         * 1. Create 2000 lists and 30000 items for these lists
+         * 2. Insert the lists and the items in the DB
+         */
+        val listIds = (1..2000).toList()
+        val lists = listIds.map { insertTestList(PostListDescriptorForRestSite(testSite(it))) }
+        val items = (1..30000L).mapIndexed { index, itemId ->
+            ListItemModel(listId = listIds[index % listIds.size], remoteItemId = itemId)
+        }
+        listItemSqlUtils.insertItemList(items)
+
+        /**
+         * 1. Pick 1 item to delete and 999 lists to delete from
+         * 2. Delete the item from selected lists
+         * 3. If a list is picked to be deleted from, verify that remaining items don't contain
+         * items that should be deleted.
+         * 4. Verify that the remaining items are unchanged for lists that are not picked to be
+         * deleted from and SQLiteException for too many variables isn't thrown.
+         */
+        val remoteItemIdsToDelete = items.map{ it.remoteItemId }.take(1)
+        val listIdsToDeleteFrom = lists.map { it.id }.take(999)
+        listItemSqlUtils.deleteItemsFromLists(listIdsToDeleteFrom, remoteItemIdsToDelete)
+        items.groupBy { it.listId }.forEach { (listId, itemList) ->
+            val remainingItems = listItemSqlUtils.getListItems(listId)
+            if (listIdsToDeleteFrom.contains(listId)) {
+                assertFalse(remainingItems.any { remoteItemIdsToDelete.contains(it.remoteItemId) })
+            } else {
+                assertTrue {
+                    // `contains` approach wouldn't work here since the `id` fields might be different
+                    itemList.zip(remainingItems).fold(true) { acc, (first, second) ->
+                        acc && first.listId == second.listId && first.remoteItemId == second.remoteItemId
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testDeleteFromListsDoesNotCrashForEmptyRemoteItemIds() {
+        /**
+         * 1. Create a test list
+         * 2. Attempt to delete an empty list of remote item ids from the list
+         * 3. Verify that this case is handled correctly in `deleteItemsFromLists` and it does not crash.
+         *
+         * This test is added due to a bug in WellSql where it doesn't handle empty lists properly while building
+         * `isIn` queries.
+         */
+        val testList = insertTestList(PostListDescriptorForXmlRpcSite(testSite()))
+        listItemSqlUtils.deleteItemsFromLists(listOf(testList.id), emptyList())
+    }
+
+    @Test
+    fun testDeleteFromListsDoesNotCrashForEmptyListOfLists() {
+        /**
+         * 1. Attempt to delete a list of remote item ids from an empty list of lists
+         * 2. Verify that this case is handled correctly in `deleteItemsFromLists` and it does not crash.
+         *
+         * This test is added due to a bug in WellSql where it doesn't handle empty lists properly while building
+         * `isIn` queries.
+         */
+        listItemSqlUtils.deleteItemsFromLists(emptyList(), listOf(1L, 2L))
+    }
+
+    @Test
+    fun insertDuplicateListItemModel() {
+        val testRemoteItemId = 1245L // value doesn't matter
+
+        /**
+         * 1. Since a [ListItemModel] requires a [ListModel] in the DB due to the foreign key restriction, a test list
+         * will be inserted in the DB.
+         * 2. Generate 2 [ListItemModel]s with the exact same values and insert the first one in the DB
+         * 3. Verify that first [ListItemModel] is inserted correctly
+         */
+        val testList = insertTestList(PostListDescriptorForXmlRpcSite(testSite()))
+        val listItemModel = ListItemModel(testList.id, testRemoteItemId)
+        val listItemModel2 = ListItemModel(testList.id, testRemoteItemId)
+        listItemSqlUtils.insertItemList(listOf(listItemModel))
+        val insertedItemList = listItemSqlUtils.getListItems(testList.id)
+        assertEquals(1, insertedItemList.size)
+
+        /**
+         * 1. Insert the second [ListItemModel] in the DB
+         * 2. Verify that no new record is created and the list size is the same.
+         * 3. Verify that the [ListItemModel.id] has not changed
+         */
+        listItemSqlUtils.insertItemList(listOf(listItemModel2))
+        val updatedItemList = listItemSqlUtils.getListItems(testList.id)
+        assertEquals(1, updatedItemList.size)
+        assertEquals(insertedItemList[0].id, updatedItemList[0].id)
+    }
+
+    private fun generateInsertAndAssertListItems(listDescriptor: ListDescriptor, count: Int = 20): ListModel {
+        /**
+         * 1. Since a [ListItemModel] requires a [ListModel] in the DB due to the foreign key restriction, a test list
+         * will be inserted in the DB.
+         * 2. A list of test [ListItemModel]s will be generated and inserted in the DB
+         * 3. Verify that the [ListItemModel] instances are inserted correctly
+         */
+        val testList = insertTestList(listDescriptor)
+        val itemList = generateItemList(testList, count)
+        listItemSqlUtils.insertItemList(itemList)
+        assertEquals(count, listItemSqlUtils.getListItems(testList.id).size)
+        return testList
+    }
+
+    /**
+     * Creates and inserts a [ListModel] for the given [ListDescriptor].
+     * It also asserts that the list is inserted correctly.
+     */
+    private fun insertTestList(listDescriptor: ListDescriptor): ListModel {
+        listSqlUtils.insertOrUpdateList(listDescriptor)
+        val list = listSqlUtils.getList(listDescriptor)
+        assertNotNull(list)
+        return list!!
+    }
+
+    /**
+     * Helper function that creates a list of [ListItemModel] to be used in tests.
+     */
+    private fun generateItemList(listModel: ListModel, count: Int): List<ListItemModel> =
+            (1..count).map { ListItemModel(listModel.id, it.toLong()) }
+
+    private fun testSite(localSiteId: Int = 111): SiteModel {
+        val site = SiteModel()
+        site.id = localSiteId
+        site.siteId = 222
+        return site
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListModelTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListModelTest.kt
new file mode 100644
index 00000000000..25a5a2d315f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListModelTest.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.list
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.list.ListOrder
+import org.wordpress.android.fluxc.model.list.ListState
+import org.wordpress.android.fluxc.model.list.ListState.ERROR
+import org.wordpress.android.fluxc.model.list.ListState.FETCHED
+import org.wordpress.android.fluxc.model.list.ListState.NEEDS_REFRESH
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class ListModelTest {
+    /**
+     * Tests [ListOrder.fromValue] for [ListOrder].
+     */
+    @Test
+    fun testBasicListOrder() {
+        assertEquals(ListOrder.ASC, ListOrder.fromValue("asc"))
+        assertEquals(ListOrder.DESC, ListOrder.fromValue("desc"))
+    }
+
+    /**
+     * Basic tests for [ListState.FETCHING_FIRST_PAGE].
+     */
+    @Test
+    fun testFetchingFirstPage() {
+        val listState = ListState.FETCHING_FIRST_PAGE
+        assertTrue(listState.isFetchingFirstPage())
+        assertFalse(listState.isLoadingMore())
+        assertFalse(listState.canLoadMore())
+    }
+
+    /**
+     * Basic tests for [ListState.LOADING_MORE].
+     */
+    @Test
+    fun testLoadingMore() {
+        val listState = ListState.LOADING_MORE
+        assertFalse(listState.isFetchingFirstPage())
+        assertTrue(listState.isLoadingMore())
+        assertFalse(listState.canLoadMore())
+    }
+
+    /**
+     * Basic tests for [ListState.NEEDS_REFRESH], [ListState.FETCHED], [ListState.ERROR]. Currently we don't have
+     * custom logic for these states, these tests should be expanded if/when we add custom implementation for them.
+     */
+    @Test
+    fun testNonSpecialStates() {
+        listOf(NEEDS_REFRESH, FETCHED, ERROR).forEach { listState ->
+            assertFalse(listState.isFetchingFirstPage())
+            assertFalse(listState.isLoadingMore())
+            assertFalse(listState.canLoadMore())
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListSqlUtilsTest.kt
new file mode 100644
index 00000000000..0f0b40874cb
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/ListSqlUtilsTest.kt
@@ -0,0 +1,122 @@
+package org.wordpress.android.fluxc.list
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListModel
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForRestSite
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForXmlRpcSite
+import org.wordpress.android.fluxc.persistence.ListSqlUtils
+import kotlin.test.assertNotEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@RunWith(RobolectricTestRunner::class)
+class ListSqlUtilsTest {
+    private lateinit var listSqlUtils: ListSqlUtils
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(appContext, ListModel::class.java)
+        WellSql.init(config)
+        config.reset()
+
+        listSqlUtils = ListSqlUtils()
+    }
+
+    @Test
+    fun testInsertAndUpdateList() {
+        val listDescriptor = PostListDescriptorForRestSite(testSite())
+        /**
+         * 1. Insert a test list
+         * 2. Wait 1 second before the update to ensure `lastModified` value will be different
+         * 3. Insert the same list which should update instead
+         * 4. Verify the `lastModified` values are different
+         */
+        val insertedList = insertOrUpdateAndThenAssertList(listDescriptor)
+        Thread.sleep(1000)
+        val updatedList = insertOrUpdateAndThenAssertList(listDescriptor)
+        assertNotEquals(insertedList.lastModified, updatedList.lastModified)
+    }
+
+    /**
+     * Inserts several different lists to test different combinations for [ListDescriptor]
+     */
+    @Test
+    fun testInsertSeveralDifferentLists() {
+        insertOrUpdateAndThenAssertList(PostListDescriptorForRestSite(testSite()))
+        insertOrUpdateAndThenAssertList(PostListDescriptorForXmlRpcSite(testSite()))
+    }
+
+    @Test
+    fun testDeleteList() {
+        val listDescriptor = PostListDescriptorForRestSite(testSite())
+        /**
+         * 1. Insert a test list
+         * 2. Delete it
+         * 3. Verify that it is deleted correctly
+         */
+        insertOrUpdateAndThenAssertList(listDescriptor)
+        listSqlUtils.deleteList(listDescriptor)
+        assertNull(listSqlUtils.getList(listDescriptor))
+    }
+
+    @Test
+    fun testDeleteAllLists() {
+        val listDescriptors = (1..10).map { PostListDescriptorForRestSite(testSite(it)) }
+        /**
+         * 1. Insert 10 different lists
+         * 2. Delete all lists
+         * 3. Verify that all of them are deleted correctly
+         */
+        listDescriptors.forEach { insertOrUpdateAndThenAssertList(it) }
+        listSqlUtils.deleteAllLists()
+        listDescriptors.forEach { assertNull(listSqlUtils.getList(it)) }
+    }
+
+    @Test
+    fun testDeleteExpiredLists() {
+        val listDescriptors1 = (1..5).map { PostListDescriptorForRestSite(testSite(it)) }
+        val listDescriptors2 = (6..10).map { PostListDescriptorForXmlRpcSite(testSite(it)) }
+        val sleepDuration = 2000L
+        val expirationDuration = sleepDuration - 500L // 500 ms seems to be enough for this test
+
+        /**
+         * 1. Insert 5 lists, wait for 600 ms, so the [ListModel.lastModified] is different, then insert another 5 lists
+         * 2. Delete the lists that hasn't been updated in the last 400 ms
+         * 3. Verify that the first 5 lists were removed and the next 5 lists are not
+         */
+
+        listDescriptors1.forEach { insertOrUpdateAndThenAssertList(it) }
+        Thread.sleep(sleepDuration)
+        listDescriptors2.forEach { insertOrUpdateAndThenAssertList(it) }
+
+        listSqlUtils.deleteExpiredLists(expirationDuration)
+
+        listDescriptors1.forEach { assertNull(listSqlUtils.getList(it)) }
+        listDescriptors2.forEach { assertNotNull(listSqlUtils.getList(it)) }
+    }
+
+    /**
+     * Inserts or updates the list for the listDescriptor and asserts that it's inserted correctly
+     */
+    private fun insertOrUpdateAndThenAssertList(listDescriptor: ListDescriptor): ListModel {
+        listSqlUtils.insertOrUpdateList(listDescriptor)
+        val listModel = listSqlUtils.getList(listDescriptor)
+        assertNotNull(listModel)
+        return listModel!!
+    }
+
+    private fun testSite(localSiteId: Int = 123): SiteModel {
+        val site = SiteModel()
+        site.id = localSiteId
+        return site
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListFactoryTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListFactoryTest.kt
new file mode 100644
index 00000000000..fa1ea242c3a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListFactoryTest.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.fluxc.list
+
+import androidx.paging.DataSource.InvalidatedCallback
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.list.PagedListFactory
+
+internal class PagedListFactoryTest {
+    @Test
+    fun `create factory triggers create data source`() {
+        val mockCreateDataSource = mock<() -> TestInternalPagedListDataSource>()
+        whenever(mockCreateDataSource.invoke()).thenReturn(mock())
+        val pagedListFactory = PagedListFactory(mockCreateDataSource)
+
+        pagedListFactory.create()
+
+        verify(mockCreateDataSource, times(1)).invoke()
+    }
+
+    @Test
+    fun `invalidate triggers create data source`() {
+        val mockCreateDataSource = mock<() -> TestInternalPagedListDataSource>()
+        whenever(mockCreateDataSource.invoke()).thenReturn(mock())
+        val invalidatedCallback = mock<InvalidatedCallback>()
+
+        val pagedListFactory = PagedListFactory(mockCreateDataSource)
+        val currentSource = pagedListFactory.create()
+        currentSource.addInvalidatedCallback(invalidatedCallback)
+
+        pagedListFactory.invalidate()
+
+        verify(invalidatedCallback, times(1)).onInvalidated()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListWrapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListWrapperTest.kt
new file mode 100644
index 00000000000..4bbdacd75f9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/PagedListWrapperTest.kt
@@ -0,0 +1,190 @@
+package org.wordpress.android.fluxc.list
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import androidx.paging.PagedList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.firstValue
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.TEST_SCOPE
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListState
+import org.wordpress.android.fluxc.model.list.PagedListWrapper
+import org.wordpress.android.fluxc.store.ListStore.ListError
+import org.wordpress.android.fluxc.store.ListStore.ListErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ListStore.ListErrorType.PERMISSION_ERROR
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged.CauseOfListChange
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged.CauseOfListChange.FIRST_PAGE_FETCHED
+import org.wordpress.android.fluxc.store.ListStore.OnListDataInvalidated
+import org.wordpress.android.fluxc.store.ListStore.OnListRequiresRefresh
+import org.wordpress.android.fluxc.store.ListStore.OnListStateChanged
+
+@RunWith(MockitoJUnitRunner::class)
+class PagedListWrapperTest {
+    @get:Rule
+    val rule = InstantTaskExecutorRule()
+
+    private val mockDispatcher = mock<Dispatcher>()
+    private val mockListDescriptor = mock<ListDescriptor>()
+    private val mockRefresh = mock<() -> Unit>()
+    private val mockInvalidate = mock<() -> Unit>()
+
+    private fun createPagedListWrapper(lifecycle: Lifecycle = mock()) = PagedListWrapper(
+            data = MutableLiveData<PagedList<String>>(),
+            dispatcher = mockDispatcher,
+            listDescriptor = mockListDescriptor,
+            lifecycle = lifecycle,
+            refresh = mockRefresh,
+            invalidate = mockInvalidate,
+            parentCoroutineContext = TEST_SCOPE.coroutineContext
+    )
+
+    @Test
+    fun `registers dispatcher and observes lifecycle in init`() {
+        val mockLifecycle = mock<Lifecycle>()
+
+        val pagedListWrapper = createPagedListWrapper(mockLifecycle)
+
+        verify(mockDispatcher).register(pagedListWrapper)
+        verify(mockLifecycle).addObserver(pagedListWrapper)
+    }
+
+    @Test
+    fun `unregisters dispatcher and stops observing lifecycle on destroy`() {
+        val lifecycle = LifecycleRegistry(mock())
+        assertThat(lifecycle.observerCount).isEqualTo(0)
+        lifecycle.markState(Lifecycle.State.CREATED)
+
+        val pagedListWrapper = createPagedListWrapper(lifecycle)
+        assertThat(lifecycle.observerCount).isEqualTo(1)
+        lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+
+        verify(mockDispatcher).register(pagedListWrapper)
+        verify(mockDispatcher).unregister(pagedListWrapper)
+        assertThat(lifecycle.observerCount).isEqualTo(0)
+    }
+
+    @Test
+    fun `fetchFirstPage invokes refresh property`() {
+        val pagedListWrapper = createPagedListWrapper()
+
+        pagedListWrapper.fetchFirstPage()
+
+        verify(mockRefresh).invoke()
+    }
+
+    @Test
+    fun `invalidateData invokes invalidate property`() {
+        val pagedListWrapper = createPagedListWrapper()
+
+        pagedListWrapper.invalidateData()
+
+        verify(mockInvalidate).invoke()
+    }
+
+    @Test
+    fun `fetchingFirstPage ListState is propagated correctly`() {
+        testListStateIsPropagatedCorrectly(ListState.FETCHING_FIRST_PAGE)
+    }
+
+    @Test
+    fun `loadingMore ListState is propagated correctly`() {
+        testListStateIsPropagatedCorrectly(ListState.LOADING_MORE)
+    }
+
+    @Test
+    fun `default ListState is propagated correctly`() {
+        testListStateIsPropagatedCorrectly(ListState.defaultState)
+    }
+
+    @Test
+    fun `permission ListError is propagated correctly`() {
+        testListStateIsPropagatedCorrectly(ListState.ERROR, ListError(PERMISSION_ERROR))
+    }
+
+    @Test
+    fun `generic ListError is propagated correctly`() {
+        testListStateIsPropagatedCorrectly(ListState.ERROR, ListError(GENERIC_ERROR))
+    }
+
+    @Test
+    fun `onListChanged invokes invalidate property`() {
+        triggerOnListChanged()
+        verify(mockInvalidate).invoke()
+    }
+
+    @Test
+    fun `onListRequiresRefresh invokes refresh`() {
+        triggerOnListRequiresRefresh()
+        verify(mockRefresh).invoke()
+    }
+
+    @Test
+    fun `onListDataInvalidated invokes invalidate property`() {
+        triggerOnListDataInvalidated()
+        verify(mockInvalidate).invoke()
+    }
+
+    private fun testListStateIsPropagatedCorrectly(listState: ListState, listError: ListError? = null) {
+        val pagedListWrapper = createPagedListWrapper()
+        val isFetchingFirstPageObserver = mock<Observer<Boolean>>()
+        val isLoadingMoreObserver = mock<Observer<Boolean>>()
+        val listErrorObserver = mock<Observer<ListError?>>()
+        pagedListWrapper.isFetchingFirstPage.observeForever(isFetchingFirstPageObserver)
+        pagedListWrapper.isLoadingMore.observeForever(isLoadingMoreObserver)
+        pagedListWrapper.listError.observeForever(listErrorObserver)
+
+        val event = OnListStateChanged(mockListDescriptor, listState, listError)
+        pagedListWrapper.onListStateChanged(event)
+
+        captureAndVerifySingleValue(isFetchingFirstPageObserver, listState.isFetchingFirstPage())
+        captureAndVerifySingleValue(isLoadingMoreObserver, listState.isLoadingMore())
+        captureAndVerifySingleValue(listErrorObserver, listError)
+    }
+
+    private inline fun <reified T> captureAndVerifySingleValue(observer: Observer<T>, result: T) {
+        val captor = ArgumentCaptor.forClass(T::class.java)
+        verify(observer).onChanged(captor.capture())
+        assertThat(captor.firstValue).isEqualTo(result)
+    }
+
+    private fun triggerOnListChanged(
+        causeOfListChange: CauseOfListChange = FIRST_PAGE_FETCHED,
+        error: ListError? = null
+    ) {
+        val pagedListWrapper = createPagedListWrapper()
+        val event = OnListChanged(
+                listDescriptors = listOf(mockListDescriptor),
+                causeOfChange = causeOfListChange,
+                error = error
+        )
+        pagedListWrapper.onListChanged(event)
+    }
+
+    private fun triggerOnListRequiresRefresh() {
+        val pagedListWrapper = createPagedListWrapper()
+        whenever(mockListDescriptor.typeIdentifier).thenReturn(ListDescriptorTypeIdentifier(0))
+        val event = OnListRequiresRefresh(type = mockListDescriptor.typeIdentifier)
+        pagedListWrapper.onListRequiresRefresh(event)
+    }
+
+    private fun triggerOnListDataInvalidated() {
+        val pagedListWrapper = createPagedListWrapper()
+        whenever(mockListDescriptor.typeIdentifier).thenReturn(ListDescriptorTypeIdentifier(0))
+        val event = OnListDataInvalidated(type = mockListDescriptor.typeIdentifier)
+        pagedListWrapper.onListDataInvalidated(event)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/TestListDescriptor.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/TestListDescriptor.kt
new file mode 100644
index 00000000000..b56c15d6037
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/TestListDescriptor.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.list
+
+import org.mockito.kotlin.mock
+import org.wordpress.android.fluxc.model.list.ListConfig
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListDescriptorUniqueIdentifier
+import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSource
+import org.wordpress.android.fluxc.model.list.datasource.ListItemDataSourceInterface
+
+internal typealias TestListIdentifier = Long
+internal typealias TestPagedListResultType = String
+internal typealias TestInternalPagedListDataSource =
+        InternalPagedListDataSource<TestListDescriptor, TestListIdentifier, TestPagedListResultType>
+internal typealias TestListItemDataSource =
+        ListItemDataSourceInterface<TestListDescriptor, TestListIdentifier, TestPagedListResultType>
+
+internal class TestListDescriptor(
+    override val uniqueIdentifier: ListDescriptorUniqueIdentifier = mock(),
+    override val typeIdentifier: ListDescriptorTypeIdentifier = mock(),
+    override val config: ListConfig = ListConfig.default
+) : ListDescriptor
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/ListDescriptorTestHelper.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/ListDescriptorTestHelper.kt
new file mode 100644
index 00000000000..d879e6e46b2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/ListDescriptorTestHelper.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.list.post
+
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.not
+import org.hamcrest.MatcherAssert.assertThat
+import org.wordpress.android.fluxc.model.list.ListConfig
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+
+const val LIST_DESCRIPTOR_TEST_FIRST_MOCK_SITE_LOCAL_SITE_ID = 1
+const val LIST_DESCRIPTOR_TEST_SECOND_MOCK_SITE_LOCAL_SITE_ID = 2
+const val LIST_DESCRIPTOR_TEST_QUERY_1 = "some query"
+const val LIST_DESCRIPTOR_TEST_QUERY_2 = "another query"
+val LIST_DESCRIPTOR_TEST_LIST_CONFIG_1 = ListConfig(
+        networkPageSize = 10,
+        initialLoadSize = 10,
+        dbPageSize = 10,
+        prefetchDistance = 10
+)
+val LIST_DESCRIPTOR_TEST_LIST_CONFIG_2 = ListConfig(
+        networkPageSize = 20,
+        initialLoadSize = 20,
+        dbPageSize = 20,
+        prefetchDistance = 20
+)
+
+fun assertSameTypeIdentifiers(reason: String, descriptor1: ListDescriptor, descriptor2: ListDescriptor) {
+    assertThat(reason, descriptor1.typeIdentifier, equalTo(descriptor2.typeIdentifier))
+}
+
+fun assertDifferentTypeIdentifiers(reason: String, descriptor1: ListDescriptor, descriptor2: ListDescriptor) {
+    assertThat(reason, descriptor1.typeIdentifier, not(equalTo(descriptor2.typeIdentifier)))
+}
+
+fun assertSameUniqueIdentifiers(reason: String, descriptor1: ListDescriptor, descriptor2: ListDescriptor) {
+    assertThat(reason, descriptor1.uniqueIdentifier, equalTo(descriptor2.uniqueIdentifier))
+}
+
+fun assertDifferentUniqueIdentifiers(reason: String, descriptor1: ListDescriptor, descriptor2: ListDescriptor) {
+    assertThat(reason, descriptor1.uniqueIdentifier, not(equalTo(descriptor2.uniqueIdentifier)))
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/PostListDescriptorTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/PostListDescriptorTest.kt
new file mode 100644
index 00000000000..3f3a92a1e87
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/list/post/PostListDescriptorTest.kt
@@ -0,0 +1,254 @@
+package org.wordpress.android.fluxc.list.post
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameters
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.list.ListDescriptorUnitTestCase
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.AuthorFilter
+import org.wordpress.android.fluxc.model.list.ListOrder.ASC
+import org.wordpress.android.fluxc.model.list.ListOrder.DESC
+import org.wordpress.android.fluxc.model.list.PostListDescriptor
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForRestSite
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForXmlRpcSite
+import org.wordpress.android.fluxc.model.list.PostListOrderBy.DATE
+import org.wordpress.android.fluxc.model.list.PostListOrderBy.ID
+import org.wordpress.android.fluxc.model.post.PostStatus
+
+private typealias PostListDescriptorTestCase = ListDescriptorUnitTestCase<PostListDescriptor>
+
+@RunWith(Parameterized::class)
+internal class PostListDescriptorTest(
+    private val testCase: PostListDescriptorTestCase
+) {
+    companion object {
+        @JvmStatic
+        @Parameters
+        @Suppress("LongMethod")
+        fun testCases(): List<PostListDescriptorTestCase> {
+            val mockSite = mock<SiteModel>()
+            val mockSite2 = mock<SiteModel>()
+            whenever(mockSite.id).thenReturn(LIST_DESCRIPTOR_TEST_FIRST_MOCK_SITE_LOCAL_SITE_ID)
+            whenever(mockSite2.id).thenReturn(LIST_DESCRIPTOR_TEST_SECOND_MOCK_SITE_LOCAL_SITE_ID)
+            return listOf(
+                    // PostListDescriptorForRestSite - PostListDescriptorForXmlRpcSite
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different descriptor types have different type identifiers",
+                            uniqueIdentifierReason = "Different descriptor types have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(site = mockSite),
+                            // We need to use a different site because the same site can't be both rest and xml-rpc
+                            descriptor2 = PostListDescriptorForXmlRpcSite(site = mockSite2),
+                            shouldHaveSameTypeIdentifier = false,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Same site
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Same sites should have same type identifier",
+                            uniqueIdentifierReason = "Same sites should have same unique identifier",
+                            descriptor1 = PostListDescriptorForRestSite(site = mockSite),
+                            descriptor2 = PostListDescriptorForRestSite(site = mockSite),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = true
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Same sites should have same type identifier",
+                            uniqueIdentifierReason = "Same sites should have same unique identifier",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(site = mockSite),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(site = mockSite),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = true
+                    ),
+                    // Different site
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different sites should have different type identifiers",
+                            uniqueIdentifierReason = "Different sites should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(site = mockSite),
+                            descriptor2 = PostListDescriptorForRestSite(site = mockSite2),
+                            shouldHaveSameTypeIdentifier = false,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different sites should have different type identifiers",
+                            uniqueIdentifierReason = "Different sites should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(site = mockSite),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(site = mockSite2),
+                            shouldHaveSameTypeIdentifier = false,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different status list
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different status lists should have same type identifiers",
+                            uniqueIdentifierReason = "Different status lists should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    statusList = listOf(PostStatus.PUBLISHED)
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    statusList = listOf(PostStatus.DRAFT)
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different status lists should have same type identifiers",
+                            uniqueIdentifierReason = "Different status lists should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    statusList = listOf(PostStatus.PUBLISHED)
+                            ),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    statusList = listOf(PostStatus.DRAFT)
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different order
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different order should have same type identifiers",
+                            uniqueIdentifierReason = "Different order should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    order = ASC
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    order = DESC
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different order should have same type identifiers",
+                            uniqueIdentifierReason = "Different order should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    order = ASC
+                            ),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    order = DESC
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different order by
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different order by should have same type identifiers",
+                            uniqueIdentifierReason = "Different order by should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    orderBy = DATE
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    orderBy = ID
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different order by should have same type identifiers",
+                            uniqueIdentifierReason = "Different order by should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    orderBy = DATE
+                            ),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    orderBy = ID
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different search query
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different search query should have same type identifiers",
+                            uniqueIdentifierReason = "Different search query should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    searchQuery = LIST_DESCRIPTOR_TEST_QUERY_1
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    searchQuery = LIST_DESCRIPTOR_TEST_QUERY_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different search query should have same type identifiers",
+                            uniqueIdentifierReason = "Different search query should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    searchQuery = LIST_DESCRIPTOR_TEST_QUERY_1
+                            ),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    searchQuery = LIST_DESCRIPTOR_TEST_QUERY_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different list config
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different list configs should have same type identifiers",
+                            uniqueIdentifierReason = "Different list configs should have same unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    config = LIST_DESCRIPTOR_TEST_LIST_CONFIG_1
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    config = LIST_DESCRIPTOR_TEST_LIST_CONFIG_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = true
+                    ),
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different list configs should have same type identifiers",
+                            uniqueIdentifierReason = "Different list configs should have same unique identifiers",
+                            descriptor1 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    config = LIST_DESCRIPTOR_TEST_LIST_CONFIG_1
+                            ),
+                            descriptor2 = PostListDescriptorForXmlRpcSite(
+                                    mockSite,
+                                    config = LIST_DESCRIPTOR_TEST_LIST_CONFIG_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = true
+                    ),
+                    // Different author which is only available for REST sites
+                    PostListDescriptorTestCase(
+                            typeIdentifierReason = "Different author should have same type identifiers",
+                            uniqueIdentifierReason = "Different author should have different unique identifiers",
+                            descriptor1 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    author = AuthorFilter.Everyone
+                            ),
+                            descriptor2 = PostListDescriptorForRestSite(
+                                    mockSite,
+                                    author = AuthorFilter.SpecificAuthor(1337)
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `test type identifier`() {
+        testCase.testTypeIdentifier()
+    }
+
+    @Test
+    fun `test unique identifier`() {
+        testCase.testUniqueIdentifier()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorSubTypeTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorSubTypeTest.kt
new file mode 100644
index 00000000000..9c609df40f2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorSubTypeTest.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.media
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type.NO_ERROR
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type.UNSUPPORTED_MIME_TYPE
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.UndefinedSubType
+
+@RunWith(MockitoJUnitRunner::class)
+class MediaErrorSubTypeTest {
+    @Test
+    fun `deserialize returns UndefinedSubType when name is null`() {
+        val result = MediaErrorSubType.deserialize(null)
+        assertThat(result).isEqualTo(UndefinedSubType)
+    }
+
+    @Test
+    fun `deserialize returns UndefinedSubType when name does not match any mapped subtype`() {
+        val result = MediaErrorSubType.deserialize("this_does_not:match")
+        assertThat(result).isEqualTo(UndefinedSubType)
+    }
+
+    @Test
+    fun `deserialize returns MalformedMediaArgSubType(UNSUPPORTED_MIME_TYPE) when name matches`() {
+        val result = MediaErrorSubType.deserialize("MALFORMED_MEDIA_ARG_SUBTYPE:UNSUPPORTED_MIME_TYPE")
+        assertThat(result).isEqualTo(MalformedMediaArgSubType(UNSUPPORTED_MIME_TYPE))
+    }
+
+    @Test
+    fun `deserialize returns NO_ERROR(null) when name matches`() {
+        val result = MediaErrorSubType.deserialize("MALFORMED_MEDIA_ARG_SUBTYPE:NO_ERROR")
+        assertThat(result).isEqualTo(MalformedMediaArgSubType(NO_ERROR))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorTest.kt
new file mode 100644
index 00000000000..a1f6d91ff5a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaErrorTest.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.fluxc.media
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.store.MediaStore
+
+@RunWith(MockitoJUnitRunner::class)
+class MediaErrorTest {
+    private lateinit var mediaError: MediaStore.MediaError
+
+    @Before
+    fun setUp() {
+        mediaError = MediaStore.MediaError(MediaStore.MediaErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun `user message empty on API user message empty`() {
+        val userMessage = mediaError.apiUserMessageIfAvailable
+
+        assertThat(userMessage).isNullOrEmpty()
+    }
+
+    @Test
+    fun `user message extracted on BAD_REQUEST and API user message available`() {
+        mediaError.type = MediaStore.MediaErrorType.BAD_REQUEST
+        mediaError.message = "rest_upload_user_quota_exceeded|You have used your space quota. " +
+                "Please delete files before uploading. Back"
+
+        val userMessage = mediaError.apiUserMessageIfAvailable
+
+        assertThat(userMessage).isNotEmpty
+        assertThat(userMessage).isEqualTo("You have used your space quota. " +
+                "Please delete files before uploading. Back")
+    }
+
+    @Test
+    fun `user message not extracted on BAD_REQUEST and API user message not available`() {
+        mediaError.type = MediaStore.MediaErrorType.BAD_REQUEST
+        mediaError.message = "You have used your space quota. " +
+                "Please delete files before uploading. Back"
+
+        val userMessage = mediaError.apiUserMessageIfAvailable
+
+        assertThat(userMessage).isNotEmpty
+        assertThat(userMessage).isEqualTo("You have used your space quota. " +
+                "Please delete files before uploading. Back")
+    }
+
+    @Test
+    fun `user message not extracted on media error type different from BAD_REQUEST`() {
+        mediaError.message = "rest_upload_user_quota_exceeded|You have used your space quota. " +
+                "Please delete files before uploading. Back"
+
+        val userMessage = mediaError.apiUserMessageIfAvailable
+
+        assertThat(userMessage).isNotEmpty
+        assertThat(userMessage).isEqualTo("rest_upload_user_quota_exceeded|You have used your space quota. " +
+                "Please delete files before uploading. Back")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaSqlUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaSqlUtilsTest.java
new file mode 100644
index 00000000000..66e5d67ccd5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaSqlUtilsTest.java
@@ -0,0 +1,490 @@
+package org.wordpress.android.fluxc.media;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import com.wellsql.generated.MediaModelTable;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.utils.MimeType.Type;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.wordpress.android.fluxc.store.MediaStore.NOT_DELETED_STATES;
+
+@RunWith(RobolectricTestRunner.class)
+public class MediaSqlUtilsTest {
+    private static final int TEST_LOCAL_SITE_ID = 42;
+    private static final int SMALL_TEST_POOL = 10;
+
+    private final Random mRandom = new Random(System.currentTimeMillis());
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.getApplication().getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, MediaModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    // Attempts to insert null then verifies there is no media
+    @Test
+    public void testInsertNullMedia() {
+        assertThat(0).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(null));
+        assertThat(MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID))).isEmpty();
+    }
+
+    // Inserts a media item with various known fields then retrieves and validates those fields
+    @Test
+    public void testInsertMedia() {
+        long testId = Math.abs(mRandom.nextLong());
+        String testTitle = getTestString();
+        String testDescription = getTestString();
+        String testCaption = getTestString();
+        MediaModel testMedia = getTestMedia(testId, testTitle, testDescription, testCaption);
+        assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(testMedia));
+        List<MediaModel> media = MediaSqlUtils.getSiteMediaWithId(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), testId);
+        assertThat(media).hasSize(1);
+        assertThat(media.get(0)).isNotNull();
+        assertThat(media.get(0).getMediaId()).isEqualTo(testId);
+        assertThat(media.get(0).getTitle()).isEqualTo(testTitle);
+        assertThat(media.get(0).getDescription()).isEqualTo(testDescription);
+        assertThat(media.get(0).getCaption()).isEqualTo(testCaption);
+    }
+
+    // Inserts 10 items with known IDs then retrieves all media and validates IDs
+    @Test
+    public void testGetAllSiteMedia() {
+        long[] testIds = insertBasicTestItems();
+        List<MediaModel> storedMedia = MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID));
+        assertThat(storedMedia).hasSize(testIds.length);
+        for (int i = 0; i < testIds.length; ++i) {
+            assertThat(storedMedia.get(i)).isNotNull();
+            assertThat(storedMedia.get(i).getMediaId()).isEqualTo(testIds[i]);
+        }
+    }
+
+    // Inserts a media item, verifies it's in the DB, deletes the item, verifies it's not in the DB
+    @Test
+    public void testDeleteMedia() {
+        long testId = Math.abs(mRandom.nextLong());
+        MediaModel testMedia = getTestMedia(testId);
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(testMedia)).isEqualTo(1);
+        List<MediaModel> media = MediaSqlUtils.getSiteMediaWithId(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), testId);
+        assertThat(media).hasSize(1);
+        assertThat(media.get(0)).isNotNull();
+        assertThat(media.get(0).getMediaId()).isEqualTo(testId);
+        assertThat(MediaSqlUtils.deleteMedia(testMedia)).isEqualTo(1);
+        media = MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID));
+        assertThat(media.isEmpty()).isTrue();
+    }
+
+    // Inserts local media items and ensures they're deletable, and that they're recognized as unique by deleteMedia()
+    @Test
+    public void testDeleteLocalMedia() {
+        MediaModel testLocalMedia = getTestMedia(0);
+        MediaModel testLocalMedia2 = getTestMedia(0);
+
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(testLocalMedia)).isEqualTo(1);
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(testLocalMedia2)).isEqualTo(1);
+
+        List<MediaModel> media = MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID));
+        assertThat(media).hasSize(2);
+
+        assertThat(MediaSqlUtils.deleteMedia(media.get(0))).isEqualTo(1);
+    }
+
+    // Inserts many media items then retrieves only some items and validates based on ID
+    @Test
+    public void testGetSpecifiedMedia() {
+        long[] testIds = insertBasicTestItems();
+        List<Long> mediaIds = new ArrayList<>();
+        for (int i = 0; i < SMALL_TEST_POOL; i += 2) {
+            mediaIds.add(testIds[i]);
+        }
+        List<MediaModel> media = MediaSqlUtils.
+                getSiteMediaWithIds(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), mediaIds);
+        assertThat(media).hasSize(SMALL_TEST_POOL / 2);
+        for (int i = 0; i < media.size(); ++i) {
+            assertThat(media.get(i).getMediaId()).isEqualTo(testIds[i * 2]);
+        }
+    }
+
+    // Inserts media of multiple MIME types then retrieves only images and verifies
+    @Test
+    @SuppressWarnings("ConstantValue")
+    public void testGetSiteImages() {
+        List<Long> imageIds = new ArrayList<>(SMALL_TEST_POOL);
+        List<Long> videoIds = new ArrayList<>(SMALL_TEST_POOL);
+        for (int i = 0; i < imageIds.size(); ++i) {
+            imageIds.add(mRandom.nextLong());
+            videoIds.add(mRandom.nextLong());
+            MediaModel image = getTestMedia(imageIds.get(i));
+            image.setMimeType("image/jpg");
+            MediaModel video = getTestMedia(videoIds.get(i));
+            video.setMimeType("video/mp4");
+            assertThat(MediaSqlUtils.insertOrUpdateMedia(image)).isEqualTo(0);
+            assertThat(MediaSqlUtils.insertOrUpdateMedia(video)).isEqualTo(0);
+        }
+        List<MediaModel> images = MediaSqlUtils.getSiteImages(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID));
+        assertThat(imageIds.size()).isEqualTo(images.size());
+        for (int i = 0; i < imageIds.size(); ++i) {
+            assertThat(images.get(0).getMimeType().contains(Type.IMAGE.getValue())).isTrue();
+            assertThat(imageIds).contains(images.get(i).getMediaId());
+        }
+    }
+
+    // Inserts many images then retrieves all images with a supplied exclusion filter
+    @Test
+    public void testGetSiteImagesExclusionFilter() {
+        long[] imageIds = insertImageTestItems();
+        List<Long> exclusion = new ArrayList<>();
+        for (int i = 0; i < SMALL_TEST_POOL; i += 2) {
+            exclusion.add(imageIds[i]);
+        }
+        List<MediaModel> includedImages = MediaSqlUtils
+                .getSiteImagesExcluding(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), exclusion);
+        assertThat(includedImages).hasSize(SMALL_TEST_POOL - exclusion.size());
+        for (int i = 0; i < includedImages.size(); ++i) {
+            assertThat(exclusion).doesNotContain(includedImages.get(i).getMediaId());
+        }
+    }
+
+    // Inserts many media with compounding titles, verifies search field narrows as terms are added
+    @Test
+    public void testMediaTitleSearch() {
+        String[] testTitles = new String[SMALL_TEST_POOL];
+        testTitles[0] = "Base String";
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(getTestMedia(0, testTitles[0], "", ""))).isEqualTo(1);
+        for (int i = 1; i < testTitles.length; ++i) {
+            testTitles[i] = testTitles[i - 1] + i;
+            assertThat(MediaSqlUtils.insertOrUpdateMedia(getTestMedia(i, testTitles[i], "", ""))).isEqualTo(1);
+        }
+        for (int i = 0; i < testTitles.length; ++i) {
+            List<MediaModel> mediaModels = MediaSqlUtils
+                    .searchSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), testTitles[i]);
+            assertThat(mediaModels).hasSize(SMALL_TEST_POOL - i);
+        }
+    }
+
+    // Inserts many media with compounding titles, gets media with exact title and verifies
+    @Test
+    public void testMatchSiteMediaColumn() {
+        String[] testTitles = new String[SMALL_TEST_POOL];
+        testTitles[0] = "Base String";
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(getTestMedia(0, testTitles[0], "", ""))).isEqualTo(1);
+        for (int i = 1; i < testTitles.length; ++i) {
+            testTitles[i] = testTitles[i - 1] + i;
+            assertThat(MediaSqlUtils.insertOrUpdateMedia(getTestMedia(i, testTitles[i], "", ""))).isEqualTo(1);
+        }
+        for (String testTitle : testTitles) {
+            List<MediaModel> mediaModels = MediaSqlUtils
+                    .matchSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), MediaModelTable.TITLE, testTitle);
+            assertThat(mediaModels).hasSize(1);
+            assertThat(mediaModels.get(0).getTitle()).isEqualTo(testTitle);
+        }
+    }
+
+    // Adds a media item with known fields, updates all fields, retrieves and verifies
+    @Test
+    public void testUpdateExistingMedia() {
+        long testId = 1;
+        long testPostId = 10;
+        long testAuthorId = 100;
+        String testGuid = "testGuid";
+        int testLocalSiteId = 1000;
+        String testUploadDate = "testUploadDate";
+        String testTitle = "testTitle";
+        String testDescription = "testDescription";
+        String testCaption = "testCaption";
+        String testUrl = "testUrl";
+        String testThumbnailUrl = "testThumbnailUrl";
+        String testPath = "testPath";
+        String testFileName = "testFileName";
+        String testFileExt = "testFileExt";
+        String testMimeType = "video/mp4";
+        String testAlt = "testAlt";
+        int testWidth = 1024;
+        int testHeight = 768;
+        int testLength = 60;
+        String testVideoPressGuid = "testVideoPressGuid";
+        boolean testVideoPressProcessing = false;
+        MediaUploadState testUploadState = MediaUploadState.UPLOADING;
+        int testHorizontalAlign = 500;
+        boolean testVerticalAlign = false;
+        boolean testFeatured = false;
+        boolean testFeaturedInPost = false;
+        boolean testMarkedLocallyAsFeatured = false;
+
+        MediaModel testModel = new MediaModel(
+                testLocalSiteId,
+                testId,
+                testPostId,
+                testAuthorId,
+                testGuid,
+                testUploadDate,
+                testUrl,
+                testThumbnailUrl,
+                testFileName,
+                testFileExt,
+                testMimeType,
+                testTitle,
+                testCaption,
+                testDescription,
+                testAlt,
+                testWidth,
+                testHeight,
+                testLength,
+                testVideoPressGuid,
+                testVideoPressProcessing,
+                testUploadState,
+                null,
+                null,
+                null,
+                false
+        );
+        testModel.setFilePath(testPath);
+        testModel.setHorizontalAlignment(testHorizontalAlign);
+        testModel.setVerticalAlignment(testVerticalAlign);
+        testModel.setFeatured(testFeatured);
+        testModel.setFeaturedInPost(testFeaturedInPost);
+        testModel.setMarkedLocallyAsFeatured(testMarkedLocallyAsFeatured);
+        assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(testModel));
+
+        MediaModel testModelUpdated = new MediaModel(
+                testLocalSiteId,
+                testId,
+                testPostId + 1,
+                testAuthorId + 1,
+                testGuid + 1,
+                testUploadDate + 1,
+                testUrl + 1,
+                testThumbnailUrl + 1,
+                testFileName + 1,
+                testFileExt + 1,
+                testMimeType + 1,
+                testTitle + 1,
+                testCaption + 1,
+                testDescription + 1,
+                testAlt + 1,
+                testWidth + 1,
+                testHeight + 1,
+                testLength + 1,
+                testVideoPressGuid + 1,
+                !testVideoPressProcessing,
+                MediaUploadState.UPLOADED,
+                null,
+                null,
+                null,
+                false
+        );
+        testModelUpdated.setFilePath(testPath + 1);
+        testModelUpdated.setHorizontalAlignment(testHorizontalAlign + 1);
+        testModelUpdated.setVerticalAlignment(!testVerticalAlign);
+        testModelUpdated.setFeatured(!testFeatured);
+        testModelUpdated.setFeaturedInPost(!testFeaturedInPost);
+        testModelUpdated.setMarkedLocallyAsFeatured(!testMarkedLocallyAsFeatured);
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(testModelUpdated)).isEqualTo(1);
+
+        List<MediaModel> media = MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(testLocalSiteId));
+        assertThat(media).hasSize(1);
+        MediaModel testMedia = media.get(0);
+        assertThat(testMedia.getMediaId()).isEqualTo(testId);
+        assertThat(testMedia.getPostId()).isEqualTo(testPostId + 1);
+        assertThat(testMedia.getAuthorId()).isEqualTo(testAuthorId + 1);
+        assertThat(testMedia.getGuid()).isEqualTo(testGuid + 1);
+        assertThat(testMedia.getUploadDate()).isEqualTo(testUploadDate + 1);
+        assertThat(testMedia.getTitle()).isEqualTo(testTitle + 1);
+        assertThat(testMedia.getDescription()).isEqualTo(testDescription + 1);
+        assertThat(testMedia.getCaption()).isEqualTo(testCaption + 1);
+        assertThat(testMedia.getUrl()).isEqualTo(testUrl + 1);
+        assertThat(testMedia.getThumbnailUrl()).isEqualTo(testThumbnailUrl + 1);
+        assertThat(testMedia.getFilePath()).isEqualTo(testPath + 1);
+        assertThat(testMedia.getFileName()).isEqualTo(testFileName + 1);
+        assertThat(testMedia.getFileExtension()).isEqualTo(testFileExt + 1);
+        assertThat(testMedia.getMimeType()).isEqualTo(testMimeType + 1);
+        assertThat(testMedia.getAlt()).isEqualTo(testAlt + 1);
+        assertThat(testMedia.getWidth()).isEqualTo(testWidth + 1);
+        assertThat(testMedia.getHeight()).isEqualTo(testHeight + 1);
+        assertThat(testMedia.getLength()).isEqualTo(testLength + 1);
+        assertThat(testMedia.getVideoPressGuid()).isEqualTo(testVideoPressGuid + 1);
+        assertThat(testMedia.getVideoPressProcessingDone()).isEqualTo(!testVideoPressProcessing);
+        assertThat(MediaUploadState.fromString(testMedia.getUploadState())).isEqualTo(MediaUploadState.UPLOADED);
+        assertThat(testMedia.getHorizontalAlignment()).isEqualTo(testHorizontalAlign + 1);
+        assertThat(testMedia.getVerticalAlignment()).isEqualTo(!testVerticalAlign);
+        assertThat(testMedia.getFeatured()).isEqualTo(!testFeatured);
+        assertThat(testMedia.getFeaturedInPost()).isEqualTo(!testFeaturedInPost);
+        assertThat(testMedia.getMarkedLocallyAsFeatured()).isEqualTo(!testMarkedLocallyAsFeatured);
+    }
+
+    // Inserts many items with matching titles, deletes all media with the title, verifies
+    @Test
+    public void testDeleteMatchingSiteMedia() {
+        MediaSqlUtils.insertOrUpdateMedia(getTestMedia(SMALL_TEST_POOL + 1, "Not the same title", "", ""));
+        String testTitle = "Test Title";
+        for (int i = 0; i < SMALL_TEST_POOL; ++i) {
+            assertThat(MediaSqlUtils.insertOrUpdateMedia(getTestMedia(i, testTitle, "", ""))).isEqualTo(1);
+        }
+        assertThat(MediaSqlUtils
+                .deleteMatchingSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID), MediaModelTable.TITLE, testTitle))
+                .isEqualTo(SMALL_TEST_POOL);
+        List<MediaModel> media = MediaSqlUtils.getAllSiteMedia(getTestSiteWithLocalId(TEST_LOCAL_SITE_ID));
+        assertThat(1).isEqualTo(media.size());
+        assertThat(media.get(0).getMediaId()).isEqualTo(SMALL_TEST_POOL + 1);
+    }
+
+    @Test
+    public void testGetNotDeletedUnattachedMediaAsCursor() {
+        SiteModel site = getTestSiteWithLocalId(TEST_LOCAL_SITE_ID);
+
+        // Insert media
+        insertBasicTestItems();
+
+        // Insert one deleted media
+        MediaModel image = getTestMedia(42);
+        image.setUploadState(MediaUploadState.DELETED);
+        assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(image));
+
+        assertThat(MediaSqlUtils.getMediaWithStatesAsCursor(site, NOT_DELETED_STATES).getCount())
+                .isEqualTo(SMALL_TEST_POOL);
+    }
+
+    @Test
+    public void testGetNotDeletedSiteMediaAsCursor() {
+        SiteModel site = getTestSiteWithLocalId(TEST_LOCAL_SITE_ID);
+
+        // Insert media
+        insertBasicTestItems();
+
+        // Insert one detached but deleted media
+        MediaModel media = getTestMedia(42);
+        media.setUploadState(MediaUploadState.DELETED);
+        assertThat(MediaSqlUtils.insertOrUpdateMedia(media)).isEqualTo(1);
+
+        // Insert one attached media
+        media = getTestMedia(43);
+        media.setUploadState(MediaUploadState.UPLOADED);
+        media.setPostId(42);
+
+        assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(media));
+        Cursor c = MediaSqlUtils.getUnattachedMediaWithStates(site, NOT_DELETED_STATES);
+        assertThat(c.getCount()).isEqualTo(SMALL_TEST_POOL);
+    }
+
+    @Test
+    public void testGetNotDeletedSiteImagesAsCursor() {
+        SiteModel site = getTestSiteWithLocalId(TEST_LOCAL_SITE_ID);
+
+        // Insert images
+        insertImageTestItems();
+
+        // Insert one deleted image
+        MediaModel image = getTestMedia(42);
+        image.setMimeType("image/jpg");
+        image.setUploadState(MediaUploadState.DELETED);
+        assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(image));
+
+        assertThat(MediaSqlUtils.getImagesWithStatesAsCursor(site, NOT_DELETED_STATES).getCount())
+                .isEqualTo(SMALL_TEST_POOL);
+        assertThat(MediaSqlUtils.getMediaWithStatesAsCursor(site, NOT_DELETED_STATES).getCount())
+                .isEqualTo(SMALL_TEST_POOL);
+    }
+
+    @Test
+        public void testPushAndFetchCollision() {
+        // Test uploading media, fetching remote media and updating the db from the fetch first
+
+        MediaModel mediaModel = getTestMedia(0);
+        MediaSqlUtils.insertMediaForResult(mediaModel);
+
+        SiteModel site = getTestSiteWithLocalId(TEST_LOCAL_SITE_ID);
+
+        // The media item after uploading, updated with the remote media ID, about to be saved locally
+        MediaModel mediaFromUploadResponse = MediaSqlUtils.getAllSiteMedia(site).get(0);
+        mediaFromUploadResponse.setUploadState(MediaUploadState.UPLOADED);
+        mediaFromUploadResponse.setMediaId(42);
+
+        // The same media, but fetched from the server from FETCH_MEDIA_LIST (so no local ID until insertion)
+        final MediaModel mediaFromMediaListFetch = MediaSqlUtils.getAllSiteMedia(site).get(0);
+        mediaFromMediaListFetch.setUploadState(MediaUploadState.UPLOADED);
+        mediaFromMediaListFetch.setMediaId(42);
+        mediaFromMediaListFetch.setId(0);
+
+        MediaSqlUtils.insertOrUpdateMedia(mediaFromMediaListFetch);
+        MediaSqlUtils.insertOrUpdateMedia(mediaFromUploadResponse);
+
+        assertThat(MediaSqlUtils.getAllSiteMedia(site).size()).isEqualTo(1);
+
+        MediaModel finalMedia = MediaSqlUtils.getAllSiteMedia(site).get(0);
+        assertThat(finalMedia.getMediaId()).isEqualTo(42);
+        assertThat(mediaModel.getLocalSiteId()).isEqualTo(finalMedia.getLocalSiteId());
+    }
+
+    // Utilities
+
+    private long[] insertBasicTestItems() {
+        long[] testItemIds = new long[MediaSqlUtilsTest.SMALL_TEST_POOL];
+        for (int i = 0; i < MediaSqlUtilsTest.SMALL_TEST_POOL; ++i) {
+            testItemIds[i] = mRandom.nextLong();
+            MediaModel media = getTestMedia(testItemIds[i]);
+            media.setUploadState(MediaUploadState.UPLOADED);
+            assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(media));
+        }
+        return testItemIds;
+    }
+
+    private long[] insertImageTestItems() {
+        long[] testItemIds = new long[MediaSqlUtilsTest.SMALL_TEST_POOL];
+        for (int i = 0; i < MediaSqlUtilsTest.SMALL_TEST_POOL; ++i) {
+            testItemIds[i] = Math.abs(mRandom.nextInt());
+            MediaModel image = getTestMedia(testItemIds[i]);
+            image.setMimeType("image/jpg");
+            image.setUploadState(MediaUploadState.UPLOADED);
+            assertThat(1).isEqualTo(MediaSqlUtils.insertOrUpdateMedia(image));
+        }
+        return testItemIds;
+    }
+
+    private MediaModel getTestMedia(long mediaId) {
+        return new MediaModel(
+                TEST_LOCAL_SITE_ID,
+                mediaId
+        );
+    }
+
+    private MediaModel getTestMedia(long mediaId, String title, String description, String caption) {
+        MediaModel media = new MediaModel(
+                TEST_LOCAL_SITE_ID,
+                mediaId
+        );
+        media.setTitle(title);
+        media.setDescription(description);
+        media.setCaption(caption);
+        return media;
+    }
+
+    private String getTestString() {
+        return "BaseTestString-" + mRandom.nextInt();
+    }
+
+    private SiteModel getTestSiteWithLocalId(int localSiteId) {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(localSiteId);
+        return siteModel;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaStoreTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaStoreTest.java
new file mode 100644
index 00000000000..eb84050a63b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaStoreTest.java
@@ -0,0 +1,732 @@
+package org.wordpress.android.fluxc.media;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.rest.wpapi.media.ApplicationPasswordsMediaRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.media.wpv2.WPComV2MediaRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.media.MediaXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.store.MediaStore;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.generateMedia;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.generateMediaFromPath;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.generateRandomizedMedia;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.generateRandomizedMediaList;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.insertMediaIntoDatabase;
+import static org.wordpress.android.fluxc.media.MediaTestUtils.insertRandomMediaIntoDatabase;
+
+@RunWith(RobolectricTestRunner.class)
+public class MediaStoreTest {
+    @SuppressWarnings("KotlinInternalInJava")
+    private final MediaStore mMediaStore = new MediaStore(new Dispatcher(),
+            Mockito.mock(MediaRestClient.class),
+            Mockito.mock(MediaXMLRPCClient.class),
+            Mockito.mock(WPComV2MediaRestClient.class),
+            Mockito.mock(ApplicationPasswordsMediaRestClient.class),
+            Mockito.mock(org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+                    .ApplicationPasswordsConfiguration.class)
+    );
+
+    @Before
+    public void setUp() {
+        Context context = RuntimeEnvironment.getApplication().getApplicationContext();
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(context, MediaModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testGetAllMedia() {
+        final int testSiteId = 2;
+        final List<MediaModel> testMedia = insertRandomMediaIntoDatabase(testSiteId, 5);
+
+        // get all media via MediaStore
+        List<MediaModel> storeMedia = mMediaStore.getAllSiteMedia(getTestSiteWithLocalId(testSiteId));
+        assertNotNull(storeMedia);
+        assertEquals(testMedia.size(), storeMedia.size());
+
+        // verify media
+        for (MediaModel media : storeMedia) {
+            assertEquals(testSiteId, media.getLocalSiteId());
+            assertTrue(testMedia.contains(media));
+        }
+    }
+
+    @Test
+    public void testMediaCount() {
+        final int testSiteId = 2;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(0, mMediaStore.getSiteMediaCount(testSite));
+
+        // count after insertion
+        insertRandomMediaIntoDatabase(testSiteId, 5);
+        assertEquals(5, mMediaStore.getSiteMediaCount(testSite));
+
+        // count after inserting with different site ID
+        final int wrongSiteId = testSiteId + 1;
+        SiteModel wrongSite = getTestSiteWithLocalId(wrongSiteId);
+        assertEquals(0, mMediaStore.getSiteMediaCount(wrongSite));
+        insertRandomMediaIntoDatabase(wrongSiteId, 1);
+        assertEquals(1, mMediaStore.getSiteMediaCount(wrongSite));
+        assertEquals(5, mMediaStore.getSiteMediaCount(testSite));
+    }
+
+    @Test
+    public void testHasSiteMediaWithId() {
+        final int testSiteId = 24;
+        final long testMediaId = 22;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(0, mMediaStore.getSiteMediaCount(testSite));
+        assertFalse(mMediaStore.hasSiteMediaWithId(testSite, testMediaId));
+
+        // add test media
+        MediaModel testMedia = getBasicMedia();
+        testMedia.setLocalSiteId(testSiteId);
+        testMedia.setMediaId(testMediaId);
+        assertEquals(1, insertMediaIntoDatabase(testMedia));
+
+        // verify store has inserted media
+        assertEquals(1, mMediaStore.getSiteMediaCount(testSite));
+        assertTrue(mMediaStore.hasSiteMediaWithId(testSite, testMediaId));
+    }
+
+    @Test
+    public void testGetSpecificSiteMedia() {
+        final int testSiteId = 25;
+        final long testMediaId = 11;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertFalse(mMediaStore.hasSiteMediaWithId(testSite, testMediaId));
+
+        // add test media
+        MediaModel testMedia = getBasicMedia();
+        testMedia.setLocalSiteId(testSiteId);
+        testMedia.setMediaId(testMediaId);
+        assertEquals(1, insertMediaIntoDatabase(testMedia));
+
+        // cannot get media with incorrect site ID
+        final int wrongSiteId = testSiteId + 1;
+        SiteModel wrongSite = getTestSiteWithLocalId(wrongSiteId);
+        assertNull(mMediaStore.getSiteMediaWithId(wrongSite, testMediaId));
+
+        // verify stored media
+        final MediaModel storeMedia = mMediaStore.getSiteMediaWithId(testSite, testMediaId);
+        assertNotNull(storeMedia);
+        assertEquals(testMedia, storeMedia);
+    }
+
+    @Test
+    public void testGetListOfSiteMedia() {
+        // insert list of media
+        final int testListSize = 10;
+        final int testSiteId = 55;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        List<MediaModel> insertedMedia = insertRandomMediaIntoDatabase(testSiteId, testListSize);
+        assertEquals(testListSize, mMediaStore.getSiteMediaCount(testSite));
+
+        // create whitelist
+        List<Long> whitelist = new ArrayList<>(testListSize / 2);
+        for (int i = 0; i < testListSize; i += 2) {
+            whitelist.add(insertedMedia.get(i).getMediaId());
+        }
+
+        final List<MediaModel> storeMedia = mMediaStore.getSiteMediaWithIds(testSite, whitelist);
+        assertNotNull(storeMedia);
+        assertEquals(storeMedia.size(), whitelist.size());
+        for (MediaModel media : storeMedia) {
+            assertTrue(whitelist.contains(media.getMediaId()));
+        }
+    }
+
+    @Test
+    public void testGetSiteImages() {
+        final String testVideoPath = "/test/test_video.mp4";
+        final String testImagePath = "/test/test_image.jpg";
+        final int testSiteId = 55;
+        final long testVideoId = 987;
+        final long testImageId = 654;
+
+        // insert media of different types
+        MediaModel videoMedia = generateMediaFromPath(testSiteId, testVideoId, testVideoPath);
+        assertTrue(MediaUtils.isVideoMimeType(videoMedia.getMimeType()));
+        MediaModel imageMedia = generateMediaFromPath(testSiteId, testImageId, testImagePath);
+        assertTrue(MediaUtils.isImageMimeType(imageMedia.getMimeType()));
+        insertMediaIntoDatabase(videoMedia);
+        insertMediaIntoDatabase(imageMedia);
+
+        final List<MediaModel> storeImages = mMediaStore.getSiteImages(getTestSiteWithLocalId(testSiteId));
+        assertNotNull(storeImages);
+        assertEquals(1, storeImages.size());
+        assertEquals(testImageId, storeImages.get(0).getMediaId());
+        assertTrue(MediaUtils.isImageMimeType(storeImages.get(0).getMimeType()));
+    }
+
+    @Test
+    public void testGetSiteImageCount() {
+        final int testSiteId = 9001;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(0, mMediaStore.getSiteImages(testSite).size());
+
+        // insert both images and videos
+        final int testListSize = 10;
+        final List<MediaModel> testImages = new ArrayList<>(testListSize);
+        final List<MediaModel> testVideos = new ArrayList<>(testListSize);
+        final String testVideoPath = "/test/test_video%d.mp4";
+        final String testImagePath = "/test/test_image%d.png";
+        for (int i = 0; i < testListSize; ++i) {
+            MediaModel testImage = generateMediaFromPath(testSiteId, i, String.format(testImagePath, i));
+            MediaModel testVideo = generateMediaFromPath(testSiteId, i + testListSize, String.format(testVideoPath, i));
+            assertEquals(1, insertMediaIntoDatabase(testImage));
+            assertEquals(1, insertMediaIntoDatabase(testVideo));
+            testImages.add(testImage);
+            testVideos.add(testVideo);
+        }
+
+        assertEquals(mMediaStore.getSiteMediaCount(testSite), testImages.size() + testVideos.size());
+        assertEquals(mMediaStore.getSiteImages(testSite).size(), testImages.size());
+    }
+
+    @Test
+    public void testGetSiteImagesBlacklist() {
+        final int testSiteId = 3;
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(0, mMediaStore.getSiteImages(testSite).size());
+
+        final int testListSize = 10;
+        final List<MediaModel> testImages = new ArrayList<>(testListSize);
+        final String testImagePath = "/test/test_image%d.png";
+        for (int i = 0; i < testListSize; ++i) {
+            MediaModel image = generateMediaFromPath(testSiteId, i, String.format(testImagePath, i));
+            assertEquals(1, insertMediaIntoDatabase(image));
+            testImages.add(image);
+        }
+        assertEquals(testListSize, mMediaStore.getSiteImages(testSite).size());
+
+        // create blacklist
+        List<Long> blacklist = new ArrayList<>(testListSize / 2);
+        for (int i = 0; i < testListSize; i += 2) {
+            blacklist.add(testImages.get(i).getMediaId());
+        }
+
+        final List<MediaModel> storeMedia = mMediaStore.getSiteImagesExcludingIds(testSite, blacklist);
+        assertNotNull(storeMedia);
+        assertEquals(testListSize - blacklist.size(), storeMedia.size());
+        for (MediaModel media : storeMedia) {
+            assertFalse(blacklist.contains(media.getMediaId()));
+        }
+    }
+
+    @Test
+    public void testGetUnattachedSiteMedia() {
+        final int testSiteId = 10001;
+        final int testPoolSize = 10;
+        final List<MediaModel> unattachedMedia = new ArrayList<>(testPoolSize);
+        for (int i = 0; i < testPoolSize; ++i) {
+            MediaModel attached = generateRandomizedMedia(testSiteId);
+            MediaModel unattached = generateRandomizedMedia(testSiteId);
+            attached.setMediaId(i);
+            unattached.setMediaId(i + testPoolSize);
+            attached.setPostId(i + testPoolSize);
+            unattached.setPostId(0);
+            insertMediaIntoDatabase(attached);
+            insertMediaIntoDatabase(unattached);
+            unattachedMedia.add(unattached);
+        }
+
+        final List<MediaModel> storeMedia = mMediaStore.getUnattachedSiteMedia(getTestSiteWithLocalId(testSiteId));
+        assertNotNull(storeMedia);
+        assertEquals(storeMedia.size(), unattachedMedia.size());
+        for (int i = 0; i < storeMedia.size(); ++i) {
+            assertTrue(storeMedia.contains(unattachedMedia.get(i)));
+        }
+    }
+
+    @Test
+    public void testGetUnattachedSiteMediaCount() {
+        final int testSiteId = 10001;
+        final int testPoolSize = 10;
+        for (int i = 0; i < testPoolSize; ++i) {
+            MediaModel attached = generateRandomizedMedia(testSiteId);
+            MediaModel unattached = generateRandomizedMedia(testSiteId);
+            attached.setMediaId(i);
+            unattached.setMediaId(i + testPoolSize);
+            attached.setPostId(i + testPoolSize);
+            unattached.setPostId(0);
+            insertMediaIntoDatabase(attached);
+            insertMediaIntoDatabase(unattached);
+        }
+        assertEquals(testPoolSize, mMediaStore.getUnattachedSiteMedia(getTestSiteWithLocalId(testSiteId)).size());
+    }
+
+    @Test
+    public void testGetLocalSiteMedia() {
+        final int testSiteId = 9;
+        final long localMediaId = 2468;
+        final long remoteMediaId = 1357;
+
+        // add local media to site
+        final MediaModel localMedia = getBasicMedia();
+        localMedia.setLocalSiteId(testSiteId);
+        localMedia.setMediaId(localMediaId);
+        localMedia.setUploadState(MediaUploadState.UPLOADING);
+        insertMediaIntoDatabase(localMedia);
+
+        // add remote media
+        final MediaModel remoteMedia = getBasicMedia();
+        remoteMedia.setLocalSiteId(testSiteId);
+        remoteMedia.setMediaId(remoteMediaId);
+        // remote media has a defined upload date, simulated here
+        remoteMedia.setUploadState(MediaUploadState.UPLOADED);
+        insertMediaIntoDatabase(remoteMedia);
+
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(2, mMediaStore.getSiteMediaCount(testSite));
+
+        // verify local store media
+        final List<MediaModel> localSiteMedia = mMediaStore.getLocalSiteMedia(testSite);
+        assertNotNull(localSiteMedia);
+        assertEquals(1, localSiteMedia.size());
+        assertNotNull(localSiteMedia.get(0));
+        assertEquals(localMediaId, localSiteMedia.get(0).getMediaId());
+
+        // verify uploaded store media
+        final List<MediaModel> uploadedSiteMedia = mMediaStore.getSiteMediaWithState(testSite,
+                MediaUploadState.UPLOADED);
+        assertNotNull(uploadedSiteMedia);
+        assertEquals(1, uploadedSiteMedia.size());
+        assertNotNull(uploadedSiteMedia.get(0));
+        assertEquals(remoteMediaId, uploadedSiteMedia.get(0).getMediaId());
+    }
+
+    @Test
+    public void testGetUrlForVideoWithVideoPressGuid() {
+        // insert video
+        final int testSiteId = 13;
+        final long testMediaId = 42;
+        final String testVideoPath = "/test/test_video.mp4";
+        final MediaModel testVideo = generateMediaFromPath(testSiteId, testMediaId, testVideoPath);
+        final String testUrl = "http://notarealurl.testfluxc.org/not/a/real/resource/path.mp4";
+        final String testVideoPressGuid = "thisisonlyatest";
+        testVideo.setUrl(testUrl);
+        testVideo.setVideoPressGuid(testVideoPressGuid);
+        assertEquals(1, insertMediaIntoDatabase(testVideo));
+
+        // retrieve video and verify
+        final String storeUrl = mMediaStore
+                .getUrlForSiteVideoWithVideoPressGuid(getTestSiteWithLocalId(testSiteId), testVideoPressGuid);
+        assertNotNull(storeUrl);
+        assertEquals(testUrl, storeUrl);
+    }
+
+    @Test
+    public void testGetThumbnailUrl() {
+        // create and insert media with defined thumbnail URL
+        final int testSiteId = 180;
+        final long testMediaId = 360;
+        final MediaModel testMedia = generateRandomizedMedia(testSiteId);
+        final String testUrl = "http://notarealurl.testfluxc.org/not/a/real/resource/path.mp4";
+        testMedia.setThumbnailUrl(testUrl);
+        testMedia.setMediaId(testMediaId);
+        assertEquals(1, insertMediaIntoDatabase(testMedia));
+
+        // retrieve media and verify
+        final String storeUrl = mMediaStore
+                .getThumbnailUrlForSiteMediaWithId(getTestSiteWithLocalId(testSiteId), testMediaId);
+        assertNotNull(storeUrl);
+        assertEquals(testUrl, storeUrl);
+    }
+
+    @Test
+    public void testSearchSiteMediaTitles() {
+        final int testSiteId = 628;
+        final int testPoolSize = 10;
+        final String[] testTitles = new String[testPoolSize];
+
+        String baseString = "Base String";
+        for (int i = 0; i < testPoolSize; ++i) {
+            testTitles[i] = baseString;
+            MediaModel testMedia = generateMedia(baseString, null, null, null);
+            testMedia.setLocalSiteId(testSiteId);
+            testMedia.setMediaId(i);
+            assertEquals(1, insertMediaIntoDatabase(testMedia));
+            baseString += String.valueOf(i);
+        }
+
+        for (int i = 0; i < testPoolSize; ++i) {
+            List<MediaModel> storeMedia = mMediaStore
+                    .searchSiteMedia(getTestSiteWithLocalId(testSiteId), testTitles[i]);
+            assertNotNull(storeMedia);
+            assertEquals(storeMedia.size(), testPoolSize - i);
+        }
+    }
+
+    @Test
+    public void testSearchSiteImages() {
+        final String testImagePath = "/test/test_image.jpg";
+        final String testVideoPath = "/test/test_video.mp4";
+        final String testAudioPath = "/test/test_audio.mp3";
+
+        final int testSiteId = 55;
+        final long testImageId = 654;
+        final long testVideoId = 987;
+        final long testAudioId = 540;
+
+        // generate media of different types
+        MediaModel imageMedia = generateMediaFromPath(testSiteId, testImageId, testImagePath);
+        imageMedia.setTitle("Awesome Image");
+        imageMedia.setDescription("This is an image test");
+        assertTrue(MediaUtils.isImageMimeType(imageMedia.getMimeType()));
+
+        MediaModel videoMedia = generateMediaFromPath(testSiteId, testVideoId, testVideoPath);
+        videoMedia.setTitle("Video Title");
+        videoMedia.setCaption("Test Caption");
+        assertTrue(MediaUtils.isVideoMimeType(videoMedia.getMimeType()));
+
+        MediaModel audioMedia = generateMediaFromPath(testSiteId, testAudioId, testAudioPath);
+        audioMedia.setDescription("This is an audio test");
+        assertTrue(MediaUtils.isAudioMimeType(audioMedia.getMimeType()));
+
+        // insert media of different types
+        insertMediaIntoDatabase(videoMedia);
+        insertMediaIntoDatabase(imageMedia);
+        insertMediaIntoDatabase(audioMedia);
+
+        // verify the correct media is returned
+        final List<MediaModel> storeImages = mMediaStore
+                .searchSiteImages(getTestSiteWithLocalId(testSiteId), "test");
+
+        assertNotNull(storeImages);
+        assertEquals(1, storeImages.size());
+        assertEquals(testImageId, storeImages.get(0).getMediaId());
+        assertTrue(MediaUtils.isImageMimeType(storeImages.get(0).getMimeType()));
+        assertEquals(testSiteId, storeImages.get(0).getLocalSiteId());
+    }
+
+    @Test
+    public void testSearchSiteVideos() {
+        final String testVideoPath1 = "/test/video_1.mp4";
+        final String testVideoPath2 = "/test/video_2.mp4";
+        final String testDocumentPath = "/test/test_document.pdf";
+
+        final int testSiteId = 423;
+        final long testVideoId1 = 675;
+        final long testVideoId2 = 1432;
+        final long testDocumentId = 125;
+
+        // generate media of different types
+        MediaModel videoMedia1 = generateMediaFromPath(testSiteId, testVideoId1, testVideoPath1);
+        videoMedia1.setTitle("My trip title");
+        assertTrue(MediaUtils.isVideoMimeType(videoMedia1.getMimeType()));
+
+        MediaModel videoMedia2 = generateMediaFromPath(testSiteId, testVideoId2, testVideoPath2);
+        videoMedia2.setTitle("Test video title");
+        assertTrue(MediaUtils.isVideoMimeType(videoMedia2.getMimeType()));
+
+        MediaModel documentMedia = generateMediaFromPath(testSiteId, testDocumentId, testDocumentPath);
+        documentMedia.setTitle("My first test");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia.getMimeType()));
+
+        // insert media of different types
+        insertMediaIntoDatabase(videoMedia1);
+        insertMediaIntoDatabase(videoMedia2);
+        insertMediaIntoDatabase(documentMedia);
+
+        // verify the correct media is returned
+        final List<MediaModel> storeVideos = mMediaStore
+                .searchSiteVideos(getTestSiteWithLocalId(testSiteId), "test");
+        assertNotNull(storeVideos);
+        assertEquals(1, storeVideos.size());
+        assertEquals(testVideoId2, storeVideos.get(0).getMediaId());
+        assertTrue(MediaUtils.isVideoMimeType(storeVideos.get(0).getMimeType()));
+        assertEquals(testSiteId, storeVideos.get(0).getLocalSiteId());
+    }
+
+    @Test
+    public void testSearchSiteAudio() {
+        final String testImagePath = "/test/test_image.jpg";
+        final String testAudioPath1 = "/test/my_audio.mp3";
+        final String testAudioPath2 = "/test/awesome_2018.mp3";
+        final String testDocumentPath = "/test/test_document.pdf";
+
+        final int testSiteId = 8765;
+        final long testImageId = 34;
+        final long testAudioId1 = 100;
+        final long testAudioId2 = 99;
+        final long testDocumentId = 43;
+
+        // generate media of different types
+        MediaModel imageMedia = generateMediaFromPath(testSiteId, testImageId, testImagePath);
+        imageMedia.setTitle("Title test");
+        assertTrue(MediaUtils.isImageMimeType(imageMedia.getMimeType()));
+
+        MediaModel audioMedia1 = generateMediaFromPath(testSiteId, testAudioId1, testAudioPath1);
+        audioMedia1.setTitle("The big one");
+        audioMedia1.setDescription("Test for the World");
+        assertTrue(MediaUtils.isAudioMimeType(audioMedia1.getMimeType()));
+
+        MediaModel audioMedia2 = generateMediaFromPath(testSiteId, testAudioId2, testAudioPath2);
+        audioMedia2.setTitle("The test!");
+        audioMedia2.setDescription("Without description");
+        assertTrue(MediaUtils.isAudioMimeType(audioMedia2.getMimeType()));
+
+        MediaModel documentMedia = generateMediaFromPath(testSiteId, testDocumentId, testDocumentPath);
+        documentMedia.setTitle("Document with every test of the app");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia.getMimeType()));
+
+        // insert media of different types
+        insertMediaIntoDatabase(imageMedia);
+        insertMediaIntoDatabase(audioMedia1);
+        insertMediaIntoDatabase(audioMedia2);
+        insertMediaIntoDatabase(documentMedia);
+
+        // verify the correct media is returned (just audio)
+        final List<MediaModel> storeAudio = mMediaStore
+                .searchSiteAudio(getTestSiteWithLocalId(testSiteId), "test");
+        assertNotNull(storeAudio);
+        assertEquals(2, storeAudio.size());
+        assertEquals(testAudioId1, storeAudio.get(0).getMediaId());
+        assertEquals(testAudioId2, storeAudio.get(1).getMediaId());
+
+        assertTrue(MediaUtils.isAudioMimeType(storeAudio.get(0).getMimeType()));
+        assertTrue(MediaUtils.isAudioMimeType(storeAudio.get(1).getMimeType()));
+
+        assertEquals(testSiteId, storeAudio.get(0).getLocalSiteId());
+        assertEquals(testSiteId, storeAudio.get(1).getLocalSiteId());
+    }
+
+    @Test
+    public void testSearchSiteDocuments() {
+        final String testAudioPath = "/test/test_audio.mp3";
+        final String testDocumentPath1 = "/test/document.pdf";
+        final String testDocumentPath2 = "/test/document.doc";
+        final String testDocumentPath3 = "/test/document.xls";
+        final String testDocumentPath4 = "/test/document.pps";
+
+        final int testSiteId = 865234;
+        final long testAudioId = 78;
+        final long testDocumentId1 = 234;
+        final long testDocumentId2 = 657;
+        final long testDocumentId3 = 98;
+        final long testDocumentId4 = 543;
+
+        // generate media of different types
+        MediaModel audioMedia = generateMediaFromPath(testSiteId, testAudioId, testAudioPath);
+        audioMedia.setTitle("My first test");
+        audioMedia.setDescription("This is a description test");
+        audioMedia.setCaption("Caption test");
+        assertTrue(MediaUtils.isAudioMimeType(audioMedia.getMimeType()));
+
+        MediaModel documentMedia1 = generateMediaFromPath(testSiteId, testDocumentId1, testDocumentPath1);
+        documentMedia1.setTitle("The Document");
+        documentMedia1.setDescription("short description");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia1.getMimeType()));
+
+        MediaModel documentMedia2 = generateMediaFromPath(testSiteId, testDocumentId2, testDocumentPath2);
+        documentMedia2.setTitle("Document to Test");
+        documentMedia2.setDescription("medium description");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia2.getMimeType()));
+
+        MediaModel documentMedia3 = generateMediaFromPath(testSiteId, testDocumentId3, testDocumentPath3);
+        documentMedia3.setTitle("Document");
+        documentMedia3.setDescription("Large description with a test");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia3.getMimeType()));
+
+        MediaModel documentMedia4 = generateMediaFromPath(testSiteId, testDocumentId4, testDocumentPath4);
+        documentMedia4.setTitle("Document Title");
+        documentMedia4.setDescription("description");
+        assertTrue(MediaUtils.isApplicationMimeType(documentMedia4.getMimeType()));
+
+        // insert media of different types
+        insertMediaIntoDatabase(audioMedia);
+        insertMediaIntoDatabase(documentMedia1);
+        insertMediaIntoDatabase(documentMedia2);
+        insertMediaIntoDatabase(documentMedia3);
+        insertMediaIntoDatabase(documentMedia4);
+
+        // verify the correct media is returned (just documents)
+        final List<MediaModel> storeDocuments = mMediaStore
+                .searchSiteDocuments(getTestSiteWithLocalId(testSiteId), "test");
+        assertNotNull(storeDocuments);
+        assertEquals(2, storeDocuments.size());
+        assertEquals(testDocumentId2, storeDocuments.get(0).getMediaId());
+        assertEquals(testDocumentId3, storeDocuments.get(1).getMediaId());
+
+        assertTrue(MediaUtils.isApplicationMimeType(storeDocuments.get(0).getMimeType()));
+        assertTrue(MediaUtils.isApplicationMimeType(storeDocuments.get(1).getMimeType()));
+
+        assertEquals(testSiteId, storeDocuments.get(0).getLocalSiteId());
+        assertEquals(testSiteId, storeDocuments.get(1).getLocalSiteId());
+    }
+
+    @Test
+    public void testGetPostMedia() {
+        final int testSiteId = 11235813;
+        final int testLocalPostId = 213253;
+        final long postMediaId = 13;
+        final long unattachedMediaId = 57;
+        final long otherMediaId = 911;
+        final String testPath = "this/is/only/a/test.png";
+
+        // add post media with test path
+        final MediaModel postMedia = getBasicMedia();
+        postMedia.setLocalSiteId(testSiteId);
+        postMedia.setLocalPostId(testLocalPostId);
+        postMedia.setMediaId(postMediaId);
+        postMedia.setFilePath(testPath);
+        insertMediaIntoDatabase(postMedia);
+
+        // add unattached media with test path
+        final MediaModel unattachedMedia = getBasicMedia();
+        unattachedMedia.setLocalSiteId(testSiteId);
+        unattachedMedia.setLocalPostId(testLocalPostId);
+        unattachedMedia.setFilePath(testPath);
+        unattachedMedia.setMediaId(unattachedMediaId);
+        insertMediaIntoDatabase(unattachedMedia);
+
+        // add post media with different file path
+        final MediaModel otherPathMedia = getBasicMedia();
+        otherPathMedia.setLocalSiteId(testSiteId);
+        otherPathMedia.setLocalPostId(testLocalPostId);
+        otherPathMedia.setMediaId(otherMediaId);
+        otherPathMedia.setFilePath("appended/" + testPath);
+        insertMediaIntoDatabase(otherPathMedia);
+
+        // verify the correct media is in the store
+        PostModel post = new PostModel();
+        post.setId(testLocalPostId);
+        final MediaModel storeMedia = mMediaStore.getMediaForPostWithPath(post, testPath);
+        assertNotNull(storeMedia);
+        assertEquals(testPath, storeMedia.getFilePath());
+        assertEquals(postMediaId, storeMedia.getMediaId());
+        assertEquals(3, mMediaStore.getSiteMediaCount(getTestSiteWithLocalId(testSiteId)));
+
+        // verify the correct media is in the store
+        List<MediaModel> mediaModelList = mMediaStore.getMediaForPost(post);
+        assertNotNull(mediaModelList);
+        assertEquals(3, mediaModelList.size());
+        for (MediaModel media : mediaModelList) {
+            assertNotNull(media);
+            assertEquals(post.getId(), media.getLocalPostId());
+        }
+    }
+
+    @Test
+    public void testGetNextSiteMediaToDelete() {
+        final int testSiteId = 30984;
+        final int count = 10;
+
+        // add media with varying upload states
+        final List<MediaModel> pendingDelete = generateRandomizedMediaList(count, testSiteId);
+        final List<MediaModel> other = generateRandomizedMediaList(count, testSiteId);
+        for (int i = 0; i < count; ++i) {
+            pendingDelete.get(i).setUploadState(MediaUploadState.DELETING);
+            pendingDelete.get(i).setMediaId(i + (count * 2));
+            other.get(i).setUploadState(MediaUploadState.UPLOADED);
+            other.get(i).setMediaId(i + count);
+            insertMediaIntoDatabase(pendingDelete.get(i));
+            insertMediaIntoDatabase(other.get(i));
+        }
+
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(count * 2, mMediaStore.getSiteMediaCount(testSite));
+
+        // verify store media updates as media is deleted
+        for (int i = 0; i < count; ++i) {
+            MediaModel next = mMediaStore.getNextSiteMediaToDelete(testSite);
+            assertNotNull(next);
+            assertEquals(MediaUploadState.DELETING, MediaUploadState.fromString(next.getUploadState()));
+            assertTrue(pendingDelete.contains(next));
+            MediaSqlUtils.deleteMedia(next);
+            assertEquals(count * 2 - i - 1, mMediaStore.getSiteMediaCount(testSite));
+            pendingDelete.remove(next);
+        }
+    }
+
+    @Test
+    public void testHasSiteMediaToDelete() {
+        final int testSiteId = 30984;
+        final int count = 10;
+
+        // add media with varying upload states
+        final List<MediaModel> pendingDelete = generateRandomizedMediaList(count, testSiteId);
+        final List<MediaModel> other = generateRandomizedMediaList(count, testSiteId);
+        for (int i = 0; i < count; ++i) {
+            pendingDelete.get(i).setUploadState(MediaUploadState.DELETING);
+            pendingDelete.get(i).setMediaId(i + (count * 2));
+            other.get(i).setUploadState(MediaUploadState.DELETED);
+            other.get(i).setMediaId(i + count);
+            insertMediaIntoDatabase(pendingDelete.get(i));
+            insertMediaIntoDatabase(other.get(i));
+        }
+
+        SiteModel testSite = getTestSiteWithLocalId(testSiteId);
+        assertEquals(count * 2, mMediaStore.getSiteMediaCount(testSite));
+
+        // verify store still has media to delete after deleting one
+        assertTrue(mMediaStore.hasSiteMediaToDelete(testSite));
+        MediaModel next = mMediaStore.getNextSiteMediaToDelete(testSite);
+        assertNotNull(next);
+        assertTrue(pendingDelete.contains(next));
+        MediaSqlUtils.deleteMedia(next);
+        pendingDelete.remove(next);
+        assertEquals(count * 2 - 1, mMediaStore.getSiteMediaCount(testSite));
+        assertTrue(mMediaStore.hasSiteMediaToDelete(testSite));
+
+        // verify store has no media to delete after removing all
+        for (MediaModel pending : pendingDelete) {
+            MediaSqlUtils.deleteMedia(pending);
+        }
+        assertEquals(count, mMediaStore.getSiteMediaCount(testSite));
+        assertFalse(mMediaStore.hasSiteMediaToDelete(testSite));
+    }
+
+    @Test
+    public void testRemoveAllMedia() {
+        SiteModel testSite1 = getTestSiteWithLocalId(1);
+        insertRandomMediaIntoDatabase(testSite1.getId(), 5);
+        assertEquals(5, mMediaStore.getSiteMediaCount(testSite1));
+
+        SiteModel testSite2 = getTestSiteWithLocalId(2);
+        insertRandomMediaIntoDatabase(testSite2.getId(), 7);
+        assertEquals(7, mMediaStore.getSiteMediaCount(testSite2));
+
+        MediaSqlUtils.deleteAllMedia();
+
+        assertEquals(0, mMediaStore.getSiteMediaCount(testSite1));
+        assertEquals(0, mMediaStore.getSiteMediaCount(testSite2));
+    }
+
+    private MediaModel getBasicMedia() {
+        return generateMedia("Test Title", "Test Description", "Test Caption", "Test Alt");
+    }
+
+    private SiteModel getTestSiteWithLocalId(int localSiteId) {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(localSiteId);
+        return siteModel;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaTestUtils.java
new file mode 100644
index 00000000000..255f59e9914
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/media/MediaTestUtils.java
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.media;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+public class MediaTestUtils {
+    public static int insertMediaIntoDatabase(MediaModel media) {
+        return MediaSqlUtils.insertOrUpdateMedia(media);
+    }
+
+    public static List<MediaModel> insertRandomMediaIntoDatabase(int localSiteId, int count) {
+        List<MediaModel> insertedMedia = generateRandomizedMediaList(count, localSiteId);
+        for (MediaModel media : insertedMedia) {
+            assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(media));
+        }
+        return insertedMedia;
+    }
+
+    public static MediaModel generateMedia(String title, String desc, String caption, String alt) {
+        MediaModel media = new MediaModel(
+                0,
+                0
+        );
+        media.setTitle(title);
+        media.setDescription(desc);
+        media.setCaption(caption);
+        media.setAlt(alt);
+        return media;
+    }
+
+    public static MediaModel generateMediaFromPath(int localSiteId, long mediaId, String filePath) {
+        MediaModel media = new MediaModel(
+                localSiteId,
+                mediaId
+        );
+        media.setFilePath(filePath);
+        media.setFileName(MediaUtils.getFileName(filePath));
+        media.setFileExtension(MediaUtils.getExtension(filePath));
+        media.setMimeType(MediaUtils.getMimeTypeForExtension(media.getFileExtension()));
+        media.setTitle(media.getFileName());
+        return media;
+    }
+
+    public static MediaModel generateRandomizedMedia(int localSiteId) {
+        MediaModel media = generateMedia(randomStr(5), randomStr(5), randomStr(5), randomStr(5));
+        media.setLocalSiteId(localSiteId);
+        return media;
+    }
+
+    public static List<MediaModel> generateRandomizedMediaList(int size, int localSiteId) {
+        List<MediaModel> mediaList = new ArrayList<>();
+        for (int i = 0; i < size; ++i) {
+            MediaModel newMedia = generateRandomizedMedia(localSiteId);
+            newMedia.setMediaId(i);
+            mediaList.add(newMedia);
+        }
+        return mediaList;
+    }
+
+    public static String randomStr(int length) {
+        String randomString = UUID.randomUUID().toString();
+        return length > randomString.length() ? randomString : randomString.substring(0, length);
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/BloggingRemindersMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/BloggingRemindersMapperTest.kt
new file mode 100644
index 00000000000..5a20ca8e75d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/BloggingRemindersMapperTest.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.model
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.FRIDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.MONDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.SATURDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.SUNDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.THURSDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.TUESDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.WEDNESDAY
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao.BloggingReminders
+
+class BloggingRemindersMapperTest {
+    private val mapper = BloggingRemindersMapper()
+    private val testSiteId = 1
+    private val testHour = 10
+    private val testMinute = 0
+
+    @Test
+    fun `model mapped to database with all days selected`() {
+        val enabledDays = setOf(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY)
+        val fullModel = BloggingRemindersModel(
+                testSiteId,
+                enabledDays,
+                testHour,
+                testMinute
+        )
+
+        val databaseModel = mapper.toDatabaseModel(fullModel)
+
+        databaseModel.assertDays(enabledDays)
+    }
+
+    @Test
+    fun `model mapped to database with one day selected`() {
+        for (day in Day.values()) {
+            val enabledDays = setOf(day)
+            val fullModel = BloggingRemindersModel(
+                    testSiteId,
+                    enabledDays
+            )
+
+            val databaseModel = mapper.toDatabaseModel(fullModel)
+
+            databaseModel.assertDays(enabledDays)
+        }
+    }
+
+    @Test
+    fun `model mapped from database with all days selected`() {
+        val fullModel = BloggingReminders(
+                localSiteId = testSiteId,
+                monday = true,
+                tuesday = true,
+                wednesday = true,
+                thursday = true,
+                friday = true,
+                saturday = true,
+                sunday = true,
+                hour = testHour,
+                minute = testMinute
+        )
+
+        val domainModel = mapper.toDomainModel(fullModel)
+
+        domainModel.assertDays(fullModel)
+    }
+
+    @Test
+    fun `model mapped from database with one day selected`() {
+        val fullModel = BloggingReminders(
+                localSiteId = testSiteId,
+                sunday = true,
+                hour = testHour,
+                minute = testMinute
+        )
+
+        val domainModel = mapper.toDomainModel(fullModel)
+
+        domainModel.assertDays(fullModel)
+    }
+
+    private fun BloggingReminders.assertDays(enabledDays: Set<Day>) {
+        assertThat(this.localSiteId).isEqualTo(testSiteId)
+        assertThat(this.monday).isEqualTo(enabledDays.contains(MONDAY))
+        assertThat(this.tuesday).isEqualTo(enabledDays.contains(TUESDAY))
+        assertThat(this.wednesday).isEqualTo(enabledDays.contains(WEDNESDAY))
+        assertThat(this.thursday).isEqualTo(enabledDays.contains(THURSDAY))
+        assertThat(this.friday).isEqualTo(enabledDays.contains(FRIDAY))
+        assertThat(this.saturday).isEqualTo(enabledDays.contains(SATURDAY))
+        assertThat(this.sunday).isEqualTo(enabledDays.contains(SUNDAY))
+        assertThat(this.hour).isEqualTo(testHour)
+        assertThat(this.minute).isEqualTo(testMinute)
+    }
+
+    private fun BloggingRemindersModel.assertDays(databaseModel: BloggingReminders) {
+        assertThat(this.siteId).isEqualTo(testSiteId)
+        assertThat(this.enabledDays.contains(MONDAY)).isEqualTo(databaseModel.monday)
+        assertThat(this.enabledDays.contains(TUESDAY)).isEqualTo(databaseModel.tuesday)
+        assertThat(this.enabledDays.contains(WEDNESDAY)).isEqualTo(databaseModel.wednesday)
+        assertThat(this.enabledDays.contains(THURSDAY)).isEqualTo(databaseModel.thursday)
+        assertThat(this.enabledDays.contains(FRIDAY)).isEqualTo(databaseModel.friday)
+        assertThat(this.enabledDays.contains(SATURDAY)).isEqualTo(databaseModel.saturday)
+        assertThat(this.enabledDays.contains(SUNDAY)).isEqualTo(databaseModel.sunday)
+        assertThat(this.hour).isEqualTo(testHour)
+        assertThat(this.minute).isEqualTo(testMinute)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapperTest.kt
new file mode 100644
index 00000000000..8b81bdbd162
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapperTest.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.model
+
+import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.Posts
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient.UpdateHomepageResponse
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteHomepageSettingsMapperTest {
+    private val mapper = SiteHomepageSettingsMapper()
+
+    @Test
+    fun `maps site to page homepage settings`() {
+        val site = SiteModel()
+        site.showOnFront = "page"
+        val pageForPostsId: Long = 1
+        site.pageForPosts = pageForPostsId
+        val pageOnFrontId: Long = 2
+        site.pageOnFront = pageOnFrontId
+        val homepageSettings = mapper.map(site)
+
+        assertThat((homepageSettings as StaticPage).pageForPostsId).isEqualTo(pageForPostsId)
+        assertThat(homepageSettings.pageOnFrontId).isEqualTo(pageOnFrontId)
+    }
+
+    @Test
+    fun `maps site to posts homepage settings`() {
+        val site = SiteModel()
+        site.showOnFront = "posts"
+        val homepageSettings = mapper.map(site)
+
+        assertThat(homepageSettings is Posts).isTrue()
+    }
+
+    @Test
+    fun `returns null on unexpected type`() {
+        val site = SiteModel()
+        site.showOnFront = "unexpected"
+
+        val homepageSettings = mapper.map(site)
+
+        assertThat(homepageSettings).isNull()
+    }
+
+    @Test
+    fun `maps response to page homepage settings`() {
+        val pageForPostsId: Long = 1
+        val pageOnFrontId: Long = 2
+        val response = UpdateHomepageResponse(true, pageOnFrontId, pageForPostsId)
+
+        val homepageSettings = mapper.map(response)
+
+        assertThat((homepageSettings as StaticPage).pageForPostsId).isEqualTo(pageForPostsId)
+        assertThat(homepageSettings.pageOnFrontId).isEqualTo(pageOnFrontId)
+    }
+
+    @Test
+    fun `maps response to posts homepage settings`() {
+        val response = UpdateHomepageResponse(false, null, null)
+
+        val homepageSettings = mapper.map(response)
+
+        assertThat(homepageSettings is Posts).isTrue()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/customer/WCCustomerMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/customer/WCCustomerMapperTest.kt
new file mode 100644
index 00000000000..d17e875f10b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/customer/WCCustomerMapperTest.kt
@@ -0,0 +1,456 @@
+package org.wordpress.android.fluxc.model.customer
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerDTO
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerFromAnalyticsDTO
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class WCCustomerMapperTest {
+    val mapper = WCCustomerMapper()
+
+    @Test
+    @Suppress("LongMethod")
+    fun `mapper maps to correct customer model`() {
+        // given
+        val remoteId = 13L
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val billing = CustomerDTO.Billing(
+            address1 = "address1",
+            address2 = "address2",
+            city = "city",
+            company = "company",
+            country = "country",
+            email = "email",
+            firstName = "firstName",
+            lastName = "lastName",
+            phone = "phone",
+            postcode = "postcode",
+            state = "state"
+        )
+        val shipping = CustomerDTO.Shipping(
+            address1 = "address1",
+            address2 = "address2",
+            city = "city",
+            company = "company",
+            country = "country",
+            firstName = "firstName",
+            lastName = "lastName",
+            postcode = "postcode",
+            state = "state"
+        )
+        val response = CustomerDTO(
+            avatarUrl = "avatarUrl",
+            billing = billing,
+            dateCreated = "dateCreated",
+            dateCreatedGmt = "dateCreatedGmt",
+            dateModified = "dateModified",
+            dateModifiedGmt = "dateModifiedGmt",
+            email = "email",
+            firstName = "firstName",
+            id = remoteId,
+            isPayingCustomer = true,
+            lastName = "lastName",
+            role = "role",
+            shipping = shipping,
+            username = "username"
+        )
+
+        // when
+        val result = mapper.mapToModel(site, response)
+
+        // then
+        with(result) {
+            assertEquals("avatarUrl", avatarUrl)
+            assertEquals("dateCreated", dateCreated)
+            assertEquals("dateCreatedGmt", dateCreatedGmt)
+            assertEquals("dateModified", dateModified)
+            assertEquals("dateModifiedGmt", dateModifiedGmt)
+            assertEquals("email", email)
+            assertEquals("firstName", firstName)
+            assertEquals(remoteCustomerId, remoteId)
+            assertTrue(isPayingCustomer)
+            assertEquals("lastName", lastName)
+            assertEquals("role", role)
+            assertEquals("username", username)
+
+            assertEquals("address1", shippingAddress1)
+            assertEquals("address2", shippingAddress2)
+            assertEquals("city", shippingCity)
+            assertEquals("company", shippingCompany)
+            assertEquals("country", shippingCountry)
+            assertEquals("firstName", shippingFirstName)
+            assertEquals("lastName", shippingLastName)
+            assertEquals("postcode", shippingPostcode)
+            assertEquals("state", shippingState)
+
+            assertEquals("address1", billingAddress1)
+            assertEquals("address2", billingAddress2)
+            assertEquals("city", billingCity)
+            assertEquals("company", billingCompany)
+            assertEquals("country", billingCountry)
+            assertEquals("firstName", billingFirstName)
+            assertEquals("lastName", billingLastName)
+            assertEquals("postcode", billingPostcode)
+            assertEquals("state", billingState)
+            assertEquals("email", billingEmail)
+            assertEquals("phone", billingPhone)
+        }
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun `mapper maps to correct customer dto`() {
+        // given
+        val model = WCCustomerModel().apply {
+            avatarUrl = "avatarUrl"
+            dateCreated = "dateCreated"
+            dateCreatedGmt = "dateCreatedGmt"
+            dateModified = "dateModified"
+            dateModifiedGmt = "dateModifiedGmt"
+            email = "email"
+            firstName = "firstName"
+            isPayingCustomer = true
+            lastName = "lastName"
+            role = "role"
+            username = "username"
+
+            billingAddress1 = "address1"
+            billingAddress2 = "address2"
+            billingCity = "city"
+            billingCompany = "company"
+            billingCountry = "country"
+            billingEmail = "email"
+            billingFirstName = "firstName"
+            billingLastName = "lastName"
+            billingPhone = "phone"
+            billingPostcode = "postcode"
+            billingState = "state"
+
+            shippingAddress1 = "address1"
+            shippingAddress2 = "address2"
+            shippingCity = "city"
+            shippingCompany = "company"
+            shippingCountry = "country"
+            shippingFirstName = "firstName"
+            shippingLastName = "lastName"
+            shippingPostcode = "postcode"
+            shippingState = "state"
+        }
+
+        // when
+        val result = mapper.mapToDTO(model)
+
+        // then
+        with(result) {
+            assertNull(avatarUrl)
+            assertNull(dateCreated)
+            assertNull(dateCreatedGmt)
+            assertNull(dateModified)
+            assertNull(dateModifiedGmt)
+            assertEquals("email", email)
+            assertEquals("firstName", firstName)
+            assertFalse(isPayingCustomer)
+            assertEquals("lastName", lastName)
+            assertNull(role)
+            assertEquals("username", username)
+
+            assertEquals("address1", shipping?.address1)
+            assertEquals("address2", shipping?.address2)
+            assertEquals("city", shipping?.city)
+            assertEquals("company", shipping?.company)
+            assertEquals("country", shipping?.country)
+            assertEquals("firstName", shipping?.firstName)
+            assertEquals("lastName", shipping?.lastName)
+            assertEquals("postcode", shipping?.postcode)
+            assertEquals("state", shipping?.state)
+
+            assertEquals("address1", billing?.address1)
+            assertEquals("address2", billing?.address2)
+            assertEquals("city", billing?.city)
+            assertEquals("company", billing?.company)
+            assertEquals("country", billing?.country)
+            assertEquals("firstName", billing?.firstName)
+            assertEquals("lastName", billing?.lastName)
+            assertEquals("postcode", billing?.postcode)
+            assertEquals("state", billing?.state)
+            assertEquals("email", billing?.email)
+            assertEquals("phone", billing?.phone)
+        }
+    }
+
+    @Test
+    fun `given total spend more than 0, when mapToModel, then maps to correct model with  paying true`() {
+        // GIVEN
+        val remoteId = 13L
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val response = CustomerFromAnalyticsDTO(
+            avgOrderValue = 1.0,
+            city = "city",
+            country = "country",
+            dateLastActive = "dateLastActive",
+            dateLastActiveGmt = "dateLastActiveGmt",
+            dateLastOrder = "dateLastOrder",
+            dateRegistered = "dateRegistered",
+            dateRegisteredGmt = "dateRegisteredGmt",
+            email = "email",
+            id = remoteId,
+            name = "firstname lastname",
+            ordersCount = 1,
+            postcode = "postcode",
+            state = "state",
+            totalSpend = 1.0,
+            userId = 1L
+        )
+
+        // WHEN
+        val result = mapper.mapToModel(site, response)
+
+        // THEN
+        assertThat(result.firstName).isEqualTo("firstname")
+        assertThat(result.lastName).isEqualTo("lastname")
+        assertThat(result.email).isEqualTo("email")
+        assertThat(result.isPayingCustomer).isEqualTo(true)
+        assertThat(result.remoteCustomerId).isEqualTo(1L)
+        assertThat(result.dateCreated).isEqualTo("dateRegistered")
+        assertThat(result.dateModified).isEqualTo("dateLastActive")
+
+        assertThat(result.billingCountry).isEqualTo("country")
+        assertThat(result.shippingCountry).isEqualTo("country")
+
+        assertThat(result.billingCity).isEqualTo("city")
+        assertThat(result.shippingCity).isEqualTo("city")
+
+        assertThat(result.shippingFirstName).isEqualTo("firstname")
+        assertThat(result.shippingLastName).isEqualTo("lastname")
+        assertThat(result.billingFirstName).isEqualTo("firstname")
+        assertThat(result.billingLastName).isEqualTo("lastname")
+
+        assertThat(result.billingPostcode).isEqualTo("postcode")
+        assertThat(result.shippingPostcode).isEqualTo("postcode")
+
+        assertThat(result.billingState).isEqualTo("state")
+        assertThat(result.shippingState).isEqualTo("state")
+    }
+
+    @Test
+    fun `given total spend 0, when mapToModel, then maps to correct model with paying false`() {
+        // GIVEN
+        val remoteId = 13L
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val response = CustomerFromAnalyticsDTO(
+            avgOrderValue = 1.0,
+            city = "city",
+            country = "country",
+            dateLastActive = "dateLastActive",
+            dateLastActiveGmt = "dateLastActiveGmt",
+            dateLastOrder = "dateLastOrder",
+            dateRegistered = "dateRegistered",
+            dateRegisteredGmt = "dateRegisteredGmt",
+            email = "email",
+            id = remoteId,
+            name = "firstname lastname",
+            ordersCount = 1,
+            postcode = "postcode",
+            state = "state",
+            totalSpend = 0.0,
+            userId = 1L
+        )
+
+        // WHEN
+        val result = mapper.mapToModel(site, response)
+
+        // THEN
+        assertThat(result.isPayingCustomer).isEqualTo(false)
+    }
+
+    @Test
+    fun `given customer name, then first name is properly assigned`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstname lastname")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("firstname", result.firstName)
+    }
+
+    @Test
+    fun `given customer name as null, then first name returns empty string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = null)
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("", result.firstName)
+    }
+
+    @Test
+    fun `given customer name with no space, then first name returns full string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstnamelastname")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("firstnamelastname", result.firstName)
+    }
+
+    @Test
+    fun `given customer name, then last name is properly assigned`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstname lastname")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("lastname", result.lastName)
+    }
+
+    @Test
+    fun `given customer name as null, then last name returns empty string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = null)
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("", result.lastName)
+    }
+
+    @Test
+    fun `given customer name has no space, then last name returns empty string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstnamelastname")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("", result.lastName)
+    }
+
+    @Test
+    fun `given customer name has multiple spaces, then first name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstname and a very long last name")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("firstname", result.firstName)
+    }
+
+    @Test
+    fun `given customer name has multiple spaces, then last name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstname and a very long last name")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("and a very long last name", result.lastName)
+    }
+
+    @Test
+    fun `given customer name has leading space, then first name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "  firstname and a very long last name")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("firstname", result.firstName)
+    }
+
+    @Test
+    fun `given customer name has trailing space, then last name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "firstname and a very long last name  ")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("and a very long last name", result.lastName)
+    }
+
+    @Test
+    fun `given customer name has multiple in between space, then first name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "  firstname   and  a   very  long last name")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("firstname", result.firstName)
+    }
+
+    @Test
+    fun `given customer name has multiple in between space, then last name returns proper string`() {
+        // GIVEN
+        val siteId = 23
+        val site = SiteModel().apply { id = siteId }
+
+        val customerDTO = CustomerFromAnalyticsDTO(name = "  firstname   and  a   very  long last name")
+
+        // WHEN
+        val result = mapper.mapToModel(site, customerDTO)
+
+        // THEN
+        assertEquals("and  a   very  long last name", result.lastName)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapperTest.kt
new file mode 100644
index 00000000000..f0bc609961e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapperTest.kt
@@ -0,0 +1,97 @@
+package org.wordpress.android.fluxc.model.jetpacksocial
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.network.rest.wpcom.site.JetpackSocialResponse
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao.JetpackSocialEntity
+
+class JetpackSocialMapperTest {
+    private val siteLocalId = 123
+    private val classToTest = JetpackSocialMapper()
+
+    @Test
+    fun `Should map entity to default values correctly if response properties are null`() {
+        val actual = classToTest.mapEntity(
+            siteLocalId = siteLocalId,
+            response = JetpackSocialResponse(
+                isShareLimitEnabled = null,
+                toBePublicizedCount = null,
+                shareLimit = null,
+                publicizedCount = null,
+                sharedPostsCount = null,
+                sharesRemaining = null,
+                isEnhancedPublishingEnabled = null,
+                isSocialImageGeneratorEnabled = null,
+            ),
+        )
+        val expected = JetpackSocialEntity(
+            siteLocalId = siteLocalId,
+            isShareLimitEnabled = false,
+            toBePublicizedCount = -1,
+            shareLimit = -1,
+            publicizedCount = -1,
+            sharedPostsCount = -1,
+            sharesRemaining = -1,
+            isEnhancedPublishingEnabled = false,
+            isSocialImageGeneratorEnabled = false,
+        )
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `Should map entity correctly if response properties are present`() {
+        val actual = classToTest.mapEntity(
+            siteLocalId = siteLocalId,
+            response = JetpackSocialResponse(
+                isShareLimitEnabled = true,
+                toBePublicizedCount = 10,
+                shareLimit = 11,
+                publicizedCount = 12,
+                sharedPostsCount = 13,
+                sharesRemaining = 14,
+                isEnhancedPublishingEnabled = true,
+                isSocialImageGeneratorEnabled = true,
+            ),
+        )
+        val expected = JetpackSocialEntity(
+            siteLocalId = siteLocalId,
+            isShareLimitEnabled = true,
+            toBePublicizedCount = 10,
+            shareLimit = 11,
+            publicizedCount = 12,
+            sharedPostsCount = 13,
+            sharesRemaining = 14,
+            isEnhancedPublishingEnabled = true,
+            isSocialImageGeneratorEnabled = true,
+        )
+        assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `Should map domain correctly`() {
+        val actual = classToTest.mapDomain(
+            JetpackSocialEntity(
+                siteLocalId = siteLocalId,
+                isShareLimitEnabled = true,
+                toBePublicizedCount = 10,
+                shareLimit = 11,
+                publicizedCount = 12,
+                sharedPostsCount = 13,
+                sharesRemaining = 14,
+                isEnhancedPublishingEnabled = true,
+                isSocialImageGeneratorEnabled = true,
+            )
+        )
+        val expected = JetpackSocial(
+            isShareLimitEnabled = true,
+            toBePublicizedCount = 10,
+            shareLimit = 11,
+            publicizedCount = 12,
+            sharedPostsCount = 13,
+            sharesRemaining = 14,
+            isEnhancedPublishingEnabled = true,
+            isSocialImageGeneratorEnabled = true,
+        )
+        assertThat(actual).isEqualTo(expected)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/scan/threat/ThreatsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/scan/threat/ThreatsMapperTest.kt
new file mode 100644
index 00000000000..e8dc22b3169
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/scan/threat/ThreatsMapperTest.kt
@@ -0,0 +1,196 @@
+package org.wordpress.android.fluxc.model.scan.threat
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable.FixType
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension.ExtensionType
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat.Fixable
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(MockitoJUnitRunner::class)
+class ThreatsMapperTest {
+    private lateinit var mapper: ThreatMapper
+
+    @Before
+    fun setUp() {
+        mapper = ThreatMapper()
+    }
+
+    @Test
+    fun `maps generic threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_GENERIC_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is GenericThreatModel)
+        model.baseThreatModel.apply {
+            assertEquals(id, threat.id)
+            assertEquals(signature, threat.signature)
+            assertEquals(description, threat.description)
+            assertEquals(status, ThreatStatus.fromValue(threat.status))
+            assertEquals(firstDetected, threat.firstDetected)
+            assertEquals(fixedOn, threat.fixedOn)
+            assertNull(fixable)
+        }
+    }
+
+    @Test
+    fun `maps file threat with context as json object correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(
+            javaClass,
+            THREAT_FILE_WITH_CONTEXT_AS_JSON_OBJECT_JSON
+        )
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is FileThreatModel)
+
+        model.apply {
+            assertNotNull(context)
+            assertNotNull(context.lines)
+            assertTrue(requireNotNull(context.lines).isNotEmpty())
+            assertEquals(context.lines.size, 3)
+
+            context.lines[0].apply {
+                assertEquals(lineNumber, 3)
+                assertEquals(contents, "echo <<<HTML")
+            }
+
+            val highlights = context.lines[1].highlights?.get(0)
+            highlights?.let {
+                val (startIndex, endIndex) = it
+                assertEquals(startIndex, 0)
+                assertEquals(endIndex, 68)
+            }
+        }
+    }
+
+    @Test
+    fun `maps file threat with context received as string correctly`() {
+        val threatContextJsonString = UnitTestUtils.getStringFromResourceFile(
+            javaClass,
+            THREAT_FILE_WITH_CONTEXT_AS_STRING_JSON
+        )
+        val threat = getThreatFromJsonString(threatContextJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is FileThreatModel)
+
+        model.apply {
+            assertNotNull(context)
+            assertTrue(requireNotNull(context.lines).isEmpty())
+        }
+    }
+
+    @Test
+    fun `maps core file modification threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_CORE_FILE_MODIFICATION_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is CoreFileModificationThreatModel)
+
+        model.apply {
+            assertEquals(diff, threat.diff)
+            assertEquals(fileName, threat.fileName)
+        }
+    }
+
+    @Test
+    fun `maps database threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_DATABASE_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is DatabaseThreatModel)
+        assertEquals(model.rows, threat.rows)
+    }
+
+    @Test
+    fun `maps vulnerable extension threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_VULNERABLE_EXTENSION_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertTrue(model is VulnerableExtensionThreatModel)
+
+        model.apply {
+            assertEquals(extension.type, ExtensionType.fromValue(threat.extension?.type))
+            assertEquals(extension.slug, threat.extension?.slug)
+            assertEquals(extension.name, threat.extension?.name)
+            assertEquals(extension.version, threat.extension?.version)
+            assertEquals(extension.isPremium, threat.extension?.isPremium)
+        }
+    }
+
+    @Test
+    fun `maps fixable threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_FIXABLE_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertNotNull(model.baseThreatModel.fixable)
+        assertEquals(model.baseThreatModel.fixable?.fixer, FixType.fromValue(threat.fixable?.fixer))
+    }
+
+    @Test
+    fun `maps fixable threat correctly for unknown fix type`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_FIXABLE_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat.copy(fixable = Fixable(fixer = "rollback", file = null, target = null)))
+
+        assertEquals(model.baseThreatModel.fixable?.fixer, FixType.UNKNOWN)
+    }
+
+    @Test
+    fun `maps not fixable threat correctly`() {
+        val threatJsonString = UnitTestUtils.getStringFromResourceFile(javaClass, THREAT_NOT_FIXABLE_JSON)
+        val threat = getThreatFromJsonString(threatJsonString)
+
+        val model = mapper.map(threat)
+
+        assertNull(model.baseThreatModel.fixable)
+    }
+
+    private fun getThreatFromJsonString(json: String): Threat {
+        val responseType = object : TypeToken<Threat>() {}.type
+        return Gson().fromJson(json, responseType) as Threat
+    }
+
+    companion object {
+        private const val THREAT_GENERIC_JSON = "wp/jetpack/scan/threat/threat-generic.json"
+        private const val THREAT_CORE_FILE_MODIFICATION_JSON =
+            "wp/jetpack/scan/threat/threat-core-file-modification.json"
+        private const val THREAT_DATABASE_JSON = "wp/jetpack/scan/threat/threat-database.json"
+        private const val THREAT_FILE_WITH_CONTEXT_AS_JSON_OBJECT_JSON =
+            "wp/jetpack/scan/threat/threat-file-with-context-as-json-object.json"
+        private const val THREAT_FILE_WITH_CONTEXT_AS_STRING_JSON =
+            "wp/jetpack/scan/threat/threat-file-with-context-as-string.json"
+        private const val THREAT_VULNERABLE_EXTENSION_JSON = "wp/jetpack/scan/threat/threat-vulnerable-extension.json"
+        private const val THREAT_FIXABLE_JSON = "wp/jetpack/scan/threat/threat-fixable.json"
+        private const val THREAT_NOT_FIXABLE_JSON = "wp/jetpack/scan/threat/threat-not-fixable.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/site/SiteModelTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/site/SiteModelTest.kt
new file mode 100644
index 00000000000..f530565f411
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/site/SiteModelTest.kt
@@ -0,0 +1,175 @@
+package org.wordpress.android.fluxc.model.site
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.site.SiteUtils
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class SiteModelTest {
+    /* Publicize support */
+    @Test
+    fun `given self hosted non jp site, when site is generated, publicize is disabled`() {
+        val site = SiteUtils.generateSelfHostedNonJPSite()
+
+        assertFalse(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given jetpack site, when site is generated over xmlrpc, publicize is disabled`() {
+        val site = SiteUtils.generateJetpackSiteOverXMLRPC()
+
+        assertFalse(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given site with publish posts capability disabled, when site is generated, publicize is disabled`() {
+        val site = SiteUtils.generateWPComSite()
+        site.hasCapabilityPublishPosts = false
+
+        assertFalse(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given wpcom site with publish posts capability enabled, when site is generated, publicize is enabled`() {
+        val site = SiteUtils.generateWPComSite()
+        site.hasCapabilityPublishPosts = true
+
+        assertTrue(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given wpcom site with publicize permanently disabled, when site is generated, publicize is disabled`() {
+        val site = SiteUtils.generateWPComSite()
+        site.hasCapabilityPublishPosts = true
+        site.setIsPublicizePermanentlyDisabled(true)
+
+        assertFalse(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given jetpack site with publicize module, when site is generated over rest, publicize is enabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.hasCapabilityPublishPosts = true
+        site.activeModules = SiteModel.ACTIVE_MODULES_KEY_PUBLICIZE
+
+        assertTrue(site.supportsPublicize())
+    }
+
+    @Test
+    fun `given jetpack site without publicize module, when site is generated over rest, publicize is disabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.hasCapabilityPublishPosts = true
+        site.activeModules = ""
+
+        assertFalse(site.supportsPublicize())
+    }
+
+    /* Share buttons support */
+    @Test
+    fun `given self hosted non jp site, when site is generated, share buttons is not supported`() {
+        val site = SiteUtils.generateSelfHostedNonJPSite()
+
+        assertFalse(site.supportsShareButtons())
+    }
+
+    @Test
+    fun `given jetpack site, when site is generated over xmlrpc, share buttons is not supported`() {
+        val site = SiteUtils.generateJetpackSiteOverXMLRPC()
+
+        assertFalse(site.supportsShareButtons())
+    }
+
+    @Test
+    fun `given any site without manage options capability, when site is generated, share buttons is not supported`() {
+        val site = SiteUtils.generateWPComSite()
+        site.hasCapabilityManageOptions = false
+
+        assertFalse(site.supportsShareButtons())
+    }
+
+    @Test
+    fun `given jetpack site without sharing buttons module, when site is generated, share buttons is not supported`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.hasCapabilityManageOptions = true
+        site.activeModules = ""
+
+        assertFalse(site.supportsShareButtons())
+    }
+
+    @Test
+    fun `given jetpack site with sharing buttons module, when site is generated, share buttons is supported`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.hasCapabilityManageOptions = true
+        site.activeModules = SiteModel.ACTIVE_MODULES_KEY_SHARING_BUTTONS
+
+        assertTrue(site.supportsShareButtons())
+    }
+
+    /* Sharing support */
+    @Test
+    fun `given publicize supported wpcom site, when site is generated, sharing is enabled`() {
+        val site = SiteUtils.generateWPComSite()
+        site.setPublicizeSupport(true)
+
+        assertTrue(site.supportsSharing())
+    }
+
+    @Test
+    fun `given share buttons supported wpcom site, when site is generated, sharing is enabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.setShareButtonsSupport(true)
+
+        assertTrue(site.supportsSharing())
+    }
+
+    @Test
+    fun `given publicize + share buttons unsupported wpcom site, when site is generated, sharing is disabled`() {
+        val site = SiteUtils.generateWPComSite()
+        site.setPublicizeSupport(false)
+        site.setShareButtonsSupport(false)
+
+        assertFalse(site.supportsSharing())
+    }
+
+    @Test
+    fun `given share buttons supported jetpack site, when site is generated over rest, sharing is enabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.setShareButtonsSupport(true)
+
+        assertTrue(site.supportsSharing())
+    }
+
+    @Test
+    fun `given publicize supported jetpack site, when site is generated over rest, sharing is enabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.setPublicizeSupport(true)
+
+        assertTrue(site.supportsSharing())
+    }
+
+    @Test
+    fun `given publicize + share btns unsupported jetpack site, when site generated over rest, sharing is disabled`() {
+        val site = SiteUtils.generateJetpackSiteOverRestOnly()
+        site.setPublicizeSupport(false)
+        site.setShareButtonsSupport(false)
+
+        assertFalse(site.supportsSharing())
+    }
+
+    private fun SiteModel.setPublicizeSupport(enablePublicizeSupport: Boolean) {
+        this.hasCapabilityPublishPosts = enablePublicizeSupport
+        if (isJetpackConnected) {
+            if (enablePublicizeSupport) activeModules = SiteModel.ACTIVE_MODULES_KEY_PUBLICIZE
+        } else {
+            setIsPublicizePermanentlyDisabled(!enablePublicizeSupport)
+        }
+    }
+
+    private fun SiteModel.setShareButtonsSupport(enableShareButtonsSupport: Boolean) {
+        hasCapabilityManageOptions = enableShareButtonsSupport
+        if (isJetpackConnected) {
+            if (enableShareButtonsSupport) activeModules = SiteModel.ACTIVE_MODULES_KEY_SHARING_BUTTONS
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/InsightsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/InsightsMapperTest.kt
new file mode 100644
index 00000000000..a6e0d76ca50
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/InsightsMapperTest.kt
@@ -0,0 +1,160 @@
+package org.wordpress.android.fluxc.model.stats
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.WP_COM
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse.Streak
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse.Streaks
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.stats.ALL_TIME_RESPONSE
+import org.wordpress.android.fluxc.store.stats.COMMENT_COUNT
+import org.wordpress.android.fluxc.store.stats.FIRST_DAY
+import org.wordpress.android.fluxc.store.stats.FIRST_DAY_VIEWS
+import org.wordpress.android.fluxc.store.stats.FOLLOWER_RESPONSE
+import org.wordpress.android.fluxc.store.stats.LATEST_POST
+import org.wordpress.android.fluxc.store.stats.LIKE_COUNT
+import org.wordpress.android.fluxc.store.stats.MOST_POPULAR_RESPONSE
+import org.wordpress.android.fluxc.store.stats.POST_COUNT
+import org.wordpress.android.fluxc.store.stats.POST_STATS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.REBLOG_COUNT
+import org.wordpress.android.fluxc.store.stats.SECOND_DAY
+import org.wordpress.android.fluxc.store.stats.SECOND_DAY_VIEWS
+import org.wordpress.android.fluxc.store.stats.VIEWS
+import org.wordpress.android.fluxc.store.stats.VIEW_ALL_FOLLOWERS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.VISITS_DATE
+import org.wordpress.android.fluxc.store.stats.VISITS_RESPONSE
+import java.util.Calendar
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class InsightsMapperTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    private lateinit var mapper: InsightsMapper
+    private val siteId = 3L
+    @Before
+    fun setUp() {
+        mapper = InsightsMapper(statsUtils)
+        whenever(site.siteId).thenReturn(siteId)
+    }
+
+    @Test
+    fun `maps all time response`() {
+        val model = mapper.map(ALL_TIME_RESPONSE, site)
+
+        assertThat(model.siteId).isEqualTo(siteId)
+        assertThat(model.date).isEqualTo(ALL_TIME_RESPONSE.date)
+        assertThat(model.visitors).isEqualTo(ALL_TIME_RESPONSE.stats?.visitors)
+        assertThat(model.views).isEqualTo(ALL_TIME_RESPONSE.stats?.views)
+        assertThat(model.posts).isEqualTo(ALL_TIME_RESPONSE.stats?.posts)
+        assertThat(model.viewsBestDay).isEqualTo(ALL_TIME_RESPONSE.stats?.viewsBestDay)
+        assertThat(model.viewsBestDayTotal).isEqualTo(ALL_TIME_RESPONSE.stats?.viewsBestDayTotal)
+    }
+
+    @Test
+    fun `maps most popular response`() {
+        val model = mapper.map(MOST_POPULAR_RESPONSE, site)
+
+        assertThat(model.siteId).isEqualTo(siteId)
+        assertThat(model.highestDayOfWeek).isEqualTo(MOST_POPULAR_RESPONSE.highestDayOfWeek)
+        assertThat(model.highestHour).isEqualTo(MOST_POPULAR_RESPONSE.highestHour)
+        assertThat(model.highestDayPercent).isEqualTo(MOST_POPULAR_RESPONSE.highestDayPercent)
+        assertThat(model.highestHourPercent).isEqualTo(MOST_POPULAR_RESPONSE.highestHourPercent)
+    }
+
+    @Test
+    fun `maps latest posts response`() {
+        val model = mapper.map(
+                LATEST_POST,
+                POST_STATS_RESPONSE, site
+        )
+
+        assertThat(model.siteId).isEqualTo(siteId)
+        assertThat(model.postTitle).isEqualTo(LATEST_POST.title)
+        assertThat(model.postURL).isEqualTo(LATEST_POST.url)
+        assertThat(model.postDate).isEqualTo(LATEST_POST.date)
+        assertThat(model.postId).isEqualTo(LATEST_POST.id)
+        assertThat(model.postCommentCount).isEqualTo(COMMENT_COUNT)
+        assertThat(model.postViewsCount).isEqualTo(VIEWS)
+        assertThat(model.postLikeCount).isEqualTo(LIKE_COUNT)
+        assertThat(model.dayViews).containsOnly(FIRST_DAY to FIRST_DAY_VIEWS, SECOND_DAY to SECOND_DAY_VIEWS)
+    }
+
+    @Test
+    fun `maps visits response`() {
+        val model = mapper.map(VISITS_RESPONSE)
+
+        assertThat(model.period).isEqualTo(VISITS_DATE)
+        assertThat(model.comments).isEqualTo(COMMENT_COUNT)
+        assertThat(model.likes).isEqualTo(LIKE_COUNT)
+        assertThat(model.posts).isEqualTo(POST_COUNT)
+        assertThat(model.reblogs).isEqualTo(REBLOG_COUNT)
+        assertThat(model.views).isEqualTo(VIEWS)
+        assertThat(model.visitors).isEqualTo(org.wordpress.android.fluxc.store.stats.VISITORS)
+    }
+
+    @Test
+    fun `maps visits response with empty data`() {
+        val model = mapper.map(VisitResponse(null, null, listOf("views", "comments"), listOf(listOf("10"))))
+
+        assertThat(model.views).isEqualTo(10)
+        assertThat(model.comments).isEqualTo(0)
+    }
+
+    @Test
+    fun `maps and merges followers responses`() {
+        val model = mapper.mapAndMergeFollowersModels(VIEW_ALL_FOLLOWERS_RESPONSE, WP_COM, LimitMode.Top(1))
+
+        assertThat(model.followers.size).isEqualTo(1)
+        assertThat(model.followers.first().label).isEqualTo(FOLLOWER_RESPONSE.label)
+    }
+
+    @Test
+    fun `maps posting activity and crops by start and end date`() {
+        val startDay = Day(2019, 1, 20)
+        val endDay = Day(2019, 2, 5)
+        val dayBeforeStart = Calendar.getInstance()
+        dayBeforeStart.set(2019, 1, 19)
+        val dateOnStart = Calendar.getInstance()
+        dateOnStart.set(2019, 1, 20)
+        val dateOnEnd = Calendar.getInstance()
+        dateOnEnd.set(2019, 2, 5)
+        val dayAfterEnd = Calendar.getInstance()
+        dayAfterEnd.set(2019, 2, 6)
+        val postCount = 2
+        val date = "2010-10-11"
+        val formattedDate = Date(123)
+        whenever(statsUtils.fromFormattedDate(date)).thenReturn(formattedDate)
+        val longStreak = Streak(date, date, 150)
+        val currentStreak = Streak(date, date, 150)
+        val response = PostingActivityResponse(
+                Streaks(longStreak, currentStreak),
+                mapOf(
+                        dayBeforeStart.timeInMillis / 1000 to 1,
+                        dateOnStart.timeInMillis / 1000 to postCount,
+                        dateOnEnd.timeInMillis / 1000 to postCount,
+                        dayAfterEnd.timeInMillis / 1000 to 3
+                )
+        )
+        val model = mapper.map(response, startDay, endDay)
+
+        assertThat(model.months).hasSize(2)
+        assertThat(model.months[0].days[20]).isEqualTo(postCount)
+        assertThat(model.months[1].days[5]).isEqualTo(postCount)
+        assertThat(model.streak.longestStreakStart).isEqualTo(formattedDate)
+        assertThat(model.streak.longestStreakEnd).isEqualTo(formattedDate)
+        assertThat(model.streak.longestStreakLength).isEqualTo(longStreak.length)
+        assertThat(model.streak.currentStreakStart).isEqualTo(formattedDate)
+        assertThat(model.streak.currentStreakEnd).isEqualTo(formattedDate)
+        assertThat(model.streak.currentStreakLength).isEqualTo(currentStreak.length)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/TimeStatsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/TimeStatsMapperTest.kt
new file mode 100644
index 00000000000..c0d2189fa01
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/model/stats/TimeStatsMapperTest.kt
@@ -0,0 +1,140 @@
+package org.wordpress.android.fluxc.model.stats
+
+import com.google.gson.Gson
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse.ViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse.ViewsResponse.PostViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.store.stats.time.POST_AND_PAGE_VIEWS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.time.POST_ID
+import org.wordpress.android.fluxc.store.stats.time.POST_TITLE
+import org.wordpress.android.fluxc.store.stats.time.POST_URL
+import org.wordpress.android.fluxc.store.stats.time.POST_VIEWS
+
+@RunWith(MockitoJUnitRunner::class)
+class TimeStatsMapperTest {
+    @Mock lateinit var gson: Gson
+    private lateinit var timeStatsMapper: TimeStatsMapper
+
+    @Before
+    fun setUp() {
+        timeStatsMapper = TimeStatsMapper(gson)
+    }
+
+    @Test
+    fun `parses portfolio page type`() {
+        val portfolioResponse = PostViewsResponse(
+                POST_ID,
+                POST_TITLE,
+                "jetpack-portfolio",
+                POST_URL,
+                POST_VIEWS
+        )
+        val response = POST_AND_PAGE_VIEWS_RESPONSE.copy(
+                days = mapOf(
+                        "2019-01-01" to ViewsResponse(
+                                listOf(portfolioResponse), 10
+                        )
+                )
+        )
+
+        val mappedResult = timeStatsMapper.map(response, LimitMode.All)
+
+        assertThat(mappedResult.views).hasSize(1)
+        assertThat(mappedResult.views.first().type).isEqualTo(ViewsType.OTHER)
+    }
+
+    @Test
+    fun `parses empty referrers`() {
+        val response = ReferrersResponse("DAYS", null, null, emptyList())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.groups).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherViews).isZero()
+        assertThat(result.totalViews).isZero()
+    }
+
+    @Test
+    fun `parses empty posts and views`() {
+        val response = PostAndPageViewsResponse(null, emptyMap(), "DAYS")
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.views).isEmpty()
+        assertThat(result.hasMore).isFalse()
+    }
+
+    @Test
+    fun `parses empty clicks`() {
+        val response = ClicksResponse(null, emptyMap())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.groups).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherClicks).isZero()
+        assertThat(result.totalClicks).isZero()
+    }
+
+    @Test
+    fun `parses empty country views`() {
+        val response = CountryViewsResponse(emptyMap(), emptyMap())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.countries).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherViews).isZero()
+        assertThat(result.totalViews).isZero()
+    }
+
+    @Test
+    fun `parses empty authors`() {
+        val response = AuthorsResponse(null, emptyMap())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.authors).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherViews).isZero()
+    }
+
+    @Test
+    fun `parses empty search terms`() {
+        val response = SearchTermsResponse(null, emptyMap())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.searchTerms).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherSearchTerms).isZero()
+        assertThat(result.totalSearchTerms).isZero()
+    }
+
+    @Test
+    fun `parses empty videos`() {
+        val response = VideoPlaysResponse(null, emptyMap())
+
+        val result = timeStatsMapper.map(response, LimitMode.Top(5))
+
+        assertThat(result.plays).isEmpty()
+        assertThat(result.hasMore).isFalse()
+        assertThat(result.otherPlays).isZero()
+        assertThat(result.totalPlays).isZero()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/OpenJdkCookieManagerTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/OpenJdkCookieManagerTest.kt
new file mode 100644
index 00000000000..60ebc4c7bde
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/OpenJdkCookieManagerTest.kt
@@ -0,0 +1,223 @@
+package org.wordpress.android.fluxc.network
+
+import org.junit.Assert
+import org.junit.Test
+import java.net.CookieManager
+import java.net.CookiePolicy
+import java.net.URI
+import java.util.LinkedList
+
+/**
+ * The test cases here are copied from OpenJdk's CookieManagerTest:
+ * https://github.com/openjdk/jdk/blob/20db7800a657b311eeac504a2bbae4adbc209dbf/test/jdk/java/net/CookieHandler/CookieManagerTest.java
+ */
+class OpenJdkCookieManagerTest {
+    private val testCount = 6
+    private val localHostAddr = "wordpress.com"
+
+    private val testCases: Array<Array<CookieTestCase>> = Array(testCount) { emptyArray() }
+    private val testPolicies: Array<CookiePolicy?> = arrayOfNulls(testCount)
+
+    init {
+        var count = 0
+
+        // an http session with Netscape cookies exchanged
+        testPolicies[count] = CookiePolicy.ACCEPT_ORIGINAL_SERVER
+        testCases[count++] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie",
+                "CUSTOMER=WILE:BOB; " +
+                    "path=/; expires=Sat, 09-Nov-2030 23:12:40 GMT;" + "domain=." +
+                    localHostAddr,
+                "CUSTOMER=WILE:BOB",
+                "/"
+            ),
+            CookieTestCase(
+                "Set-Cookie",
+                "PART_NUMBER=ROCKET_LAUNCHER_0001; path=/;domain=.$localHostAddr",
+                "CUSTOMER=WILE:BOB; PART_NUMBER=ROCKET_LAUNCHER_0001",
+                "/"
+            ),
+            CookieTestCase(
+                "Set-Cookie",
+                "SHIPPING=FEDEX; path=/foo;domain=.$localHostAddr",
+                "CUSTOMER=WILE:BOB; PART_NUMBER=ROCKET_LAUNCHER_0001",
+                "/"
+            ),
+            CookieTestCase(
+                "Set-Cookie",
+                "SHIPPING=FEDEX; path=/foo;domain=.$localHostAddr",
+                "CUSTOMER=WILE:BOB; PART_NUMBER=ROCKET_LAUNCHER_0001; SHIPPING=FEDEX",
+                "/foo"
+            )
+        )
+
+        // check whether or not path rule is applied
+        testPolicies[count] = CookiePolicy.ACCEPT_ORIGINAL_SERVER
+        testCases[count++] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie",
+                "PART_NUMBER=ROCKET_LAUNCHER_0001; path=/;domain=.$localHostAddr",
+                "PART_NUMBER=ROCKET_LAUNCHER_0001",
+                "/"
+            ),
+            CookieTestCase(
+                "Set-Cookie",
+                "PART_NUMBER=RIDING_ROCKET_0023; path=/ammo;domain=.$localHostAddr",
+                "PART_NUMBER=RIDING_ROCKET_0023; PART_NUMBER=ROCKET_LAUNCHER_0001",
+                "/ammo"
+            )
+        )
+
+        // an http session with rfc2965 cookies exchanged
+        testPolicies[count] = CookiePolicy.ACCEPT_ORIGINAL_SERVER
+        testCases[count++] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie2",
+                "Customer=\"WILE_E_COYOTE\"; Version=\"1\"; Path=\"/acme\";domain=.$localHostAddr",
+                "\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";\$Domain=\".$localHostAddr\"",
+                "/acme/login"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                "Part_Number=\"Rocket_Launcher_0001\"; Version=\"1\";Path=\"/acme\";domain=.$localHostAddr",
+                ("\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";" + "\$Domain=\"." +
+                    localHostAddr + "\"" + "; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";"
+                    + "\$Domain=\"." + localHostAddr + "\""),
+                "/acme/pickitem"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                "Shipping=\"FedEx\"; Version=\"1\"; Path=\"/acme\";domain=.$localHostAddr",
+                ("\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";" + "\$Domain=\"." + localHostAddr +
+                    "\"" + "; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";" + "\$Domain=\"."
+                    + localHostAddr + "\"" + "; Shipping=\"FedEx\";\$Path=\"/acme\";" +
+                    "\$Domain=\"." + localHostAddr + "\""),
+                "/acme/shipping"
+            )
+        )
+
+        // check whether or not the path rule is applied
+        testPolicies[count] = CookiePolicy.ACCEPT_ORIGINAL_SERVER
+        testCases[count++] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie2",
+                "Part_Number=\"Rocket_Launcher_0001\"; Version=\"1\"; Path=\"/acme\";domain=.$localHostAddr",
+                "\$Version=\"1\"; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";\$Domain=\".$localHostAddr\"",
+                "/acme/ammo"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                ("Part_Number=\"Riding_Rocket_0023\"; Version=\"1\"; Path=\"/acme/ammo\";" + "domain=."
+                    + localHostAddr),
+                ("\$Version=\"1\"; Part_Number=\"Riding_Rocket_0023\";\$Path=\"/acme/ammo\";\$Domain=\"."
+                    + localHostAddr + "\"" + "; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";"
+                    + "\$Domain=\"." + localHostAddr + "\""),
+                "/acme/ammo"
+            ),
+            CookieTestCase(
+                "",
+                "",
+                "\$Version=\"1\"; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";\$Domain=\".$localHostAddr\"",
+                "/acme/parts"
+            )
+        )
+
+        // new cookie should overwrite old cookie
+        testPolicies[count] = CookiePolicy.ACCEPT_ORIGINAL_SERVER
+        testCases[count++] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie2",
+                "Part_Number=\"Rocket_Launcher_0001\"; Version=\"1\"; Path=\"/acme\";domain=.$localHostAddr",
+                "\$Version=\"1\"; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";\$Domain=\".$localHostAddr\"",
+                "/acme"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                "Part_Number=\"Rocket_Launcher_2000\"; Version=\"1\"; Path=\"/acme\";domain=.$localHostAddr",
+                "\$Version=\"1\"; Part_Number=\"Rocket_Launcher_2000\";\$Path=\"/acme\";\$Domain=\".$localHostAddr\"",
+                "/acme"
+            )
+        )
+
+        // cookies without domain attributes
+        // RFC 2965 states that domain should default to host
+        testPolicies[count] = CookiePolicy.ACCEPT_ALL
+        testCases[count] = arrayOf(
+            CookieTestCase(
+                "Set-Cookie2",
+                "Customer=\"WILE_E_COYOTE\"; Version=\"1\"; Path=\"/acme\"",
+                "\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";\$Domain=\"$localHostAddr\"",
+                "/acme/login"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                "Part_Number=\"Rocket_Launcher_0001\"; Version=\"1\";Path=\"/acme\"",
+                ("\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";\$Domain=\"" + localHostAddr + "\"" +
+                    "; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";\$Domain=\"" + localHostAddr + "\""),
+                "/acme/pickitem"
+            ),
+            CookieTestCase(
+                "Set-Cookie2",
+                "Shipping=\"FedEx\"; Version=\"1\"; Path=\"/acme\"",
+                ("\$Version=\"1\"; Customer=\"WILE_E_COYOTE\";\$Path=\"/acme\";\$Domain=\"" + localHostAddr + "\"" +
+                    "; Part_Number=\"Rocket_Launcher_0001\";\$Path=\"/acme\";\$Domain=\"" + localHostAddr + "\"" +
+                    "; Shipping=\"FedEx\";\$Path=\"/acme\";\$Domain=\"" + localHostAddr + "\""),
+                "/acme/shipping"
+            )
+        )
+    }
+
+    @Test
+    fun test_cookies() {
+        val cookieManager: CookieManager = OpenJdkCookieManager()
+        for (testCases in testCases) {
+            for (testCase in testCases) {
+                val path = URI("https://$localHostAddr${testCase.serverPath}")
+
+                cookieManager.put(
+                    path,
+                    mapOf(testCase.headerToken to listOf(testCase.cookieToSend))
+                )
+                val cookieManagerCookies = cookieManager.get(path, emptyMap())["Cookie"]
+                    ?.joinToString(";")
+                    .orEmpty()
+
+                Assert.assertTrue(
+                    "Cookies not matching for testCase: $testCase",
+                    cookieEquals(testCase.cookieToRecv, cookieManagerCookies)
+                )
+            }
+            cookieManager.cookieStore.removeAll()
+        }
+    }
+
+    private fun cookieEquals(s1: String, s2: String): Boolean {
+        val s1a = s1.removeWhiteSpace().split(";").toTypedArray()
+        val s2a = s2.removeWhiteSpace().split(";").toTypedArray()
+        val l1: List<String> = LinkedList(listOf(*s1a)).sorted()
+        val l2: List<String> = LinkedList(listOf(*s2a)).sorted()
+        for ((i, s) in l1.withIndex()) {
+            if (s != l2[i]) {
+                return false
+            }
+        }
+        return true
+    }
+
+    private fun String.removeWhiteSpace(): String {
+        val sb = StringBuilder()
+        for (i in indices) {
+            val c = get(i)
+            if (!Character.isWhitespace(c)) sb.append(c)
+        }
+        return sb.toString()
+    }
+}
+
+data class CookieTestCase(
+    val headerToken: String,
+    val cookieToSend: String,
+    val cookieToRecv: String,
+    val serverPath: String
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetworkTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetworkTest.kt
new file mode 100644
index 00000000000..5834a850a6e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetworkTest.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.network
+
+import com.android.volley.Cache
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.NetworkResponse
+import com.android.volley.Request
+import com.android.volley.Response
+import com.android.volley.ServerError
+import com.android.volley.toolbox.BaseHttpStack
+import com.android.volley.toolbox.HttpResponse
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.network.RetryOnRedirectBasicNetwork.HTTP_TEMPORARY_REDIRECT
+import java.net.HttpURLConnection.HTTP_OK
+import kotlin.math.min
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+private const val TIMEOUT = 1
+private const val BACKOFF_MULTIPLIER = 1f
+
+@Ignore("Caused by: java.lang.ClassNotFoundException: org.apache.http.StatusLine")
+@RunWith(RobolectricTestRunner::class)
+class RetryOnRedirectBasicNetworkTest {
+    private val redirectResponse = HttpResponse(HTTP_TEMPORARY_REDIRECT, listOf())
+    private val successResponse = HttpResponse(HTTP_OK, listOf())
+
+    // Mocked responses sequence that requires 3 retries for a successful response
+    private val mockedResponses = listOf(redirectResponse, redirectResponse, redirectResponse, successResponse)
+
+    @Test
+    fun successfulRetryOnRedirect() {
+        val network = RetryOnRedirectBasicNetwork(MockedHttpStack(mockedResponses))
+        val request: Request<String> = MockedRequest
+        request.retryPolicy = DefaultRetryPolicy(TIMEOUT, 3, BACKOFF_MULTIPLIER)
+        val response = network.performRequest(request)
+        assertEquals(response.statusCode, HTTP_OK)
+    }
+
+    @Test
+    fun unsuccessfulRetryOnRedirect() {
+        val network = RetryOnRedirectBasicNetwork(MockedHttpStack(mockedResponses))
+        val request: Request<String> = MockedRequest
+        request.retryPolicy = DefaultRetryPolicy(TIMEOUT, 2, BACKOFF_MULTIPLIER)
+        val response = try {
+            network.performRequest(request)
+        } catch (error: ServerError) {
+            assertEquals(error.networkResponse.statusCode, HTTP_TEMPORARY_REDIRECT)
+            null
+        }
+        assertNull(response)
+    }
+
+    private class MockedHttpStack(private val responses: List<HttpResponse>) : BaseHttpStack() {
+        private var requestCount = 0
+
+        override fun executeRequest(request: Request<*>, additionalHeaders: Map<String, String>): HttpResponse {
+            val index = min(responses.size - 1, requestCount)
+            requestCount += 1
+            return responses[index]
+        }
+    }
+
+    private object MockedRequest : Request<String>(Method.GET, "http://foo.bar", null) {
+        override fun getHeaders(): Map<String, String> = mapOf()
+
+        override fun getParams(): Map<String, String> = mapOf()
+
+        override fun deliverResponse(response: String?) = Unit // Do nothing (ignore)
+
+        override fun parseNetworkResponse(response: NetworkResponse?): Response<String> =
+            Response.success("foo", Cache.Entry())
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/WPComGsonRequestTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/WPComGsonRequestTest.kt
new file mode 100644
index 00000000000..deaf8567f1e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/WPComGsonRequestTest.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.network
+
+import com.android.volley.NetworkResponse
+import com.android.volley.Response.Listener
+import com.android.volley.VolleyError
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import kotlin.test.assertEquals
+
+@RunWith(RobolectricTestRunner::class)
+class WPComGsonRequestTest {
+    @Test
+    fun testWPComErrorResponse() {
+        val url = WPCOMREST.sites.site(123).posts.post(456).urlV1_1
+        val request = WPComGsonRequest.buildGetRequest(url, null, Object::class.java,
+                mock<Listener<String>>(), mock())
+
+        val responseJson = "{\"error\":\"unknown_post\",\"message\":\"Unknown post\"}"
+        val baseNetworkError = buildErrorResponseObject(responseJson, 404)
+
+        // Simulate a network response for this request
+        val augmentedError = request.deliverBaseNetworkError(baseNetworkError) as WPComGsonNetworkError
+
+        assertEquals(GenericErrorType.UNKNOWN, augmentedError.type)
+        assertEquals("unknown_post", augmentedError.apiError)
+        assertEquals("Unknown post", augmentedError.message)
+    }
+
+    @Test
+    fun testWPComV2ErrorResponse() {
+        val url = WPCOMV2.users.username.suggestions.url
+        val request = WPComGsonRequest.buildGetRequest(url, null, Object::class.java,
+                mock<Listener<String>>(), mock())
+
+        val responseJson = "{\"code\":\"rest_no_name\"," +
+                "\"message\":\"A name from which to derive username suggestions is required.\"}"
+        val baseNetworkError = buildErrorResponseObject(responseJson, 400)
+
+        // Simulate a network response for this request
+        val augmentedError = request.deliverBaseNetworkError(baseNetworkError) as WPComGsonNetworkError
+
+        assertEquals(GenericErrorType.UNKNOWN, augmentedError.type)
+        assertEquals("rest_no_name", augmentedError.apiError)
+        assertEquals("A name from which to derive username suggestions is required.", augmentedError.message)
+    }
+
+    private fun buildErrorResponseObject(responseJson: String, errorCode: Int): BaseNetworkError {
+        val networkResponse = NetworkResponse(errorCode, responseJson.toByteArray(), mapOf(), true)
+        return BaseNetworkError(VolleyError(networkResponse))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClientTest.kt
new file mode 100644
index 00000000000..200de23bc6e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClientTest.kt
@@ -0,0 +1,228 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import com.android.volley.Header
+import com.android.volley.NetworkResponse
+import com.android.volley.NoConnectionError
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import junit.framework.TestCase
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+class NonceRestClientTest {
+    private val wpApiEncodedRequestBuilder: WPAPIEncodedBodyRequestBuilder = mock()
+    private val currentTimeProvider: CurrentTimeProvider = mock()
+    private val dispatcher: Dispatcher = mock()
+    private val requestQueue: RequestQueue = mock()
+    private val userAgent: UserAgent = mock()
+
+    private lateinit var subject: NonceRestClient
+    private val time = 123456L
+
+    private val site = SiteModel().apply {
+        url = "asiteurl.com"
+        username = "a_username"
+        password = "a_password"
+    }
+    private val nonceRequestUrl = "${site.url}/wp-admin/admin-ajax.php?action=rest-nonce"
+
+    @Before
+    fun setUp() {
+        subject = NonceRestClient(wpApiEncodedRequestBuilder, currentTimeProvider, dispatcher, requestQueue, userAgent)
+        whenever(currentTimeProvider.currentDate()).thenReturn(Date(time))
+    }
+
+    @Test
+    fun `successful nonce request`() = test {
+        val redirectResponse = WPAPIResponse.Error<String>(
+            WPAPINetworkError(
+                BaseNetworkError(
+                    VolleyError(
+                        NetworkResponse(
+                            301,
+                            byteArrayOf(),
+                            false,
+                            System.currentTimeMillis(),
+                            listOf(Header("Location", nonceRequestUrl))
+                        )
+                    )
+                ),
+                null
+            )
+        )
+        val expectedNonce = "1expectedNONCE"
+        givenLoginResponse(redirectResponse)
+        givenNonceRequestResponse(WPAPIResponse.Success(expectedNonce))
+
+        val actual = subject.requestNonce(site)
+
+        TestCase.assertEquals(Nonce.Available(expectedNonce, site.username), actual)
+    }
+
+    @Test
+    fun `invalid credentials returns correct error message`() = test {
+        @Suppress("MaxLineLength")
+        val loginResponse = WPAPIResponse.Success(
+            """
+            <html>
+              <head>
+                    <div id="login_error">
+                        <strong>Error:</strong> The password you entered for the username <strong>demo</strong> is incorrect. <a href="link/">Lost your password?</a><br>
+                    </div>
+              </head>
+            </html>
+        """.trimIndent()
+        )
+        givenLoginResponse(loginResponse)
+
+        val actual = subject.requestNonce(site)
+
+        assertIs<Nonce.FailedRequest>(actual)
+        assertEquals(Nonce.CookieNonceErrorType.NOT_AUTHENTICATED, actual.type)
+        assertEquals("Error: The password you entered for the username demo is incorrect.", actual.errorMessage)
+    }
+
+    @Test
+    fun `invalid nonce of '0' returns FailedRequest`() = test {
+        val redirectUrl = "${site.url}/wp-admin/admin-ajax.php?action=rest-nonce"
+
+        val redirectResponse = WPAPIResponse.Error<String>(
+            WPAPINetworkError(
+                BaseNetworkError(
+                    VolleyError(
+                        NetworkResponse(
+                            301,
+                            byteArrayOf(),
+                            false,
+                            System.currentTimeMillis(),
+                            listOf(Header("Location", redirectUrl))
+                        )
+                    )
+                ),
+                null
+            )
+        )
+
+        val invalidNonce = "0"
+        val response = WPAPIResponse.Success(invalidNonce)
+        givenLoginResponse(redirectResponse)
+        whenever(wpApiEncodedRequestBuilder.syncGetRequest(subject, redirectUrl))
+            .thenReturn(response)
+
+        val actual = subject.requestNonce(site)
+        assertIs<Nonce.FailedRequest>(actual)
+        assertEquals(time, actual.timeOfResponse)
+        assertEquals(Nonce.CookieNonceErrorType.INVALID_NONCE, actual.type)
+    }
+
+    @Test
+    fun `failed nonce request return FailedRequest`() = test {
+        val baseNetworkError = WPAPINetworkError(
+            BaseNetworkError(
+                VolleyError(
+                    NetworkResponse(400, byteArrayOf(), false, System.currentTimeMillis(), listOf())
+                )
+            )
+        )
+        givenLoginResponse(WPAPIResponse.Error(baseNetworkError))
+
+        val actual = subject.requestNonce(site)
+
+        assertIs<Nonce.FailedRequest>(actual)
+        assertEquals(time, actual.timeOfResponse)
+        assertEquals(Nonce.CookieNonceErrorType.GENERIC_ERROR, actual.type)
+        assertEquals(baseNetworkError, actual.networkError)
+    }
+
+    @Test
+    fun `failed nonce request with connection error returns Unknown`() = test {
+        val baseNetworkError = mock<WPAPINetworkError>()
+        baseNetworkError.volleyError = NoConnectionError()
+        givenLoginResponse(WPAPIResponse.Error(baseNetworkError))
+
+        val actual = subject.requestNonce(site)
+        TestCase.assertEquals(Nonce.Unknown(site.username), actual)
+    }
+
+    @Test
+    fun `custom login URL returns correct error type`() = test {
+        val error = WPAPINetworkError(
+            BaseNetworkError(
+                VolleyError(
+                    NetworkResponse(
+                        404,
+                        byteArrayOf(),
+                        false,
+                        System.currentTimeMillis(),
+                        listOf()
+                    )
+                )
+            )
+        )
+        givenLoginResponse(WPAPIResponse.Error(error))
+
+        val actual = subject.requestNonce(site)
+
+        assertIs<Nonce.FailedRequest>(actual)
+        assertEquals(Nonce.CookieNonceErrorType.CUSTOM_LOGIN_URL, actual.type)
+    }
+
+    @Test
+    fun `custom admin URL returns correct error type`() = test {
+        val redirectResponse = WPAPINetworkError(
+            BaseNetworkError(
+                VolleyError(
+                    NetworkResponse(
+                        301,
+                        byteArrayOf(),
+                        false,
+                        System.currentTimeMillis(),
+                        listOf(Header("Location", nonceRequestUrl))
+                    )
+                )
+            ),
+            null
+        )
+        val nonceError = WPAPINetworkError(
+            BaseNetworkError(
+                VolleyError(
+                    NetworkResponse(404, byteArrayOf(), false, System.currentTimeMillis(), listOf())
+                )
+            )
+        )
+        givenLoginResponse(WPAPIResponse.Error(redirectResponse))
+        givenNonceRequestResponse(WPAPIResponse.Error(nonceError))
+
+        val actual = subject.requestNonce(site)
+
+        assertIs<Nonce.FailedRequest>(actual)
+        assertEquals(Nonce.CookieNonceErrorType.CUSTOM_ADMIN_URL, actual.type)
+    }
+
+    private suspend fun givenLoginResponse(response: WPAPIResponse<String>) {
+        val body = mapOf(
+            "log" to site.username,
+            "pwd" to site.password,
+            "redirect_to" to nonceRequestUrl
+        )
+
+        whenever(wpApiEncodedRequestBuilder.syncPostRequest(subject, "${site.url}/wp-login.php", body = body))
+            .thenReturn(response)
+    }
+
+    private suspend fun givenNonceRequestResponse(response: WPAPIResponse<String>) {
+        whenever(wpApiEncodedRequestBuilder.syncGetRequest(subject, nonceRequestUrl))
+            .thenReturn(response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPApiRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPApiRestClientTest.kt
new file mode 100644
index 00000000000..e3a875be7ab
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPApiRestClientTest.kt
@@ -0,0 +1,262 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.plugin
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.reflect.TypeToken
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doSuspendableAnswer
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.CookieNonceAuthenticator
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Available
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.network.rest.wpapi.plugin.PluginResponseModel.Description
+import org.wordpress.android.fluxc.test
+import java.lang.reflect.Type
+
+class PluginWPApiRestClientTest {
+    private val dispatcher: Dispatcher = mock()
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder = mock()
+    private val requestQueue: RequestQueue = mock()
+    private val userAgent: UserAgent = mock()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var bodyCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: PluginWPAPIRestClient
+
+    private val siteUrl = "http://site.com"
+    val site = SiteModel().apply {
+        url = siteUrl
+        username = "username"
+    }
+
+    private val cookieNonceAuthenticator: CookieNonceAuthenticator = mock {
+        onBlocking {
+            makeAuthenticatedWPAPIRequest(
+                eq(site),
+                any<suspend (Nonce) -> WPAPIResponse<*>>()
+            )
+        } doSuspendableAnswer   {
+            it.getArgument<suspend (Nonce) -> WPAPIResponse<*>>(1).invoke(Available("nonce", site.username))
+        }
+    }
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        bodyCaptor = argumentCaptor()
+        restClient = PluginWPAPIRestClient(
+            wpApiGsonRequestBuilder,
+            cookieNonceAuthenticator,
+            dispatcher,
+            requestQueue,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `fetches plugins`() = test {
+        initFetchPluginsResponse(listOf(testPlugin))
+        val responseModel = restClient.fetchPlugins(site, false)
+        assertThat(responseModel.data).isNotNull()
+        assertMappedPlugin(responseModel.data!![0], testPlugin)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("http://site.com/wp-json/wp/v2/plugins")
+        assertThat(paramsCaptor.lastValue).isEqualTo(emptyMap<String, String>())
+        assertThat(bodyCaptor.lastValue).isEqualTo(emptyMap<String, String>())
+    }
+
+    @Test
+    fun `returns error response on fetch`() = test {
+        val errorMessage = "message"
+        val error = WPAPINetworkError(
+            BaseNetworkError(
+                NETWORK_ERROR,
+                errorMessage,
+                VolleyError(errorMessage)
+            )
+        )
+        initFetchPluginsResponse(
+            error = error
+        )
+        val responseModel = restClient.fetchPlugins(site, false)
+        assertThat(responseModel.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `installs a plugin`() = test {
+        initInstallPluginResponse(testPlugin)
+        val installedPluginSlug = "plugin_slug"
+        val responseModel = restClient.installPlugin(site, installedPluginSlug)
+        assertMappedPlugin(responseModel.data!!, testPlugin)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("http://site.com/wp-json/wp/v2/plugins")
+        assertThat(bodyCaptor.lastValue).isEqualTo(mapOf("slug" to installedPluginSlug))
+    }
+
+    @Test
+    fun `sets plugin as active`() = test {
+        initConfigurePluginResponse(testPlugin)
+        val installedPluginSlug = "plugin_slug"
+        val active = true
+        val responseModel = restClient.updatePlugin(site, installedPluginSlug, active)
+        assertMappedPlugin(responseModel.data!!, testPlugin)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("http://site.com/wp-json/wp/v2/plugins/$installedPluginSlug")
+        assertThat(bodyCaptor.lastValue).isEqualTo(mapOf("status" to "active"))
+    }
+
+    @Test
+    fun `sets plugin as inactive`() = test {
+        initConfigurePluginResponse(testPlugin)
+        val installedPluginSlug = "plugin_slug"
+        val active = false
+        val responseModel = restClient.updatePlugin(site, installedPluginSlug, active)
+        assertMappedPlugin(responseModel.data!!, testPlugin)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("http://site.com/wp-json/wp/v2/plugins/$installedPluginSlug")
+        assertThat(bodyCaptor.lastValue).isEqualTo(mapOf("status" to "inactive"))
+    }
+
+    @Test
+    fun `deletes a plugin`() = test {
+        initDeletePluginResponse(testPlugin)
+        val installedPluginSlug = "plugin_slug"
+        val responseModel = restClient.deletePlugin(site, installedPluginSlug)
+        assertMappedPlugin(responseModel.data!!, testPlugin)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("http://site.com/wp-json/wp/v2/plugins/$installedPluginSlug")
+        assertThat(bodyCaptor.lastValue).isEqualTo(emptyMap<String, String>())
+    }
+
+    private fun assertMappedPlugin(
+        responseModel: SitePluginModel,
+        plugin: PluginResponseModel
+    ) {
+        assertThat(responseModel.isActive).isEqualTo(plugin.status == "active")
+        assertThat(responseModel.authorUrl).isEqualTo(plugin.authorUri)
+        assertThat(responseModel.authorName).isEqualTo(plugin.author)
+        assertThat(responseModel.description).isEqualTo(plugin.description!!.raw)
+        assertThat(responseModel.displayName).isEqualTo(plugin.name)
+        assertThat(responseModel.name).isEqualTo(plugin.plugin)
+        assertThat(responseModel.pluginUrl).isEqualTo(plugin.pluginUri)
+        assertThat(responseModel.version).isEqualTo(plugin.version)
+        assertThat(responseModel.slug).isEqualTo(plugin.textDomain)
+    }
+
+    private suspend fun initFetchPluginsResponse(
+        data: List<PluginResponseModel>? = null,
+        error: WPAPINetworkError? = null
+    ): WPAPIResponse<List<PluginResponseModel>> {
+        val typeToken = object : TypeToken<List<PluginResponseModel>>() {}
+        return initSyncGetResponse(typeToken.type, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initSyncGetResponse(
+        type: Type,
+        data: T,
+        error: WPAPINetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): WPAPIResponse<T> {
+        val response = if (error != null) WPAPIResponse.Error(error) else WPAPIResponse.Success(data)
+        whenever(
+            wpApiGsonRequestBuilder.syncGetRequest<T>(
+                eq(restClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                bodyCaptor.capture(),
+                eq(type),
+                eq(cachingEnabled),
+                any(),
+                any()
+            )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initInstallPluginResponse(
+        data: PluginResponseModel? = null,
+        error: WPAPINetworkError? = null
+    ): WPAPIResponse<PluginResponseModel> {
+        val response = if (error != null) Error(error) else Success(data ?: mock())
+        whenever(
+            wpApiGsonRequestBuilder.syncPostRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                bodyCaptor.capture(),
+                eq(PluginResponseModel::class.java),
+                any()
+            )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initConfigurePluginResponse(
+        data: PluginResponseModel? = null,
+        error: WPAPINetworkError? = null
+    ): WPAPIResponse<PluginResponseModel> {
+        val response = if (error != null) Error(error) else Success(data ?: mock())
+        whenever(
+            wpApiGsonRequestBuilder.syncPutRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                bodyCaptor.capture(),
+                eq(PluginResponseModel::class.java),
+                any()
+            )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initDeletePluginResponse(
+        data: PluginResponseModel? = null,
+        error: WPAPINetworkError? = null
+    ): WPAPIResponse<PluginResponseModel> {
+        val response = if (error != null) Error(error) else Success(data ?: mock())
+        whenever(
+            wpApiGsonRequestBuilder.syncDeleteRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                bodyCaptor.capture(),
+                eq(PluginResponseModel::class.java),
+                any()
+            )
+        ).thenReturn(response)
+        return response
+    }
+
+    companion object {
+        private val testPlugin = PluginResponseModel(
+            "test-plugin/test-plugin",
+            "status",
+            "name",
+            "pluginUri",
+            "author",
+            "authorUri",
+            Description("raw", "renderd"),
+            "1.2.3",
+            false,
+            "",
+            "",
+            "plugin"
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClientTest.kt
new file mode 100644
index 00000000000..063c1fe13f8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClientTest.kt
@@ -0,0 +1,148 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.reactnative
+
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import junit.framework.AssertionFailedError
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.fail
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse
+import org.wordpress.android.fluxc.test
+
+class ReactNativeWPAPIRestClientTest {
+    private val wpApiGsonRequestBuilder = mock<WPAPIGsonRequestBuilder>()
+    private val dispatcher = mock<Dispatcher>()
+    private val requestQueue = mock<RequestQueue>()
+    private val userAgent = mock<UserAgent>()
+
+    private val url = "a_url"
+    private val params = mapOf("a_key" to "a_value")
+    private val body = mapOf("b_key" to "b_value")
+
+    private lateinit var subject: ReactNativeWPAPIRestClient
+
+    @Before
+    fun setUp() {
+        subject = ReactNativeWPAPIRestClient(
+                wpApiGsonRequestBuilder,
+                dispatcher,
+                requestQueue,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `GET request handles successful response`() = test {
+        val errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse = { _ ->
+            throw AssertionFailedError("errorHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedJson = mock<JsonElement>()
+        val successHandler = { data: JsonElement? ->
+            if (data != expectedJson) fail("expected data was not passed to successHandler")
+            expected
+        }
+
+        val expectedRestCallResponse = Success(expectedJson)
+        verifyGETRequest(successHandler, errorHandler, expectedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `GET request handles failure response`() = test {
+        val successHandler = { _: JsonElement? ->
+            throw AssertionFailedError("successHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedBaseNetworkError = mock<WPAPINetworkError>()
+        val errorHandler = { error: BaseNetworkError ->
+            if (error != expectedBaseNetworkError) fail("expected error was not passed to errorHandler")
+            expected
+        }
+
+        val mockedRestCallResponse = Error<JsonElement>(expectedBaseNetworkError)
+        verifyGETRequest(successHandler, errorHandler, mockedRestCallResponse, expected)
+    }
+    
+    @Test
+    fun `POST request handles successful response`() = test {
+        val errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse = { _ ->
+            throw AssertionFailedError("errorHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedJson = mock<JsonElement>()
+        val successHandler = { data: JsonElement? ->
+            if (data != expectedJson) fail("expected data was not passed to successHandler")
+            expected
+        }
+
+        val expectedRestCallResponse = Success(expectedJson)
+        verifyPOSTRequest(successHandler, errorHandler, expectedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `POST request handles failure response`() = test {
+        val successHandler = { _: JsonElement? ->
+            throw AssertionFailedError("successHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedBaseNetworkError = mock<WPAPINetworkError>()
+        val errorHandler = { error: BaseNetworkError ->
+            if (error != expectedBaseNetworkError) fail("expected error was not passed to errorHandler")
+            expected
+        }
+
+        val mockedRestCallResponse = Error<JsonElement>(expectedBaseNetworkError)
+        verifyPOSTRequest(successHandler, errorHandler, mockedRestCallResponse, expected)
+    }
+
+    private suspend fun verifyGETRequest(
+        successHandler: (JsonElement?) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        expectedRestCallResponse: WPAPIResponse<JsonElement>,
+        expected: ReactNativeFetchResponse
+    ) {
+        whenever(wpApiGsonRequestBuilder.syncGetRequest(
+                subject,
+                url,
+                params,
+                emptyMap(),
+                JsonElement::class.java,
+                true)
+        ).thenReturn(expectedRestCallResponse)
+
+        val actual = subject.getRequest(url, params, successHandler, errorHandler)
+        assertEquals(expected, actual)
+    }
+
+    private suspend fun verifyPOSTRequest(
+        successHandler: (JsonElement?) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        expectedRestCallResponse: WPAPIResponse<JsonElement>,
+        expected: ReactNativeFetchResponse
+    ) {
+        whenever(wpApiGsonRequestBuilder.syncPostRequest(
+            subject,
+            url,
+            body,
+            JsonElement::class.java)
+        ).thenReturn(expectedRestCallResponse)
+
+        val actual = subject.postRequest(url, body, successHandler, errorHandler)
+        assertEquals(expected, actual)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityFixtures.kt
new file mode 100644
index 00000000000..ae079ffeb8e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityFixtures.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.activity
+
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.tools.FormattableContent
+import java.util.Date
+
+val ACTIVITY_RESPONSE = ActivityLogRestClient.ActivitiesResponse.ActivityResponse("activity",
+        FormattableContent(text = "text"),
+        "name",
+        ActivityLogRestClient.ActivitiesResponse.Actor("author",
+                "John Smith",
+                10,
+                15,
+                ActivityLogRestClient.ActivitiesResponse.Icon("jpg",
+                        "dog.jpg",
+                        100,
+                        100),
+                "admin"),
+        "create a blog",
+        Date(),
+        ActivityLogRestClient.ActivitiesResponse.Generator(10.3f, 123),
+        false,
+        "10.0",
+        "gridicon.jpg",
+        "OK",
+        "activity123")
+val ACTIVITY_RESPONSE_PAGE = ActivityLogRestClient.ActivitiesResponse.Page(listOf(ACTIVITY_RESPONSE))
+val REWIND_RESPONSE = ActivityLogRestClient.RewindStatusResponse.Rewind(rewind_id = "123",
+        status = RewindStatusModel.Rewind.Status.RUNNING.value,
+        progress = null,
+        reason = null,
+        site_id = null,
+        restore_id = 5,
+        message = null,
+        currentEntry = null)
+val REWIND_STATUS_RESPONSE = ActivityLogRestClient.RewindStatusResponse(
+        state = RewindStatusModel.State.ACTIVE.value,
+        reason = "reason",
+        last_updated = Date(),
+        can_autoconfigure = true,
+        credentials = listOf(),
+        rewind = REWIND_RESPONSE,
+        message = "Starting",
+        currentEntry = null)
+val BACKUP_DOWNLOAD_STATUS_RESPONSE = ActivityLogRestClient.BackupDownloadStatusResponse(
+        downloadId = 0,
+        rewindId = "rewindId",
+        backupPoint = Date(),
+        startedAt = Date(),
+        progress = 35,
+        downloadCount = null,
+        validUntil = null,
+        url = null)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt
new file mode 100644
index 00000000000..a708440e233
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClientTest.kt
@@ -0,0 +1,777 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.activity
+
+import com.android.volley.RequestQueue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Reason
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivitiesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivitiesResponse.Page
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivityTypesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivityTypesResponse.ActivityType
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivityTypesResponse.Groups
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.BackupDownloadResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.BackupDownloadStatusResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.DismissBackupDownloadResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.RewindResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.RewindStatusResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityLogErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityTypesErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadStatusErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedBackupDownloadStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedRewindStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.utils.TimeZoneProvider
+import java.util.Date
+import java.util.TimeZone
+
+private const val DATE_1_IN_MILLIS = 1578614400000L // 2020-01-10T00:00:00+00:00
+private const val DATE_2_IN_MILLIS = 1578787200000L // 2020-01-12T00:00:00+00:00
+
+@RunWith(MockitoJUnitRunner::class)
+class ActivityLogRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestPayload: FetchActivityLogPayload
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var timeZoneProvider: TimeZoneProvider
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var activityRestClient: ActivityLogRestClient
+    private val siteId: Long = 12
+    private val number = 10
+    private val offset = 0
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        activityRestClient = ActivityLogRestClient(
+                wpComGsonRequestBuilder,
+                timeZoneProvider,
+                dispatcher,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent)
+        whenever(requestPayload.site).thenReturn(site)
+        whenever(timeZoneProvider.getDefaultTimeZone()).thenReturn(TimeZone.getTimeZone("GMT"))
+    }
+
+    @Test
+    fun fetchActivity_passesCorrectParamToBuildRequest() = test {
+        initFetchActivity()
+        val payload = FetchActivityLogPayload(
+                site,
+                false,
+                Date(DATE_1_IN_MILLIS),
+                Date(DATE_2_IN_MILLIS),
+                listOf("post", "attachment")
+        )
+
+        activityRestClient.fetchActivity(payload, number, offset)
+
+        assertEquals(urlCaptor.firstValue, "https://public-api.wordpress.com/wpcom/v2/sites/$siteId/activity/")
+        with(paramsCaptor.firstValue) {
+            assertEquals("1", this["page"])
+            assertEquals("$number", this["number"])
+            assertNotNull(this["after"])
+            assertNotNull(this["before"])
+            assertEquals("post", this["group[0]"])
+            assertEquals("attachment", this["group[1]"])
+        }
+    }
+
+    @Test
+    fun fetchActivity_passesOnlyNonEmptyParamsToBuildRequest() = test {
+        initFetchActivity()
+        val payload = FetchActivityLogPayload(
+                site,
+                false,
+                after = null,
+                before = null,
+                groups = listOf()
+        )
+        activityRestClient.fetchActivity(payload, number, offset)
+
+        assertEquals(urlCaptor.firstValue, "https://public-api.wordpress.com/wpcom/v2/sites/$siteId/activity/")
+        with(paramsCaptor.firstValue) {
+            assertEquals("1", this["page"])
+            assertEquals("$number", this["number"])
+            assertEquals(2, size)
+        }
+    }
+
+    @Test
+    fun fetchActivity_adjustsDateRangeBasedOnTimezoneGMT3() = test {
+        val timezoneOffset = 3
+        whenever(timeZoneProvider.getDefaultTimeZone()).thenReturn(TimeZone.getTimeZone("GMT+$timezoneOffset"))
+        initFetchActivity()
+        val payload = FetchActivityLogPayload(
+                site,
+                false,
+                // 2020-01-10T00:00:00+00:00
+                Date(DATE_1_IN_MILLIS),
+                // 2020-01-12T00:00:00+00:00
+                Date(DATE_2_IN_MILLIS)
+        )
+
+        activityRestClient.fetchActivity(payload, number, offset)
+
+        with(paramsCaptor.firstValue) {
+            assertEquals("2020-01-09T21:00:00+00:00", this["after"])
+            assertEquals("2020-01-11T21:00:00+00:00", this["before"])
+        }
+    }
+
+    @Test
+    fun fetchActivity_adjustsDateRangeBasedOnTimezoneGMTMinus7() = test {
+        val timezoneOffset = -7
+        whenever(timeZoneProvider.getDefaultTimeZone()).thenReturn(TimeZone.getTimeZone("GMT$timezoneOffset"))
+        initFetchActivity()
+        val payload = FetchActivityLogPayload(
+                site,
+                false,
+                // 2020-01-10T00:00:00+00:00
+                Date(DATE_1_IN_MILLIS),
+                // 2020-01-12T00:00:00+00:00
+                Date(DATE_2_IN_MILLIS)
+        )
+
+        activityRestClient.fetchActivity(payload, number, offset)
+
+        with(paramsCaptor.firstValue) {
+            assertEquals("2020-01-10T07:00:00+00:00", this["after"])
+            assertEquals("2020-01-12T07:00:00+00:00", this["before"])
+        }
+    }
+
+    @Test
+    fun fetchActivity_dispatchesResponseOnSuccess() = test {
+        val response = ActivitiesResponse(1, "response", ACTIVITY_RESPONSE_PAGE)
+        initFetchActivity(response)
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.number, number)
+            assertEquals(this@ActivityLogRestClientTest.offset, offset)
+            assertEquals(totalItems, 1)
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertEquals(activityLogModels.size, 1)
+            assertNull(error)
+            with(activityLogModels[0]) {
+                assertEquals(activityID, ACTIVITY_RESPONSE.activity_id)
+                assertEquals(gridicon, ACTIVITY_RESPONSE.gridicon)
+                assertEquals(name, ACTIVITY_RESPONSE.name)
+                assertEquals(published, ACTIVITY_RESPONSE.published)
+                assertEquals(rewindID, ACTIVITY_RESPONSE.rewind_id)
+                assertEquals(rewindable, ACTIVITY_RESPONSE.is_rewindable)
+                assertEquals(content, ACTIVITY_RESPONSE.content)
+                assertEquals(actor?.avatarURL, ACTIVITY_RESPONSE.actor?.icon?.url)
+                assertEquals(actor?.wpcomUserID, ACTIVITY_RESPONSE.actor?.wpcom_user_id)
+            }
+        }
+    }
+
+    @Test
+    fun fetchActivity_dispatchesErrorOnMissingActivityId() = test {
+        val failingPage = Page(listOf(ACTIVITY_RESPONSE.copy(activity_id = null)))
+        val activitiesResponse = ActivitiesResponse(1, "response", failingPage)
+        initFetchActivity(activitiesResponse)
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        assertEmittedActivityError(payload, ActivityLogErrorType.MISSING_ACTIVITY_ID)
+    }
+
+    @Test
+    fun fetchActivity_dispatchesErrorOnMissingSummary() = test {
+        val failingPage = Page(listOf(ACTIVITY_RESPONSE.copy(summary = null)))
+        val activitiesResponse = ActivitiesResponse(1, "response", failingPage)
+        initFetchActivity(activitiesResponse)
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        assertEmittedActivityError(payload, ActivityLogErrorType.MISSING_SUMMARY)
+    }
+
+    @Test
+    fun fetchActivity_dispatchesErrorOnMissingContentText() = test {
+        val emptyContent = FormattableContent(null)
+        val failingPage = Page(listOf(ACTIVITY_RESPONSE.copy(content = emptyContent)))
+        val activitiesResponse = ActivitiesResponse(1, "response", failingPage)
+        initFetchActivity(activitiesResponse)
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        assertEmittedActivityError(payload, ActivityLogErrorType.MISSING_CONTENT_TEXT)
+    }
+
+    @Test
+    fun fetchActivity_dispatchesErrorOnMissingPublishedDate() = test {
+        val failingPage = Page(listOf(ACTIVITY_RESPONSE.copy(published = null)))
+        val activitiesResponse = ActivitiesResponse(1, "response", failingPage)
+        initFetchActivity(activitiesResponse)
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        assertEmittedActivityError(payload, ActivityLogErrorType.MISSING_PUBLISHED_DATE)
+    }
+
+    @Test
+    fun fetchActivity_dispatchesErrorOnFailure() = test {
+        initFetchActivity(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = activityRestClient.fetchActivity(requestPayload, number, offset)
+
+        assertEmittedActivityError(payload, ActivityLogErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun fetchActivityRewind_dispatchesResponseOnSuccess() = test {
+        val state = State.ACTIVE
+        val rewindResponse = REWIND_STATUS_RESPONSE.copy(state = state.value)
+        initFetchRewindStatus(rewindResponse)
+
+        val payload = activityRestClient.fetchActivityRewind(site)
+
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertNull(error)
+            assertNotNull(rewindStatusModelResponse)
+            rewindStatusModelResponse?.apply {
+                assertEquals(reason, Reason.UNKNOWN)
+                assertEquals(state, state)
+                assertNotNull(rewind)
+                rewind?.apply {
+                    assertEquals(status.value, REWIND_RESPONSE.status)
+                }
+            }
+        }
+    }
+
+    @Test
+    fun fetchActivityRewind_dispatchesGenericErrorOnFailure() = test {
+        initFetchRewindStatus(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = activityRestClient.fetchActivityRewind(site)
+
+        assertEmittedRewindStatusError(payload, RewindStatusErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun fetchActivityRewind_dispatchesErrorOnWrongState() = test {
+        initFetchRewindStatus(REWIND_STATUS_RESPONSE.copy(state = "wrong"))
+
+        val payload = activityRestClient.fetchActivityRewind(site)
+
+        assertEmittedRewindStatusError(payload, RewindStatusErrorType.INVALID_RESPONSE)
+    }
+
+    @Test
+    fun fetchActivityRewind_dispatchesErrorOnMissingRestoreId() = test {
+        initFetchRewindStatus(REWIND_STATUS_RESPONSE.copy(rewind = REWIND_RESPONSE.copy(rewind_id = null)))
+
+        val payload = activityRestClient.fetchActivityRewind(site)
+
+        assertEmittedRewindStatusError(payload, RewindStatusErrorType.MISSING_REWIND_ID)
+    }
+
+    @Test
+    fun fetchActivityRewind_dispatchesErrorOnWrongRestoreStatus() = test {
+        initFetchRewindStatus(REWIND_STATUS_RESPONSE.copy(rewind = REWIND_RESPONSE.copy(status = "wrong")))
+
+        val payload = activityRestClient.fetchActivityRewind(site)
+
+        assertEmittedRewindStatusError(payload, RewindStatusErrorType.INVALID_REWIND_STATE)
+    }
+
+    @Test
+    fun postRewindOperation() = test {
+        val restoreId = 10L
+        val response = RewindResponse(restoreId, true, null)
+        initPostRewind(response)
+
+        val payload = activityRestClient.rewind(site, "rewindId")
+
+        assertEquals(restoreId, payload.restoreId)
+    }
+
+    @Test
+    fun postRewindOperationError() = test {
+        initPostRewind(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = activityRestClient.rewind(site, "rewindId")
+
+        assertTrue(payload.isError)
+    }
+
+    @Test
+    fun postRewindApiError() = test {
+        val restoreId = 10L
+        initPostRewind(RewindResponse(restoreId, false, "error"))
+
+        val payload = activityRestClient.rewind(site, "rewindId")
+
+        assertTrue(payload.isError)
+    }
+
+    @Test
+    fun postRewindOperationWithTypes() = test {
+        val restoreId = 10L
+        val response = RewindResponse(restoreId, true, null)
+        val types = RewindRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        initPostRewindWithTypes(data = response, requestTypes = types)
+
+        val payload = activityRestClient.rewind(site, "rewindId", types)
+
+        assertEquals(restoreId, payload.restoreId)
+    }
+
+    @Test
+    fun postRewindOperationErrorWithTypes() = test {
+        val types = RewindRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        initPostRewindWithTypes(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)), requestTypes = types)
+
+        val payload = activityRestClient.rewind(site, "rewindId", types)
+
+        assertTrue(payload.isError)
+    }
+
+    @Test
+    fun postRewindApiErrorWithTypes() = test {
+        val restoreId = 10L
+        val types = RewindRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        initPostRewindWithTypes(data = RewindResponse(restoreId, false, "error"), requestTypes = types)
+
+        val payload = activityRestClient.rewind(site, "rewindId", types)
+
+        assertTrue(payload.isError)
+    }
+
+    @Test
+    fun postBackupDownloadOperation() = test {
+        val downloadId = 10L
+        val rewindId = "rewind_id"
+        val backupPoint = "backup_point"
+        val startedAt = "started_at"
+        val progress = 0
+        val response = BackupDownloadResponse(downloadId, rewindId, backupPoint, startedAt, progress)
+        val types = BackupDownloadRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        initPostBackupDownload(rewindId = rewindId, data = response, requestTypes = types)
+
+        val payload = activityRestClient.backupDownload(site, rewindId, types)
+
+        assertEquals(downloadId, payload.downloadId)
+    }
+
+    @Test
+    fun postBackupDownloadOperationError() = test {
+        val rewindId = "rewind_id"
+        val types = BackupDownloadRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        initPostBackupDownload(rewindId = rewindId, error =
+            WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)), requestTypes = types)
+
+        val payload = activityRestClient.backupDownload(site, rewindId, types)
+
+        assertTrue(payload.isError)
+    }
+
+    @Test
+    fun fetchActivityDownload_dispatchesGenericErrorOnFailure() = test {
+        initFetchBackupDownloadStatus(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR
+                        )
+                )
+        )
+
+        val payload = activityRestClient.fetchBackupDownloadState(site)
+
+        assertEmittedDownloadStatusError(payload, BackupDownloadStatusErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun fetchActivityBackupDownload_dispatchesResponseOnSuccess() = test {
+        val progress = 55
+        val downloadResponse = BACKUP_DOWNLOAD_STATUS_RESPONSE.copy(progress = progress)
+        initFetchBackupDownloadStatus(arrayOf(downloadResponse))
+
+        val payload = activityRestClient.fetchBackupDownloadState(site)
+
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertNull(error)
+            assertNotNull(backupDownloadStatusModelResponse)
+            backupDownloadStatusModelResponse?.apply {
+                assertEquals(downloadId, BACKUP_DOWNLOAD_STATUS_RESPONSE.downloadId)
+                assertEquals(rewindId, BACKUP_DOWNLOAD_STATUS_RESPONSE.rewindId)
+                assertEquals(backupPoint, BACKUP_DOWNLOAD_STATUS_RESPONSE.backupPoint)
+                assertEquals(startedAt, BACKUP_DOWNLOAD_STATUS_RESPONSE.startedAt)
+                assertEquals(downloadCount, BACKUP_DOWNLOAD_STATUS_RESPONSE.downloadCount)
+                assertEquals(validUntil, BACKUP_DOWNLOAD_STATUS_RESPONSE.validUntil)
+                assertEquals(url, BACKUP_DOWNLOAD_STATUS_RESPONSE.url)
+                assertEquals(progress, progress)
+            }
+        }
+    }
+
+    @Test
+    fun fetchEmptyActivityBackupDownload_dispatchesResponseOnSuccess() = test {
+        initFetchBackupDownloadStatus(arrayOf())
+
+        val payload = activityRestClient.fetchBackupDownloadState(site)
+
+        with(payload) {
+            assertEquals(site, this@ActivityLogRestClientTest.site)
+            assertNull(error)
+            assertNull(backupDownloadStatusModelResponse)
+        }
+    }
+
+    @Test
+    fun fetchActivityTypes_dispatchesSuccessResponseOnSuccess() = test {
+        initFetchActivityTypes()
+        val siteId = 90L
+
+        val payload = activityRestClient.fetchActivityTypes(siteId, null, null)
+
+        with(payload) {
+            assertEquals(siteId, remoteSiteId)
+            assertEquals(false, isError)
+        }
+    }
+
+    @Test
+    fun fetchActivityTypes_dispatchesGenericErrorOnFailure() = test {
+        initFetchActivityTypes(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+        val siteId = 90L
+
+        val payload = activityRestClient.fetchActivityTypes(siteId, null, null)
+
+        with(payload) {
+            assertEquals(siteId, remoteSiteId)
+            assertEquals(true, isError)
+            assertEquals(error.type, ActivityTypesErrorType.GENERIC_ERROR)
+        }
+    }
+
+    @Test
+    fun fetchActivityTypes_mapsResponseModelsToDomainModels() = test {
+        val activityType = ActivityType("key1", "name1", 10)
+        initFetchActivityTypes(
+                data = ActivityTypesResponse(
+                        groups = Groups(
+                                activityTypes = listOf(activityType)
+                        ),
+                        15
+                )
+        )
+        val siteId = site.siteId
+
+        val payload = activityRestClient.fetchActivityTypes(siteId, null, null)
+
+        assertEquals(
+                payload.activityTypeModels[0],
+                ActivityTypeModel(activityType.key!!, activityType.name!!, activityType.count!!)
+        )
+    }
+
+    @Test
+    fun fetchActivityTypes_passesCorrectParams() = test {
+        initFetchActivityTypes()
+        val siteId = site.siteId
+        val afterMillis = 234124242145
+        val beforeMillis = 234124242999
+        val after = Date(afterMillis)
+        val before = Date(beforeMillis)
+
+        activityRestClient.fetchActivityTypes(siteId, after, before)
+
+        with(paramsCaptor.firstValue) {
+            assertNotNull(this["after"])
+            assertNotNull(this["before"])
+        }
+    }
+
+    @Test
+    fun postDismissBackupDownloadOperation() = test {
+        val downloadId = 10L
+        val response = DismissBackupDownloadResponse(downloadId, true)
+
+        initPostDismissBackupDownload(data = response)
+
+        val payload = activityRestClient.dismissBackupDownload(site, downloadId)
+
+        assertEquals(downloadId, payload.downloadId)
+    }
+
+    @Test
+    fun postDismissBackupDownloadOperationError() = test {
+        val downloadId = 10L
+        initPostDismissBackupDownload(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = activityRestClient.dismissBackupDownload(site, downloadId)
+
+        assertTrue(payload.isError)
+    }
+
+    private suspend fun initFetchActivity(
+        data: ActivitiesResponse = mock(),
+        error: WPComGsonNetworkError? = null
+    ): Response<ActivitiesResponse> {
+        val response = if (error != null) Response.Error<ActivitiesResponse>(error) else Success(data)
+        whenever(wpComGsonRequestBuilder.syncGetRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(ActivitiesResponse::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+        )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initFetchRewindStatus(
+        data: RewindStatusResponse = mock(),
+        error: WPComGsonNetworkError? = null
+    ):
+            Response<RewindStatusResponse> {
+        val response = if (error != null) Response.Error<RewindStatusResponse>(error) else Success(data)
+        whenever(wpComGsonRequestBuilder.syncGetRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(RewindStatusResponse::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initPostRewind(
+        data: RewindResponse = mock(),
+        error: WPComGsonNetworkError? = null
+    ): Response<RewindResponse> {
+        val response = if (error != null) Response.Error<RewindResponse>(error) else Success(data)
+
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                eq(null),
+                eq(mapOf()),
+                eq(RewindResponse::class.java),
+                isNull(),
+                anyOrNull(),
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initPostRewindWithTypes(
+        data: RewindResponse = mock(),
+        error: WPComGsonNetworkError? = null,
+        requestTypes: RewindRequestTypes
+    ): Response<RewindResponse> {
+        val response = if (error != null) Response.Error<RewindResponse>(error) else Success(data)
+
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                eq(null),
+                eq(mapOf("types" to requestTypes)),
+                eq(RewindResponse::class.java),
+                isNull(),
+                anyOrNull(),
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initPostBackupDownload(
+        data: BackupDownloadResponse = mock(),
+        error: WPComGsonNetworkError? = null,
+        requestTypes: BackupDownloadRequestTypes,
+        rewindId: String
+    ): Response<BackupDownloadResponse> {
+        val response = if (error != null) Response.Error<BackupDownloadResponse>(error) else Success(data)
+
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                eq(null),
+                eq(mapOf("rewindId" to rewindId,
+                        "types" to requestTypes)),
+                eq(BackupDownloadResponse::class.java),
+                isNull(),
+                anyOrNull(),
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initFetchBackupDownloadStatus(
+        data: Array<BackupDownloadStatusResponse>? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<Array<BackupDownloadStatusResponse>> {
+        val defaultError = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR))
+        val response = when {
+            error != null -> { Response.Error(error) }
+            data != null -> { Success(data) }
+            else -> { Response.Error(defaultError) }
+        }
+
+        whenever(wpComGsonRequestBuilder.syncGetRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(Array<BackupDownloadStatusResponse>::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initFetchActivityTypes(
+        data: ActivityTypesResponse = mock(),
+        error: WPComGsonNetworkError? = null
+    ): Response<ActivityTypesResponse> {
+        val response = if (error != null) Response.Error<ActivityTypesResponse>(error) else Success(data)
+        whenever(wpComGsonRequestBuilder.syncGetRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(ActivityTypesResponse::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+        )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initPostDismissBackupDownload(
+        data: DismissBackupDownloadResponse = mock(),
+        error: WPComGsonNetworkError? = null
+    ): Response<DismissBackupDownloadResponse> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+                eq(activityRestClient),
+                urlCaptor.capture(),
+                anyOrNull(),
+                eq(mapOf("dismissed" to true.toString())),
+                eq(DismissBackupDownloadResponse::class.java),
+                isNull(),
+                anyOrNull(),
+        )).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private fun assertEmittedActivityError(payload: FetchedActivityLogPayload, errorType: ActivityLogErrorType) {
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.number, number)
+            assertEquals(this@ActivityLogRestClientTest.offset, offset)
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertTrue(isError)
+            assertEquals(error.type, errorType)
+        }
+    }
+
+    private fun assertEmittedRewindStatusError(payload: FetchedRewindStatePayload, errorType: RewindStatusErrorType) {
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertTrue(isError)
+            assertEquals(errorType, error.type)
+        }
+    }
+
+    private fun assertEmittedDownloadStatusError(
+        payload: FetchedBackupDownloadStatePayload,
+        errorType: BackupDownloadStatusErrorType
+    ) {
+        with(payload) {
+            assertEquals(this@ActivityLogRestClientTest.site, site)
+            assertTrue(isError)
+            assertEquals(errorType, error.type)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClientTest.kt
new file mode 100644
index 00000000000..bec458e1174
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClientTest.kt
@@ -0,0 +1,222 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.blaze
+
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_AUTHENTICATED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsRestClient.Companion.DEFAULT_PER_PAGE
+import org.wordpress.android.fluxc.test
+import kotlin.test.assertEquals
+
+@RunWith(MockitoJUnitRunner::class)
+class BlazeCampaignsRestClientTest {
+    private val wpComNetwork: WPComNetwork = mock()
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: BlazeCampaignsRestClient
+
+    private val siteId: Long = 12
+
+    private val successResponse = BLAZE_CAMPAIGNS_RESPONSE
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = BlazeCampaignsRestClient(wpComNetwork)
+    }
+
+    @Test
+    fun `when blaze campaigns are requested, then the correct url is built`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+        val response = getResponseFromJsonString(json)
+        initFetchBlazeCampaigns(data = response)
+
+        restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+        assertEquals(
+            urlCaptor.firstValue,
+            WPCOMV2.sites.site(siteId).wordads.dsp.api.v1_1.campaigns.url
+        )
+    }
+
+    @Test
+    fun `given success call, when blaze campaigns is requested, then correct response is returned`() =
+        test {
+            val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+            initFetchBlazeCampaigns(data = getResponseFromJsonString(json))
+
+            val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+            assertSuccess(successResponse, result)
+        }
+
+    @Test
+    fun `given timeout, when blaze campaigns is requested, then return timeout error`() = test {
+        initFetchBlazeCampaigns(error = WPComGsonNetworkError(BaseNetworkError(TIMEOUT)))
+
+        val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+        assertError(BlazeCampaignsErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given network error, when blaze campaigns is requested, then return api error`() = test {
+        initFetchBlazeCampaigns(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+        assertError(BlazeCampaignsErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given invalid response, when blaze campaigns is requested, then return invalid response error`() =
+        test {
+            initFetchBlazeCampaigns(error = WPComGsonNetworkError(BaseNetworkError(INVALID_RESPONSE)))
+
+            val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+            assertError(BlazeCampaignsErrorType.INVALID_RESPONSE, result)
+        }
+
+    @Test
+    fun `given not authenticated, when blaze campaigns is requested, then return auth required error`() =
+        test {
+            initFetchBlazeCampaigns(error = WPComGsonNetworkError(BaseNetworkError(NOT_AUTHENTICATED)))
+
+            val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+            assertError(BlazeCampaignsErrorType.AUTHORIZATION_REQUIRED, result)
+        }
+
+    @Test
+    fun `given unknown error, when blaze campaigns is requested, then return generic error`() =
+        test {
+            initFetchBlazeCampaigns(error = WPComGsonNetworkError(BaseNetworkError(UNKNOWN)))
+
+            val result = restClient.fetchBlazeCampaigns(siteId, SKIP, DEFAULT_PER_PAGE, DEFAULT_LOCALE)
+
+            assertError(BlazeCampaignsErrorType.GENERIC_ERROR, result)
+        }
+
+    private suspend fun initFetchBlazeCampaigns(
+        data: BlazeCampaignListResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) {
+            Response.Error(error)
+        } else {
+            Response.Success(nonNullData)
+        }
+
+        whenever(
+            wpComNetwork.executeGetGsonRequest(
+                url = urlCaptor.capture(),
+                clazz = eq(BlazeCampaignListResponse::class.java),
+                params = paramsCaptor.capture(),
+                enableCaching = eq(false),
+                cacheTimeToLive = any(),
+                forced = eq(false)
+            )
+        ).thenReturn(response)
+    }
+
+    @Suppress("SameParameterValue")
+    private fun assertSuccess(
+        expected: BlazeCampaignListResponse,
+        actual: BlazeCampaignsFetchedPayload<BlazeCampaignListResponse>
+    ) {
+        with(actual) {
+            Assert.assertFalse(isError)
+            Assert.assertEquals(expected.skipped, actual.response?.skipped)
+            Assert.assertEquals(expected.totalCount, actual.response?.totalCount)
+            Assert.assertEquals(expected.campaigns, actual.response?.campaigns)
+        }
+    }
+
+    private fun assertError(
+        expected: BlazeCampaignsErrorType,
+        actual: BlazeCampaignsFetchedPayload<BlazeCampaignListResponse>
+    ) {
+        with(actual) {
+            Assert.assertTrue(isError)
+            Assert.assertEquals(expected, error.type)
+            Assert.assertEquals(null, error.message)
+        }
+    }
+
+    private fun getResponseFromJsonString(json: String): BlazeCampaignListResponse {
+        val responseType = object : TypeToken<BlazeCampaignListResponse>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as BlazeCampaignListResponse
+    }
+
+    private companion object {
+        const val SUCCESS_JSON = "wp/blaze/blaze-campaigns.json"
+        const val CAMPAIGN_ID = "1234"
+        const val TITLE = "title"
+        const val IMAGE_URL = "imageUrl"
+        const val CREATED_AT = "2023-06-02T00:00:00.000Z"
+        const val DURATION_IN_DAYS = 10
+        const val UI_STATUS = "rejected"
+        const val IMPRESSIONS = 0L
+        const val CLICKS = 0L
+        const val TOTAL_BUDGET = 100.0
+        const val SPENT_BUDGET = 0.0
+
+        const val SKIP = 0
+        const val TOTAL_ITEMS = 1
+        const val DEFAULT_LOCALE = "en"
+
+        val CAMPAIGN_IMAGE = CampaignImage(
+            height = 100f,
+            width = 100f,
+            mimeType = "image/jpeg",
+            url = IMAGE_URL
+        )
+
+        val CAMPAIGN_RESPONSE = BlazeCampaign(
+            id = CAMPAIGN_ID,
+            image = CAMPAIGN_IMAGE,
+            targetUrl = "https://example.com",
+            textSnippet = TITLE,
+            siteName = "siteName",
+            clicks = CLICKS,
+            impressions = IMPRESSIONS,
+            spentBudget = SPENT_BUDGET,
+            totalBudget = TOTAL_BUDGET,
+            durationDays = DURATION_IN_DAYS,
+            startTime = CREATED_AT,
+            targetUrn = "urn:wpcom:post:199247490:9",
+            status = UI_STATUS,
+            isEvergreen = false
+        )
+
+        val BLAZE_CAMPAIGNS_RESPONSE = BlazeCampaignListResponse(
+            campaigns = listOf(CAMPAIGN_RESPONSE),
+            skipped = SKIP,
+            totalCount = TOTAL_ITEMS,
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClientTest.kt
new file mode 100644
index 00000000000..f3659a581ba
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClientTest.kt
@@ -0,0 +1,254 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts
+
+import com.android.volley.RequestQueue
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.API_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient.BloggingPromptResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient.BloggingPromptsRespondentAvatar
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+/* RESPONSE */
+private const val ANSWERED_LINK_PREFIX = "https://wordpress.com/tag/dailyprompt-"
+
+private val PROMPT_ONE = BloggingPromptResponse(
+    id = 1010,
+    text = "You have 15 minutes to address the whole world live (on television or radio — " +
+        "choose your format). What would you say?",
+    date = "2022-01-04",
+    attribution = "",
+    isAnswered = false,
+    respondentsCount = 0,
+    respondentsAvatars = emptyList(),
+    answeredLink = ANSWERED_LINK_PREFIX + "1010",
+    answeredLinkText = "View all responses",
+    bloganuaryId = "bloganuary-2022-04",
+)
+
+private val PROMPT_TWO = BloggingPromptResponse(
+    id = 1011,
+    text = "Do you play in your daily life? What says “playtime” to you?",
+    date = "2022-01-05",
+    attribution = "dayone",
+    isAnswered = true,
+    respondentsCount = 1,
+    respondentsAvatars = listOf(BloggingPromptsRespondentAvatar("http://site/avatar1.jpg")),
+    answeredLink = ANSWERED_LINK_PREFIX + "1011",
+    answeredLinkText = "View all responses",
+)
+
+private val PROMPT_THREE = BloggingPromptResponse(
+    id = 1012,
+    text = "Are you good at what you do? What would you like to be better at.",
+    date = "2022-01-06",
+    isAnswered = false,
+    attribution = "",
+    respondentsCount = 2,
+    respondentsAvatars = listOf(
+        BloggingPromptsRespondentAvatar("http://site/avatar2.jpg"),
+        BloggingPromptsRespondentAvatar("http://site/avatar3.jpg")
+    ),
+    answeredLink = ANSWERED_LINK_PREFIX + "1012",
+    answeredLinkText = "View all responses",
+)
+
+private val PROMPTS_RESPONSE: BloggingPromptsListResponse = listOf(
+    PROMPT_ONE,
+    PROMPT_TWO,
+    PROMPT_THREE
+)
+
+@RunWith(MockitoJUnitRunner::class)
+class BloggingPromptsRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var site: SiteModel
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: BloggingPromptsRestClient
+
+    private val siteId: Long = 1
+    private val numberOfPromptsToFetch: Int = 40
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = BloggingPromptsRestClient(
+            wpComGsonRequestBuilder,
+            dispatcher,
+            null,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `when fetch prompts gets triggered, then the correct request url is used`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, PROMPTS_JSON)
+        initFetchPrompts(data = getPromptsResponseFromJsonString(json))
+
+        restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+        assertEquals(
+            urlCaptor.firstValue,
+            "$API_SITE_PATH/${site.siteId}/$API_BLOGGING_PROMPTS_PATH"
+        )
+    }
+
+    @Test
+    fun `given success call, when fetch prompts gets triggered, then prompts response is returned`() =
+        test {
+            val json = UnitTestUtils.getStringFromResourceFile(javaClass, PROMPTS_JSON)
+            initFetchPrompts(data = getPromptsResponseFromJsonString(json))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertSuccess(PROMPTS_RESPONSE, result)
+        }
+
+    @Test
+    fun `given unknown error, when fetch prompts gets triggered, then return prompts timeout error`() =
+        test {
+            initFetchPrompts(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertError(GENERIC_ERROR, result)
+        }
+
+    @Test
+    fun `given timeout, when fetch prompts gets triggered, then return prompts timeout error`() =
+        test {
+            initFetchPrompts(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.TIMEOUT)))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertError(TIMEOUT, result)
+        }
+
+    @Test
+    fun `given network error, when fetch prompts gets triggered, then return prompts api error`() =
+        test {
+            initFetchPrompts(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NETWORK_ERROR)))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertError(API_ERROR, result)
+        }
+
+    @Test
+    fun `given invalid response, when fetch prompts gets triggered, then return prompts invalid response error`() =
+        test {
+            initFetchPrompts(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE)))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertError(INVALID_RESPONSE, result)
+        }
+
+    @Test
+    fun `given not authenticated, when fetch prompts gets triggered, then return prompts auth required error`() =
+        test {
+            initFetchPrompts(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED)))
+
+            val result = restClient.fetchPrompts(site, numberOfPromptsToFetch, Date())
+
+            assertError(AUTHORIZATION_REQUIRED, result)
+        }
+
+    private fun getPromptsResponseFromJsonString(json: String): BloggingPromptsListResponse {
+        val responseType = object : TypeToken<BloggingPromptsListResponse>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as BloggingPromptsListResponse
+    }
+
+    private suspend fun initFetchPrompts(
+        data: BloggingPromptsListResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<BloggingPromptsListResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+            wpComGsonRequestBuilder.syncGetRequest<BloggingPromptsListResponse>(
+                eq(restClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(BloggingPromptsListResponseTypeToken.type),
+                eq(false),
+                any(),
+                eq(false),
+                authenticatedRequest = any()
+            )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    @Suppress("SameParameterValue")
+    private fun assertSuccess(
+        expected: BloggingPromptsListResponse,
+        actual: BloggingPromptsPayload<BloggingPromptsListResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@BloggingPromptsRestClientTest.site)
+            assertFalse(isError)
+            assertEquals(BloggingPromptsPayload(expected), this)
+        }
+    }
+
+    private fun assertError(
+        expected: BloggingPromptsErrorType,
+        actual: BloggingPromptsPayload<BloggingPromptsListResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@BloggingPromptsRestClientTest.site)
+            assertTrue(isError)
+            assertEquals(expected, error.type)
+            assertEquals(null, error.message)
+        }
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v3"
+        private const val API_SITE_PATH = "$API_BASE_PATH/sites"
+        private const val API_BLOGGING_PROMPTS_PATH = "blogging-prompts/"
+
+        private const val PROMPTS_JSON = "wp/bloggingprompts/prompts.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt
new file mode 100644
index 00000000000..aa4824c9b0a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/comments/CommentsRestClientTest.kt
@@ -0,0 +1,664 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comments
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentLikeWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentParent
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.Author
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.CommentsWPComRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.Post
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentsRestClient
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.utils.CommentErrorUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class CommentsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var commentErrorUtilsWrapper: CommentErrorUtilsWrapper
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var commentsMapper: CommentsMapper
+
+    private lateinit var restClient: CommentsRestClient
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var bodyCaptor: KArgumentCaptor<Map<String, Any>>
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        bodyCaptor = argumentCaptor()
+
+        restClient = CommentsRestClient(
+                appContext = null,
+                dispatcher = dispatcher,
+                requestQueue = requestQueue,
+                accessToken = accessToken,
+                userAgent = userAgent,
+                wpComGsonRequestBuilder = wpComGsonRequestBuilder,
+                commentErrorUtilsWrapper = commentErrorUtilsWrapper,
+                commentsMapper = commentsMapper
+        )
+        whenever(site.siteId).thenReturn(SITE_ID)
+    }
+
+    @Test
+    fun `fetchCommentsPage returns fetched page`() = test {
+        val response = getDefaultDto()
+
+        val commentsResponse = CommentsWPComRestResponse()
+        commentsResponse.comments = listOf(response, response, response)
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(response.toEntity())
+
+        initFetchPageResponse(commentsResponse)
+
+        val payload = restClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isFalse
+
+        val comments = payload.response!!
+        assertThat(comments.size).isEqualTo(commentsResponse.comments?.size)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/${site.siteId}/comments/"
+        )
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mutableMapOf(
+                        "status" to APPROVED.toString(),
+                        "offset" to 0.toString(),
+                        "number" to PAGE_LEN.toString(),
+                        "force" to "wpcom"
+                )
+        )
+    }
+
+    @Test
+    fun `fetchCommentsPage returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initFetchPageResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.fetchCommentsPage(
+                site = site,
+                number = PAGE_LEN,
+                offset = 0,
+                status = APPROVED
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `pushComment returns updated comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+        initPushResponse(response)
+
+        val payload = restClient.pushComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isFalse
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/${site.siteId}/comments/${comment.remoteCommentId}/"
+        )
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mutableMapOf(
+                        "content" to comment.content.orEmpty(),
+                        "date" to comment.datePublished.orEmpty(),
+                        "status" to comment.status.orEmpty()
+                )
+        )
+    }
+
+    @Test
+    fun `pushComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initPushResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.pushComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `updateEditComment returns updated comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+        initPushResponse(response)
+
+        val payload = restClient.updateEditComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isFalse
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/${site.siteId}/comments/${comment.remoteCommentId}/"
+        )
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mutableMapOf(
+                        "content" to comment.content.orEmpty(),
+                        "author" to comment.authorName.orEmpty(),
+                        "author_email" to comment.authorEmail.orEmpty(),
+                        "author_url" to comment.authorUrl.orEmpty()
+                )
+        )
+    }
+
+    @Test
+    fun `updateEditComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initPushResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.updateEditComment(
+                site = site,
+                comment = comment
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `fetchComment returns comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+
+        initFetchResponse(response)
+
+        val payload = restClient.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isFalse
+
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/${site.siteId}/comments/${comment.remoteCommentId}/"
+        )
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf<String, String>()
+        )
+    }
+
+    @Test
+    fun `fetchComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initFetchResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.fetchComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `deleteComment returns deleted comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+        initDeleteResponse(response)
+
+        val payload = restClient.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isFalse
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/${site.siteId}/comments/" +
+                        "${comment.remoteCommentId}/delete/"
+        )
+        assertThat(bodyCaptor.lastValue).isNull()
+    }
+
+    @Test
+    fun `deleteComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initDeleteResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.deleteComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `createNewReply returns reply comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+        initReplyCreateResponse(response)
+
+        val payload = restClient.createNewReply(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment.content
+        )
+
+        assertThat(payload.isError).isFalse
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/" +
+                        "${site.siteId}/comments/${comment.remoteCommentId}/replies/new/"
+        )
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mutableMapOf("content" to comment.content.orEmpty())
+        )
+    }
+
+    @Test
+    fun `createNewReply returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initReplyCreateResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.createNewReply(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment.content
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `createNewComment returns new comment`() = test {
+        val response = getDefaultDto()
+        val comment = response.toEntity()
+
+        whenever(commentsMapper.commentDtoToEntity(response, site)).thenReturn(comment)
+        initReplyCreateResponse(response)
+
+        val payload = restClient.createNewComment(
+                site = site,
+                remotePostId = comment.remotePostId,
+                comment.content
+        )
+
+        assertThat(payload.isError).isFalse
+        val commentResponse = payload.response!!
+        assertThat(commentResponse).isEqualTo(comment)
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/" +
+                        "${site.siteId}/posts/${comment.remotePostId}/replies/new/"
+        )
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mutableMapOf("content" to comment.content.orEmpty())
+        )
+    }
+
+    @Test
+    fun `createNewComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initReplyCreateResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.createNewComment(
+                site = site,
+                remotePostId = comment.remotePostId,
+                comment.content
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `likeComment returns new liked comment`() = test {
+        val comment = getDefaultDto().toEntity()
+        val response = getDefaultLikeResponse(comment.iLike)
+
+        initLikeResponse(response)
+
+        val payload = restClient.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment.iLike
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/" +
+                        "${site.siteId}/comments/${comment.remoteCommentId}/likes/new/"
+        )
+        assertThat(bodyCaptor.lastValue).isNull()
+    }
+
+    @Test
+    fun `likeComment returns new unliked comment`() = test {
+        val comment = getDefaultDto().toEntity().copy(iLike = false)
+        val response = getDefaultLikeResponse(comment.iLike)
+
+        initLikeResponse(response)
+
+        val payload = restClient.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment.iLike
+        )
+
+        assertThat(payload.isError).isFalse
+        assertThat(urlCaptor.lastValue).isEqualTo(
+                "https://public-api.wordpress.com/rest/v1.1/sites/" +
+                        "${site.siteId}/comments/${comment.remoteCommentId}/likes/mine/delete/"
+        )
+        assertThat(bodyCaptor.lastValue).isNull()
+    }
+
+    @Test
+    fun `likeComment returns an error on API fail`() = test {
+        val errorMessage = "this is an error"
+        val comment = getDefaultDto().toEntity()
+        whenever(commentErrorUtilsWrapper.networkToCommentError(any()))
+                .thenReturn(CommentError(INVALID_RESPONSE, errorMessage))
+
+        initLikeResponse(error = WPComGsonNetworkError(
+                BaseNetworkError(
+                        NETWORK_ERROR,
+                        errorMessage,
+                        VolleyError(errorMessage)
+                )
+        ))
+
+        val payload = restClient.likeComment(
+                site = site,
+                remoteCommentId = comment.remoteCommentId,
+                comment.iLike
+        )
+
+        assertThat(payload.isError).isTrue
+        assertThat(payload.error.type).isEqualTo(INVALID_RESPONSE)
+        assertThat(payload.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initFetchPageResponse(
+        data: CommentsWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentsWPComRestResponse> {
+        return initGetResponse(CommentsWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initPushResponse(
+        data: CommentWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentWPComRestResponse> {
+        return initPostResponse(CommentWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initFetchResponse(
+        data: CommentWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentWPComRestResponse> {
+        return initGetResponse(CommentWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initDeleteResponse(
+        data: CommentWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentWPComRestResponse> {
+        return initPostResponse(CommentWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initReplyCreateResponse(
+        data: CommentWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentWPComRestResponse> {
+        return initPostResponse(CommentWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initLikeResponse(
+        data: CommentLikeWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentLikeWPComRestResponse> {
+        return initPostResponse(CommentLikeWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initGetResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        any(),
+                        any(),
+                        any(),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun <T> initPostResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        bodyCaptor.capture(),
+                        eq(kclass),
+                        anyOrNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    private fun getDefaultDto(): CommentWPComRestResponse {
+        return CommentWPComRestResponse().apply {
+            ID = 137L
+            URL = "https://test-site.wordpress.com/2021/02/25/again/#comment-137"
+            author = Author().apply {
+                ID = 0L
+                URL = "https://debugging-test.wordpress.com"
+                avatar_URL = "https://gravatar.com/avatar/avatarurl"
+                email = "email@mydomain.com"
+                name = "This is my name"
+            }
+            content = "example content"
+            date = "2021-05-12T15:10:40+02:00"
+            i_like = true
+            parent = CommentParent().apply { ID = 41L }
+            post = Post().apply {
+                ID = 85L
+                link = "https://public-api.wordpress.com/rest/v1.1/sites/11111111/posts/85"
+                title = "again"
+                type = "post"
+            }
+            status = "approved"
+        }
+    }
+
+    private fun getDefaultLikeResponse(iLike: Boolean): CommentLikeWPComRestResponse {
+        return CommentLikeWPComRestResponse().apply {
+            success = true
+            i_like = iLike
+            like_count = 100L
+        }
+    }
+
+    private fun CommentWPComRestResponse.toEntity(): CommentEntity {
+        val dto = this
+        return CommentEntity(
+                id = 0L,
+                remoteCommentId = dto.ID,
+                remotePostId = dto.post?.ID ?: 0L,
+                authorId = dto.author?.ID ?: 0L,
+                localSiteId = 10,
+                remoteSiteId = 200L,
+                authorUrl = dto.author?.URL,
+                authorName = dto.author?.name,
+                authorEmail = dto.author?.email,
+                authorProfileImageUrl = dto.author?.avatar_URL,
+                postTitle = dto.post?.title,
+                status = dto.status,
+                datePublished = dto.date,
+                publishedTimestamp = 132456L,
+                content = dto.content,
+                url = dto.URL,
+                hasParent = dto.parent != null,
+                parentId = dto.parent?.ID ?: 0L,
+                iLike = dto.i_like
+        )
+    }
+
+    companion object {
+        private const val SITE_ID = 200L
+        private const val PAGE_LEN = 30
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt
new file mode 100644
index 00000000000..9ac33ade0bf
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClientTest.kt
@@ -0,0 +1,509 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.dashboard
+
+import com.android.volley.RequestQueue
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.ActivityCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.TodaysStatsCardModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivitiesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.CardsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PageResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PostsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.TodaysStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.DynamicCardResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.DynamicCardRowResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.FetchCardsPayload
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsPayload
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardErrorType
+import org.wordpress.android.fluxc.test
+
+/* DATE */
+
+private const val DATE_FORMAT_PATTERN = "yyyy-MM-dd HH:mm:ss"
+
+/* CARD TYPES */
+
+private val CARD_TYPES = listOf(
+    CardModel.Type.TODAYS_STATS,
+    CardModel.Type.POSTS,
+    CardModel.Type.PAGES,
+    CardModel.Type.ACTIVITY,
+    CardModel.Type.DYNAMIC
+)
+
+/* ERRORS */
+private const val JETPACK_DISABLED = "jetpack_disabled"
+private const val UNAUTHORIZED = "unauthorized"
+
+/* RESPONSE */
+
+private val TODAYS_STATS_RESPONSE = TodaysStatsResponse(
+        views = 100,
+        visitors = 30,
+        likes = 50,
+        comments = 10
+)
+
+private val DRAFT_POST_RESPONSE_TWO = PostResponse(
+        id = 708,
+        title = "",
+        content = "Draft Content 2",
+        featuredImage = "https://test.blog/wp-content/uploads/2021/11/draft-featured-image-2.jpeg?w=200",
+        date = "2021-11-02 15:47:42"
+)
+
+private val DRAFT_POST_RESPONSE_ONE = PostResponse(
+        id = 659,
+        title = "Draft Title 1",
+        content = "Draft Content 1",
+        featuredImage = null,
+        date = "2021-10-27 12:25:57"
+)
+
+private val SCHEDULED_POST_RESPONSE_ONE = PostResponse(
+        id = 762,
+        title = "Scheduled Title 1",
+        content = "",
+        featuredImage = "https://test.blog/wp-content/uploads/2021/11/scheduled-featured-image-1.jpeg?w=200",
+        date = "2021-12-26 23:00:33"
+)
+
+private val PAGE_RESPONSE_ONE = PageResponse(
+       id = 1,
+       title = "Page title",
+       content = "Page content",
+       modified = "2021-11-02 15:47:42",
+       status = "publish",
+       date = "2021-11-02 15:47:42"
+)
+
+private val PAGE_RESPONSE_TWO = PageResponse(
+       id = 2,
+       title = "Page title 2",
+       content = "Page content 2",
+       modified = "2023-03-02 11:55:49",
+       status = "publish",
+       date = "2023-03-02 11:55:49"
+)
+
+private val PAGES_RESPONSE = listOf(PAGE_RESPONSE_ONE, PAGE_RESPONSE_TWO)
+
+private val DYNAMIC_CARD_ROW_RESPONSE = DynamicCardRowResponse(
+    icon = "https://path/to/image",
+    title = "Row title",
+    description = "Row description"
+)
+
+private val DYNAMIC_CARD_RESPONSE = DynamicCardResponse(
+    id = "year_in_review_2023",
+    title = "News",
+    featuredImage = "https://path/to/image",
+    url = "https://wordpress.com",
+    action = "Call to action",
+    order = "top",
+    rows = listOf(DYNAMIC_CARD_ROW_RESPONSE),
+)
+
+private val DYNAMIC_CARDS_RESPONSE = listOf(DYNAMIC_CARD_RESPONSE)
+
+private val POSTS_RESPONSE = PostsResponse(
+        hasPublished = true,
+        draft = listOf(
+                DRAFT_POST_RESPONSE_TWO,
+                DRAFT_POST_RESPONSE_ONE
+        ),
+        scheduled = listOf(
+                SCHEDULED_POST_RESPONSE_ONE
+        )
+)
+
+private val ACTIVITY_RESPONSE_ICON = ActivitiesResponse.Icon("jpg", "dog.jpg", 100, 100)
+private val ACTIVITY_RESPONSE_ACTOR = ActivitiesResponse.Actor(
+    "author",
+    "John Smith",
+    10,
+    15,
+    ACTIVITY_RESPONSE_ICON,
+    "admin"
+)
+private val ACTIVITY_RESPONSE_GENERATOR = ActivitiesResponse.Generator(10.3f, 123)
+private val ACTIVITY_RESPONSE_PAGE = ActivitiesResponse.ActivityResponse(
+    summary = "activity",
+    content = null,
+    name = "name",
+    actor = ACTIVITY_RESPONSE_ACTOR,
+    type = "create a blog",
+    published = null,
+    generator = ACTIVITY_RESPONSE_GENERATOR,
+    is_rewindable = false,
+    rewind_id = "10.0",
+    gridicon = "gridicon.jpg",
+    status = "OK",
+    activity_id = "activity123"
+)
+
+private val ACTIVITY_RESPONSE_ACTIVITIES_PAGE =
+    ActivitiesResponse.Page(orderedItems = listOf(ACTIVITY_RESPONSE_PAGE))
+private val ACTIVITY_RESPONSE = ActivitiesResponse(
+    totalItems = 1,
+    summary = "response",
+    current = ACTIVITY_RESPONSE_ACTIVITIES_PAGE
+)
+
+private val CARDS_RESPONSE = CardsResponse(
+        todaysStats = TODAYS_STATS_RESPONSE,
+        posts = POSTS_RESPONSE,
+        pages = PAGES_RESPONSE,
+        activity = ACTIVITY_RESPONSE,
+        dynamic = DYNAMIC_CARDS_RESPONSE
+)
+
+private const val BUILD_NUMBER_PARAM = "build_number_param"
+private const val DEVICE_ID_PARAM = "device_id_param"
+private const val IDENTIFIER_PARAM = "identifier_param"
+private const val MARKETING_VERSION_PARAM = "marketing_version_param"
+private const val PLATFORM_PARAM = "platform_param"
+private const val ANDROID_VERSION_PARAM = "14.0"
+
+@RunWith(MockitoJUnitRunner::class)
+class CardsRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var site: SiteModel
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: CardsRestClient
+
+    private lateinit var fetchCardsPayload: FetchCardsPayload
+
+    private val siteId: Long = 1
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = CardsRestClient(
+                wpComGsonRequestBuilder,
+                dispatcher,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+        fetchCardsPayload = FetchCardsPayload(
+            site, CARD_TYPES, BUILD_NUMBER_PARAM, DEVICE_ID_PARAM,
+            IDENTIFIER_PARAM, MARKETING_VERSION_PARAM, PLATFORM_PARAM, ANDROID_VERSION_PARAM
+        )
+    }
+
+    @Test
+    fun `when fetch cards gets triggered, then the correct request url is used`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_JSON)
+        initFetchCards(data = getCardsResponseFromJsonString(json))
+
+        restClient.fetchCards(fetchCardsPayload)
+
+        assertEquals(urlCaptor.firstValue, "$API_SITE_PATH/${site.siteId}/$API_DASHBOARD_CARDS_PATH")
+    }
+
+    @Test
+    fun `given success call, when fetch cards gets triggered, then cards response is returned`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_JSON)
+        initFetchCards(data = getCardsResponseFromJsonString(json))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertSuccess(CARDS_RESPONSE, result)
+    }
+
+    @Test
+    fun `given timeout, when fetch cards gets triggered, then return cards timeout error`() = test {
+        initFetchCards(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.TIMEOUT)))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertError(CardsErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given network error, when fetch cards gets triggered, then return cards api error`() = test {
+        initFetchCards(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NETWORK_ERROR)))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertError(CardsErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given invalid response, when fetch cards gets triggered, then return cards invalid response error`() = test {
+        initFetchCards(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE)))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertError(CardsErrorType.INVALID_RESPONSE, result)
+    }
+
+    @Test
+    fun `given not authenticated, when fetch cards gets triggered, then return cards auth required error`() = test {
+        initFetchCards(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED)))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertError(CardsErrorType.AUTHORIZATION_REQUIRED, result)
+    }
+
+    @Test
+    fun `given unknown error, when fetch cards gets triggered, then return cards generic error`() = test {
+        initFetchCards(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)))
+
+        val result = restClient.fetchCards(fetchCardsPayload)
+
+        assertError(CardsErrorType.GENERIC_ERROR, result)
+    }
+
+    /* TODAY'S STATS CARD ERRORS */
+    @Test
+    fun `given jetpack disconn, when fetch cards triggered, then returns todays stats jetpack disconn card error`() =
+            test {
+                val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_WITH_ERRORS_JSON)
+                initFetchCards(data = getCardsResponseFromJsonString(json))
+
+                val result = restClient.fetchCards(fetchCardsPayload)
+
+                assertSuccessWithTodaysStatsError(TodaysStatsCardErrorType.JETPACK_DISCONNECTED, result)
+            }
+
+    @Test
+    fun `given jetpack disabled, when fetch cards triggered, then returns todays stats jetpack disabled card error`() =
+            test {
+                val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_WITH_ERRORS_JSON)
+                val data = getCardsResponseFromJsonString(json)
+                        .copy(todaysStats = TodaysStatsResponse(error = JETPACK_DISABLED))
+                initFetchCards(data = data)
+
+                val result = restClient.fetchCards(fetchCardsPayload)
+
+                assertSuccessWithTodaysStatsError(TodaysStatsCardErrorType.JETPACK_DISABLED, result)
+            }
+
+    @Test
+    fun `given stats unauthorized, when fetch cards triggered, then returns todays stats unauthorized card error`() =
+            test {
+                val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_WITH_ERRORS_JSON)
+                val data = getCardsResponseFromJsonString(json)
+                        .copy(todaysStats = TodaysStatsResponse(error = UNAUTHORIZED))
+                initFetchCards(data = data)
+
+                val result = restClient.fetchCards(fetchCardsPayload)
+
+                assertSuccessWithTodaysStatsError(TodaysStatsCardErrorType.UNAUTHORIZED, result)
+            }
+
+    /* POST CARD ERROR */
+    @Test
+    fun `given posts unauthorized error, when fetch cards triggered, then returns post card card error`() =
+            test {
+                val json = UnitTestUtils.getStringFromResourceFile(javaClass, DASHBOARD_CARDS_WITH_ERRORS_JSON)
+                initFetchCards(data = getCardsResponseFromJsonString(json))
+
+                val result = restClient.fetchCards(fetchCardsPayload)
+
+                assertSuccessWithPostCardError(result)
+            }
+
+    @Test
+    fun `given activity unauthorized, when fetch cards triggered, then returns activity unauthorized card error`() =
+        test {
+            val json = UnitTestUtils.getStringFromResourceFile(
+                javaClass,
+                DASHBOARD_CARDS_WITH_ERRORS_JSON
+            )
+            val data = getCardsResponseFromJsonString(json)
+                .copy(
+                    activity = ActivitiesResponse(
+                        error = UNAUTHORIZED, totalItems = null, summary = null, current = null
+                    )
+                )
+            initFetchCards(data = data)
+
+            val result = restClient.fetchCards(fetchCardsPayload)
+
+            assertSuccessWithActivityError(result)
+        }
+
+    private fun CardsPayload<CardsResponse>.findTodaysStatsCardError(): TodaysStatsCardError? =
+            this.response?.toCards()?.filterIsInstance(TodaysStatsCardModel::class.java)?.firstOrNull()?.error
+
+    private fun CardsPayload<CardsResponse>.findPostCardError(): PostCardError? =
+            this.response?.toCards()?.filterIsInstance(PostsCardModel::class.java)?.firstOrNull()?.error
+
+    private fun CardsPayload<CardsResponse>.findActivityCardError(): ActivityCardError? =
+        this.response?.toCards()?.filterIsInstance(ActivityCardModel::class.java)?.firstOrNull()?.error
+
+    private fun getCardsResponseFromJsonString(json: String): CardsResponse {
+        val responseType = object : TypeToken<CardsResponse>() {}.type
+        return GsonBuilder().setDateFormat(DATE_FORMAT_PATTERN)
+                .create().fromJson(json, responseType) as CardsResponse
+    }
+
+    private suspend fun initFetchCards(
+        data: CardsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CardsResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(CardsResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    @Suppress("SameParameterValue")
+    private fun assertSuccess(
+        expected: CardsResponse,
+        actual: CardsPayload<CardsResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@CardsRestClientTest.site)
+            assertFalse(isError)
+            assertEquals(expected.pages, response?.pages)
+            assertEquals(expected.posts, response?.posts)
+            assertEquals(expected.todaysStats, response?.todaysStats)
+            assertEquals(response?.activity?.totalItems, response?.activity?.totalItems)
+            assertEquals(response?.activity?.summary, response?.activity?.summary)
+            assertSuccessActivityResponse(
+                expected.activity?.current?.orderedItems?.get(0)!!,
+                response?.activity?.current?.orderedItems?.get(0)!!
+            )
+        }
+    }
+
+    private fun assertSuccessActivityResponse(expected: ActivitiesResponse.ActivityResponse,
+                                              actual: ActivitiesResponse.ActivityResponse) {
+        with(actual) {
+            assertEquals(expected.activity_id, this.activity_id)
+            assertEquals(expected.is_rewindable, this.is_rewindable)
+            assertEquals(expected.name, this.name)
+            assertEquals(expected.published, this.published)
+            assertEquals(expected.gridicon, this.gridicon)
+            assertEquals(expected.rewind_id, this.rewind_id)
+            assertEquals(expected.status, this.status)
+            assertEquals(expected.summary, this.summary)
+            assertEquals(expected.content, this.content)
+            assertEquals(expected.type, this.type)
+            assertEquals(expected.actor?.icon?.type, this.actor?.icon?.type)
+            assertEquals(expected.actor?.icon?.url, this.actor?.icon?.url)
+            assertEquals(expected.actor?.icon?.height, this.actor?.icon?.height)
+            assertEquals(expected.actor?.icon?.width, this.actor?.icon?.width)
+            assertEquals(expected.actor?.type, this.actor?.type)
+            assertEquals(expected.actor?.name, this.actor?.name)
+            assertEquals(expected.actor?.wpcom_user_id, this.actor?.wpcom_user_id)
+            assertEquals(expected.actor?.external_user_id, this.actor?.external_user_id)
+            assertEquals(expected.actor?.role, this.actor?.role)
+            assertEquals(expected.generator?.blog_id, this.generator?.blog_id)
+            assertEquals(expected.generator?.jetpack_version, this.generator?.jetpack_version)
+        }
+    }
+
+    private fun assertError(
+        expected: CardsErrorType,
+        actual: CardsPayload<CardsResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@CardsRestClientTest.site)
+            assertTrue(isError)
+            assertEquals(expected, error.type)
+            assertEquals(null, error.message)
+        }
+    }
+
+    private fun assertSuccessWithTodaysStatsError(
+        expected: TodaysStatsCardErrorType,
+        actual: CardsPayload<CardsResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@CardsRestClientTest.site)
+            assertFalse(isError)
+            assertEquals(expected, findTodaysStatsCardError()?.type)
+        }
+    }
+
+    private fun assertSuccessWithPostCardError(
+        actual: CardsPayload<CardsResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@CardsRestClientTest.site)
+            assertFalse(isError)
+            assertEquals(PostCardErrorType.UNAUTHORIZED, findPostCardError()?.type)
+        }
+    }
+
+    private fun assertSuccessWithActivityError(
+        actual: CardsPayload<CardsResponse>
+    ) {
+        with(actual) {
+            assertEquals(site, this@CardsRestClientTest.site)
+            assertFalse(isError)
+            assertEquals(ActivityCardErrorType.UNAUTHORIZED, findActivityCardError()?.type)
+        }
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v2"
+        private const val API_SITE_PATH = "$API_BASE_PATH/sites"
+        private const val API_DASHBOARD_CARDS_PATH = "dashboard/cards-data/"
+
+        private const val DASHBOARD_CARDS_JSON = "wp/dashboard/cards.json"
+        private const val DASHBOARD_CARDS_WITH_ERRORS_JSON = "wp/dashboard/cards_with_errors.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt
new file mode 100644
index 00000000000..a04dcdf13b6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClientTest.kt
@@ -0,0 +1,202 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.experiments
+
+import com.android.volley.RequestQueue
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.experiments.AssignmentsModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.experiments.ExperimentRestClient.Companion.DEFAULT_VERSION
+import org.wordpress.android.fluxc.network.rest.wpcom.experiments.ExperimentRestClient.FetchAssignmentsResponse
+import org.wordpress.android.fluxc.store.ExperimentStore.FetchedAssignmentsPayload
+import org.wordpress.android.fluxc.store.ExperimentStore.Platform.CALYPSO
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class ExperimentRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+
+    private lateinit var experimentRestClient: ExperimentRestClient
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        experimentRestClient = ExperimentRestClient(
+                wpComGsonRequestBuilder,
+                null,
+                dispatcher,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `calls correct url with default values`() = test {
+        initRequest(Success(successfulResponse))
+
+        experimentRestClient.fetchAssignments(defaultPlatform, emptyList())
+
+        val expectedUrl = "$EXPERIMENTS_ENDPOINT/$DEFAULT_VERSION/assignments/${defaultPlatform.value}/"
+        val expectedParams = mapOf(
+                "experiment_names" to "",
+                "anon_id" to ""
+        )
+
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `calls correct url with single experiment name`() = test {
+        initRequest(Success(successfulResponse))
+
+        val experimentsNames = listOf("experiment_one")
+
+        experimentRestClient.fetchAssignments(defaultPlatform, experimentsNames)
+
+        val expectedUrl = "$EXPERIMENTS_ENDPOINT/$DEFAULT_VERSION/assignments/${defaultPlatform.value}/"
+        val expectedParams = mapOf(
+                "experiment_names" to "experiment_one",
+                "anon_id" to ""
+        )
+
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `calls correct url with multiple experiment names`() = test {
+        initRequest(Success(successfulResponse))
+
+        val experimentNames = listOf("experiment_one", "experiment_two", "experiment_three")
+
+        experimentRestClient.fetchAssignments(defaultPlatform, experimentNames)
+
+        val expectedUrl = "$EXPERIMENTS_ENDPOINT/$DEFAULT_VERSION/assignments/${defaultPlatform.value}/"
+        val expectedParams = mapOf(
+                "experiment_names" to "experiment_one,experiment_two,experiment_three",
+                "anon_id" to ""
+        )
+
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `calls correct url with anonymous id`() = test {
+        initRequest(Success(successfulResponse))
+
+        val anonymousId = "myAnonymousId"
+
+        experimentRestClient.fetchAssignments(defaultPlatform, emptyList(), anonymousId)
+
+        val expectedUrl = "$EXPERIMENTS_ENDPOINT/$DEFAULT_VERSION/assignments/${defaultPlatform.value}/"
+        val expectedParams = mapOf(
+                "experiment_names" to "",
+                "anon_id" to anonymousId
+        )
+
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `calls correct url with version`() = test {
+        initRequest(Success(successfulResponse))
+
+        val version = "1.0.0"
+
+        experimentRestClient.fetchAssignments(defaultPlatform, emptyList(), null, version)
+
+        val expectedUrl = "$EXPERIMENTS_ENDPOINT/$version/assignments/${defaultPlatform.value}/"
+        val expectedParams = mapOf(
+                "experiment_names" to "",
+                "anon_id" to ""
+        )
+
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `returns assignments when API call is successful`() = test {
+        initRequest(Success(successfulResponse))
+
+        val payload = experimentRestClient.fetchAssignments(defaultPlatform, emptyList())
+
+        assertThat(payload).isNotNull
+        assertThat(payload.assignments.variations).isEqualTo(successfulPayload.assignments.variations)
+        assertThat(payload.assignments.ttl).isEqualTo(successfulPayload.assignments.ttl)
+    }
+
+    @Test
+    fun `returns error when API call fails`() = test {
+        initRequest(Error(errorResponse))
+
+        val payload = experimentRestClient.fetchAssignments(defaultPlatform, emptyList())
+
+        assertThat(payload).isNotNull
+        assertThat(payload.isError).isTrue
+    }
+
+    private suspend fun initRequest(response: Response<FetchAssignmentsResponse>) {
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(experimentRestClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(FetchAssignmentsResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(true),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+    }
+
+    companion object {
+        const val EXPERIMENTS_ENDPOINT = "https://public-api.wordpress.com/wpcom/v2/experiments"
+
+        val defaultPlatform = CALYPSO
+
+        private val successfulVariations = mapOf(
+                "experiment_one" to null,
+                "experiment_two" to "treatment",
+                "experiment_three" to "other"
+        )
+
+        val successfulResponse = FetchAssignmentsResponse(successfulVariations, 3600)
+
+        val errorResponse = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR))
+
+        val successfulPayload = FetchedAssignmentsPayload(AssignmentsModel(successfulVariations, 3600))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClientTest.kt
new file mode 100644
index 00000000000..1af50b87daa
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClientTest.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+import com.android.volley.RequestQueue
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackRestClient.JetpackInstallResponse
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class JetpackRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var jetpackTunnelGsonRequestBuilder: JetpackTunnelGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+
+    private lateinit var jetpackRestClient: JetpackRestClient
+    private val username = "John Smith"
+    private val password = "password123"
+    private val siteUrl = "http://wordpress.org"
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        jetpackRestClient = JetpackRestClient(dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                jetpackTunnelGsonRequestBuilder)
+    }
+
+    @Test
+    fun `returns success on successful jetpack install`() = test {
+        initRequest(Success(JetpackInstallResponse(true)))
+        val success = true
+
+        val jetpackInstalledPayload = jetpackRestClient.installJetpack(site)
+
+        checkUrlAndLogin()
+        assertThat(jetpackInstalledPayload).isNotNull
+        assertThat(jetpackInstalledPayload.success).isEqualTo(success)
+    }
+
+    private fun checkUrlAndLogin() {
+        val url = "https://public-api.wordpress.com/rest/v1/jetpack-install/http%3A%2F%2Fwordpress.org/"
+        assertThat(urlCaptor.lastValue).isEqualTo(url)
+        assertThat(paramsCaptor.lastValue).containsEntry("user", username).containsEntry("password", password)
+    }
+
+    @Test
+    fun `returns error with type`() = test {
+        initRequest(Error(WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR))))
+
+        val jetpackErrorPayload = jetpackRestClient.installJetpack(site)
+
+        checkUrlAndLogin()
+        assertThat(jetpackErrorPayload).isNotNull
+        assertThat(jetpackErrorPayload.success).isEqualTo(false)
+        assertThat(jetpackErrorPayload.error?.type).isEqualTo(JetpackInstallErrorType.GENERIC_ERROR)
+    }
+
+    suspend fun initRequest(response: WPComGsonRequestBuilder.Response<JetpackInstallResponse>) {
+        whenever(site.username).thenReturn(username)
+        whenever(site.password).thenReturn(password)
+        whenever(site.url).thenReturn(siteUrl)
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+                eq(jetpackRestClient),
+                urlCaptor.capture(),
+                eq(null),
+                paramsCaptor.capture(),
+                eq(JetpackInstallResponse::class.java),
+                isNull(),
+                anyOrNull(),
+        )).thenReturn(response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jitm/JitmRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jitm/JitmRestClientTest.kt
new file mode 100644
index 00000000000..2de0c24f6ce
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/jitm/JitmRestClientTest.kt
@@ -0,0 +1,199 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jitm
+
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.generated.endpoint.JPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JITMApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JITMContent
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JITMCta
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.jitm.JitmRestClient
+
+class JitmRestClientTest {
+    private val wooNetwork: WooNetwork = mock()
+    private lateinit var jitmRestClient: JitmRestClient
+
+    @Before
+    fun setup() {
+        jitmRestClient = JitmRestClient(wooNetwork)
+    }
+
+    private fun provideJitmApiResponse(
+        template: String = "",
+        content: JITMContent = provideJitmContent(),
+        jitmCta: JITMCta = provideJitmCta(),
+        timeToLive: Int = 0,
+        id: String = "",
+        featureClass: String = "",
+        expires: Long = 0L,
+        maxDismissal: Int = 2,
+        isDismissible: Boolean = false,
+        url: String = "",
+        jitmStatsUrl: String = "",
+        assets: Map<String, String>? = null
+    ) = JITMApiResponse(
+        template = template,
+        content = content,
+        cta = jitmCta,
+        timeToLive = timeToLive,
+        id = id,
+        featureClass = featureClass,
+        expires = expires,
+        maxDismissal = maxDismissal,
+        isDismissible = isDismissible,
+        url = url,
+        jitmStatsUrl = jitmStatsUrl,
+        assets = assets
+    )
+
+    private fun provideJitmContent(
+        message: String = "",
+        description: String = "",
+        icon: String = "",
+        title: String = "",
+        iconPath: String = ""
+    ) = JITMContent(
+        message = message,
+        description = description,
+        icon = icon,
+        title = title,
+        iconPath = iconPath,
+    )
+
+    private fun provideJitmCta(
+        message: String = "",
+        link: String = ""
+    ) = JITMCta(
+        message = message,
+        link = link
+    )
+
+    @Test
+    fun `given success response, when fetch jitm, return success`() {
+        runBlocking {
+            val site = SiteModel().apply { siteId = 1234 }
+            whenever(
+                wooNetwork.executeGetGsonRequest(
+                    site = site,
+                    path = JPAPI.jitm.pathV4,
+                    params = mapOf(
+                        "message_path" to "",
+                        "query" to "",
+                    ),
+                    clazz = Array<JITMApiResponse>::class.java,
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(
+                    arrayOf(provideJitmApiResponse())
+                )
+            )
+
+            val actualResponse = jitmRestClient.fetchJitmMessage(
+                site,
+                "",
+                "",
+            )
+
+            assertThat(actualResponse.isError).isFalse
+            assertThat(actualResponse.result).isNotNull
+        }
+    }
+
+    @Test
+    fun `given error response, when fetch jitm, return error`() {
+        val site = SiteModel().apply { siteId = 1234 }
+        runBlocking {
+            val expectedError = mock<WPAPINetworkError>().apply {
+                type = mock()
+            }
+            whenever(
+                wooNetwork.executeGetGsonRequest(
+                    site = site,
+                    path = JPAPI.jitm.pathV4,
+                    params = mapOf(
+                        "message_path" to "",
+                        "query" to "",
+                    ),
+                    clazz = Array<JITMApiResponse>::class.java,
+                )
+            ).thenReturn(
+                WPAPIResponse.Error(expectedError)
+            )
+
+            val actualResponse = jitmRestClient.fetchJitmMessage(site, "", "")
+
+            assertThat(actualResponse.isError).isTrue
+            assertThat(actualResponse.error).isNotNull
+        }
+    }
+
+    @Test
+    fun `given success response, when dismiss jitm, return success`() {
+        runBlocking {
+            val site = SiteModel().apply { siteId = 1234 }
+            whenever(
+                wooNetwork.executePostGsonRequest(
+                    site = site,
+                    path = JPAPI.jitm.pathV4,
+                    body = mapOf(
+                        "id" to "",
+                        "feature_class" to ""
+                    ),
+                    clazz = Any::class.java,
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(
+                    arrayOf(provideJitmApiResponse())
+                )
+            )
+
+            val actualResponse = jitmRestClient.dismissJitmMessage(
+                site,
+                "",
+                ""
+            )
+
+            assertThat(actualResponse.isError).isFalse
+            assertThat(actualResponse.result).isTrue
+        }
+    }
+
+    @Test
+    fun `given error response, when dismiss jitm, return error`() {
+        runBlocking {
+            val site = SiteModel().apply { siteId = 1234 }
+            val expectedError = mock<WPAPINetworkError>().apply {
+                type = mock()
+            }
+            whenever(
+                wooNetwork.executePostGsonRequest(
+                    site = site,
+                    path = JPAPI.jitm.pathV4,
+                    body = mapOf(
+                        "id" to "",
+                        "feature_class" to ""
+                    ),
+                    clazz = Any::class.java,
+                )
+            ).thenReturn(
+                WPAPIResponse.Error(expectedError)
+            )
+
+            val actualResponse = jitmRestClient.dismissJitmMessage(
+                site,
+                "",
+                ""
+            )
+
+            assertThat(actualResponse.isError).isTrue
+            assertThat(actualResponse.result).isNull()
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClientTest.kt
new file mode 100644
index 00000000000..01d085c1e0e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClientTest.kt
@@ -0,0 +1,149 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media.wpv2
+
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.ResponseBody.Companion.toResponseBody
+import okio.IOException
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.action.UploadAction.UPLOADED_MEDIA
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.media.MediaTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.io.File
+import java.util.concurrent.CountDownLatch
+
+@RunWith(RobolectricTestRunner::class)
+class WPComV2MediaRestClientTest {
+    private val accessToken: AccessToken = mock()
+    private val okHttpClient: OkHttpClient = mock()
+    private val dispatcher: Dispatcher = mock()
+    private val wpComNetwork: WPComNetwork = mock()
+    private val mockedCall: Call = mock()
+    private lateinit var countDownLatch: CountDownLatch
+    private lateinit var restClient: WPComV2MediaRestClient
+
+    private lateinit var dispatchedPayload: ProgressPayload
+
+    @Before
+    fun setup() {
+        restClient = WPComV2MediaRestClient(
+                dispatcher = dispatcher,
+                coroutineEngine = initCoroutineEngine(),
+                okHttpClient = okHttpClient,
+                accessToken = accessToken,
+                wpComNetwork = wpComNetwork
+        )
+        EventBus.getDefault().register(this)
+    }
+
+    @Test
+    fun `emit success action when upload finishes`() {
+        createFileThenRunTest {
+            whenever(okHttpClient.newCall(any())).thenReturn(mockedCall)
+            whenever(mockedCall.enqueue(any())).then {
+                (it.arguments.first() as Callback).onResponse(
+                        mockedCall,
+                        mock {
+                            on { body } doReturn UnitTestUtils.getStringFromResourceFile(
+                                    this::class.java,
+                                    "media/media-upload-wp-api-success.json"
+                            ).toResponseBody("application/json".toMediaType())
+                            on { isSuccessful } doReturn true
+                        }
+                )
+                countDownLatch.countDown()
+            }
+
+            countDownLatch = CountDownLatch(1)
+            restClient.uploadMedia(SiteModel(), MediaTestUtils.generateMediaFromPath(0, 0L, "./image.jpg"))
+
+            countDownLatch.await()
+
+            verify(dispatcher).dispatch(argThat {
+                type == UPLOADED_MEDIA && (payload as ProgressPayload).completed
+            })
+        }
+    }
+
+    @Test
+    fun `emit failure action when upload fails`() {
+        createFileThenRunTest {
+            whenever(okHttpClient.newCall(any())).thenReturn(mockedCall)
+            whenever(mockedCall.enqueue(any())).then {
+                (it.arguments.first() as Callback).onFailure(mock(), IOException())
+                countDownLatch.countDown()
+            }
+
+            countDownLatch = CountDownLatch(1)
+            restClient.uploadMedia(SiteModel(), MediaTestUtils.generateMediaFromPath(0, 0L, "./image.jpg"))
+
+            countDownLatch.await()
+
+            verify(dispatcher).dispatch(argThat {
+                type == UPLOADED_MEDIA && (payload as ProgressPayload).error != null
+            })
+        }
+    }
+
+    @Test
+    fun `emit failure action when we can't parse the response`() {
+        createFileThenRunTest {
+            whenever(okHttpClient.newCall(any())).thenReturn(mockedCall)
+            whenever(mockedCall.enqueue(any())).then {
+                (it.arguments.first() as Callback).onResponse(
+                        mockedCall,
+                        mock {
+                            on { body } doReturn "".toResponseBody("application/json".toMediaType())
+                            on { isSuccessful } doReturn true
+                        }
+                )
+                countDownLatch.countDown()
+            }
+
+            countDownLatch = CountDownLatch(1)
+            restClient.uploadMedia(SiteModel(), MediaTestUtils.generateMediaFromPath(0, 0L, "./image.jpg"))
+
+            countDownLatch.await()
+
+            verify(dispatcher).dispatch(argThat {
+                type == UPLOADED_MEDIA && (payload as ProgressPayload).error != null
+            })
+        }
+    }
+
+    private fun createFileThenRunTest(test: () -> Unit) {
+        val file = File("./image.jpg")
+        file.createNewFile()
+        try {
+            test()
+        } finally {
+            file.delete()
+        }
+    }
+
+    @Subscribe
+    fun onAction(action: Action<*>) {
+        if (action.type == UPLOADED_MEDIA) {
+            dispatchedPayload = action.payload as ProgressPayload
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt
new file mode 100644
index 00000000000..437d0d2a31b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClientTest.kt
@@ -0,0 +1,262 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import com.android.volley.RequestQueue
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_AUTHENTICATED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsRestClient.FeatureFlagsPayload
+import org.wordpress.android.fluxc.test
+import kotlin.test.assertEquals
+
+@RunWith(MockitoJUnitRunner::class)
+class FeatureFlagsRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: FeatureFlagsRestClient
+    
+    private val successResponse = mapOf("flag-1" to true, "flag-2" to false)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = FeatureFlagsRestClient(
+            wpComGsonRequestBuilder,
+            dispatcher,
+            null,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `when feature flags are requested, then the correct url is built`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+        val response = getResponseFromJsonString(json)
+        initFetchFeatureFlags(data = response)
+
+        restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertEquals(urlCaptor.firstValue,
+            "${API_BASE_PATH}/${API_AUTH_MOBILE_FEATURE_FLAG_PATH}")
+    }
+
+    @Test
+    fun `given success call, when f-flags are requested, then correct response is returned`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+        initFetchFeatureFlags(data = getResponseFromJsonString(json))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertSuccess(successResponse, result)
+    }
+
+    @Test
+    fun `given timeout, when f-flags are requested, then return timeout error`() = test {
+        initFetchFeatureFlags(error = WPComGsonNetworkError(BaseNetworkError(TIMEOUT)))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertError(FeatureFlagsErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given network error, when f-flags are requested, then return api error`() = test {
+        initFetchFeatureFlags(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertError(FeatureFlagsErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given invalid response, when f-flags are requested, then return invalid response error`() = test {
+        initFetchFeatureFlags(error = WPComGsonNetworkError(BaseNetworkError(INVALID_RESPONSE)))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertError(FeatureFlagsErrorType.INVALID_RESPONSE, result)
+    }
+
+    @Test
+    fun `given not authenticated, when f-flags are requested, then return auth required error`() = test {
+        initFetchFeatureFlags(error = WPComGsonNetworkError(BaseNetworkError(NOT_AUTHENTICATED)))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertError(FeatureFlagsErrorType.AUTH_ERROR, result)
+    }
+
+    @Test
+    fun `given unknown error, when f-flags are requested, then return generic error`() = test {
+        initFetchFeatureFlags(error = WPComGsonNetworkError(BaseNetworkError(UNKNOWN)))
+
+        val result = restClient.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        assertError(FeatureFlagsErrorType.GENERIC_ERROR, result)
+    }
+
+
+    private suspend fun initFetchFeatureFlags(
+        data: Map<*, *>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) {
+            Response.Error(error)
+        } else {
+            Response.Success(nonNullData)
+        }
+
+        whenever(
+            wpComGsonRequestBuilder.syncGetRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(Map::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+            )
+        ).thenReturn(response)
+    }
+
+    @Suppress("SameParameterValue")
+    private fun assertSuccess(
+        expected: Map<String, Boolean>,
+        actual: FeatureFlagsFetchedPayload
+    ) {
+        with(actual) {
+            Assert.assertFalse(isError)
+            Assert.assertEquals(FeatureFlagsFetchedPayload(expected), this)
+        }
+    }
+
+    private fun assertError(
+        expected: FeatureFlagsErrorType,
+        actual: FeatureFlagsFetchedPayload
+    ) {
+        with(actual) {
+            Assert.assertTrue(isError)
+            Assert.assertEquals(expected, error.type)
+            Assert.assertEquals(null, error.message)
+        }
+    }
+
+    private fun getResponseFromJsonString(json: String): Map<String, Boolean> {
+        val responseType = object : TypeToken<Map<*, *>>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as Map<String, Boolean>
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v2"
+        private const val API_AUTH_MOBILE_FEATURE_FLAG_PATH = "mobile/feature-flags/"
+
+        private const val BUILD_NUMBER_PARAM = "build_number_param"
+        private const val DEVICE_ID_PARAM = "device_id_param"
+        private const val IDENTIFIER_PARAM = "identifier_param"
+        private const val MARKETING_VERSION_PARAM = "marketing_version_param"
+        private const val PLATFORM_PARAM = "platform_param"
+        private const val OS_VERSION_PARAM = "os_version_param"
+
+        private const val SUCCESS_JSON = "wp/mobile/feature-flags-success.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClientTest.kt
new file mode 100644
index 00000000000..be0e0a76cc8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClientTest.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import junit.framework.AssertionFailedError
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload
+import org.wordpress.android.fluxc.test
+
+class JetpackMigrationRestClientTest {
+    private val wpComGsonRequestBuilder = mock<WPComGsonRequestBuilder>()
+    private val context = mock<Context>()
+    private val dispatcher = mock<Dispatcher>()
+    private val requestQueue = mock<RequestQueue>()
+    private val accessToken = mock<AccessToken>()
+    private val userAgent = mock<UserAgent>()
+
+    private lateinit var client: JetpackMigrationRestClient
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        client = JetpackMigrationRestClient(
+                wpComGsonRequestBuilder,
+                dispatcher,
+                context,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `fetch handles successful response`() = test {
+        val errorHandler: (BaseNetworkError?) -> MigrationCompleteFetchedPayload = { _ ->
+            throw AssertionFailedError("errorHandler should not have been called")
+        }
+
+        val expected = MigrationCompleteFetchedPayload.Success
+        val expectedJson = mock<JsonElement>()
+
+        val expectedRestCallResponse = Success(expectedJson)
+        verifyRestApi(errorHandler, expectedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `fetch handles failure response`() = test {
+        val expected = mock<MigrationCompleteFetchedPayload>()
+        val expectedBaseNetworkError = mock<WPComGsonNetworkError>()
+        val errorHandler = { error: BaseNetworkError? ->
+            if (error != expectedBaseNetworkError) fail("expected error was not passed to errorHandler")
+            expected
+        }
+
+        val mockedRestCallResponse = Error<JsonElement>(expectedBaseNetworkError)
+        verifyRestApi(errorHandler, mockedRestCallResponse, expected)
+    }
+
+    private suspend fun verifyRestApi(
+        errorHandler: (BaseNetworkError?) -> MigrationCompleteFetchedPayload,
+        expectedRestCallResponse: WPComGsonRequestBuilder.Response<JsonElement>,
+        expected: MigrationCompleteFetchedPayload
+    ) {
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(client),
+                        urlCaptor.capture(),
+                        eq(mapOf()),
+                        eq(mapOf()),
+                        eq(JsonElement::class.java),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(expectedRestCallResponse)
+
+        val actual = client.migrationComplete(errorHandler)
+        assertEquals(expected, actual)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt
new file mode 100644
index 00000000000..ec9cc0bfbd9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClientTest.kt
@@ -0,0 +1,181 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import com.android.volley.RequestQueue
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.test
+import kotlin.test.assertEquals
+
+@RunWith(MockitoJUnitRunner::class)
+class RemoteConfigRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: RemoteConfigRestClient
+    
+    private val successResponse = mapOf("jp-deadline" to "2022-10-10")
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = RemoteConfigRestClient(
+            wpComGsonRequestBuilder,
+            dispatcher,
+            null,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `when remote configs are requested, then the correct url is built`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+        val response = getResponseFromJsonString(json)
+        initFetchRemoteConfig(data = response)
+
+        restClient.fetchRemoteConfig()
+
+        assertEquals(urlCaptor.firstValue,
+            "${API_BASE_PATH}/${API_MOBILE_REMOTE_CONFIG_PATH}")
+    }
+
+    @Test
+    fun `given success call, when remote-config are requested, then correct response is returned`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, SUCCESS_JSON)
+        initFetchRemoteConfig(data = getResponseFromJsonString(json))
+
+        val result = restClient.fetchRemoteConfig()
+
+        assertSuccess(successResponse, result)
+    }
+
+    @Test
+    fun `given timeout, when remote-config are requested, then return timeout error`() = test {
+        initFetchRemoteConfig(error = WPComGsonNetworkError(BaseNetworkError(TIMEOUT)))
+
+        val result = restClient.fetchRemoteConfig()
+
+        assertError(RemoteConfigErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given network error, when remote-config are requested, then return api error`() = test {
+        initFetchRemoteConfig(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val result = restClient.fetchRemoteConfig()
+
+        assertError(RemoteConfigErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given invalid response, when remote-config are requested, then return invalid response error`() = test {
+        initFetchRemoteConfig(error = WPComGsonNetworkError(BaseNetworkError(INVALID_RESPONSE)))
+
+        val result = restClient.fetchRemoteConfig()
+
+        assertError(RemoteConfigErrorType.INVALID_RESPONSE, result)
+    }
+
+    @Test
+    fun `given unknown error, when remote-config are requested, then return generic error`() = test {
+        initFetchRemoteConfig(error = WPComGsonNetworkError(BaseNetworkError(UNKNOWN)))
+
+        val result = restClient.fetchRemoteConfig()
+
+        assertError(RemoteConfigErrorType.GENERIC_ERROR, result)
+    }
+
+
+    private suspend fun initFetchRemoteConfig(
+        data: Map<*, *>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) {
+            Response.Error(error)
+        } else {
+            Response.Success(nonNullData)
+        }
+
+        whenever(
+            wpComGsonRequestBuilder.syncGetRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(Map::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+            )
+        ).thenReturn(response)
+    }
+
+    @Suppress("SameParameterValue")
+    private fun assertSuccess(
+        expected: Map<String, String>,
+        actual: RemoteConfigFetchedPayload
+    ) {
+        with(actual) {
+            Assert.assertFalse(isError)
+            Assert.assertEquals(RemoteConfigFetchedPayload(expected), this)
+        }
+    }
+
+    private fun assertError(
+        expected: RemoteConfigErrorType,
+        actual: RemoteConfigFetchedPayload
+    ) {
+        with(actual) {
+            Assert.assertTrue(isError)
+            Assert.assertEquals(expected, error.type)
+            Assert.assertEquals(null, error.message)
+        }
+    }
+
+    private fun getResponseFromJsonString(json: String): Map<String, String> {
+        val responseType = object : TypeToken<Map<*, *>>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as Map<String, String>
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v2"
+        private const val API_MOBILE_REMOTE_CONFIG_PATH = "mobile/remote-config/"
+
+        private const val SUCCESS_JSON = "wp/mobile/remote-config-success.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClientTest.kt
new file mode 100644
index 00000000000..4da10dfcaf3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClientTest.kt
@@ -0,0 +1,371 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobilepay
+
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.mobilepay.MobilePayRestClient.CreateOrderErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.mobilepay.MobilePayRestClient.CreateOrderResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.mobilepay.MobilePayRestClient.CreateOrderResponseType
+import org.wordpress.android.fluxc.test
+
+class MobilePayRestClientTest {
+    private var wpComGsonRequestBuilder: WPComGsonRequestBuilder = mock()
+    private var dispatcher: Dispatcher = mock()
+    private var requestQueue: RequestQueue = mock()
+    private var accessToken: AccessToken = mock()
+    private var userAgent: UserAgent = mock()
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var bodyCaptor: KArgumentCaptor<Map<String, Any>>
+    private lateinit var retryPolicyCaptor: KArgumentCaptor<DefaultRetryPolicy>
+    private lateinit var headersCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: MobilePayRestClient
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        bodyCaptor = argumentCaptor()
+        headersCaptor = argumentCaptor()
+        retryPolicyCaptor = argumentCaptor()
+        restClient = MobilePayRestClient(
+            wpComGsonRequestBuilder,
+            null,
+            dispatcher,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `given custom url, when create order, then correct custom url used`() = test {
+        // GIVEN
+        val customUrl = "https://custom.url"
+        initResponse()
+
+        // WHEN
+        restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = customUrl
+        )
+
+        // THEN
+        assertThat(urlCaptor.firstValue).isEqualTo(
+            "$customUrl/wpcom/v2/iap/orders/"
+        )
+    }
+
+    @Test
+    fun `given standard url, when create order, then correct standard url used`() = test {
+        // GIVEN
+        initResponse()
+
+        // WHEN
+        restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(urlCaptor.firstValue).isEqualTo(
+            "https://public-api.wordpress.com/wpcom/v2/iap/orders/"
+        )
+    }
+
+    @Test
+    fun `given params, when create order, then correct body used`() = test {
+        // GIVEN
+        initResponse()
+
+        // WHEN
+        restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(bodyCaptor.firstValue["currency"]).isEqualTo(CURRENCY)
+        assertThat(bodyCaptor.firstValue["price"]).isEqualTo(PRICE_IN_CENTS)
+        assertThat(bodyCaptor.firstValue["product_id"]).isEqualTo(PRODUCT_IDENTIFIER)
+        assertThat(bodyCaptor.firstValue["purchase_token"]).isEqualTo(PURCHASE_TOKEN)
+        assertThat(bodyCaptor.firstValue["site_id"]).isEqualTo(SITE_ID)
+    }
+
+    @Test
+    fun `given app id, when create order, then correct header used`() = test {
+        // GIVEN
+        initResponse()
+
+        // WHEN
+        restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(headersCaptor.firstValue["X-APP-ID"]).isEqualTo(APP_ID)
+    }
+
+    @Test
+    fun `given successful response, when create order, then success returned`() = test {
+        // GIVEN
+        initResponse(data = CreateOrderResponseType(ORDER_ID))
+
+        // WHEN
+        val result = restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(result).isInstanceOf(CreateOrderResponse.Success::class.java)
+        assertThat((result as CreateOrderResponse.Success).orderId).isEqualTo(ORDER_ID)
+    }
+
+    @Test
+    fun `given timeout error response, when create order, then timeout error returned`() = test {
+        // GIVEN
+        initResponse(
+            error = WPComGsonNetworkError(
+                BaseNetworkError(
+                    BaseRequest.GenericErrorType.TIMEOUT,
+                    VolleyError()
+                )
+            )
+        )
+
+        // WHEN
+        val result = restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat((result as CreateOrderResponse.Error).type).isEqualTo(
+            CreateOrderErrorType.TIMEOUT
+        )
+    }
+
+    @Test
+    fun `given api server error response, when create order, then api error returned`() = test {
+        // GIVEN
+        initResponse(
+            error = WPComGsonNetworkError(
+                BaseNetworkError(
+                    BaseRequest.GenericErrorType.SERVER_ERROR,
+                    VolleyError()
+                )
+            )
+        )
+
+        // WHEN
+        val result = restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat((result as CreateOrderResponse.Error).type).isEqualTo(
+            CreateOrderErrorType.API_ERROR
+        )
+    }
+
+    @Test
+    fun `given api auth error response, when create order, then auth error returned`() = test {
+        // GIVEN
+        initResponse(
+            error = WPComGsonNetworkError(
+                BaseNetworkError(
+                    BaseRequest.GenericErrorType.AUTHORIZATION_REQUIRED,
+                    VolleyError()
+                )
+            )
+        )
+
+        // WHEN
+        val result = restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat((result as CreateOrderResponse.Error).type).isEqualTo(
+            CreateOrderErrorType.AUTH_ERROR
+        )
+    }
+
+    @Test
+    fun `given api invalid error response, when create order, then invalid error returned`() =
+        test {
+            // GIVEN
+            initResponse(
+                error = WPComGsonNetworkError(
+                    BaseNetworkError(
+                        BaseRequest.GenericErrorType.INVALID_RESPONSE,
+                        VolleyError()
+                    )
+                )
+            )
+
+            // WHEN
+            val result = restClient.createOrder(
+                productIdentifier = PRODUCT_IDENTIFIER,
+                priceInCents = PRICE_IN_CENTS,
+                currency = CURRENCY,
+                purchaseToken = PURCHASE_TOKEN,
+                appId = APP_ID,
+                siteId = SITE_ID,
+                customBaseUrl = null
+            )
+
+            // THEN
+            assertThat((result as CreateOrderResponse.Error).type).isEqualTo(
+                CreateOrderErrorType.INVALID_RESPONSE
+            )
+        }
+
+    @Test
+    fun `given generic error response, when create order, then generic error returned`() = test {
+        // GIVEN
+        val reason = "reason"
+        initResponse(
+            error = WPComGsonNetworkError(
+                BaseNetworkError(
+                    BaseRequest.GenericErrorType.UNKNOWN,
+                    reason,
+                    VolleyError()
+                )
+            )
+        )
+
+        // WHEN
+        val result = restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(result).isInstanceOf(CreateOrderResponse.Error::class.java)
+        assertThat((result as CreateOrderResponse.Error).type).isEqualTo(
+            CreateOrderErrorType.GENERIC_ERROR
+        )
+        assertThat(result.message).isEqualTo(reason)
+    }
+
+    @Test
+    fun `when create order, then specific policy applyied`() = test {
+        // GIVEN
+        initResponse()
+
+        // WHEN
+        restClient.createOrder(
+            productIdentifier = PRODUCT_IDENTIFIER,
+            priceInCents = PRICE_IN_CENTS,
+            currency = CURRENCY,
+            purchaseToken = PURCHASE_TOKEN,
+            appId = APP_ID,
+            siteId = SITE_ID,
+            customBaseUrl = null
+        )
+
+        // THEN
+        assertThat(retryPolicyCaptor.firstValue.currentRetryCount).isEqualTo(0)
+        assertThat(retryPolicyCaptor.firstValue.currentTimeout).isEqualTo(120_000)
+        assertThat(retryPolicyCaptor.firstValue.backoffMultiplier).isEqualTo(1.0f)
+    }
+
+    private suspend fun initResponse(
+        data: CreateOrderResponseType? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) {
+            Response.Error(error)
+        } else {
+            Response.Success(nonNullData)
+        }
+
+        whenever(
+            wpComGsonRequestBuilder.syncPostRequest(
+                restClient = eq(restClient),
+                url = urlCaptor.capture(),
+                params = eq(null),
+                body = bodyCaptor.capture(),
+                clazz = eq(CreateOrderResponseType::class.java),
+                retryPolicy = retryPolicyCaptor.capture(),
+                headers = headersCaptor.capture()
+            )
+        ).thenReturn(response)
+    }
+
+    companion object {
+        private const val PRODUCT_IDENTIFIER = "product_1"
+        private const val PRICE_IN_CENTS = 100
+        private const val CURRENCY = "USD"
+        private const val PURCHASE_TOKEN = "purchase_token"
+        private const val SITE_ID = 1L
+        private const val APP_ID = "app_id"
+        private const val ORDER_ID = 1L
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersFixtures.kt
new file mode 100644
index 00000000000..2ed290cea42
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersFixtures.kt
@@ -0,0 +1,119 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.planoffers
+
+import org.mockito.kotlin.mock
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.Feature
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.Group
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.Plan
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.PlanId
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOffer
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferWithDetails
+
+val PLAN_OFFER_MODELS = listOf(
+        PlanOffersModel(
+                listOf(1), listOf(
+                PlanOffersModel.Feature("subdomain", "WordPress.com Subdomain", "Subdomain Description"),
+                PlanOffersModel.Feature("jetpack-essentials", "JE Features", "JE Description")
+        ), "WordPress.com Free",
+                "Free",
+                "Best for Getting Started",
+                "Free description",
+                "https://s0.wordpress.com/i/store/mobile/plan-free.png"
+        ), PlanOffersModel(
+        listOf(1003, 1023), listOf(
+        PlanOffersModel.Feature("custom-domain", "Custom Domain Name", "CDN Description"),
+        PlanOffersModel.Feature("support-live", "Email & Live Chat Support", "LS Description"),
+        PlanOffersModel.Feature("no-ads", "Remove WordPress.com Ads", "No Ads Description")
+), "WordPress.com Premium",
+        "Premium",
+        "Best for Entrepreneurs and Freelancers",
+        "Premium description",
+        "https://s0.wordpress.com/i/store/mobile/plan-premium.png"
+)
+)
+
+val PLAN_OFFERS_RESPONSE = PlanOffersResponse(
+        listOf(
+                Group("personal", "Personal"),
+                Group("business", "Business")
+        ), listOf(
+        Plan(
+                listOf("personal", "too personal"),
+                listOf(PlanId(1)),
+                listOf("subdomain", "jetpack-essentials"),
+                "WordPress.com Free",
+                "Free",
+                "Best for Getting Started",
+                "Free description",
+                "https://s0.wordpress.com/i/store/mobile/plan-free.png"
+        ), Plan(
+        listOf("business"),
+        listOf(PlanId(1003), PlanId(1023)),
+        listOf("custom-domain", "support-live", "no-ads"),
+        "WordPress.com Premium",
+        "Premium",
+        "Best for Entrepreneurs and Freelancers",
+        "Premium description",
+        "https://s0.wordpress.com/i/store/mobile/plan-premium.png"
+)
+), listOf(
+        Feature("subdomain", "WordPress.com Subdomain", "Subdomain Description"),
+        Feature("jetpack-essentials", "JE Features", "JE Description"),
+        Feature("custom-domain", "Custom Domain Name", "CDN Description"),
+        Feature("support-live", "Email & Live Chat Support", "LS Description"),
+        Feature("no-ads", "Remove WordPress.com Ads", "No Ads Description")
+)
+)
+
+fun getDatabaseModel(
+    emptyPlanIds: Boolean = false,
+    emptyPlanFeatures: Boolean = false
+): PlanOfferWithDetails {
+    return PlanOfferWithDetails(
+            planOffer = PlanOffer(
+                    internalPlanId = 0,
+                    name = null,
+                    shortName = "shortName",
+                    tagline = "tagline",
+                    description = null,
+                    icon = null
+            ),
+            planIds = if (emptyPlanIds) emptyList() else listOf(mock(), mock()),
+            planFeatures = if (emptyPlanFeatures) emptyList() else listOf(mock(), mock(), mock())
+    )
+}
+
+fun getDomainModel(
+    emptyPlanIds: Boolean = false,
+    emptyFeatures: Boolean = false
+): PlanOffersModel {
+    return PlanOffersModel(
+            planIds = if (emptyPlanIds) null else listOf(100, 200),
+            features = if (emptyFeatures) null else listOf(mock(), mock()),
+            name = "name",
+            shortName = null,
+            tagline = null,
+            description = "description",
+            iconUrl = "iconUrl"
+    )
+}
+
+fun areSame(
+    domainModel: PlanOffersModel,
+    databaseModel: PlanOfferWithDetails
+): Boolean {
+    return domainModel.name == databaseModel.planOffer.name &&
+            domainModel.shortName == databaseModel.planOffer.shortName &&
+            domainModel.tagline == databaseModel.planOffer.tagline &&
+            domainModel.description == databaseModel.planOffer.description &&
+            domainModel.iconUrl == databaseModel.planOffer.icon &&
+            (domainModel.planIds ?: emptyList()).size == databaseModel.planIds.size &&
+            (domainModel.features ?: emptyList()).size == databaseModel.planFeatures.size &&
+            domainModel.planIds?.equals(databaseModel.planIds.map {
+                it.productId
+            }) ?: true &&
+            databaseModel.planFeatures.map {
+                PlanOffersModel.Feature(id = it.stringId, name = it.name, description = it.description)
+            } == domainModel.features ?: emptyList<PlanOffersModel.Feature>()
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt
new file mode 100644
index 00000000000..9c5d94c16f3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClientTest.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.planoffers
+
+import com.android.volley.RequestQueue
+import org.assertj.core.api.Assertions
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class PlanOffersRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+
+    private lateinit var planOffersRestClient: PlanOffersRestClient
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        planOffersRestClient = PlanOffersRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `returns plans on successful fetch`() = test {
+        initRequest(Success(PLAN_OFFERS_RESPONSE))
+        val payload = planOffersRestClient.fetchPlanOffers()
+
+        Assertions.assertThat(payload).isNotNull
+        Assertions.assertThat(payload.planOffers).isEqualTo(PLAN_OFFER_MODELS)
+    }
+
+    @Test
+    fun `returns error on unsuccessful fetch`() = test {
+        initRequest(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+        val payload = planOffersRestClient.fetchPlanOffers()
+
+        Assertions.assertThat(payload).isNotNull
+        Assertions.assertThat(payload.planOffers).isNull()
+        Assert.assertTrue(payload.isError)
+    }
+
+    private suspend fun initRequest(
+        data: WPComGsonRequestBuilder.Response<PlanOffersResponse>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val response = if (error != null) Response.Error(error) else data
+
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(planOffersRestClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(PlanOffersResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(true),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt
new file mode 100644
index 00000000000..00a3c17745e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClientTest.kt
@@ -0,0 +1,100 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.products
+
+import com.android.volley.RequestQueue
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.products.Product
+import org.wordpress.android.fluxc.model.products.ProductsResponse
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class ProductsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+
+    private lateinit var productsRestClient: ProductsRestClient
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+
+        productsRestClient = ProductsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `returns products on successful fetch`() = test {
+        initRequest(data = Success(ProductsResponse(listOf(Product()))))
+
+        val response = productsRestClient.fetchProducts()
+
+        assertThat(response).isNotNull
+        assertThat(response).isInstanceOf(Success::class.java)
+        assertThat((response as Success).data.products).isNotEmpty
+    }
+
+    @Test
+    fun `returns error on unsuccessful fetch`() = test {
+        initRequest(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val response = productsRestClient.fetchProducts()
+
+        assertThat(response).isNotNull
+        assertThat(response).isNotInstanceOf(Success::class.java)
+        assertThat(response).isInstanceOf(Error::class.java)
+    }
+
+    private suspend fun initRequest(
+        data: Response<ProductsResponse>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val response = if (error != null) Error(error) else data
+
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(productsRestClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(ProductsResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClientTest.kt
new file mode 100644
index 00000000000..e3279b5c076
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClientTest.kt
@@ -0,0 +1,364 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth
+
+import com.android.volley.RequestQueue
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthAuthenticateResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthValidateResponse
+import org.wordpress.android.fluxc.test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+
+@RunWith(MockitoJUnitRunner::class)
+class QRCodeAuthRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: QRCodeAuthRestClient
+
+    private val validateSuccess = QRCodeAuthValidateResponse(
+        browser = "Chrome",
+        location = "Secaucus, New Jersey",
+        success = true
+    )
+
+    private val authenticateSuccess = QRCodeAuthAuthenticateResponse(
+        authenticated = true
+    )
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = QRCodeAuthRestClient(
+            wpComGsonRequestBuilder,
+            dispatcher,
+            null,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    // VALIDATE TESTS
+    @Test
+    fun `when validate is requested, then the correct url is built`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, VALIDATE_SUCCESS_JSON)
+        val response = getValidateResponseFromJsonString(json)
+        initPostValidate(data = response)
+
+        restClient.validate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertEquals(urlCaptor.firstValue,
+            "$API_BASE_PATH/$API_AUTH_QRCODE_VALIDATE_PATH")
+    }
+
+    @Test
+    fun `given success, when validate is triggered, then validate response is returned`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, VALIDATE_SUCCESS_JSON)
+        val response = getValidateResponseFromJsonString(json)
+        initPostValidate(data = response)
+
+        val result = restClient.validate(TOKEN_PARAM, DATA_PARAM)
+
+        assertValidateSuccess(validateSuccess, result)
+    }
+
+    @Test
+    fun `given data invalid, when validate is triggered, then error response is returned`() = test {
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.DATA_INVALID.name.lowercase()
+        }
+        initPostValidate(error = error)
+
+        val result = restClient.validate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.DATA_INVALID, result)
+    }
+
+    @Test
+    fun `given rest invalid param, when validate is triggered, then error response is returned`() = test {
+        // {"code":"rest_invalid_param","message":"Data is invalid (1) invalid base64 string","data":{"status":400}}
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.REST_INVALID_PARAM.name.lowercase()
+        }
+        initPostValidate(error = error)
+
+        val result = restClient.validate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.REST_INVALID_PARAM, result)
+    }
+
+    @Test
+    fun `given not authorized, when validate is triggered, then error response is returned`() = test {
+        // {"code":"not_authorized","message":"Did not authorize the user","data":{"status":400}}
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.NOT_AUTHORIZED.name.lowercase()
+        }
+        initPostValidate(error = error)
+
+        val result = restClient.validate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.NOT_AUTHORIZED, result)
+    }
+
+    @Test
+    fun `given network error, when validate is triggered, then error response is returned`() = test {
+        initPostValidate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NETWORK_ERROR)))
+
+        val result = restClient.validate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given timeout error, when validate is triggered, then error response is returned`() = test {
+        initPostValidate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.TIMEOUT)))
+
+        val result = restClient.validate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given invalid response, when validate is triggered, then error response is returned`() = test {
+        initPostValidate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE)))
+
+        val result = restClient.validate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.INVALID_RESPONSE, result)
+    }
+
+    @Test
+    fun `given not authenticated, when validate is triggered, then error response is returned`() = test {
+        initPostValidate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED)))
+
+        val result = restClient.validate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.AUTHORIZATION_REQUIRED, result)
+    }
+
+    // AUTHENTICATE TESTS
+    @Test
+    fun `when authenticate is requested, then the correct url is built`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, AUTHENTICATE_SUCCESS_JSON)
+        val response = getAuthenticateResponseFromJsonString(json)
+        initPostAuthenticate(data = response)
+
+        restClient.authenticate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertEquals(urlCaptor.firstValue,
+            "$API_BASE_PATH/$API_AUTH_QRCODE_AUTHENTICATE_PATH")
+    }
+
+    @Test
+    fun `given success, when authenticate is triggered, then validate response is returned`() = test {
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, AUTHENTICATE_SUCCESS_JSON)
+        val response = getAuthenticateResponseFromJsonString(json)
+        initPostAuthenticate(data = response)
+
+        val result = restClient.authenticate(TOKEN_PARAM, DATA_PARAM)
+
+        assertAuthenticateSuccess(authenticateSuccess, result)
+    }
+
+    @Test
+    fun `given data invalid, when authenticate is triggered, then error response is returned`() = test {
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.DATA_INVALID.name.lowercase()
+        }
+        initPostAuthenticate(error = error)
+
+        val result = restClient.authenticate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.DATA_INVALID, result)
+    }
+
+    @Test
+    fun `given rest invalid param, when authenticate is triggered, then error response is returned`() = test {
+        // {"code":"rest_invalid_param","message":"Data is invalid (1) invalid base64 string","data":{"status":400}}
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.REST_INVALID_PARAM.name.lowercase()
+        }
+        initPostAuthenticate(error = error)
+
+        val result = restClient.authenticate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.REST_INVALID_PARAM, result)
+    }
+
+    @Test
+    fun `given not authorized, when authenticate is triggered, then error response is returned`() = test {
+        // {"code":"not_authorized","message":"Did not authorize the user","data":{"status":400}}
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.UNKNOWN)).apply {
+            apiError = QRCodeAuthErrorType.NOT_AUTHORIZED.name.lowercase()
+        }
+        initPostAuthenticate(error = error)
+
+        val result = restClient.authenticate(TOKEN_PARAM, DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.NOT_AUTHORIZED, result)
+    }
+
+    @Test
+    fun `given network error, when authenticate is triggered, then error response is returned`() = test {
+        initPostAuthenticate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NETWORK_ERROR)))
+
+        val result = restClient.authenticate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.API_ERROR, result)
+    }
+
+    @Test
+    fun `given timeout error, when authenticate is triggered, then error response is returned`() = test {
+        initPostAuthenticate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.TIMEOUT)))
+
+        val result = restClient.authenticate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.TIMEOUT, result)
+    }
+
+    @Test
+    fun `given invalid response, when authenticate is triggered, then error response is returned`() = test {
+        initPostAuthenticate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE)))
+
+        val result = restClient.authenticate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.INVALID_RESPONSE, result)
+    }
+
+    @Test
+    fun `given not authenticated, when authenticate is triggered, then error response is returned`() = test {
+        initPostAuthenticate(error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED)))
+
+        val result = restClient.authenticate(token = TOKEN_PARAM, data = DATA_PARAM)
+
+        assertError(QRCodeAuthErrorType.AUTHORIZATION_REQUIRED, result)
+    }
+
+    private suspend fun initPostValidate(
+        data: QRCodeAuthValidateResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<QRCodeAuthValidateResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Response.Success(nonNullData)
+
+        whenever(
+            wpComGsonRequestBuilder.syncPostRequest(
+                restClient = eq(restClient),
+                url = urlCaptor.capture(),
+                params = paramsCaptor.capture(),
+                body = anyOrNull(),
+                clazz = eq(QRCodeAuthValidateResponse::class.java),
+                retryPolicy = isNull(),
+                headers = anyOrNull(),
+            )
+        ).thenReturn(response)
+
+        return response
+    }
+
+    private suspend fun initPostAuthenticate(
+        data: QRCodeAuthAuthenticateResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<QRCodeAuthAuthenticateResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Response.Success(nonNullData)
+
+        whenever(
+            wpComGsonRequestBuilder.syncPostRequest(
+                restClient = eq(restClient),
+                url = urlCaptor.capture(),
+                params = paramsCaptor.capture(),
+                body = anyOrNull(),
+                clazz = eq(QRCodeAuthAuthenticateResponse::class.java),
+                retryPolicy = isNull(),
+                headers = anyOrNull()
+            )
+        ).thenReturn(response)
+
+        return response
+    }
+
+    private fun assertValidateSuccess(
+        expected: QRCodeAuthValidateResponse,
+        actual: QRCodeAuthPayload<QRCodeAuthValidateResponse>
+    ) {
+        with(actual) {
+            assertFalse(isError)
+            assertEquals(QRCodeAuthPayload(expected), this)
+        }
+    }
+
+    private fun assertAuthenticateSuccess(
+        expected: QRCodeAuthAuthenticateResponse,
+        actual: QRCodeAuthPayload<QRCodeAuthAuthenticateResponse>
+    ) {
+        with(actual) {
+            assertFalse(isError)
+            assertEquals(QRCodeAuthPayload(expected), this)
+        }
+    }
+
+    private fun <T> assertError(
+        expected: QRCodeAuthErrorType,
+        actual: QRCodeAuthPayload<T>
+    ) {
+        with(actual) {
+            Assert.assertTrue(isError)
+            Assert.assertEquals(expected, error.type)
+            Assert.assertEquals(null, error.message)
+        }
+    }
+
+    private fun getValidateResponseFromJsonString(json: String): QRCodeAuthValidateResponse {
+        val responseType = object : TypeToken<QRCodeAuthValidateResponse>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as QRCodeAuthValidateResponse
+    }
+
+    private fun getAuthenticateResponseFromJsonString(json: String): QRCodeAuthAuthenticateResponse {
+        val responseType = object : TypeToken<QRCodeAuthAuthenticateResponse>() {}.type
+        return GsonBuilder()
+            .create().fromJson(json, responseType) as QRCodeAuthAuthenticateResponse
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v2"
+        private const val API_AUTH_QRCODE_VALIDATE_PATH = "auth/qr-code/validate/"
+        private const val API_AUTH_QRCODE_AUTHENTICATE_PATH = "auth/qr-code/authenticate/"
+
+        private const val TOKEN_PARAM = "token_param"
+        private const val DATA_PARAM = "data_param"
+
+        private const val VALIDATE_SUCCESS_JSON = "wp/qrcode/validate-success.json"
+        private const val AUTHENTICATE_SUCCESS_JSON = "wp/qrcode/authenticate-success.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClientTest.kt
new file mode 100644
index 00000000000..cd61d2cc771
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClientTest.kt
@@ -0,0 +1,153 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.reactnative
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import junit.framework.AssertionFailedError
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse
+import org.wordpress.android.fluxc.test
+
+class ReactNativeWPComRestClientTest {
+    private val wpComGsonRequestBuilder = mock<WPComGsonRequestBuilder>()
+    private val context = mock<Context>()
+    private val dispatcher = mock<Dispatcher>()
+    private val requestQueue = mock<RequestQueue>()
+    private val accessToken = mock<AccessToken>()
+    private val userAgent = mock<UserAgent>()
+
+    private val url = "a_url"
+    val params = mapOf("a_key" to "a_value")
+    val body = mapOf("b_key" to "b_value")
+
+    private lateinit var subject: ReactNativeWPComRestClient
+
+    @Before
+    fun setUp() {
+        subject = ReactNativeWPComRestClient(
+                wpComGsonRequestBuilder,
+                context,
+                dispatcher,
+                requestQueue,
+                accessToken,
+                userAgent)
+    }
+
+    @Test
+    fun `GET request handles successful response`() = test {
+        val errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse = { _ ->
+            throw AssertionFailedError("errorHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedJson = mock<JsonElement>()
+        val successHandler = { data: JsonElement ->
+            if (data != expectedJson) fail("expected data was not passed to successHandler")
+            expected
+        }
+
+        val expectedRestCallResponse = Success(expectedJson)
+        verifyGETRequest(successHandler, errorHandler, expectedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `GET request handles failure response`() = test {
+        val successHandler = { _: JsonElement ->
+            throw AssertionFailedError("successHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedBaseNetworkError = mock<WPComGsonNetworkError>()
+        val errorHandler = { error: BaseNetworkError ->
+            if (error != expectedBaseNetworkError) fail("expected error was not passed to errorHandler")
+            expected
+        }
+
+        val mockedRestCallResponse = Error<JsonElement>(expectedBaseNetworkError)
+        verifyGETRequest(successHandler, errorHandler, mockedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `POST request handles successful response`() = test {
+        val errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse = { _ ->
+            throw AssertionFailedError("errorHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedJson = mock<JsonElement>()
+        val successHandler = { data: JsonElement ->
+            if (data != expectedJson) fail("expected data was not passed to successHandler")
+            expected
+        }
+
+        val expectedRestCallResponse = Success(expectedJson)
+        verifyPOSTRequest(successHandler, errorHandler, expectedRestCallResponse, expected)
+    }
+
+    @Test
+    fun `POST request handles failure response`() = test {
+        val successHandler = { _: JsonElement ->
+            throw AssertionFailedError("successHandler should not have been called")
+        }
+
+        val expected = mock<ReactNativeFetchResponse>()
+        val expectedBaseNetworkError = mock<WPComGsonNetworkError>()
+        val errorHandler = { error: BaseNetworkError ->
+            if (error != expectedBaseNetworkError) fail("expected error was not passed to errorHandler")
+            expected
+        }
+
+        val mockedRestCallResponse = Error<JsonElement>(expectedBaseNetworkError)
+        verifyPOSTRequest(successHandler, errorHandler, mockedRestCallResponse, expected)
+    }
+
+    private suspend fun verifyGETRequest(
+        successHandler: (JsonElement) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        expectedRestCallResponse: WPComGsonRequestBuilder.Response<JsonElement>,
+        expected: ReactNativeFetchResponse
+    ) {
+        whenever(wpComGsonRequestBuilder.syncGetRequest(
+                subject,
+                url,
+                params,
+                JsonElement::class.java,
+                true,
+        )
+        ).thenReturn(expectedRestCallResponse)
+
+        val actual = subject.getRequest(url, params, successHandler, errorHandler)
+        assertEquals(expected, actual)
+    }
+
+    private suspend fun verifyPOSTRequest(
+        successHandler: (JsonElement) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        expectedRestCallResponse: WPComGsonRequestBuilder.Response<JsonElement>,
+        expected: ReactNativeFetchResponse
+    ) {
+        whenever(wpComGsonRequestBuilder.syncPostRequest(
+            subject,
+            url,
+            params,
+            body,
+            JsonElement::class.java)
+        ).thenReturn(expectedRestCallResponse)
+
+        val actual = subject.postRequest(url, params, body, successHandler, errorHandler)
+        assertEquals(expected, actual)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt
new file mode 100644
index 00000000000..21900da4e59
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClientTest.kt
@@ -0,0 +1,532 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan
+
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Credentials
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Reason
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.model.scan.threat.ThreatMapper
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.FixThreatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.FixThreatsStatusResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import org.wordpress.android.fluxc.store.ScanStore.FetchedScanStatePayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsErrorType
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusErrorType
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatErrorType
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartErrorType
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateErrorType
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class ScanRestClientTest {
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var threatMapper: ThreatMapper
+
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var scanRestClient: ScanRestClient
+    private val siteId: Long = 12
+    private val threatId: Long = 1
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        scanRestClient = ScanRestClient(
+                wpComGsonRequestBuilder,
+                threatMapper,
+                dispatcher,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `fetch scan state builds correct request url`() = test {
+        val successResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        scanRestClient.fetchScanState(site)
+
+        assertEquals(urlCaptor.firstValue, "$API_BASE_PATH/sites/${site.siteId}/scan/")
+    }
+
+    @Test
+    fun `fetch scan state dispatches response on success`() = test {
+        val successResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertEquals(site, this@ScanRestClientTest.site)
+            assertNull(error)
+            assertNotNull(scanStateModel)
+            requireNotNull(scanStateModel).apply {
+                assertEquals(state, State.fromValue(requireNotNull(scanResponse.state)))
+                assertEquals(hasCloud, requireNotNull(scanResponse.hasCloud))
+                assertEquals(hasValidCredentials, scanResponse.credentials?.firstOrNull()?.stillValid)
+                assertEquals(reason, Reason.NO_REASON)
+                assertNotNull(credentials)
+                assertNotNull(threats)
+                mostRecentStatus?.apply {
+                    assertEquals(progress, scanResponse.mostRecentStatus?.progress)
+                    assertEquals(startDate, scanResponse.mostRecentStatus?.startDate)
+                    assertEquals(duration, scanResponse.mostRecentStatus?.duration)
+                    assertEquals(error, scanResponse.mostRecentStatus?.error)
+                    assertEquals(isInitial, scanResponse.mostRecentStatus?.isInitial)
+                }
+                currentStatus?.apply {
+                    assertEquals(progress, scanResponse.mostRecentStatus?.progress)
+                    assertEquals(startDate, scanResponse.mostRecentStatus?.startDate)
+                    assertEquals(isInitial, scanResponse.mostRecentStatus?.isInitial)
+                }
+                credentials?.forEachIndexed { index, creds ->
+                    creds.apply {
+                        assertEquals(type, scanResponse.credentials?.get(index)?.type)
+                        assertEquals(role, scanResponse.credentials?.get(index)?.role)
+                        assertEquals(host, scanResponse.credentials?.get(index)?.host)
+                        assertEquals(port, scanResponse.credentials?.get(index)?.port)
+                        assertEquals(user, scanResponse.credentials?.get(index)?.user)
+                        assertEquals(path, scanResponse.credentials?.get(index)?.path)
+                        assertEquals(stillValid, scanResponse.credentials?.get(index)?.stillValid)
+                    }
+                }
+                assertEquals(threats?.size, scanResponse.threats?.size)
+            }
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches most recent status for idle state`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(javaClass, JP_COMPLETE_SCAN_IDLE_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertNotNull(scanStateModel?.mostRecentStatus)
+            assertEquals(scanStateModel?.state, State.IDLE)
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches empty creds when server creds not setup for site with scan capability`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(
+                javaClass,
+                JP_SCAN_DAILY_SCAN_IDLE_WITH_THREAT_WITHOUT_SERVER_CREDS_JSON
+        )
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertEquals(scanStateModel?.credentials, emptyList<Credentials>())
+            assertEquals(scanStateModel?.state, State.IDLE)
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches empty threats if no threats found for site with scan capability`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(javaClass, JP_COMPLETE_SCAN_IDLE_JSON)
+
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertEquals(scanStateModel?.threats, emptyList<Threat>())
+            assertEquals(scanStateModel?.state, State.IDLE)
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches current progress status for scanning state`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(javaClass, JP_COMPLETE_SCAN_SCANNING_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertNotNull(scanStateModel?.currentStatus)
+            assertEquals(scanStateModel?.state, State.SCANNING)
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches reason, null threats and creds for scan unavailable state`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(
+                javaClass,
+                JP_BACKUP_DAILY_SCAN_UNAVAILABLE_JSON
+        )
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse)
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        with(payload) {
+            assertNull(scanStateModel?.credentials)
+            assertNull(scanStateModel?.threats)
+            assertNotNull(scanStateModel?.reason)
+            assertEquals(scanStateModel?.state, State.UNAVAILABLE)
+        }
+    }
+
+    @Test
+    fun `fetch scan state dispatches generic error on failure`() = test {
+        initFetchScanState(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        assertEmittedScanStateError(payload, ScanStateErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun `fetch scan state dispatches error on wrong state`() = test {
+        val successResponseJson = UnitTestUtils.getStringFromResourceFile(javaClass, JP_COMPLETE_SCAN_IDLE_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        initFetchScanState(scanResponse.copy(state = "wrong"))
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        assertEmittedScanStateError(payload, ScanStateErrorType.INVALID_RESPONSE)
+    }
+
+    @Test
+    fun `fetch scan state dispatches error on missing threat id`() = test {
+        val successResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        val threatWithIdNotSet = requireNotNull(scanResponse.threats?.get(0)).copy(id = null)
+        initFetchScanState(scanResponse.copy(threats = listOf(threatWithIdNotSet)))
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        assertEmittedScanStateError(payload, ScanStateErrorType.INVALID_RESPONSE)
+    }
+
+    @Test
+    fun `fetch scan state dispatches error on missing threat signature`() = test {
+        val successResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        val threatWithSignatureNotSet = requireNotNull(scanResponse.threats?.get(0)).copy(signature = null)
+        initFetchScanState(scanResponse.copy(threats = listOf(threatWithSignatureNotSet)))
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        assertEmittedScanStateError(payload, ScanStateErrorType.INVALID_RESPONSE)
+    }
+
+    @Test
+    fun `fetch scan state dispatches error on missing threat first detected`() = test {
+        val successResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON)
+        val scanResponse = getScanStateResponseFromJsonString(successResponseJson)
+        val threatWithFirstDetectedNotSet = requireNotNull(scanResponse.threats?.get(0)).copy(firstDetected = null)
+        initFetchScanState(scanResponse.copy(threats = listOf(threatWithFirstDetectedNotSet)))
+
+        val payload = scanRestClient.fetchScanState(site)
+
+        assertEmittedScanStateError(payload, ScanStateErrorType.INVALID_RESPONSE)
+    }
+
+    @Test
+    fun `start scan builds correct request url`() = test {
+        val scanStartResponse = ScanStartResponse(success = true)
+        initStartScan(scanStartResponse)
+
+        scanRestClient.startScan(site)
+
+        assertEquals(urlCaptor.firstValue, "$API_BASE_PATH/sites/${site.siteId}/scan/enqueue/")
+    }
+
+    @Test
+    fun `start scan dispatches response on success`() = test {
+        val scanStartResponse = ScanStartResponse(success = true)
+        initStartScan(scanStartResponse)
+
+        val payload = scanRestClient.startScan(site)
+
+        with(payload) {
+            assertEquals(site, this@ScanRestClientTest.site)
+            assertNull(error)
+        }
+    }
+
+    @Test
+    fun `start scan dispatches api error on failure from api`() = test {
+        val errorResponseJson =
+                UnitTestUtils.getStringFromResourceFile(javaClass, JP_BACKUP_DAILY_START_SCAN_ERROR_JSON)
+        val startScanResponse = getStartScanResponseFromJsonString(errorResponseJson)
+        initStartScan(startScanResponse)
+
+        val payload = scanRestClient.startScan(site)
+
+        with(payload) {
+            assertEquals(site, this@ScanRestClientTest.site)
+            assertTrue(isError)
+            assertEquals(ScanStartErrorType.API_ERROR, error.type)
+        }
+    }
+
+    @Test
+    fun `fix threats dispatches response on success`() = test {
+        val fixThreatsResponse = FixThreatsResponse(ok = true)
+        initFixThreats(fixThreatsResponse)
+
+        val payload = scanRestClient.fixThreats(siteId, listOf(threatId))
+
+        with(payload) {
+            assertEquals(remoteSiteId, siteId)
+            assertNull(error)
+        }
+    }
+
+    @Test
+    fun `fix threats dispatches api error on failure from api`() = test {
+        val fixThreatsResponse = FixThreatsResponse(ok = false)
+        initFixThreats(fixThreatsResponse)
+
+        val payload = scanRestClient.fixThreats(siteId, listOf(threatId))
+
+        with(payload) {
+            assertEquals(siteId, this@ScanRestClientTest.siteId)
+            assertTrue(isError)
+            assertEquals(FixThreatsErrorType.API_ERROR, error.type)
+        }
+    }
+
+    @Test
+    fun `ignore threat dispatches response on success`() = test {
+        initIgnoreThreat()
+
+        val payload = scanRestClient.ignoreThreat(siteId, threatId)
+
+        with(payload) {
+            assertEquals(remoteSiteId, siteId)
+            assertNull(error)
+        }
+    }
+
+    @Test
+    fun `ignore threats dispatches generic error on failure`() = test {
+        initIgnoreThreat(error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val payload = scanRestClient.ignoreThreat(siteId, threatId)
+
+        with(payload) {
+            assertEquals(remoteSiteId, siteId)
+            assertTrue(isError)
+            assertEquals(IgnoreThreatErrorType.GENERIC_ERROR, error.type)
+        }
+    }
+
+    @Test
+    fun `fetch fix threats status dispatches response on success`() = test {
+        initFetchFixThreatsStatus(FixThreatsStatusResponse(ok = true, fixThreatsStatus = listOf()))
+
+        val payload = scanRestClient.fetchFixThreatsStatus(siteId, listOf(threatId))
+
+        with(payload) {
+            assertEquals(remoteSiteId, siteId)
+            assertNull(error)
+        }
+    }
+
+    @Test
+    fun `fetch fix threats status dispatches api error on failure from api`() = test {
+        initFetchFixThreatsStatus(FixThreatsStatusResponse(ok = false, fixThreatsStatus = null))
+
+        val payload = scanRestClient.fetchFixThreatsStatus(siteId, listOf(threatId))
+
+        with(payload) {
+            assertEquals(remoteSiteId, siteId)
+            assertTrue(isError)
+            assertEquals(FixThreatsStatusErrorType.API_ERROR, error.type)
+        }
+    }
+
+    private fun assertEmittedScanStateError(payload: FetchedScanStatePayload, errorType: ScanStateErrorType) {
+        with(payload) {
+            assertEquals(site, this@ScanRestClientTest.site)
+            assertTrue(isError)
+            assertEquals(errorType, error.type)
+        }
+    }
+
+    private fun getScanStateResponseFromJsonString(json: String): ScanStateResponse {
+        val responseType = object : TypeToken<ScanStateResponse>() {}.type
+        return Gson().fromJson(json, responseType) as ScanStateResponse
+    }
+
+    private fun getStartScanResponseFromJsonString(json: String): ScanStartResponse {
+        val responseType = object : TypeToken<ScanStartResponse>() {}.type
+        return Gson().fromJson(json, responseType) as ScanStartResponse
+    }
+
+    private suspend fun initFetchScanState(
+        data: ScanStateResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<ScanStateResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(scanRestClient),
+                        urlCaptor.capture(),
+                        eq(mapOf()),
+                        eq(ScanStateResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+
+        val threatModel = mock<ThreatModel>()
+        whenever(threatMapper.map(any())).thenReturn(threatModel)
+
+        return response
+    }
+
+    private suspend fun initStartScan(
+        data: ScanStartResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<ScanStartResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(scanRestClient),
+                        urlCaptor.capture(),
+                        eq(mapOf()),
+                        anyOrNull(),
+                        eq(ScanStartResponse::class.java),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun initFixThreats(
+        data: FixThreatsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<FixThreatsResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(scanRestClient),
+                        urlCaptor.capture(),
+                        anyOrNull(),
+                        anyOrNull(),
+                        eq(FixThreatsResponse::class.java),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initIgnoreThreat(
+        error: WPComGsonNetworkError? = null
+    ): Response<Any> {
+        val response = if (error != null) Response.Error(error) else Success(Any())
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(scanRestClient),
+                        urlCaptor.capture(),
+                        anyOrNull(),
+                        anyOrNull(),
+                        eq(Any::class.java),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun initFetchFixThreatsStatus(
+        data: FixThreatsStatusResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<FixThreatsStatusResponse> {
+        val nonNullData = data ?: mock()
+        val response = if (error != null) Response.Error(error) else Success(nonNullData)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(scanRestClient),
+                        urlCaptor.capture(),
+                        anyOrNull(),
+                        eq(FixThreatsStatusResponse::class.java),
+                        eq(false),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    companion object {
+        private const val API_BASE_PATH = "https://public-api.wordpress.com/wpcom/v2"
+        private const val JP_COMPLETE_SCAN_IDLE_JSON = "wp/jetpack/scan/jp-complete-scan-idle.json"
+        private const val JP_COMPLETE_SCAN_SCANNING_JSON = "wp/jetpack/scan/jp-complete-scan-scanning.json"
+        private const val JP_BACKUP_DAILY_SCAN_UNAVAILABLE_JSON =
+                "wp/jetpack/scan/jp-backup-daily-scan-unavailable.json"
+        private const val JP_SCAN_DAILY_SCAN_IDLE_WITH_THREATS_JSON =
+                "wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat.json"
+        private const val JP_SCAN_DAILY_SCAN_IDLE_WITH_THREAT_WITHOUT_SERVER_CREDS_JSON =
+                "wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat-without-server-creds.json"
+        private const val JP_BACKUP_DAILY_START_SCAN_ERROR_JSON =
+                "wp/jetpack/scan/jp-backup-daily-start-scan-error.json"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClientTest.kt
new file mode 100644
index 00000000000..8175cffee73
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClientTest.kt
@@ -0,0 +1,175 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.MapAssert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteHomepageSettings
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.Posts
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient.UpdateHomepageResponse
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteHomepageRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: SiteHomepageRestClient
+    private val siteId: Long = 12
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = SiteHomepageRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `returns success when setting homepage to page`() = test {
+        val pageSettings = StaticPage(1, 2)
+        val isPageOnFront = true
+        val response = UpdateHomepageResponse(isPageOnFront, pageSettings.pageOnFrontId, pageSettings.pageForPostsId)
+        val expectedParams = mapOf(
+                "is_page_on_front" to isPageOnFront.toString(),
+                "page_on_front_id" to pageSettings.pageOnFrontId.toString(),
+                "page_for_posts_id" to pageSettings.pageForPostsId.toString()
+        )
+
+        testSuccessResponse(response, pageSettings, expectedParams)
+    }
+
+    @Test
+    fun `does not add page on front parameter when it is missing`() = test {
+        val pageSettings = StaticPage(1, -1)
+        val isPageOnFront = true
+        val response = UpdateHomepageResponse(isPageOnFront, pageSettings.pageOnFrontId, pageSettings.pageForPostsId)
+        val expectedParams = mapOf(
+                "is_page_on_front" to isPageOnFront.toString(),
+                "page_for_posts_id" to pageSettings.pageForPostsId.toString()
+        )
+
+        testSuccessResponse(response, pageSettings, expectedParams)
+    }
+
+    @Test
+    fun `does not add page for posts parameter when it is missing`() = test {
+        val pageSettings = StaticPage(-1, 2)
+        val isPageOnFront = true
+        val response = UpdateHomepageResponse(isPageOnFront, pageSettings.pageOnFrontId, pageSettings.pageForPostsId)
+        val expectedParams = mapOf(
+                "is_page_on_front" to isPageOnFront.toString(),
+                "page_on_front_id" to pageSettings.pageOnFrontId.toString()
+        )
+
+        testSuccessResponse(response, pageSettings, expectedParams)
+    }
+
+    @Test
+    fun `returns success when setting homepage to posts`() = test {
+        val postsSettings = Posts
+        val isPageOnFront = false
+        val response = UpdateHomepageResponse(isPageOnFront, null, null)
+        val expectedParams = mapOf("is_page_on_front" to isPageOnFront.toString())
+
+        testSuccessResponse(response, postsSettings, expectedParams)
+    }
+
+    private suspend fun testSuccessResponse(
+        response: UpdateHomepageResponse,
+        homepageSettings: SiteHomepageSettings,
+        expectedParams: Map<String, String>
+    ): MapAssert<String, String>? {
+        initHomepageResponse(response)
+
+        val responseModel = restClient.updateHomepage(site, homepageSettings)
+
+        assertThat(responseModel).isEqualTo(Success(response))
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/homepage/")
+        return assertThat(paramsCaptor.lastValue).isEqualTo(expectedParams)
+    }
+
+    @Test
+    fun `returns error when API call fails`() = test {
+        val errorMessage = "message"
+        initHomepageResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+        val response = restClient.updateHomepage(site, StaticPage(1, 2))
+        val errorResponse = response as Error<UpdateHomepageResponse>
+        assertThat(errorResponse.error).isNotNull()
+        assertThat(errorResponse.error.type).isEqualTo(NETWORK_ERROR)
+        assertThat(errorResponse.error.message).isEqualTo(errorMessage)
+        Unit
+    }
+
+    private suspend fun initHomepageResponse(
+        data: UpdateHomepageResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<UpdateHomepageResponse> {
+        return initResponse(UpdateHomepageResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        eq(null),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt
new file mode 100644
index 00000000000..a99a3cfc2c2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt
@@ -0,0 +1,720 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.mockStatic
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AppSecrets
+import org.wordpress.android.fluxc.network.rest.wpcom.site.NewSiteResponse.BlogDetails
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteWPComRestResponse.SitesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.StatusType.ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.site.StatusType.SUCCESS
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType
+import org.wordpress.android.fluxc.store.SiteStore.SiteFilter.WPCOM
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.COMING_SOON
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PUBLIC
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.util.DateTimeUtils
+import org.wordpress.android.util.UrlUtils
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var appSecrets: AppSecrets
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var bodyCaptor: KArgumentCaptor<Map<String, Any>>
+    private lateinit var restClient: SiteRestClient
+    private val siteId: Long = 12
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        bodyCaptor = argumentCaptor()
+        restClient = SiteRestClient(
+            appContext = null,
+            dispatcher = dispatcher,
+            requestQueue = requestQueue,
+            appSecrets = appSecrets,
+            wpComGsonRequestBuilder = wpComGsonRequestBuilder,
+            coroutineEngine = initCoroutineEngine(),
+            accessToken = accessToken,
+            userAgent = userAgent
+        )
+        whenever(site.siteId).thenReturn(siteId)
+    }
+
+    @Test
+    fun `returns fetched site`() = test {
+        val response = SiteWPComRestResponse()
+        response.ID = siteId
+        val name = "Updated name"
+        response.name = name
+        response.URL = "site.com"
+
+        initSiteResponse(response)
+
+        val responseModel = restClient.fetchSite(site)
+        assertThat(responseModel.name).isEqualTo(name)
+        assertThat(responseModel.siteId).isEqualTo(siteId)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
+                                "visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
+                                "organization_id,was_ecommerce_trial,single_user_site"
+                )
+        )
+    }
+
+    @Test
+    fun `fetchSite returns error when API call fails`() = test {
+        val errorMessage = "message"
+        initSiteResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                GenericErrorType.NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+        val errorResponse = restClient.fetchSite(site)
+
+        assertNotNull(errorResponse.error)
+        assertThat(errorResponse.error.type).isEqualTo(GenericErrorType.NETWORK_ERROR)
+        assertThat(errorResponse.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns fetched sites using filter`() = test {
+        val response = SiteWPComRestResponse()
+        response.ID = siteId
+        val name = "Updated name"
+        response.name = name
+        response.URL = "site.com"
+
+        val sitesResponse = SitesResponse()
+        sitesResponse.sites = listOf(response)
+
+        initSitesResponse(data = sitesResponse)
+        initSitesFeaturesResponse(data = SitesFeaturesRestResponse(emptyMap()))
+
+        val responseModel = restClient.fetchSites(listOf(WPCOM), false)
+        assertThat(responseModel.sites).hasSize(1)
+        assertThat(responseModel.sites[0].name).isEqualTo(name)
+        assertThat(responseModel.sites[0].siteId).isEqualTo(siteId)
+
+        assertThat(urlCaptor.firstValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.2/me/sites/")
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/me/sites/features/")
+        assertThat(paramsCaptor.firstValue).isEqualTo(
+                mapOf(
+                        "filters" to "wpcom",
+                        "fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
+                                "visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
+                                "organization_id,was_ecommerce_trial,single_user_site"
+                )
+        )
+    }
+
+    @Test
+    fun `returns fetched sites when not filtering`() = test {
+        val response = SiteWPComRestResponse()
+        response.ID = siteId
+        val name = "Updated name"
+        response.name = name
+        response.URL = "site.com"
+
+        val sitesResponse = SitesResponse()
+        sitesResponse.sites = listOf(response)
+
+        initSitesResponse(data = sitesResponse)
+
+        val responseModel = restClient.fetchSites(emptyList(), false)
+        assertThat(responseModel.sites).hasSize(1)
+        assertThat(responseModel.sites[0].name).isEqualTo(name)
+        assertThat(responseModel.sites[0].siteId).isEqualTo(siteId)
+
+        assertThat(urlCaptor.firstValue)
+            .isEqualTo("https://public-api.wordpress.com/rest/v1.1/me/sites/")
+        assertThat(paramsCaptor.firstValue).isEqualTo(
+            mapOf(
+                "fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
+                    "visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
+                    "organization_id,was_ecommerce_trial,single_user_site"
+            )
+        )
+    }
+
+    @Test
+    fun `fetched sites can filter JP connected package sites`() = test {
+        val response = SiteWPComRestResponse()
+        response.ID = siteId
+        val name = "Updated name"
+        response.name = name
+        response.URL = "site.com"
+        response.jetpack = false
+        response.jetpack_connection = true
+
+        val sitesResponse = SitesResponse()
+        sitesResponse.sites = listOf(response)
+
+        initSitesResponse(data = sitesResponse)
+        initSitesFeaturesResponse(data = SitesFeaturesRestResponse(features = emptyMap()))
+
+        val responseModel = restClient.fetchSites(listOf(WPCOM), true)
+
+        assertThat(responseModel.sites).hasSize(0)
+    }
+
+    @Test
+    fun `fetchSites returns error when API call fails`() = test {
+        val errorMessage = "message"
+        initSitesResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                GenericErrorType.NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+        val errorResponse = restClient.fetchSites(listOf(), false)
+
+        assertNotNull(errorResponse.error)
+        assertThat(errorResponse.error.type).isEqualTo(GenericErrorType.NETWORK_ERROR)
+        assertThat(errorResponse.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `creates new site with all params`() = test {
+        val data = NewSiteResponse()
+        val blogDetails = BlogDetails()
+        blogDetails.blogid = siteId.toString()
+        data.blog_details = blogDetails
+        val appId = "app_id"
+        whenever(appSecrets.appId).thenReturn(appId)
+        val appSecret = "app_secret"
+        whenever(appSecrets.appSecret).thenReturn(appSecret)
+
+        initNewSiteResponse(data)
+
+        val dryRun = false
+        val siteName = "Site name"
+        val siteTitle = "site title"
+        val language = "CZ"
+        val visibility = PUBLIC
+        val segmentId = 123L
+        val siteDesign = "design"
+        val timeZoneId = "Europe/London"
+        val findAvailableUrl = true
+
+        val result = restClient.newSite(
+            siteName,
+            siteTitle,
+            language,
+            timeZoneId,
+            visibility,
+            segmentId,
+            siteDesign,
+            findAvailableUrl,
+            dryRun
+        )
+
+        assertThat(result.newSiteRemoteId).isEqualTo(siteId)
+        assertThat(result.dryRun).isEqualTo(dryRun)
+
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/new/")
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "blog_name" to siteName,
+                        "blog_title" to siteTitle,
+                        "lang_id" to language,
+                        "public" to "1",
+                        "validate" to "0",
+                        "find_available_url" to findAvailableUrl.toString(),
+                        "client_id" to appId,
+                        "client_secret" to appSecret,
+                        "options" to mapOf<String, Any>(
+                                "site_segment" to segmentId,
+                                "template" to siteDesign,
+                                "timezone_string" to timeZoneId,
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `creates new site without a site name`() = test {
+        val data = NewSiteResponse()
+        val blogDetails = BlogDetails()
+        blogDetails.blogid = siteId.toString()
+        data.blog_details = blogDetails
+        val appId = "app_id"
+        whenever(appSecrets.appId).thenReturn(appId)
+        val appSecret = "app_secret"
+        whenever(appSecrets.appSecret).thenReturn(appSecret)
+
+        initNewSiteResponse(data)
+
+        val dryRun = false
+        val siteName = null
+        val siteTitle = "site title"
+        val language = "CZ"
+        val visibility = PUBLIC
+        val segmentId = 123L
+        val siteDesign = "design"
+        val timeZoneId = "Europe/London"
+
+        val result = restClient.newSite(
+            siteName,
+            siteTitle,
+            language,
+            timeZoneId,
+            visibility,
+            segmentId,
+            siteDesign,
+            null,
+            dryRun
+        )
+
+        assertThat(result.newSiteRemoteId).isEqualTo(siteId)
+        assertThat(result.dryRun).isEqualTo(dryRun)
+
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/new/")
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+            mapOf(
+                "blog_name" to siteTitle,
+                "blog_title" to siteTitle,
+                "lang_id" to language,
+                "public" to "1",
+                "validate" to "0",
+                "find_available_url" to "1",
+                "client_id" to appId,
+                "client_secret" to appSecret,
+                "options" to mapOf<String, Any>(
+                    "site_segment" to segmentId,
+                    "template" to siteDesign,
+                    "site_creation_flow" to "with-design-picker",
+                    "timezone_string" to timeZoneId,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `creates new site without a site name and site title`() = test {
+        val data = NewSiteResponse()
+        val blogDetails = BlogDetails()
+        blogDetails.blogid = siteId.toString()
+        data.blog_details = blogDetails
+        val appId = "app_id"
+        whenever(appSecrets.appId).thenReturn(appId)
+        val appSecret = "app_secret"
+        whenever(appSecrets.appSecret).thenReturn(appSecret)
+
+        initNewSiteResponse(data)
+
+        val dryRun = false
+        val siteName = null
+        val siteTitle = null
+        val language = "CZ"
+        val visibility = PUBLIC
+        val segmentId = 123L
+        val siteDesign = "design"
+        val timeZoneId = "Europe/London"
+
+        val result = restClient.newSite(
+            siteName,
+            siteTitle,
+            language,
+            timeZoneId,
+            visibility,
+            segmentId,
+            siteDesign,
+            null,
+            dryRun
+        )
+
+        assertThat(result.newSiteRemoteId).isEqualTo(siteId)
+        assertThat(result.dryRun).isEqualTo(dryRun)
+
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/new/")
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+            mapOf(
+                "blog_name" to "",
+                "lang_id" to language,
+                "public" to "1",
+                "validate" to "0",
+                "find_available_url" to "1",
+                "client_id" to appId,
+                "client_secret" to appSecret,
+                "options" to mapOf<String, Any>(
+                    "site_segment" to segmentId,
+                    "template" to siteDesign,
+                    "site_creation_flow" to "with-design-picker",
+                    "timezone_string" to timeZoneId,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `creates new site without params with dry run`() = test {
+        val data = NewSiteResponse()
+        val blogDetails = BlogDetails()
+        blogDetails.blogid = siteId.toString()
+        data.blog_details = blogDetails
+        val appId = "app_id"
+        whenever(appSecrets.appId).thenReturn(appId)
+        val appSecret = "app_secret"
+        whenever(appSecrets.appSecret).thenReturn(appSecret)
+
+        initNewSiteResponse(data)
+
+        val dryRun = true
+        val siteName = "Site name"
+        val siteTitle = null
+        val language = "CZ"
+        val visibility = SiteVisibility.PRIVATE
+        val timeZoneId = "Europe/London"
+
+        val result = restClient.newSite(
+            siteName,
+            siteTitle,
+            language,
+            timeZoneId,
+            visibility,
+            null,
+            null,
+            null,
+            dryRun
+        )
+
+        assertThat(result.newSiteRemoteId).isEqualTo(siteId)
+        assertThat(result.dryRun).isEqualTo(dryRun)
+
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/new/")
+        assertThat(bodyCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "blog_name" to siteName,
+                        "lang_id" to language,
+                        "public" to "-1",
+                        "validate" to "1",
+                        "client_id" to appId,
+                        "client_secret" to appSecret,
+                        "options" to mapOf<String, Any>(
+                            "timezone_string" to timeZoneId,
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `returns fetched post formats`() = test {
+        val response = PostFormatsResponse()
+        val slug = "testSlug"
+        val displayName = "testDisplayName"
+        response.formats = mapOf(slug to displayName)
+
+        initPostFormatsResponse(response)
+
+        val responseModel = restClient.fetchPostFormats(site)
+        assertThat(responseModel.postFormats).hasSize(1)
+        assertThat(responseModel.postFormats[0].slug).isEqualTo(slug)
+        assertThat(responseModel.postFormats[0].displayName).isEqualTo(displayName)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/post-formats/")
+    }
+
+    @Test
+    fun `fetchPostFormats returns error when API call fails`() = test {
+        val errorMessage = "message"
+        initPostFormatsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                GenericErrorType.NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+        val errorResponse = restClient.fetchPostFormats(site)
+
+        assertNotNull(errorResponse.error)
+        assertThat(errorResponse.error.type).isEqualTo(PostFormatsErrorType.GENERIC_ERROR)
+    }
+
+    @Test
+    fun `creates new site in coming soon state`() = test {
+        // given
+        whenever(appSecrets.appId).thenReturn("")
+        whenever(appSecrets.appSecret).thenReturn("")
+        initNewSiteResponse()
+
+        // when
+        restClient.newSite("", "", "", "", visibility = COMING_SOON, null, null, null, false)
+
+        // then
+        val body = bodyCaptor.lastValue
+        @Suppress("UNCHECKED_CAST")
+        val options = body["options"] as Map<String, String>
+
+        assertThat(body).containsEntry("public", "0")
+        assertThat(options).containsEntry("wpcom_public_coming_soon", "1")
+    }
+
+    @Test
+    fun `creates new site with override site creation flow if specified`() = test {
+        // given
+        whenever(appSecrets.appId).thenReturn("")
+        whenever(appSecrets.appSecret).thenReturn("")
+        initNewSiteResponse()
+
+        val siteCreationFlow = "sample_creation_flow"
+
+        // when
+        restClient.newSite(
+            null,
+            "",
+            "",
+            "",
+            visibility = COMING_SOON,
+            null,
+            null,
+            null,
+            false,
+            siteCreationFlow = siteCreationFlow
+        )
+
+        // then
+        val body = bodyCaptor.lastValue
+        @Suppress("UNCHECKED_CAST")
+        val options = body["options"] as Map<String, String>
+
+        assertThat(options).containsEntry("site_creation_flow", siteCreationFlow)
+    }
+
+    @Test
+    fun `when all domains are requested, then the correct response is built`() = test {
+        val allDomainsJson = "wp/all-domains/all-domains.json"
+        val json = UnitTestUtils.getStringFromResourceFile(javaClass, allDomainsJson)
+        val responseType = object : TypeToken<AllDomainsResponse>() {}.type
+        val response = GsonBuilder().create().fromJson(json, responseType) as AllDomainsResponse
+
+        initAllDomainsResponse(data = response)
+
+        val responseModel = restClient.fetchAllDomains()
+        assert(responseModel is Success)
+        with((responseModel as Success).data) {
+            assertThat(domains).hasSize(4)
+            assertThat(domains[0].domain).isEqualTo("some.test.domain")
+            assertThat(domains[0].wpcomDomain).isFalse
+            assertThat(domains[0].registrationDate).isEqualTo(
+                DateTimeUtils.dateUTCFromIso8601("2009-03-26T21:20:53+00:00")
+            )
+            assertThat(domains[0].expiry).isEqualTo(
+                DateTimeUtils.dateUTCFromIso8601("2024-03-24T00:00:00+00:00")
+            )
+            assertThat(domains[0].domainStatus).isNotNull
+            assertThat(domains[0].domainStatus?.status).isEqualTo("Active")
+            assertThat(domains[0].domainStatus?.statusType).isEqualTo(SUCCESS)
+            assertThat(domains[1].domain).isEqualTo("some.test.domain.with.status.weight")
+            assertThat(domains[1].wpcomDomain).isTrue
+            assertThat(domains[1].domainStatus).isNotNull
+            assertThat(domains[1].domainStatus?.status).isEqualTo("Expiring soon")
+            assertThat(domains[1].domainStatus?.statusType).isEqualTo(ERROR)
+            assertThat(domains[1].domainStatus?.statusWeight).isEqualTo(1000)
+            assertThat(domains[2].domain).isEqualTo("some.test.domain.with.action.required")
+            assertThat(domains[2].domainStatus).isNotNull
+            assertThat(domains[2].domainStatus?.actionRequired).isTrue
+            assertThat(domains[3].domain).isEqualTo("some.test.domain.no.domain.status")
+            assertThat(domains[3].domainStatus).isNull()
+        }
+    }
+
+    @Test
+    fun `given a network error, when all domains are requested, then return api error`() = test {
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NETWORK_ERROR))
+        initAllDomainsResponse(error = error)
+
+        val response = restClient.fetchAllDomains()
+        assert(response is Response.Error)
+        with((response as Response.Error).error) {
+            assertThat(type).isEqualTo(GenericErrorType.NETWORK_ERROR)
+            assertThat(message).isNull()
+        }
+    }
+
+    @Test
+    fun `given timeout, when all domains are requested, then return timeout error`() = test {
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.TIMEOUT))
+        initAllDomainsResponse(error = error)
+
+        val response = restClient.fetchAllDomains()
+        assert(response is Response.Error)
+        with((response as Response.Error).error) {
+            assertThat(type).isEqualTo(GenericErrorType.TIMEOUT)
+            assertThat(message).isNull()
+        }
+    }
+
+    @Test
+    fun `given not authenticated, when all domains are requested, then retun auth required error`() = test {
+        val tokenErrorMessage = "An active access token must be used to query information about the current user."
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED, tokenErrorMessage))
+        initAllDomainsResponse(error = error)
+
+        val response = restClient.fetchAllDomains()
+        assert(response is Response.Error)
+        with((response as Response.Error).error) {
+            assertThat(type).isEqualTo(GenericErrorType.NOT_AUTHENTICATED)
+            assertThat(message).isEqualTo(tokenErrorMessage)
+        }
+    }
+
+    @Test
+    fun `given a suspended WPCom website, when fetching site info, then return correct error`() = test {
+        val urlUtilsMock = mockStatic(UrlUtils::class.java)
+        whenever(UrlUtils.addUrlSchemeIfNeeded(any(), any())).thenAnswer { it.arguments[0] as String }
+        val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.INVALID_RESPONSE, "")).apply {
+            apiError = "connection_disabled"
+        }
+        initGetResponse(ConnectSiteInfoResponse::class.java, null, error)
+
+        val result = restClient.fetchConnectSiteInfoSync("test.com")
+
+        assertThat(result.error).isNotNull
+        assertThat(result.error!!.type).isEqualTo(SiteErrorType.WPCOM_SITE_SUSPENDED)
+        urlUtilsMock.close()
+    }
+
+    private suspend fun initSiteResponse(
+        data: SiteWPComRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<SiteWPComRestResponse> {
+        return initGetResponse(SiteWPComRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initSitesResponse(
+        data: SitesResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<SitesResponse> {
+        return initGetResponse(SitesResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initNewSiteResponse(
+        data: NewSiteResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<NewSiteResponse> {
+        return initPostResponse(NewSiteResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initPostFormatsResponse(
+        data: PostFormatsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PostFormatsResponse> {
+        return initGetResponse(PostFormatsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initSitesFeaturesResponse(
+        data: SitesFeaturesRestResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<SitesFeaturesRestResponse> {
+        return initGetResponse(SitesFeaturesRestResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initAllDomainsResponse(
+        data: AllDomainsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<AllDomainsResponse> {
+        return initGetResponse(AllDomainsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initGetResponse(
+        clazz: Class<T>,
+        data: T?,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        if (error == null && data == null) {
+            error("Either data or error must be provided")
+        }
+        val response = if (error != null) Response.Error(error) else Success<T>(data!!)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(clazz),
+                        any(),
+                        any(),
+                        any(),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        return response
+    }
+
+    private suspend fun <T> initPostResponse(
+        clazz: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        bodyCaptor.capture(),
+                        eq(clazz),
+                        anyOrNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClientTest.kt
new file mode 100644
index 00000000000..3c1c7e8cb48
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClientTest.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.test
+import kotlin.test.assertEquals
+
+internal class XPostsRestClientTest {
+    private lateinit var subject: XPostsRestClient
+    private val wpComGsonRequestBuilder = mock<WPComGsonRequestBuilder>()
+
+    @Before
+    fun setup() {
+        subject = XPostsRestClient(wpComGsonRequestBuilder, mock(), mock(), mock(), mock(), mock())
+    }
+
+    @Test
+    fun `fetch performs request`() = test {
+        val site = SiteModel().apply { siteId = 123 }
+        val expected = mock<WPComGsonRequestBuilder.Response<Array<XPostSiteModel>>>()
+
+        val url = WPCOMV2.sites.site(site.siteId).xposts.url
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        subject,
+                        url,
+                        mapOf("decode_html" to "true"),
+                        Array<XPostSiteModel>::class.java,
+                        true,
+                        60000,
+                )
+        )
+                .thenReturn(expected)
+
+        val actual = subject.fetch(site)
+        assertEquals(expected, actual)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt
new file mode 100644
index 00000000000..8e5b3ea6d3d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/InsightsRestClientTest.kt
@@ -0,0 +1,522 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient.CommentsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.EMAIL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.WP_COM
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.FOLLOWERS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.POST_STATS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.PUBLICIZE_RESPONSE
+import org.wordpress.android.fluxc.store.stats.TAGS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.TOP_COMMENTS_RESPONSE
+import org.wordpress.android.fluxc.store.stats.VISITS_RESPONSE
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class InsightsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var allTimeInsightsRestClient: AllTimeInsightsRestClient
+    private lateinit var commentsRestClient: CommentsRestClient
+    private lateinit var followersRestClient: FollowersRestClient
+    private lateinit var latestPostInsightsRestClient: LatestPostInsightsRestClient
+    private lateinit var publicizeRestClient: PublicizeRestClient
+    private lateinit var tagsRestClient: TagsRestClient
+    private lateinit var todayInsightsRestClient: TodayInsightsRestClient
+    private val siteId: Long = 12
+    private val postId: Long = 1
+    private val pageSize = 5
+
+    @Before
+    @Suppress("LongMethod")
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        allTimeInsightsRestClient = AllTimeInsightsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        commentsRestClient = CommentsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        followersRestClient = FollowersRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        latestPostInsightsRestClient = LatestPostInsightsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        publicizeRestClient = PublicizeRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        tagsRestClient = TagsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        todayInsightsRestClient = TodayInsightsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+    }
+
+    @Test
+    fun `returns all time success response`() = test {
+        val response = mock<AllTimeResponse>()
+        initAllTimeResponse(response)
+
+        val responseModel = allTimeInsightsRestClient.fetchAllTimeInsights(site, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/")
+        assertThat(paramsCaptor.lastValue).isEmpty()
+    }
+
+    @Test
+    fun `returns all time error response`() = test {
+        val errorMessage = "message"
+        initAllTimeResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = allTimeInsightsRestClient.fetchAllTimeInsights(site, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns latest post success response`() = test {
+        val response = mock<PostsResponse>()
+        initLatestPostResponse(response)
+
+        val responseModel = latestPostInsightsRestClient.fetchLatestPostForInsights(site, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/posts/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "fields" to "ID,title,URL,discussion,like_count,date,featured_image",
+                        "number" to "1",
+                        "order_by" to "date",
+                        "type" to "post"
+                )
+        )
+    }
+
+    @Test
+    fun `returns latest post error response`() = test {
+        val errorMessage = "message"
+        initLatestPostResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = latestPostInsightsRestClient.fetchLatestPostForInsights(site, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns posts view success response`() = test {
+        initPostsViewResponse(POST_STATS_RESPONSE)
+
+        val responseModel = latestPostInsightsRestClient.fetchPostStats(site, postId, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(POST_STATS_RESPONSE)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/post/1/")
+        assertThat(paramsCaptor.lastValue).isEmpty()
+    }
+
+    @Test
+    fun `returns posts view error response`() = test {
+        val errorMessage = "message"
+        initPostsViewResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = latestPostInsightsRestClient.fetchPostStats(site, postId, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns visits per time period`() = test {
+        initVisitResponse(VISITS_RESPONSE)
+
+        val formattedDate = "2019-01-17"
+        whenever(statsUtils.getFormattedDate(isNull(), any())).thenReturn(formattedDate)
+        val responseModel = todayInsightsRestClient.fetchTimePeriodStats(site, DAYS, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(VISITS_RESPONSE)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/visits/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "date" to formattedDate,
+                        "quantity" to "1",
+                        "unit" to "day"
+                )
+        )
+    }
+
+    @Test
+    fun `returns visits per time period error response`() = test {
+        val errorMessage = "message"
+        initVisitResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = todayInsightsRestClient.fetchTimePeriodStats(site, DAYS, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns WPCOM followers`() = test {
+        assertFollowers(WP_COM, "wpcom")
+    }
+
+    @Test
+    fun `returns email followers`() = test {
+        assertFollowers(EMAIL, "email")
+    }
+
+    private suspend fun assertFollowers(
+        followerType: FollowerType,
+        path: String
+    ) {
+        initFollowersResponse(FOLLOWERS_RESPONSE)
+
+        val pageSize = 10
+        val page = 1
+        val responseModel = followersRestClient.fetchFollowers(site, followerType, page, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(FOLLOWERS_RESPONSE)
+        val expectedUrl = "https://public-api.wordpress.com/rest/v1.1/sites/12/stats/followers/"
+        assertThat(urlCaptor.lastValue).isEqualTo(expectedUrl)
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to "$pageSize",
+                        "type" to path
+                )
+        )
+    }
+
+    @Test
+    fun `returns followers error response`() = test {
+        val errorMessage = "message"
+        initFollowersResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = followersRestClient.fetchFollowers(site, WP_COM, 1, 10, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns top comments`() = test {
+        initCommentsResponse(TOP_COMMENTS_RESPONSE)
+
+        val pageSize = 10
+        val responseModel = commentsRestClient.fetchTopComments(site, forced = false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(TOP_COMMENTS_RESPONSE)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/comments/")
+    }
+
+    @Test
+    fun `returns top comments error response`() = test {
+        val errorMessage = "message"
+        initCommentsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = commentsRestClient.fetchTopComments(site, forced = false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns tags and categories`() = test {
+        initTagsResponse(TAGS_RESPONSE)
+
+        val responseModel = tagsRestClient.fetchTags(site, max = pageSize, forced = false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(TAGS_RESPONSE)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/tags/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(mapOf("max" to "$pageSize"))
+    }
+
+    @Test
+    fun `returns tags and categories error response`() = test {
+        val errorMessage = "message"
+        initTagsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = tagsRestClient.fetchTags(site, max = pageSize, forced = false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns publicize`() = test {
+        initPublicizeResponse(PUBLICIZE_RESPONSE)
+
+        val responseModel = publicizeRestClient.fetchPublicizeData(site, forced = false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(PUBLICIZE_RESPONSE)
+        val url = "https://public-api.wordpress.com/rest/v1.1/sites/12/stats/publicize/"
+        assertThat(urlCaptor.lastValue).isEqualTo(url)
+    }
+
+    @Test
+    fun `returns publicize error response`() = test {
+        val errorMessage = "message"
+        initPublicizeResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = publicizeRestClient.fetchPublicizeData(site, forced = false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initAllTimeResponse(
+        data: AllTimeResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<AllTimeResponse> {
+        return initResponse(AllTimeResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initLatestPostResponse(
+        data: PostsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PostsResponse> {
+        return initResponse(PostsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initPostsViewResponse(
+        data: PostStatsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PostStatsResponse> {
+        return initResponse(PostStatsResponse::class.java, data ?: mock(), error, cachingEnabled = false)
+    }
+
+    private suspend fun initVisitResponse(
+        data: VisitResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<VisitResponse> {
+        return initResponse(VisitResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initFollowersResponse(
+        data: FollowersResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<FollowersResponse> {
+        return initResponse(FollowersResponse::class.java, data ?: mock(), error, cachingEnabled = false)
+    }
+
+    private suspend fun initCommentsResponse(
+        data: CommentsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CommentsResponse> {
+        return initResponse(CommentsResponse::class.java, data ?: mock(), error, cachingEnabled = false)
+    }
+
+    private suspend fun initTagsResponse(
+        data: TagsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<TagsResponse> {
+        return initResponse(TagsResponse::class.java, data ?: mock(), error, cachingEnabled = false)
+    }
+
+    private suspend fun initPublicizeResponse(
+        data: PublicizeResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PublicizeResponse> {
+        return initResponse(PublicizeResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = true
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        any(),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt
new file mode 100644
index 00000000000..13a0e42fcf5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClientTest.kt
@@ -0,0 +1,113 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class MostPopularRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: MostPopularRestClient
+    private val siteId: Long = 12
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = MostPopularRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `returns most popular success response`() = test {
+        val response = mock<MostPopularResponse>()
+        initMostPopularResponse(response)
+
+        val responseModel = restClient.fetchMostPopularInsights(site, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/insights/")
+        assertThat(paramsCaptor.lastValue).isEmpty()
+    }
+
+    @Test
+    fun `returns most popular error response`() = test {
+        val errorMessage = "message"
+        initMostPopularResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchMostPopularInsights(site, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initMostPopularResponse(
+        data: MostPopularResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<MostPopularResponse> {
+        val response = if (error != null) Error<MostPopularResponse>(error) else Success(data ?: mock())
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        any(),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(MostPopularResponse::class.java),
+                        eq(true),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt
new file mode 100644
index 00000000000..43e98699d5c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClientTest.kt
@@ -0,0 +1,130 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.POSTING_ACTIVITY_RESPONSE
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class PostingActivityRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: PostingActivityRestClient
+    private val siteId: Long = 12
+    private val startDay = Day(2018, 1, 1)
+    private val formattedStartDate = "2018-01-01"
+    private val endDay = Day(2019, 1, 1)
+    private val formattedEndDate = "2019-01-01"
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = PostingActivityRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(startDay)).thenReturn(formattedStartDate)
+        whenever(statsUtils.getFormattedDate(endDay)).thenReturn(formattedEndDate)
+    }
+
+    @Test
+    fun `returns posting activity`() = test {
+        initResponse(POSTING_ACTIVITY_RESPONSE)
+
+        val responseModel = restClient.fetchPostingActivity(site, startDay, endDay, forced = false)
+
+        Assertions.assertThat(responseModel.response).isNotNull
+        Assertions.assertThat(responseModel.response).isEqualTo(POSTING_ACTIVITY_RESPONSE)
+        val url = "https://public-api.wordpress.com/rest/v1.1/sites/12/stats/streak/"
+        Assertions.assertThat(urlCaptor.lastValue).isEqualTo(url)
+        Assertions.assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "endDate" to "2019-01-01",
+                        "gmtOffset" to "0",
+                        "max" to "3000",
+                        "startDate" to "2018-01-01"
+                )
+        )
+    }
+
+    @Test
+    fun `returns posting activity error response`() = test {
+        val errorMessage = "message"
+        initResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchPostingActivity(site, startDay, endDay, forced = false)
+
+        Assertions.assertThat(responseModel.error).isNotNull
+        Assertions.assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        Assertions.assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initResponse(
+        data: PostingActivityResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PostingActivityResponse> {
+        val response = if (error != null) Response.Error<PostingActivityResponse>(error) else Success(data ?: mock())
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(PostingActivityResponse::class.java),
+                        eq(true),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt
new file mode 100644
index 00000000000..8f17e580e0c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClientTest.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient.SummaryResponse
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class SummaryRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: SummaryRestClient
+    private val siteId: Long = 12
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = SummaryRestClient(
+            dispatcher,
+            wpComGsonRequestBuilder,
+            null,
+            requestQueue,
+            accessToken,
+            userAgent
+        )
+    }
+
+    @Test
+    fun `returns summary success response`() = test {
+        val response = mock<SummaryResponse>()
+        initSummaryResponse(response)
+
+        val responseModel = restClient.fetchSummary(site, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue).isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/summary/")
+        assertThat(paramsCaptor.lastValue).isEmpty()
+    }
+
+    @Test
+    fun `returns summary error response`() = test {
+        val errorMessage = "message"
+        initSummaryResponse(
+            error = WPComGsonNetworkError(
+                BaseNetworkError(NETWORK_ERROR, errorMessage, VolleyError(errorMessage))
+            )
+        )
+
+        val responseModel = restClient.fetchSummary(site, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initSummaryResponse(
+        data: SummaryResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<SummaryResponse> {
+        val response = if (error != null) Error(error) else Success(data ?: mock())
+        whenever(
+            wpComGsonRequestBuilder.syncGetRequest(
+                any(),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(SummaryResponse::class.java),
+                eq(false),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+            )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt
new file mode 100644
index 00000000000..7edf3673ec7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClientTest.kt
@@ -0,0 +1,156 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient.SubscribersResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class SubscribersRestClientTest {
+    @Mock
+    private lateinit var dispatcher: Dispatcher
+
+    @Mock
+    private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+
+    @Mock
+    private lateinit var site: SiteModel
+
+    @Mock
+    private lateinit var requestQueue: RequestQueue
+
+    @Mock
+    private lateinit var accessToken: AccessToken
+
+    @Mock
+    private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: SubscribersRestClient
+    private val siteId = 12L
+    private val quantity = 30
+    private val currentDateValue = "2022-10-10"
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = SubscribersRestClient(
+            dispatcher,
+            wpComGsonRequestBuilder,
+            null,
+            requestQueue,
+            accessToken, userAgent
+        )
+    }
+
+    @Test
+    fun `returns subscribers per day success response`() = test { testSuccessResponse(DAYS) }
+
+    @Test
+    fun `returns subscribers per day error response`() = test { testErrorResponse(DAYS) }
+
+    @Test
+    fun `returns subscribers per week success response`() = test { testSuccessResponse(WEEKS) }
+
+    @Test
+    fun `returns subscribers per week error response`() = test { testErrorResponse(WEEKS) }
+
+    @Test
+    fun `returns subscribers per month success response`() = test { testSuccessResponse(MONTHS) }
+
+    @Test
+    fun `returns subscribers per month error response`() = test { testErrorResponse(MONTHS) }
+
+    @Test
+    fun `returns subscribers per year success response`() = test { testSuccessResponse(YEARS) }
+
+    @Test
+    fun `returns subscribers per year error response`() = test { testErrorResponse(YEARS) }
+
+    private suspend fun testSuccessResponse(granularity: StatsGranularity) {
+        val response = mock<SubscribersResponse>()
+        initSubscribersResponse(response)
+
+        val responseModel = restClient.fetchSubscribers(site, granularity, quantity, currentDateValue, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+            .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/subscribers/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+            mapOf("quantity" to quantity.toString(), "unit" to granularity.toString(), "date" to currentDateValue)
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initSubscribersResponse(
+            error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR, errorMessage, VolleyError(errorMessage)))
+        )
+
+        val responseModel = restClient.fetchSubscribers(site, period, quantity, currentDateValue, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initSubscribersResponse(
+        data: SubscribersResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ) = initResponse(SubscribersResponse::class.java, data ?: mock(), error)
+
+    private suspend fun <T> initResponse(
+        clazz: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+            wpComGsonRequestBuilder.syncGetRequest(
+                eq(restClient),
+                urlCaptor.capture(),
+                paramsCaptor.capture(),
+                eq(clazz),
+                eq(cachingEnabled),
+                any(),
+                eq(false),
+                customGsonBuilder = anyOrNull(),
+                authenticatedRequest = any()
+            )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt
new file mode 100644
index 00000000000..36c40870f57
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClientTest.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class AuthorsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private val gson: Gson = GsonBuilder().create()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: AuthorsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val stringDate = "2018-10-10"
+    private val requestedDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = AuthorsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                gson,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(requestedDate), isNull())).thenReturn(stringDate)
+    }
+
+    @Test
+    fun `returns authors by day success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns authors by day error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns authors by week success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns authors by week error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns authors by month success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns authors by month error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns authors by year success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns authors by year error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<AuthorsResponse>()
+        initAuthorsResponse(response)
+
+        val responseModel = restClient.fetchAuthors(site, period, requestedDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/top-authors/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to stringDate
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initAuthorsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchAuthors(site, period, requestedDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initAuthorsResponse(
+        data: AuthorsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<AuthorsResponse> {
+        return initResponse(AuthorsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt
new file mode 100644
index 00000000000..7963d890a57
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClientTest.kt
@@ -0,0 +1,230 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse.ClickGroup
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class ClicksRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private val gson: Gson = GsonBuilder().create()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: ClicksRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentDateValue = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = ClicksRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                gson,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentDateValue)
+    }
+
+    @Test
+    fun `returns post & page day views success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page day views error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page week views success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page week views error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page month views success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page month views error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page year views success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns post & page year views error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    @Test
+    fun `maps group with clicks`() {
+        val icon = "icon.jpg"
+        val name = "Name"
+        val views = 5
+        val firstUrl = "firstUrl.com"
+        val firstChildName = "First name"
+        val firstChildViews = 3
+        val secondUrl = "secondUrl.com"
+        val secondChildName = "Second name"
+        val secondChildViews = 2
+        val group = "{\"icon\":\"$icon\",\n" +
+                "\"url\":null,\n" +
+                "\"name\":\"$name\",\n" +
+                "\"views\":$views,\n" +
+                "\"children\":[\n" +
+                "{\"url\":\"$firstUrl\",\n" +
+                "\"name\":\"$firstChildName\",\n" +
+                "\"views\":$firstChildViews}," +
+                "{\"url\":\"$secondUrl\",\n" +
+                "\"name\":\"$secondChildName\",\n" +
+                "\"views\":$secondChildViews}" +
+                "]}"
+        val parsedGroup = gson.fromJson<ClickGroup>(group, ClickGroup::class.java)
+
+        parsedGroup.build(gson)
+
+        assertThat(parsedGroup.name).isEqualTo(name)
+        assertThat(parsedGroup.views).isEqualTo(views)
+        assertThat(parsedGroup.icon).isEqualTo(icon)
+        assertThat(parsedGroup.clicks).hasSize(2)
+        parsedGroup.clicks?.get(0)?.apply {
+            assertThat(this.name).isEqualTo(firstChildName)
+            assertThat(this.url).isEqualTo(firstUrl)
+            assertThat(this.views).isEqualTo(firstChildViews)
+            assertThat(this.icon).isNull()
+        }
+        parsedGroup.clicks?.get(1)?.apply {
+            assertThat(this.name).isEqualTo(secondChildName)
+            assertThat(this.url).isEqualTo(secondUrl)
+            assertThat(this.views).isEqualTo(secondChildViews)
+            assertThat(this.icon).isNull()
+        }
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<ClicksResponse>()
+        initClicksResponse(response)
+
+        val responseModel = restClient.fetchClicks(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/clicks/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to currentDateValue
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initClicksResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchClicks(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initClicksResponse(
+        data: ClicksResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<ClicksResponse> {
+        return initResponse(ClicksResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt
new file mode 100644
index 00000000000..4996c502470
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClientTest.kt
@@ -0,0 +1,180 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class CountryViewsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: CountryViewsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentDateValue = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = CountryViewsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentDateValue)
+    }
+
+    @Test
+    fun `returns country views by day success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns country views by day error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns country views by week success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns country views by week error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns country views by month success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns country views by month error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns country views by year success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns country views by year error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<CountryViewsResponse>()
+        initCountryViewsResponse(response)
+
+        val responseModel = restClient.fetchCountryViews(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/country-views/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to currentDateValue
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initCountryViewsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchCountryViews(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initCountryViewsResponse(
+        data: CountryViewsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<CountryViewsResponse> {
+        return initResponse(CountryViewsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt
new file mode 100644
index 00000000000..fbecd885523
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClientTest.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class FileDownloadsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private val gson: Gson = GsonBuilder().create()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: FileDownloadsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val stringDate = "2018-10-10"
+    private val requestedDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = FileDownloadsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                gson,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(requestedDate), isNull())).thenReturn(stringDate)
+    }
+
+    @Test
+    fun `returns authors by day success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns authors by day error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns authors by week success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns authors by week error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns authors by month success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns authors by month error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns authors by year success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns authors by year error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<FileDownloadsResponse>()
+        initFileDownloadsResponse(response)
+
+        val responseModel = restClient.fetchFileDownloads(site, period, requestedDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/file-downloads/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "num" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to stringDate
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initFileDownloadsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchFileDownloads(site, period, requestedDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initFileDownloadsResponse(
+        data: FileDownloadsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<FileDownloadsResponse> {
+        return initResponse(FileDownloadsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt
new file mode 100644
index 00000000000..a77d433551c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClientTest.kt
@@ -0,0 +1,180 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class PostAndPageViewsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: PostAndPageViewsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentStringDate = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = PostAndPageViewsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentStringDate)
+    }
+
+    @Test
+    fun `returns post & page day views success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page day views error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page week views success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page week views error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page month views success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page month views error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page year views success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns post & page year views error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(granularity: StatsGranularity) {
+        val response = mock<PostAndPageViewsResponse>()
+        initAllTimeResponse(response)
+
+        val responseModel = restClient.fetchPostAndPageViews(site, granularity, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/top-posts/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to granularity.toString(),
+                        "date" to currentStringDate
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(granularity: StatsGranularity) {
+        val errorMessage = "message"
+        initAllTimeResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchPostAndPageViews(site, granularity, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initAllTimeResponse(
+        data: PostAndPageViewsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<PostAndPageViewsResponse> {
+        return initResponse(PostAndPageViewsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClientTest.kt
new file mode 100644
index 00000000000..1482ef1f367
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClientTest.kt
@@ -0,0 +1,344 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReportReferrerAsSpamResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.UnparsedReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.UnparsedReferrersResponse.UnparsedReferrerGroup
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class ReferrersRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private val gson: Gson = GsonBuilder().create()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: ReferrersRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentStringDate = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = ReferrersRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                gson,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentStringDate)
+    }
+
+    @Test
+    fun `returns post & page day views success response`() = test {
+        testFetchReferrersSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page day views error response`() = test {
+        testFetchReferrersErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page week views success response`() = test {
+        testFetchReferrersSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page week views error response`() = test {
+        testFetchReferrersErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page month views success response`() = test {
+        testFetchReferrersSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page month views error response`() = test {
+        testFetchReferrersErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page year views success response`() = test {
+        testFetchReferrersSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns post & page year views error response`() = test {
+        testFetchReferrersErrorResponse(YEARS)
+    }
+
+    @Test
+    fun `maps group with views`() {
+        val group = "{\"group\":\"WordPress.com Reader\"," +
+                "\"name\":\"WordPress.com Reader\"," +
+                "\"url\":\"https:\\/\\/wordpress.com\\/\"," +
+                "\"icon\":\"https:\\/\\/secure.gravatar.com\\/blavatar\\/236c008da9dc0edb4b3464ecebb3fc1d?s=48\"," +
+                "\"total\":16," +
+                "\"follow_data\":null," +
+                "\"results\":" +
+                "{\"views\":16}" +
+                "}"
+        val unparsedGroup = gson.fromJson(group, UnparsedReferrerGroup::class.java)
+
+        val parsedGroup = unparsedGroup.parse(gson)
+
+        assertThat(parsedGroup.views).isEqualTo(16)
+        assertThat(parsedGroup.referrers).isNull()
+    }
+
+    @Test
+    fun `maps group with referrers`() {
+        val groupId = "group1"
+        val groupName = "Group Name"
+        val groupViews = 96
+        val firstReferrerName = "referrer1"
+        val secondReferrerName = "referrer2"
+        val firstUrl = "url1.com"
+        val secondUrl = "url2.com"
+        val firstViews = 91
+        val secondViews = 5
+        val group = "{\"group\":\"$groupId\",\n" +
+                "\"name\":\"$groupName\",\n" +
+                "\"icon\":null,\"total\":$groupViews,\"follow_data\":null," +
+                "\"results\":" +
+                "[{\"name\":\"$firstReferrerName\",\"url\":\"$firstUrl\",\"views\":$firstViews}," +
+                "{\"name\":\"$secondReferrerName\",\"url\":\"$secondUrl\",\"views\":$secondViews}]}"
+        val unparsedGroup = gson.fromJson(group, UnparsedReferrerGroup::class.java)
+
+        val parsedGroup = unparsedGroup.parse(gson)
+
+        assertThat(parsedGroup.group).isEqualTo(groupId)
+        assertThat(parsedGroup.views).isNull()
+        assertThat(parsedGroup.referrers).hasSize(2)
+        parsedGroup.referrers?.get(0)?.apply {
+            assertThat(this.name).isEqualTo(firstReferrerName)
+            assertThat(this.url).isEqualTo(firstUrl)
+            assertThat(this.views).isEqualTo(firstViews)
+            assertThat(this.icon).isNull()
+        }
+        parsedGroup.referrers?.get(1)?.apply {
+            assertThat(this.name).isEqualTo(secondReferrerName)
+            assertThat(this.url).isEqualTo(secondUrl)
+            assertThat(this.views).isEqualTo(secondViews)
+            assertThat(this.icon).isNull()
+        }
+    }
+
+    private suspend fun testFetchReferrersSuccessResponse(granularity: StatsGranularity) {
+        val response = mock<UnparsedReferrersResponse>()
+        initFetchReferrersResponse(response)
+
+        val responseModel = restClient.fetchReferrers(site, granularity, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(ReferrersResponse(null, null, null, emptyList()))
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/referrers/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to granularity.toString(),
+                        "date" to currentStringDate
+                )
+        )
+    }
+
+    private suspend fun testFetchReferrersErrorResponse(granularity: StatsGranularity) {
+        val errorMessage = "message"
+        initFetchReferrersResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchReferrers(site, granularity, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns success when reporting referrer as spam`() = test {
+        val response = mock<ReportReferrerAsSpamResponse>()
+        initReportReferrerAsSpamApiResponse(response)
+
+        val domain = "referrers.example.com"
+        val responseModel = restClient.reportReferrerAsSpam(site, domain)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/referrers/spam/new/")
+    }
+
+    @Test
+    fun `returns error when reporting referrer as spam`() = test {
+        val errorMessage = "message"
+        initReportReferrerAsSpamApiResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val domain = "referrers.example.com"
+        val responseModel = restClient.reportReferrerAsSpam(site, domain)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    @Test
+    fun `returns success when unreporting referrer as spam`() = test {
+        val response = mock<ReportReferrerAsSpamResponse>()
+        initReportReferrerAsSpamApiResponse(response)
+
+        val domain = "referrers.example.com"
+        val responseModel = restClient.unreportReferrerAsSpam(site, domain)
+
+        assertThat(responseModel.response).isNotNull
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo(
+                        "https://public-api.wordpress.com/rest/v1.1/sites/12/stats/referrers/spam/delete/"
+                )
+    }
+
+    @Test
+    fun `returns error when unreporting referrer as spam`() = test {
+        val errorMessage = "message"
+        initReportReferrerAsSpamApiResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val domain = "referrers.example.com"
+        val responseModel = restClient.unreportReferrerAsSpam(site, domain)
+
+        assertThat(responseModel.error).isNotNull
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initFetchReferrersResponse(
+        data: UnparsedReferrersResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<UnparsedReferrersResponse> {
+        return initGetResponse(UnparsedReferrersResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun initReportReferrerAsSpamApiResponse(
+        data: ReportReferrerAsSpamResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<ReportReferrerAsSpamResponse> {
+        return initPostResponse(ReportReferrerAsSpamResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initGetResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+
+    private suspend fun <T> initPostResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null
+    ): Response<T> {
+        val response = if (error != null) Response.Error(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncPostRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(null),
+                        eq(kclass),
+                        isNull(),
+                        anyOrNull(),
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClientTest.kt
new file mode 100644
index 00000000000..188b9058378
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClientTest.kt
@@ -0,0 +1,180 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class SearchTermsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: SearchTermsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentDateValue = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = SearchTermsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentDateValue)
+    }
+
+    @Test
+    fun `returns search terms per day success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns search terms per day error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns search terms per week success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns search terms per week error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns search terms per month success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns search terms per month error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns search terms per year success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns search terms per year error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<SearchTermsResponse>()
+        initSearchTermsResponse(response)
+
+        val responseModel = restClient.fetchSearchTerms(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/search-terms/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to currentDateValue
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initSearchTermsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchSearchTerms(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initSearchTermsResponse(
+        data: SearchTermsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<SearchTermsResponse> {
+        return initResponse(SearchTermsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtilsTest.kt
new file mode 100644
index 00000000000..543880cb7f2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtilsTest.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.utils.CurrentDateUtils
+import org.wordpress.android.fluxc.utils.SiteUtils
+import java.util.Calendar
+import java.util.Locale
+
+@RunWith(MockitoJUnitRunner::class)
+class StatsUtilsTest {
+    @Mock lateinit var siteModel: SiteModel
+    @Mock lateinit var currentDateUtils: CurrentDateUtils
+    private lateinit var statsUtils: StatsUtils
+    @Before
+    fun setUp() {
+        statsUtils = StatsUtils(currentDateUtils)
+    }
+
+    @Test
+    fun `moves date to future when timezone is adds time`() {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.set(2018, 10, 10, 23, 55)
+
+        val result = statsUtils.getFormattedDate(cal.time)
+
+        assertThat(result).isEqualTo("2018-11-10")
+    }
+
+    @Test
+    fun `keeps correct date when timezone is within bounds`() {
+        val cal = Calendar.getInstance(Locale.ROOT)
+        cal.set(2018, 10, 10, 0, 15)
+
+        val result = statsUtils.getFormattedDate(cal.time)
+
+        assertThat(result).isEqualTo("2018-11-10")
+    }
+
+    @Test
+    fun `moves the date forward when the site timezone is different`() {
+        val cal = Calendar.getInstance(Locale.UK)
+        cal.set(2018, 10, 10, 23, 55)
+
+        val timeZone = SiteUtils.getNormalizedTimezone("+5")
+        val result = statsUtils.getFormattedDate(cal.time, timeZone)
+
+        assertThat(result).isEqualTo("2018-11-11")
+    }
+
+    @Test
+    fun `moves the date back when the site timezone is different`() {
+        val cal = Calendar.getInstance(Locale.UK)
+        cal.set(2018, 10, 10, 0, 15)
+
+        val timeZone = SiteUtils.getNormalizedTimezone("-5")
+        val result = statsUtils.getFormattedDate(cal.time, timeZone)
+
+        assertThat(result).isEqualTo("2018-11-09")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClientTest.kt
new file mode 100644
index 00000000000..04756fee123
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClientTest.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class VideoPlaysRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    @Mock private lateinit var statsUtils: StatsUtils
+    private val gson: Gson = GsonBuilder().create()
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: VideoPlaysRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentDateValue = "2018-10-10"
+    private val currentDate = Date(0)
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = VideoPlaysRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent,
+                gson,
+                statsUtils
+        )
+        whenever(statsUtils.getFormattedDate(eq(currentDate), isNull())).thenReturn(currentDateValue)
+    }
+
+    @Test
+    fun `returns post & page day views success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page day views error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns post & page week views success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page week views error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns post & page month views success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page month views error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns post & page year views success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns post & page year views error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<VideoPlaysResponse>()
+        initVideoPlaysResponse(response)
+
+        val responseModel = restClient.fetchVideoPlays(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/video-plays/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "max" to pageSize.toString(),
+                        "period" to period.toString(),
+                        "date" to currentDateValue
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initVideoPlaysResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchVideoPlays(site, period, currentDate, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initVideoPlaysResponse(
+        data: VideoPlaysResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<VideoPlaysResponse> {
+        return initResponse(VideoPlaysResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClientTest.kt
new file mode 100644
index 00000000000..91609fcaee7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClientTest.kt
@@ -0,0 +1,174 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+
+@RunWith(MockitoJUnitRunner::class)
+class VisitAndViewsRestClientTest {
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var wpComGsonRequestBuilder: WPComGsonRequestBuilder
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var requestQueue: RequestQueue
+    @Mock private lateinit var accessToken: AccessToken
+    @Mock private lateinit var userAgent: UserAgent
+    private lateinit var urlCaptor: KArgumentCaptor<String>
+    private lateinit var paramsCaptor: KArgumentCaptor<Map<String, String>>
+    private lateinit var restClient: VisitAndViewsRestClient
+    private val siteId: Long = 12
+    private val pageSize = 5
+    private val currentDateValue = "2018-10-10"
+
+    @Before
+    fun setUp() {
+        urlCaptor = argumentCaptor()
+        paramsCaptor = argumentCaptor()
+        restClient = VisitAndViewsRestClient(
+                dispatcher,
+                wpComGsonRequestBuilder,
+                null,
+                requestQueue,
+                accessToken,
+                userAgent
+        )
+    }
+
+    @Test
+    fun `returns visits and views per day success response`() = test {
+        testSuccessResponse(DAYS)
+    }
+
+    @Test
+    fun `returns visits and views per day error response`() = test {
+        testErrorResponse(DAYS)
+    }
+
+    @Test
+    fun `returns visits and views per week success response`() = test {
+        testSuccessResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns visits and views per week error response`() = test {
+        testErrorResponse(WEEKS)
+    }
+
+    @Test
+    fun `returns visits and views per month success response`() = test {
+        testSuccessResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns visits and views per month error response`() = test {
+        testErrorResponse(MONTHS)
+    }
+
+    @Test
+    fun `returns visits and views per year success response`() = test {
+        testSuccessResponse(YEARS)
+    }
+
+    @Test
+    fun `returns visits and views per year error response`() = test {
+        testErrorResponse(YEARS)
+    }
+
+    private suspend fun testSuccessResponse(period: StatsGranularity) {
+        val response = mock<VisitsAndViewsResponse>()
+        initVisitsAndViewsResponse(response)
+
+        val responseModel = restClient.fetchVisits(site, period, currentDateValue, pageSize, false)
+
+        assertThat(responseModel.response).isNotNull()
+        assertThat(responseModel.response).isEqualTo(response)
+        assertThat(urlCaptor.lastValue)
+                .isEqualTo("https://public-api.wordpress.com/rest/v1.1/sites/12/stats/visits/")
+        assertThat(paramsCaptor.lastValue).isEqualTo(
+                mapOf(
+                        "quantity" to pageSize.toString(),
+                        "unit" to period.toString(),
+                        "date" to currentDateValue
+                )
+        )
+    }
+
+    private suspend fun testErrorResponse(period: StatsGranularity) {
+        val errorMessage = "message"
+        initVisitsAndViewsResponse(
+                error = WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val responseModel = restClient.fetchVisits(site, period, currentDateValue, pageSize, false)
+
+        assertThat(responseModel.error).isNotNull()
+        assertThat(responseModel.error.type).isEqualTo(API_ERROR)
+        assertThat(responseModel.error.message).isEqualTo(errorMessage)
+    }
+
+    private suspend fun initVisitsAndViewsResponse(
+        data: VisitsAndViewsResponse? = null,
+        error: WPComGsonNetworkError? = null
+    ): Response<VisitsAndViewsResponse> {
+        return initResponse(VisitsAndViewsResponse::class.java, data ?: mock(), error)
+    }
+
+    private suspend fun <T> initResponse(
+        kclass: Class<T>,
+        data: T,
+        error: WPComGsonNetworkError? = null,
+        cachingEnabled: Boolean = false
+    ): Response<T> {
+        val response = if (error != null) Response.Error<T>(error) else Success(data)
+        whenever(
+                wpComGsonRequestBuilder.syncGetRequest(
+                        eq(restClient),
+                        urlCaptor.capture(),
+                        paramsCaptor.capture(),
+                        eq(kclass),
+                        eq(cachingEnabled),
+                        any(),
+                        eq(false),
+                        customGsonBuilder = anyOrNull(),
+                        authenticatedRequest = any()
+                )
+        ).thenReturn(response)
+        whenever(site.siteId).thenReturn(siteId)
+        return response
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsFixtures.kt
new file mode 100644
index 00000000000..6a3720db9b8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsFixtures.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.transactions
+
+import org.wordpress.android.fluxc.model.DomainContactModel
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient.CreateShoppingCartResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient.CreateShoppingCartResponse.Extra
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient.CreateShoppingCartResponse.Product
+
+val SUPPORTED_COUNTRIES_MODEL = arrayOf(
+        SupportedDomainCountry("US", "United State"), SupportedDomainCountry("NA", "Narnia")
+)
+
+val CREATE_SHOPPING_CART_RESPONSE = CreateShoppingCartResponse(
+        76,
+        22.toString(),
+        listOf(
+                Product(76, "superraredomainname156726.blog", Extra(true)),
+                Product(1001, "other product", Extra(true))
+        )
+)
+
+val CREATE_SHOPPING_CART_WITH_PLAN_RESPONSE = CreateShoppingCartResponse(
+    76,
+    22.toString(),
+    listOf(
+        Product(76, "superraredomainname156726.blog", Extra(true)),
+        Product(1009, "Plan", Extra(true)),
+        Product(1001, "other product", Extra(true))
+    )
+)
+
+val CREATE_SHOPPING_CART_WITH_NO_SITE_RESPONSE = CreateShoppingCartResponse(
+    0,
+    22.toString(),
+    listOf(
+        Product(76, "superraredomainname156726.blog", Extra(true)),
+        Product(1001, "other product", Extra(true))
+    )
+)
+
+val DOMAIN_CONTACT_INFORMATION = DomainContactModel(
+        "Wapu",
+        "Wordpress",
+        "WordPress",
+        "7337 Publishing Row",
+        "Apt 404",
+        "90210",
+        "Best City",
+        "CA",
+        "USA",
+        "wapu@wordpress.org",
+        "+1.3120000000",
+        null
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/GatewayRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/GatewayRestClientTest.kt
new file mode 100644
index 00000000000..e80e87bd5d9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/GatewayRestClientTest.kt
@@ -0,0 +1,137 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc
+
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient.GatewayId.CASH_ON_DELIVERY
+
+class GatewayRestClientTest {
+    private val wooNetwork: WooNetwork = mock()
+    private lateinit var gatewayRestClient: GatewayRestClient
+
+    @Before
+    fun setup() {
+        gatewayRestClient = GatewayRestClient(wooNetwork)
+    }
+
+    @Test
+    fun `given success response, when fetch gateway, return success`() {
+        runBlocking {
+            whenever(
+                wooNetwork.executeGetGsonRequest(
+                    site = any(),
+                    path = any(),
+                    clazz = any<Class<GatewayRestClient.GatewayResponse>>(),
+                    params = any(),
+                    enableCaching = any(),
+                    cacheTimeToLive = any(),
+                    forced = any(),
+                    requestTimeout = any(),
+                    retries = any()
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(mock())
+            )
+
+            val actualResponse = gatewayRestClient.fetchGateway(
+                SiteModel(),
+                ""
+            )
+
+            Assertions.assertThat(actualResponse.isError).isFalse
+            Assertions.assertThat(actualResponse.result).isNotNull
+        }
+    }
+
+    @Test
+    fun `given error response, when fetch gateway, return error`() {
+        runBlocking {
+            val expectedError = mock<WPAPINetworkError>().apply {
+                type = mock()
+            }
+            whenever(
+                wooNetwork.executeGetGsonRequest(
+                    site = any(),
+                    path = any(),
+                    clazz = any<Class<GatewayRestClient.GatewayResponse>>(),
+                    params = any(),
+                    enableCaching = any(),
+                    cacheTimeToLive = any(),
+                    forced = any(),
+                    requestTimeout = any(),
+                    retries = any()
+                )
+            ).thenReturn(
+                WPAPIResponse.Error(expectedError)
+            )
+
+            val actualResponse = gatewayRestClient.fetchGateway(SiteModel(), "")
+
+            Assertions.assertThat(actualResponse.isError).isTrue
+            Assertions.assertThat(actualResponse.error).isNotNull
+        }
+    }
+
+    @Test
+    fun `given success response, when update gateway, return success`() {
+        runBlocking {
+            whenever(
+                wooNetwork.executePostGsonRequest(
+                    any(),
+                    any(),
+                    any<Class<GatewayRestClient.GatewayResponse>>(),
+                    any()
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(mock())
+            )
+
+            val actualResponse = gatewayRestClient.updatePaymentGateway(
+                SiteModel(),
+                CASH_ON_DELIVERY,
+                enabled = false,
+                title = "title"
+            )
+
+            Assertions.assertThat(actualResponse.isError).isFalse
+            Assertions.assertThat(actualResponse.result).isNotNull
+        }
+    }
+
+    @Test
+    fun `given error response, when update gateway, return error`() {
+        runBlocking {
+            val expectedError = mock<WPAPINetworkError>().apply {
+                type = mock()
+            }
+            whenever(
+                wooNetwork.executePostGsonRequest(
+                    any(),
+                    any(),
+                    any<Class<GatewayRestClient.GatewayResponse>>(),
+                    any()
+                )
+            ).thenReturn(
+                WPAPIResponse.Error(expectedError)
+            )
+
+            val actualResponse = gatewayRestClient.updatePaymentGateway(
+                SiteModel(),
+                CASH_ON_DELIVERY,
+                enabled = true,
+                title = "title"
+            )
+
+            Assertions.assertThat(actualResponse.isError).isTrue
+            Assertions.assertThat(actualResponse.error).isNotNull
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClientTest.kt
new file mode 100644
index 00000000000..0c9cbc083c0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/customer/CustomerRestClientTest.kt
@@ -0,0 +1,78 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.customer
+
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerSorting.NAME_ASC
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerFromAnalyticsDTO
+import org.wordpress.android.fluxc.test
+
+class CustomerRestClientTest {
+    private val wooNetwork: WooNetwork = mock()
+    private val client = CustomerRestClient(wooNetwork)
+
+    @Test
+    fun `given searchQuery searchBy filter empty, when fetchCustomersFromAnalytics, then that passed to API`() {
+        test {
+            // GIVEN
+            val searchQuery = "searchQuery"
+            val searchBy = "searchBy"
+            val pageSize = 50
+            val page = 1
+            val sortType = NAME_ASC
+            val site = SiteModel().apply { siteId = 1234 }
+
+            whenever(
+                wooNetwork.executeGetGsonRequest(
+                    site = site,
+                    path = "/wc-analytics/reports/customers/",
+                    params = mapOf(
+                        "page" to page.toString(),
+                        "per_page" to pageSize.toString(),
+                        "order" to "asc",
+                        "orderby" to "name",
+                        "search" to searchQuery,
+                        "searchby" to searchBy,
+                        "filter_empty" to "email,city,state,country"
+                    ),
+                    clazz = Array<CustomerFromAnalyticsDTO>::class.java
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(
+                    arrayOf(mock())
+                )
+            )
+
+            // WHEN
+            client.fetchCustomersFromAnalytics(
+                site = site,
+                pageSize = pageSize,
+                page = page,
+                sortType = sortType,
+                searchQuery = searchQuery,
+                searchBy = searchBy,
+                filterEmpty = listOf("email", "city", "state", "country")
+            )
+
+            // THEN
+            verify(wooNetwork).executeGetGsonRequest(
+                site = site,
+                path = "/wc-analytics/reports/customers/",
+                params = mapOf(
+                    "page" to page.toString(),
+                    "per_page" to pageSize.toString(),
+                    "order" to "asc",
+                    "orderby" to "name",
+                    "search" to searchQuery,
+                    "searchby" to searchBy,
+                    "filter_empty" to "email,city,state,country"
+                ),
+                clazz = Array<CustomerFromAnalyticsDTO>::class.java
+            )
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponseTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponseTest.kt
new file mode 100644
index 00000000000..c5166c12340
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/BatchOrderApiResponseTest.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.order
+
+import com.google.gson.GsonBuilder
+import org.junit.Test
+import org.wordpress.android.fluxc.UnitTestUtils
+import kotlin.test.assertEquals
+
+class BatchOrderApiResponseTest {
+    @Test
+    fun testDeserializeBatchOrderResponse() {
+        val testGson = GsonBuilder()
+            .create()
+
+        val batchOrderJson = UnitTestUtils.getStringFromResourceFile(
+            this.javaClass, "wc/orders-batch.json"
+        )
+
+        val response = testGson.fromJson(batchOrderJson, BatchOrderApiResponse::class.java)
+        val orders = response.update
+
+        assertEquals(2, orders.size)
+
+        val firstOrder = orders[0] as BatchOrderApiResponse.OrderResponse.Success
+        assertEquals(1032L, firstOrder.order.id)
+        assertEquals("224.00", firstOrder.order.total)
+
+        val secondOrder = orders[1] as BatchOrderApiResponse.OrderResponse.Error
+        assertEquals(525L, secondOrder.id)
+        assertEquals("woocommerce_rest_shop_order_invalid_id", secondOrder.error.code)
+        assertEquals(400, secondOrder.error.data.status)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt
new file mode 100644
index 00000000000..1cc9c786a82
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductDtoMapperTest.kt
@@ -0,0 +1,120 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.product
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.mock
+import org.wordpress.android.fluxc.JsonLoaderUtils.jsonFileAs
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemotePriceType.FlatFee
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteRestrictionsType.AnyText
+import org.wordpress.android.fluxc.model.addons.RemoteAddonDto.RemoteType.Checkbox
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.metadata.get
+import kotlin.test.fail
+
+class ProductDtoMapperTest {
+    private val productDtoMapper = ProductDtoMapper(
+        stripProductMetaData = mock {
+            on { invoke(any()) } doAnswer {
+                @Suppress("UNCHECKED_CAST")
+                it.arguments[0] as List<WCMetaData>
+            }
+        }
+    )
+
+    @Test
+    fun `Product addons should be serialized correctly`() {
+        val productMetaData =
+            "wc/product-with-addons.json"
+                .jsonFileAs(ProductApiResponse::class.java)
+                ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+                ?.metaData
+
+        val addons = productMetaData?.get(WCMetaData.AddOnsMetadataKeys.ADDONS_METADATA_KEY)
+            ?.let { RemoteAddonDto.fromMetaDataValue(it.value) }
+
+        assertThat(addons).isNotNull
+        assertThat(addons).isNotEmpty
+        assertThat(addons?.size).isEqualTo(3)
+    }
+
+    @Test
+    fun `Product addons should be serialized with enum values correctly`() {
+        val productMetaData =
+            "wc/product-with-addons.json"
+                .jsonFileAs(ProductApiResponse::class.java)
+                ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+                ?.metaData
+
+        val addons = productMetaData?.get(WCMetaData.AddOnsMetadataKeys.ADDONS_METADATA_KEY)
+            ?.let { RemoteAddonDto.fromMetaDataValue(it.value) }
+
+        assertThat(addons).isNotEmpty
+
+        addons?.first()?.let {
+            assertThat(it.priceType).isEqualTo(FlatFee)
+            assertThat(it.restrictionsType).isEqualTo(AnyText)
+            assertThat(it.type).isEqualTo(Checkbox)
+        } ?: fail("Addons list shouldn't be empty")
+    }
+
+    @Test
+    fun `Product addons should contain Addon options serialized correctly`() {
+        val addonOptions = "wc/product-with-addons.json"
+            .jsonFileAs(ProductApiResponse::class.java)
+            ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+            ?.metaData
+            ?.get(WCMetaData.AddOnsMetadataKeys.ADDONS_METADATA_KEY)
+            ?.let { RemoteAddonDto.fromMetaDataValue(it.value) }
+            ?.takeIf { it.isNotEmpty() }
+            ?.first()
+            ?.options
+
+        assertThat(addonOptions).isNotNull
+        assertThat(addonOptions).isNotEmpty
+    }
+
+    @Test
+    fun `Bundled product with max size is serialized correctly`() {
+        val product = "wc/product-bundle-with-max-quantity.json"
+            .jsonFileAs(ProductApiResponse::class.java)
+            ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+            ?.product
+
+        assertThat(product?.bundleMaxSize).isEqualTo(5f)
+    }
+
+    @Test
+    fun `Bundled product with min size is serialized correctly`() {
+        val product = "wc/product-bundle-with-min-quantity.json"
+            .jsonFileAs(ProductApiResponse::class.java)
+            ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+            ?.product
+
+        assertThat(product?.bundleMinSize).isEqualTo(5f)
+    }
+
+    @Test
+    fun `Bundled product with quantity rules is serialized correctly`() {
+        val product = "wc/product-bundle-with-quantity-rules.json"
+            .jsonFileAs(ProductApiResponse::class.java)
+            ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+            ?.product
+
+        assertThat(product?.bundleMinSize).isEqualTo(5f)
+        assertThat(product?.bundleMaxSize).isEqualTo(5f)
+    }
+
+    @Test
+    fun `Bundled product with special stock status is serialized correctly`() {
+        val product = "wc/product-bundle-with-max-quantity.json"
+            .jsonFileAs(ProductApiResponse::class.java)
+            ?.let { productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it) }
+            ?.product
+
+        assertThat(product?.specialStockStatus).isEqualTo("insufficientstock")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClientTest.kt
new file mode 100644
index 00000000000..b0f1b65efa6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/shippinglabels/ShippingLabelRestClientTest.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels
+
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelPackageData
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingPackageCustoms
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+
+class ShippingLabelRestClientTest {
+    private val wooNetwork: WooNetwork = mock()
+    private val restClient = ShippingLabelRestClient(wooNetwork)
+
+    @Test
+    fun `when purchase shipping label then pass correct source param to network client`() {
+        runBlocking {
+            // GIVEN
+            whenever(
+                wooNetwork.executePostGsonRequest(
+                    any(),
+                    any(),
+                    eq(ShippingLabelStatusApiResponse::class.java),
+                    any()
+                )
+            ).thenReturn(
+                WPAPIResponse.Success(mock())
+            )
+            // WHEN
+            val siteModel = SiteModel()
+            val orderId = 1L
+            val origin: ShippingLabelAddress = mock()
+            val destination: ShippingLabelAddress = mock()
+            val packagesData: List<WCShippingLabelPackageData> = emptyList()
+            val customsData: List<WCShippingPackageCustoms>? = null
+            val emailReceipts = false
+            restClient.purchaseShippingLabels(
+                siteModel,
+                orderId,
+                origin,
+                destination,
+                packagesData,
+                customsData,
+                emailReceipts
+            )
+
+            // THEN
+            val bodyCaptor = argumentCaptor<Map<String, Any>>()
+            verify(wooNetwork).executePostGsonRequest(
+                site = eq(siteModel),
+                path = eq("/wc/v1/connect/label/1/"),
+                clazz = eq(ShippingLabelStatusApiResponse::class.java),
+                body = bodyCaptor.capture()
+            )
+            assertThat(bodyCaptor.firstValue["source"]).isEqualTo("wc-android")
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationSqlUtilsTest.kt
new file mode 100644
index 00000000000..53c064120f6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationSqlUtilsTest.kt
@@ -0,0 +1,392 @@
+package org.wordpress.android.fluxc.notifications
+
+import com.google.gson.Gson
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.notification.NoteIdSet
+import org.wordpress.android.fluxc.model.notification.NotificationModel
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationApiResponse
+import org.wordpress.android.fluxc.persistence.NotificationSqlUtils
+import org.wordpress.android.fluxc.persistence.NotificationSqlUtils.NotificationModelBuilder
+import org.wordpress.android.fluxc.tools.FormattableContentMapper
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class NotificationSqlUtilsTest {
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(appContext, listOf(NotificationModelBuilder::class.java))
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun testInsertOrUpdateNotifications() {
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+
+        // Test inserting notifications
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Test updating notifications
+        val newNote = notesList[0].copy(noteId = -1, remoteNoteId = 333)
+        val dbList = notificationSqlUtils.getNotifications().toMutableList()
+        dbList.add(newNote)
+        val updated = dbList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(7, updated)
+        val updatedList = notificationSqlUtils.getNotifications()
+        assertEquals(7, updatedList.size)
+    }
+
+    @Test
+    fun testGetNotifications() {
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Get notifications
+        val notifications = notificationSqlUtils.getNotifications(SelectQuery.ORDER_DESCENDING)
+        assertEquals(6, notifications.size)
+    }
+
+    @Test
+    fun testGetNotificationsForSite() {
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 153482281 }
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Get notifications
+        val notifications = notificationSqlUtils.getNotificationsForSite(site, SelectQuery.ORDER_DESCENDING)
+        assertEquals(3, notifications.size)
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testGetNotificationsForSite_storeOrder() {
+        // Insert notification
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/store-order-notification.json")
+        val apiResponse = NotificationTestUtils.parseNotificationApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 141286411 }
+        val notesList = listOf(NotificationApiResponse.notificationResponseToNotificationModel(apiResponse))
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(1, inserted)
+
+        // Get notification from database
+        val notifications = notificationSqlUtils.getNotificationsForSite(site, SelectQuery.ORDER_DESCENDING)
+        assertEquals(1, notifications.size)
+
+        // Verify properties
+        val note = notifications[0]
+        assertEquals(note.title, "New Order")
+        assertEquals(note.noteHash, 2064099309)
+        assertEquals(note.remoteSiteId, 141286411)
+        assertEquals(note.remoteNoteId, 3604874081)
+        assertEquals(note.type, NotificationModel.Kind.STORE_ORDER)
+        assertEquals(note.read, true)
+        assertEquals(note.subtype, NotificationModel.Subkind.UNKNOWN)
+        assertEquals(note.timestamp, "2018-10-22T21:08:11+00:00")
+        assertEquals(note.icon, "https://s.wp.com/wp-content/mu-plugins/notes/images/update-payment-2x.png")
+        assertEquals(note.url, "https://wordpress.com/store/order/droidtester2018.shop/88")
+        assertNotNull(note.subject)
+        note.subject?.let {
+            assertEquals(it[0].text, "\ud83c\udf89 You have a new order!")
+            assertEquals(it[1].text, "Someone placed a $18.00 order from Woo Test Store")
+            assertNotNull(it[1].ranges)
+            assertEquals(it[1].ranges!!.size, 1)
+            assertEquals(it[1].ranges!![0].type, "site")
+            assertEquals(it[1].ranges!![0].indices!!.size, 2)
+        }
+        assertNotNull(note.body)
+        note.body?.let { body ->
+            assertEquals(body.size, 4)
+            with(body[0]) {
+                assertEquals(text, "")
+                assertNotNull(media)
+                media?.let { media ->
+                    assertEquals(media[0].type, "image")
+                    assertEquals(media.size, 1)
+                    assertEquals(media[0].height, "48")
+                    assertEquals(media[0].width, "48")
+                    assertEquals(
+                            media[0].url,
+                            "https://s.wp.com/wp-content/mu-plugins/notes/images/store-cart-icon.png")
+                }
+            }
+            with(body[1]) {
+                assertEquals(text, "Order Number: 88\nDate: October 22, 2018\nTotal: " +
+                        "$18.00\nPayment Method: Credit Card (Stripe)")
+            }
+            with(body[2]) {
+                assertEquals(text, "Products:\n\nBeanie \u00d7 1\n")
+            }
+            with(body[3]) {
+                assertEquals(text, "\u2139\ufe0f View Order")
+                assertNotNull(ranges)
+                assertEquals(ranges!!.size, 1)
+            }
+        }
+        assertNotNull(note.meta)
+        with(note.meta!!) {
+            // verify ids
+            assertNotNull(ids)
+            assertEquals(ids!!.site, 141286411)
+            assertEquals(ids!!.order, 88)
+
+            // verify links
+            assertNotNull(links)
+            assertEquals(links!!.site, "https://public-api.wordpress.com/rest/v1/sites/141286411")
+            assertEquals(links!!.order, "https://public-api.wordpress.com/rest/v1/orders/88")
+        }
+    }
+
+    @Test
+    fun testGetNotificationsForSite_storeReview() {
+        // Insert notification
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/store-review-notification.json")
+        val apiResponse = NotificationTestUtils.parseNotificationApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 153482281 }
+        val notesList = listOf(NotificationApiResponse.notificationResponseToNotificationModel(apiResponse))
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(1, inserted)
+
+        // Get notification from database
+        val notifications = notificationSqlUtils.getNotificationsForSite(site, SelectQuery.ORDER_DESCENDING)
+        assertEquals(1, notifications.size)
+
+        // Verify properties
+        // Since we do a full test of all properties in the previous test method, only check high-level properties
+        // here.
+        val note = notifications[0]
+        assertEquals(note.noteHash, 1543255567)
+        assertEquals(note.title, "Product Review")
+        assertEquals(note.remoteSiteId, 153482281)
+        assertEquals(note.remoteNoteId, 3617558725)
+        assertEquals(note.type, NotificationModel.Kind.COMMENT)
+        assertEquals(note.read, true)
+        assertEquals(note.subtype, NotificationModel.Subkind.STORE_REVIEW)
+        assertEquals(note.timestamp, "2018-10-30T16:22:11+00:00")
+        assertEquals(note.icon, "https://2.gravatar.com/avatar/" +
+                "ebab642c3eb6022e6986f9dcf3147c1e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2F" +
+                "avatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G")
+        assertEquals(note.url, "https://testwooshop.mystagingwebsite.com/product/ninja-hoodie/#comment-2716")
+        assertNotNull(note.subject)
+        assertEquals(note.subject!!.size, 2)
+        assertEquals(note.body!!.size, 3)
+    }
+
+    @Test
+    fun testGetNotifications_filterBy() {
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Get notifications of type "store_order"
+        val newOrderNotifications = notificationSqlUtils.getNotifications(
+                filterByType = listOf(NotificationModel.Kind.STORE_ORDER.toString()))
+        assertEquals(2, newOrderNotifications.size)
+
+        // Get notifications of subtype "store_review"
+        val storeReviewNotifications = notificationSqlUtils.getNotifications(
+                filterBySubtype = listOf(NotificationModel.Subkind.STORE_REVIEW.toString()))
+        assertEquals(2, storeReviewNotifications.size)
+
+        // Get notifications of type "store_order" or subtype "store_review"
+        val combinedNotifications = notificationSqlUtils.getNotifications(
+                filterByType = listOf(NotificationModel.Kind.STORE_ORDER.toString()),
+                filterBySubtype = listOf(NotificationModel.Subkind.STORE_REVIEW.toString()))
+        assertEquals(4, combinedNotifications.size)
+    }
+
+    @Test
+    fun testGetNotificationsForSite_filterBy() {
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 153482281 }
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Get notifications of type "store_order".
+        //
+        // Note: TWO store_order notifications were inserted into the db, but they belong to two
+        // different sites so only 1 should be returned.
+        val newOrderNotifications = notificationSqlUtils.getNotificationsForSite(
+                site,
+                filterByType = listOf(NotificationModel.Kind.STORE_ORDER.toString()))
+        assertEquals(1, newOrderNotifications.size)
+
+        // Get notifications of subtype "store_review"
+        val storeReviewNotifications = notificationSqlUtils.getNotificationsForSite(
+                site,
+                filterBySubtype = listOf(NotificationModel.Subkind.STORE_REVIEW.toString()))
+        assertEquals(2, storeReviewNotifications.size)
+
+        // Get notifications of type "store_order" or subtype "store_review"
+        val combinedNotifications = notificationSqlUtils.getNotificationsForSite(
+                site,
+                filterByType = listOf(NotificationModel.Kind.STORE_ORDER.toString()),
+                filterBySubtype = listOf(NotificationModel.Subkind.STORE_REVIEW.toString()))
+        assertEquals(3, combinedNotifications.size)
+    }
+
+    @Test
+    fun testGetNotificationByIdSet() {
+        val noteId = 3616322875
+
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 153482281 }
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Fetch a single notification using the noteIdSet
+        val idSet = NoteIdSet(-1, noteId, site.siteId)
+        val notification = notificationSqlUtils.getNotificationByIdSet(idSet)
+        assertNotNull(notification)
+
+        assertEquals(notification.remoteNoteId, noteId)
+        assertEquals(notification.remoteSiteId, site.siteId)
+    }
+
+    @Test
+    fun testGetNotificationByRemoteId() {
+        val noteId = 3616322875
+
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val site = SiteModel().apply { siteId = 153482281 }
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Fetch a single notification using the remoteNoteId
+        val notification = notificationSqlUtils.getNotificationByRemoteId(noteId)
+        assertNotNull(notification)
+
+        assertEquals(notification.remoteNoteId, noteId)
+        assertEquals(notification.remoteSiteId, site.siteId)
+    }
+
+    @Test
+    fun testGetNotificationCount() {
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Get notifications
+        val count = notificationSqlUtils.getNotificationsCount()
+        assertEquals(6, count)
+    }
+
+    @Test
+    fun testHasUnreadNotifications() {
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        val site = SiteModel().apply { siteId = 153482281 }
+        val hasUnread = notificationSqlUtils.hasUnreadNotificationsForSite(site)
+        assertEquals(hasUnread, true)
+    }
+
+    @Test
+    fun testDeleteNotificationByRemoteId() {
+        val noteId = 3616322875
+
+        // Insert notifications
+        val notificationSqlUtils = NotificationSqlUtils(FormattableContentMapper(Gson()))
+        val jsonString = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/notifications-api-response.json")
+        val apiResponse = NotificationTestUtils.parseNotificationsApiResponseFromJsonString(jsonString)
+        val notesList = apiResponse.notes?.map {
+            NotificationApiResponse.notificationResponseToNotificationModel(it)
+        } ?: emptyList()
+        val inserted = notesList.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+        assertEquals(6, inserted)
+
+        // Fetch a single notification
+        val notification = notificationSqlUtils.getNotificationByRemoteId(noteId)
+        assertNotNull(notification)
+
+        // Delete notification by remoteNoteId
+        val rowsAffected = notificationSqlUtils.deleteNotificationByRemoteId(noteId)
+        assertEquals(rowsAffected, 1)
+
+        // Verify notification not in database
+        assertNull(notificationSqlUtils.getNotificationByRemoteId(noteId))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationTestUtils.kt
new file mode 100644
index 00000000000..e02ee206ff0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/notifications/NotificationTestUtils.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.notifications
+
+import com.google.gson.Gson
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationsApiResponse
+
+object NotificationTestUtils {
+    fun parseNotificationsApiResponseFromJsonString(json: String) =
+            Gson().fromJson(json, NotificationsApiResponse::class.java)
+
+    fun parseNotificationApiResponseFromJsonString(json: String) =
+            Gson().fromJson(json, NotificationApiResponse::class.java)
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreLocalChangesTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreLocalChangesTest.kt
new file mode 100644
index 00000000000..46fd35ee9ed
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreLocalChangesTest.kt
@@ -0,0 +1,147 @@
+package org.wordpress.android.fluxc.page
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.store.PageStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.UUID
+import kotlin.random.Random
+
+@RunWith(RobolectricTestRunner::class)
+class PageStoreLocalChangesTest {
+    private val postSqlUtils = PostSqlUtils()
+    private val pageStore = PageStore(
+            postStore = mock(),
+            dispatcher = mock(),
+            coroutineEngine = initCoroutineEngine(),
+            postSqlUtils = postSqlUtils,
+            currentDateUtils = mock()
+    )
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val modelsToTest = listOf(PostModel::class.java)
+        val config = SingleStoreWellSqlConfigForTests(appContext, modelsToTest, "")
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @After
+    fun tearDown() {
+        WellSql.closeDb()
+    }
+
+    @Test
+    fun `getLocalDraftPages returns local draft pages only`() = test {
+        // Arrange
+        val site = SiteModel().apply { id = 3_000 }
+
+        val baseTitle = "Voluptatem harum repellendus"
+        val expectedPages = List(3) {
+            createLocalDraft(localSiteId = site.id, baseTitle = baseTitle, isPage = true)
+        }
+
+        val unexpectedPosts = listOf(
+                // local draft post
+                createLocalDraft(localSiteId = site.id, isPage = false),
+                // other site page
+                createLocalDraft(localSiteId = 4_000, isPage = true),
+                // uploaded page
+                PostModel().apply {
+                    setTitle("Title")
+                    setLocalSiteId(site.id)
+                    setIsLocalDraft(false)
+                }
+        )
+
+        expectedPages.plus(unexpectedPosts).forEach { postSqlUtils.insertPostForResult(it) }
+
+        // Act
+        val localDraftPages = pageStore.getLocalDraftPages(site)
+
+        // Assert
+        assertThat(localDraftPages).hasSize(3)
+        assertThat(localDraftPages).allMatch { it.title.startsWith(baseTitle) }
+        assertThat(localDraftPages.map { it.id }).isEqualTo(expectedPages.map { it.id })
+    }
+
+    @Test
+    fun `getPagesWithLocalChanges returns local draft and locally changed pages only`() = test {
+        // Arrange
+        val site = SiteModel().apply { id = 3_000 }
+
+        val baseTitle = "Voluptatem harum repellendus"
+        val expectedPages = mutableListOf<PostModel>().apply {
+            addAll(List(3) {
+                createLocalDraft(localSiteId = site.id, baseTitle = baseTitle, isPage = true)
+            })
+
+            addAll(List(5) {
+                createUploadedPost(localSiteId = site.id, baseTitle = baseTitle, isPage = true).apply {
+                    setIsLocallyChanged(true)
+                }
+            })
+
+            add(createUploadedPost(localSiteId = site.id, baseTitle = baseTitle, isPage = true).apply {
+                setStatus(PostStatus.PUBLISHED.toString())
+                setIsLocallyChanged(true)
+            })
+        }.toList()
+
+        val unexpectedPosts = listOf(
+                // local draft post
+                createLocalDraft(localSiteId = site.id, isPage = false),
+                // other site page
+                createLocalDraft(localSiteId = 4_000, isPage = true),
+                // uploaded post
+                createUploadedPost(localSiteId = site.id, isPage = false),
+                // uploaded post with changes
+                createUploadedPost(localSiteId = site.id, isPage = false).apply { setIsLocallyChanged(true) },
+                // uploaded page with no changes
+                createUploadedPost(localSiteId = site.id, isPage = true),
+                // published page with no changes
+                createUploadedPost(localSiteId = site.id, isPage = true).apply {
+                    setStatus(PostStatus.PUBLISHED.toString())
+                }
+        )
+
+        expectedPages.plus(unexpectedPosts).forEach { postSqlUtils.insertPostForResult(it) }
+
+        // Act
+        val locallyChangedPages = pageStore.getPagesWithLocalChanges(site)
+
+        // Assert
+        assertThat(locallyChangedPages).hasSize(expectedPages.size)
+        assertThat(locallyChangedPages).allMatch { it.title.startsWith(baseTitle) }
+        assertThat(locallyChangedPages.map { it.id }).isEqualTo(expectedPages.map { it.id })
+    }
+
+    private fun createLocalDraft(localSiteId: Int, baseTitle: String = "Title", isPage: Boolean) = PostModel().apply {
+        setLocalSiteId(localSiteId)
+        setTitle("$baseTitle:${UUID.randomUUID()}")
+        setIsPage(isPage)
+        setIsLocalDraft(true)
+        setStatus(PostStatus.DRAFT.toString())
+    }
+
+    private fun createUploadedPost(localSiteId: Int, baseTitle: String = "Title", isPage: Boolean) = PostModel().apply {
+        setLocalSiteId(localSiteId)
+        setRemotePostId(Random.nextLong())
+        setTitle("$baseTitle:${UUID.randomUUID()}")
+        setIsPage(isPage)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreTest.kt
new file mode 100644
index 00000000000..ab10a0e6fdb
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/page/PageStoreTest.kt
@@ -0,0 +1,363 @@
+package org.wordpress.android.fluxc.page
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPages
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.page.PageModel
+import org.wordpress.android.fluxc.model.page.PageStatus
+import org.wordpress.android.fluxc.model.page.PageStatus.DRAFT
+import org.wordpress.android.fluxc.model.page.PageStatus.PENDING
+import org.wordpress.android.fluxc.model.page.PageStatus.PRIVATE
+import org.wordpress.android.fluxc.model.page.PageStatus.PUBLISHED
+import org.wordpress.android.fluxc.model.page.PageStatus.SCHEDULED
+import org.wordpress.android.fluxc.model.page.PageStatus.TRASHED
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.network.utils.CurrentDateUtils
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.store.PageStore
+import org.wordpress.android.fluxc.store.PageStore.OnPageChanged
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsPayload
+import org.wordpress.android.fluxc.store.PostStore.OnPostChanged
+import org.wordpress.android.fluxc.store.PostStore.PostDeleteActionType.TRASH
+import org.wordpress.android.fluxc.store.PostStore.PostError
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType.UNKNOWN_POST
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+
+@RunWith(MockitoJUnitRunner::class)
+class PageStoreTest {
+    @Mock lateinit var postStore: PostStore
+    @Mock lateinit var currentDateUtils: CurrentDateUtils
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var site: SiteModel
+    private lateinit var actionCaptor: KArgumentCaptor<Action<Any>>
+
+    private val query = "que"
+    private val pageWithoutQuery = initPage(1, 10, "page 1")
+    private val pageWithQuery = initPage(2, title = "page2 start $query end ")
+    private val pageWithoutTitle = initPage(3, 10)
+    private val differentPageTypes = listOf(
+            initPage(1, 0, "page 1", "publish"),
+            initPage(2, 0, "page 2", "draft"),
+            initPage(3, 0, "page 3", "future"),
+            initPage(4, 0, "page 4", "trash"),
+            initPage(5, 0, "page 5", "private"),
+            initPage(6, 0, "page 6", "pending"),
+            initPage(7, 0, "page 7", "draft"),
+            initPage(7, 0, "page 8", "unknown")
+    )
+
+    private val pageHierarchy = listOf(
+            initPage(1, 0, "page 1", "publish", 1),
+            initPage(11, 1, "page 2", "publish", 2),
+            initPage(111, 2, "page 3", "publish", 3),
+            initPage(12, 1, "page 4", "publish", 4),
+            initPage(2, 0, "page 5", "publish", 5),
+            initPage(4, 0, "page 6", "publish", 6),
+            initPage(3, 0, "page 7", "publish", 7)
+    )
+
+    private lateinit var store: PageStore
+
+    @Before
+    fun setUp() {
+        actionCaptor = argumentCaptor()
+        val pages = listOf(pageWithoutQuery, pageWithQuery, pageWithoutTitle)
+        whenever(postStore.getPagesForSite(site)).thenReturn(pages)
+        store = PageStore(postStore, PostSqlUtils(), dispatcher, currentDateUtils, initCoroutineEngine())
+    }
+
+    @Test
+    fun searchFindsAllResultsContainingText() {
+        val result = runBlocking { store.search(site, query) }
+
+        assertThat(result).hasSize(1)
+        assertThat(result[0].title).isEqualTo(pageWithQuery.title)
+    }
+
+    @Test
+    fun emptySearchResultWhenNothingContainsQuery() {
+        val result = runBlocking { store.search(site, "foo") }
+
+        assertThat(result).isEmpty()
+    }
+
+    @Test
+    fun requestPagesFetchesFromServerAndReturnsEvent() = test {
+        val expected = OnPostChanged(CauseOfOnPostChanged.FetchPages, 5, false)
+        var event: OnPageChanged? = null
+        val job = launch {
+            event = store.requestPagesFromServer(site, true)
+        }
+        delay(10)
+        store.onPostChanged(expected)
+        delay(10)
+        job.join()
+
+        assertThat(event).isEqualTo(OnPageChanged.Success)
+        verify(dispatcher).dispatch(any())
+    }
+
+    @Test
+    fun requestPagesFetchesFromServerAndReturnsEventFromTwoRequests() = test {
+        val expected = OnPostChanged(CauseOfOnPostChanged.FetchPages, 5, false)
+        var firstEvent: OnPageChanged? = null
+        var secondEvent: OnPageChanged? = null
+        val firstJob = launch {
+            firstEvent = store.requestPagesFromServer(site, true)
+        }
+        val secondJob = launch {
+            secondEvent = store.requestPagesFromServer(site, true)
+        }
+        delay(10)
+        store.onPostChanged(expected)
+        delay(10)
+        firstJob.join()
+        secondJob.join()
+
+        assertThat(firstEvent).isEqualTo(OnPageChanged.Success)
+        assertThat(secondEvent).isEqualTo(OnPageChanged.Success)
+        verify(dispatcher).dispatch(any())
+    }
+
+    @Test
+    fun `request pages returns cached result when there is recent call`() = test {
+        initNow(hour = 8, minute = 0)
+        val firstJob = launch {
+            store.requestPagesFromServer(site, forced = true)
+        }
+        delay(10)
+        store.onPostChanged(OnPostChanged(FetchPages, 5, false))
+        delay(10)
+        firstJob.join()
+        initNow(hour = 8, minute = 59)
+
+        val secondEvent = store.requestPagesFromServer(site, forced = false)
+
+        assertThat(secondEvent).isEqualTo(OnPageChanged.Success)
+        verify(dispatcher).dispatch(any())
+    }
+
+    @Test
+    fun `request pages fetches data when there is no recent call`() = test {
+        val expected = OnPostChanged(CauseOfOnPostChanged.FetchPages, 5, false)
+        var secondEvent: OnPageChanged? = null
+        initNow(hour = 8, minute = 0)
+        val firstJob = launch {
+            store.requestPagesFromServer(site, forced = true)
+        }
+        delay(10)
+        store.onPostChanged(expected)
+        delay(10)
+        firstJob.join()
+        initNow(hour = 9, minute = 0)
+
+        val secondJob = launch {
+            secondEvent = store.requestPagesFromServer(site, forced = false)
+        }
+        delay(10)
+        store.onPostChanged(expected)
+        delay(10)
+        secondJob.join()
+
+        assertThat(secondEvent).isEqualTo(OnPageChanged.Success)
+        verify(dispatcher, times(2)).dispatch(any())
+    }
+
+    private fun initNow(hour: Int, minute: Int) {
+        val now = Calendar.getInstance(Locale.UK)
+        now.set(2020, 1, 1, hour, minute)
+        whenever(currentDateUtils.getCurrentCalendar()).thenReturn(now)
+    }
+
+    @Test
+    fun requestPagesFetchesPaginatedFromServerAndReturnsSecondEvent() = test {
+        val firstEvent = OnPostChanged(CauseOfOnPostChanged.FetchPages, 5, true)
+        val lastEvent = OnPostChanged(CauseOfOnPostChanged.FetchPages, 5, false)
+        var event: OnPageChanged? = null
+        val job = launch {
+            event = store.requestPagesFromServer(site, true)
+        }
+        delay(10)
+        store.onPostChanged(firstEvent)
+        delay(10)
+        store.onPostChanged(lastEvent)
+        delay(10)
+        job.join()
+
+        assertThat(event).isEqualTo(OnPageChanged.Success)
+        verify(dispatcher, times(2)).dispatch(actionCaptor.capture())
+        val firstPayload = actionCaptor.firstValue.payload as FetchPostsPayload
+        assertThat(firstPayload.site).isEqualTo(site)
+        assertThat(firstPayload.loadMore).isEqualTo(false)
+        val lastPayload = actionCaptor.lastValue.payload as FetchPostsPayload
+        assertThat(lastPayload.site).isEqualTo(site)
+        assertThat(lastPayload.loadMore).isEqualTo(true)
+    }
+
+    @Test
+    fun deletePageTest() = test {
+        val post = pageHierarchy[0]
+        whenever(postStore.getPostByLocalPostId(post.id)).thenReturn(post)
+        val event = OnPostChanged(CauseOfOnPostChanged.DeletePost(post.id, post.remotePostId, TRASH), 0)
+        val page = PageModel(post, site, post.id, post.title, PageStatus.fromPost(post), Date(), post.isLocallyChanged,
+                post.remotePostId, null, post.featuredImageId)
+        var result: OnPageChanged? = null
+        launch {
+            result = store.deletePageFromServer(page)
+        }
+        delay(10)
+        store.onPostChanged(event)
+        delay(10)
+
+        assertThat(result).isEqualTo(OnPageChanged.Success)
+
+        verify(dispatcher, times(1)).dispatch(actionCaptor.capture())
+        val payload = actionCaptor.firstValue.payload as RemotePostPayload
+        assertThat(payload.site).isEqualTo(site)
+        assertThat(payload.post).isEqualTo(post)
+    }
+
+    @Test
+    fun deletePageWithErrorTest() = test {
+        val post = pageHierarchy[0]
+        whenever(postStore.getPostByLocalPostId(post.id)).thenReturn(null)
+        val event = OnPostChanged(CauseOfOnPostChanged.DeletePost(post.id, post.remotePostId, TRASH), 0)
+        event.error = PostError(UNKNOWN_POST)
+        val page = PageModel(post, site, post.id, post.title, PageStatus.fromPost(post), Date(), post.isLocallyChanged,
+            post.remotePostId, null, post.featuredImageId)
+        var result: OnPageChanged? = null
+        launch {
+            result = store.deletePageFromServer(page)
+        }
+        delay(10)
+
+        assertThat(result?.error?.type).isEqualTo(event.error.type)
+    }
+
+    @Test
+    fun requestPagesAndVerifyAllPageTypesPresent() = test {
+        val event = OnPostChanged(CauseOfOnPostChanged.FetchPages, 4, false)
+        launch {
+            store.requestPagesFromServer(site, true)
+        }
+        delay(10)
+        store.onPostChanged(event)
+        delay(10)
+
+        verify(dispatcher, times(1)).dispatch(actionCaptor.capture())
+        val payload = actionCaptor.firstValue.payload as FetchPostsPayload
+        assertThat(payload.site).isEqualTo(site)
+
+        val pageTypes = payload.statusTypes
+        assertThat(pageTypes.size).isEqualTo(6)
+        assertThat(pageTypes.filter { it == PostStatus.PUBLISHED }.size).isEqualTo(1)
+        assertThat(pageTypes.filter { it == PostStatus.DRAFT }.size).isEqualTo(1)
+        assertThat(pageTypes.filter { it == PostStatus.TRASHED }.size).isEqualTo(1)
+        assertThat(pageTypes.filter { it == PostStatus.SCHEDULED }.size).isEqualTo(1)
+
+        whenever(postStore.getPagesForSite(site))
+                .thenReturn(differentPageTypes.filter { payload.statusTypes.contains(PostStatus.fromPost(it)) })
+
+        val pages = store.getPagesFromDb(site)
+
+        assertThat(pages.size).isEqualTo(7)
+        assertThat(pages.filter { it.status == PUBLISHED }.size).isEqualTo(1)
+        assertThat(pages.filter { it.status == DRAFT }.size).isEqualTo(2)
+        assertThat(pages.filter { it.status == TRASHED }.size).isEqualTo(1)
+        assertThat(pages.filter { it.status == SCHEDULED }.size).isEqualTo(1)
+        assertThat(pages.filter { it.status == PRIVATE }.size).isEqualTo(1)
+        assertThat(pages.filter { it.status == PENDING }.size).isEqualTo(1)
+    }
+
+    @Test
+    fun getTopLevelPageByLocalId() = test {
+        doAnswer { invocation -> pageHierarchy.firstOrNull { it.id == invocation.arguments.first() } }
+                .`when`(postStore).getPostByLocalPostId(any())
+
+        val page = store.getPageByLocalId(1, site)
+
+        assertThat(page).isNotNull()
+        assertThat(page!!.pageId).isEqualTo(1)
+        assertThat(page.remoteId).isEqualTo(1)
+        assertThat(page.parent).isNull()
+    }
+
+    @Test
+    fun getChildPageByRemoteId() = test {
+        doAnswer { invocation -> pageHierarchy.firstOrNull { it.remotePostId == invocation.arguments.first() } }
+                .`when`(postStore).getPostByRemotePostId(any(), any())
+
+        val page = store.getPageByRemoteId(3, site)
+
+        assertThat(page).isNotNull()
+        assertThat(page!!.pageId).isEqualTo(111)
+        assertThat(page.remoteId).isEqualTo(3)
+
+        assertThat(page.parent).isNotNull()
+        assertThat(page.parent!!.remoteId).isEqualTo(2)
+
+        assertThat(page.parent!!.parent).isNotNull()
+        assertThat(page.parent!!.parent!!.remoteId).isEqualTo(1)
+        assertThat(page.parent!!.parent!!.parent).isNull()
+    }
+
+    @Test
+    fun getPages() = test {
+        whenever(postStore.getPagesForSite(site)).thenReturn(pageHierarchy)
+
+        val pages = store.getPagesFromDb(site)
+
+        assertThat(pages.size).isEqualTo(7)
+        assertThat(pages).doesNotContainNull()
+
+        assertThat(pages.filter { it.pageId < 10 }.all { it.parent == null }).isTrue()
+        assertThat(pages.filter { it.pageId > 10 }.all { it.parent != null }).isTrue()
+    }
+
+    private fun initPage(
+        id: Int,
+        parentId: Long? = null,
+        title: String? = null,
+        status: String? = "draft",
+        remoteId: Long = id.toLong()
+    ): PostModel {
+        val page = PostModel()
+        page.setId(id)
+        parentId?.let {
+            page.setParentId(parentId)
+        }
+        title?.let {
+            page.setTitle(it)
+        }
+        status?.let {
+            page.setStatus(status)
+        }
+        page.setRemotePostId(remoteId)
+        return page
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/XPostSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/XPostSqlUtilsTest.kt
new file mode 100644
index 00000000000..b22c91119fd
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/XPostSqlUtilsTest.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.fluxc.persistance
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.persistence.XPostsSqlUtils
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(RobolectricTestRunner::class)
+class XPostSqlUtilsTest {
+    private lateinit var xPostSqlUtils: XPostsSqlUtils
+    private val xPostSiteModel = XPostSiteModel().apply { blogId = 10 }
+    private val site = SiteModel().apply { id = 100 }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        SiteModel::class.java,
+                        XPostSiteModel::class.java,
+                        XPostModel::class.java))
+        WellSql.init(config)
+        config.reset()
+
+        xPostSqlUtils = XPostsSqlUtils()
+        WellSql.insert(site).execute()
+    }
+
+    @Test
+    fun `sets xposts for a site`() {
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), site)
+
+        assertEquals(listOf(xPostSiteModel), xPostSqlUtils.selectXPostsForSite(site))
+    }
+
+    @Test
+    fun `setting xposts for a site deletes previous xposts`() {
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), site)
+        xPostSqlUtils.setXPostsForSite(emptyList(), site)
+        assertTrue(xPostSqlUtils.selectXPostsForSite(site)!!.isEmpty())
+    }
+
+    @Test
+    fun `selectXPostsForSite returns null if no xposts ever set`() {
+        assertNull(xPostSqlUtils.selectXPostsForSite(site))
+    }
+
+    @Test
+    fun `selectXPostsForSite returns empty list if empty list of xposts previously set`() {
+        xPostSqlUtils.setXPostsForSite(emptyList(), site)
+        assertTrue(xPostSqlUtils.selectXPostsForSite(site)!!.isEmpty())
+    }
+
+    @Test
+    fun `inserting and retrieving an xpost`() {
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), site)
+        assertEquals(listOf(xPostSiteModel), xPostSqlUtils.selectXPostsForSite(site))
+    }
+
+    @Test
+    fun `inserting an xpost target does not affect that xpost target for other sites`() {
+        val siteWithNoXposts = SiteModel().apply { site.id + 1 }
+        WellSql.insert(siteWithNoXposts).execute()
+
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), site)
+
+        assertNull(xPostSqlUtils.selectXPostsForSite(siteWithNoXposts))
+    }
+
+    @Test
+    fun `can insert same xpost for two sites`() {
+        val otherSite = SiteModel().apply { site.id + 1 }
+        WellSql.insert(otherSite).execute()
+
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), site)
+        xPostSqlUtils.setXPostsForSite(listOf(xPostSiteModel), otherSite)
+        xPostSqlUtils.setXPostsForSite(emptyList(), otherSite)
+
+        assertTrue(xPostSqlUtils.selectXPostsForSite(site)!!.isNotEmpty())
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/InsightsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/InsightsSqlUtilsTest.kt
new file mode 100644
index 00000000000..00e8c57ef04
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/InsightsSqlUtilsTest.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.persistance.stats
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.ALL_TIME_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.INSIGHTS
+import org.wordpress.android.fluxc.store.stats.ALL_TIME_RESPONSE
+import kotlin.test.assertEquals
+
+@RunWith(MockitoJUnitRunner::class)
+class InsightsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    @Mock lateinit var site: SiteModel
+    private lateinit var insightsSqlUtils: TestSqlUtils
+
+    @Before
+    fun setUp() {
+        insightsSqlUtils = TestSqlUtils(statsSqlUtils, statsRequestSqlUtils)
+    }
+
+    @Test
+    fun `returns response from stats utils`() {
+        whenever(statsSqlUtils.select(site, ALL_TIME_INSIGHTS, INSIGHTS, AllTimeResponse::class.java)).thenReturn(
+                ALL_TIME_RESPONSE
+        )
+
+        val result = insightsSqlUtils.select(site)
+
+        assertEquals(result, ALL_TIME_RESPONSE)
+    }
+
+    @Test
+    fun `inserts response to stats utils`() {
+        insightsSqlUtils.insert(site, ALL_TIME_RESPONSE)
+
+        verify(statsSqlUtils).insert(site, ALL_TIME_INSIGHTS, INSIGHTS, ALL_TIME_RESPONSE, true)
+    }
+
+    class TestSqlUtils(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<AllTimeResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            BlockType.ALL_TIME_INSIGHTS,
+            AllTimeResponse::class.java
+    )
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/SubscribersSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/SubscribersSqlUtilsTest.kt
new file mode 100644
index 00000000000..d7ccc407644
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/SubscribersSqlUtilsTest.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.persistance.stats
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient.SubscribersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.SUBSCRIBERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SubscribersSqlUtils
+import org.wordpress.android.fluxc.store.stats.subscribers.SUBSCRIBERS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2024-04-22"
+
+@RunWith(MockitoJUnitRunner::class)
+class SubscribersSqlUtilsTest {
+    @Mock
+    lateinit var statsSqlUtils: StatsSqlUtils
+
+    @Mock
+    lateinit var site: SiteModel
+
+    @Mock
+    lateinit var statsUtils: StatsUtils
+
+    @Mock
+    lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: SubscribersSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = SubscribersSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns data from stats utils`() {
+        mappedTypes.forEach { (statsType, dbGranularity) ->
+            whenever(statsSqlUtils.select(site, SUBSCRIBERS, statsType, SubscribersResponse::class.java, DATE_VALUE))
+                .thenReturn(SUBSCRIBERS_RESPONSE)
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, SUBSCRIBERS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts data to stats utils`() {
+        mappedTypes.forEach { (statsType, dbGranularity) ->
+            timeStatsSqlUtils.insert(site, SUBSCRIBERS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, SUBSCRIBERS, statsType, SUBSCRIBERS_RESPONSE, true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/AuthorsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/AuthorsSqlUtilsTest.kt
new file mode 100644
index 00000000000..ccb45d4379b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/AuthorsSqlUtilsTest.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.AUTHORS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.AuthorsSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.AUTHORS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val STRING_DATE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class AuthorsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: AuthorsSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = AuthorsSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(STRING_DATE)
+    }
+
+    @Test
+    fun `returns data from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, AUTHORS, statsType, AuthorsResponse::class.java, STRING_DATE))
+                    .thenReturn(
+                            AUTHORS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, AUTHORS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts data to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, AUTHORS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, AUTHORS, statsType, AUTHORS_RESPONSE, true, STRING_DATE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ClicksSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ClicksSqlUtilsTest.kt
new file mode 100644
index 00000000000..d34ef66cb21
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ClicksSqlUtilsTest.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.CLICKS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ClicksSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.CLICKS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class ClicksSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: ClicksSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = ClicksSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns data from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, CLICKS, statsType, ClicksResponse::class.java, DATE_VALUE))
+                    .thenReturn(
+                            CLICKS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, CLICKS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts data to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, CLICKS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, CLICKS, statsType, CLICKS_RESPONSE, true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/CountryViewsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/CountryViewsSqlUtilsTest.kt
new file mode 100644
index 00000000000..d7c408d8d78
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/CountryViewsSqlUtilsTest.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.COUNTRY_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.CountryViewsSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.COUNTRY_VIEWS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class CountryViewsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: CountryViewsSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = CountryViewsSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns data from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, COUNTRY_VIEWS, statsType, CountryViewsResponse::class.java, DATE_VALUE))
+                    .thenReturn(
+                            COUNTRY_VIEWS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, COUNTRY_VIEWS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts data to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, COUNTRY_VIEWS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, COUNTRY_VIEWS, statsType, COUNTRY_VIEWS_RESPONSE, true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/PostAndPageViewsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/PostAndPageViewsSqlUtilsTest.kt
new file mode 100644
index 00000000000..ddf25d7a051
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/PostAndPageViewsSqlUtilsTest.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.POSTS_AND_PAGES_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.PostsAndPagesSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.POST_AND_PAGE_VIEWS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class PostAndPageViewsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: PostsAndPagesSqlUtils
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = PostsAndPagesSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns post and page day views from stats utils`() {
+        whenever(
+                statsSqlUtils.select(
+                        site,
+                        POSTS_AND_PAGES_VIEWS,
+                        DAY,
+                        PostAndPageViewsResponse::class.java,
+                        DATE_VALUE
+                )
+        )
+                .thenReturn(
+                        POST_AND_PAGE_VIEWS_RESPONSE
+                )
+
+        val result = timeStatsSqlUtils.select(site, DAYS, DATE)
+
+        assertEquals(result, POST_AND_PAGE_VIEWS_RESPONSE)
+    }
+
+    @Test
+    fun `inserts post and page day views to stats utils`() {
+        timeStatsSqlUtils.insert(
+                site,
+                POST_AND_PAGE_VIEWS_RESPONSE, DAYS, DATE
+        )
+
+        verify(statsSqlUtils).insert(site, POSTS_AND_PAGES_VIEWS, DAY, POST_AND_PAGE_VIEWS_RESPONSE,
+                true, DATE_VALUE)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ReferrersSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ReferrersSqlUtilsTest.kt
new file mode 100644
index 00000000000..e87a57fc242
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/ReferrersSqlUtilsTest.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.REFERRERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ReferrersSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.REFERRERS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class ReferrersSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    @Mock lateinit var site: SiteModel
+    private lateinit var timeStatsSqlUtils: ReferrersSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = ReferrersSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns referrers from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, REFERRERS, statsType, ReferrersResponse::class.java, DATE_VALUE))
+                    .thenReturn(
+                            REFERRERS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, REFERRERS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts referrers to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, REFERRERS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, REFERRERS, statsType, REFERRERS_RESPONSE,
+                    true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/SearchTermsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/SearchTermsSqlUtilsTest.kt
new file mode 100644
index 00000000000..f30bdbba7ab
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/SearchTermsSqlUtilsTest.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.SEARCH_TERMS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SearchTermsSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.SEARCH_TERMS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class SearchTermsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: SearchTermsSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = SearchTermsSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns search terms from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, SEARCH_TERMS, statsType, SearchTermsResponse::class.java, DATE_VALUE))
+                    .thenReturn(
+                            SEARCH_TERMS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, SEARCH_TERMS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts search terms to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, SEARCH_TERMS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, SEARCH_TERMS, statsType, SEARCH_TERMS_RESPONSE,
+                    true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VideoPlaysSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VideoPlaysSqlUtilsTest.kt
new file mode 100644
index 00000000000..d27a021946a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VideoPlaysSqlUtilsTest.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.VIDEO_PLAYS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VideoPlaysSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.VIDEO_PLAYS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class VideoPlaysSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: VideoPlaysSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = VideoPlaysSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns video plays from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(statsSqlUtils.select(site, VIDEO_PLAYS, statsType, VideoPlaysResponse::class.java, DATE_VALUE))
+                    .thenReturn(
+                            VIDEO_PLAYS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, VIDEO_PLAYS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts video plays to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, VIDEO_PLAYS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, VIDEO_PLAYS, statsType, VIDEO_PLAYS_RESPONSE,
+                    true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VisitAndViewsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VisitAndViewsSqlUtilsTest.kt
new file mode 100644
index 00000000000..a422ef9b249
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistance/stats/time/VisitAndViewsSqlUtilsTest.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.persistance.stats.time
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsRequestSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.VISITS_AND_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.DAY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.MONTH
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.WEEK
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.YEAR
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VisitsAndViewsSqlUtils
+import org.wordpress.android.fluxc.store.stats.time.VISITS_AND_VIEWS_RESPONSE
+import java.util.Date
+import kotlin.test.assertEquals
+
+private val DATE = Date(0)
+private const val DATE_VALUE = "2018-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class VisitAndViewsSqlUtilsTest {
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var statsRequestSqlUtils: StatsRequestSqlUtils
+    private lateinit var timeStatsSqlUtils: VisitsAndViewsSqlUtils
+    private val mappedTypes = mapOf(DAY to DAYS, WEEK to WEEKS, MONTH to MONTHS, YEAR to YEARS)
+
+    @Before
+    fun setUp() {
+        timeStatsSqlUtils = VisitsAndViewsSqlUtils(statsSqlUtils, statsUtils, statsRequestSqlUtils)
+        whenever(statsUtils.getFormattedDate(eq(DATE), isNull())).thenReturn(DATE_VALUE)
+    }
+
+    @Test
+    fun `returns data from stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+
+            whenever(
+                    statsSqlUtils.select(
+                            site,
+                            VISITS_AND_VIEWS,
+                            statsType,
+                            VisitsAndViewsResponse::class.java,
+                            DATE_VALUE
+                    )
+            )
+                    .thenReturn(
+                            VISITS_AND_VIEWS_RESPONSE
+                    )
+
+            val result = timeStatsSqlUtils.select(site, dbGranularity, DATE)
+
+            assertEquals(result, VISITS_AND_VIEWS_RESPONSE)
+        }
+    }
+
+    @Test
+    fun `inserts data to stats utils`() {
+        mappedTypes.forEach { statsType, dbGranularity ->
+            timeStatsSqlUtils.insert(site, VISITS_AND_VIEWS_RESPONSE, dbGranularity, DATE)
+
+            verify(statsSqlUtils).insert(site, VISITS_AND_VIEWS, statsType, VISITS_AND_VIEWS_RESPONSE,
+                    true, DATE_VALUE)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BlazeCampaignsDaoTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BlazeCampaignsDaoTest.kt
new file mode 100644
index 00000000000..646d7626dbe
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BlazeCampaignsDaoTest.kt
@@ -0,0 +1,188 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.Room
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsUtils
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
+import java.io.IOException
+import kotlin.test.assertEquals
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+class BlazeCampaignsDaoTest {
+    private lateinit var dao: BlazeCampaignsDao
+    private lateinit var db: WPAndroidDatabase
+
+    @Before
+    fun createDb() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        db = Room.inMemoryDatabaseBuilder(
+            context, WPAndroidDatabase::class.java
+        ).allowMainThreadQueries().build()
+        dao = db.blazeCampaignsDao()
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    fun `when insert followed by update, then updated campaign is returned`(): Unit = runBlocking {
+        // when
+        var model = BLAZE_CAMPAIGNS_MODEL
+        dao.insertCampaigns(SITE_ID, model)
+
+        // then
+        var observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertThat(observedStatus).isEqualTo(listOf(BLAZE_CAMPAIGN_MODEL))
+
+        // when
+        model = model.copy(campaigns = model.campaigns.map { it.copy(title = SECONDARY_TITLE) })
+        dao.insertCampaigns(SITE_ID, model)
+
+        // then
+        observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertThat(observedStatus[0].title).isEqualTo(SECONDARY_TITLE)
+    }
+
+    @Test
+    fun `when insert of first items batch, then db is cleared before insert`(): Unit = runBlocking {
+        // when
+        var model = BLAZE_CAMPAIGNS_MODEL
+        dao.insertCampaigns(SITE_ID, model)
+        var observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertEquals(observedStatus.size, 1)
+
+        model = model.copy(skipped = 1, campaigns = model.campaigns.map { it.copy(campaignId = "2") })
+        dao.insertCampaigns(SITE_ID, model)
+
+        observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertEquals(observedStatus.size, 2)
+
+        // then
+        model = model.copy(skipped = 0)
+        dao.insertCampaigns(SITE_ID, model)
+        observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertEquals(observedStatus.size, 1)
+    }
+
+    @Test
+    fun `when insert second batch of items, then db is not cleared`(): Unit = runBlocking {
+        // when
+        var model = BLAZE_CAMPAIGNS_MODEL
+        dao.insertCampaigns(SITE_ID, model)
+        var observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertEquals(observedStatus.size, 1)
+
+        model = model.copy(skipped = 1, campaigns = model.campaigns.map { it.copy(campaignId = "2") })
+        dao.insertCampaigns(SITE_ID, model)
+
+        observedStatus = dao.getCachedCampaigns(SITE_ID)
+        assertEquals(observedStatus.size, 2)
+    }
+
+    @Test
+    fun `when clear is requested, then all rows are deleted for site`(): Unit = runBlocking {
+        // when
+        val model = BLAZE_CAMPAIGNS_MODEL
+        dao.insertCampaigns(1, model)
+        dao.insertCampaigns(2, model)
+        dao.insertCampaigns(3, model)
+
+        dao.clearBlazeCampaigns(1)
+        assertEmptyResult(dao.getCachedCampaigns(1))
+        assertNotEmptyResult(dao.getCachedCampaigns(2))
+        assertNotEmptyResult(dao.getCachedCampaigns(3))
+    }
+
+    @Test
+    fun `given site not in db, when get with page, campaigns list is empty`(): Unit = runBlocking {
+        // when
+        val emptyList = emptyList<BlazeCampaignModel>()
+
+        // then
+        val observedStatus = dao.getCachedCampaigns(SITE_ID)
+
+        // when
+        assertThat(observedStatus).isEqualTo(emptyList)
+    }
+
+    @Test
+    fun `given no site, when recent campaign req, then null returned `(): Unit = runBlocking {
+        // then
+        val observedStatus = dao.getMostRecentCampaignForSite(SITE_ID)
+
+        // when
+        assertThat(observedStatus).isNull()
+    }
+
+    @Test
+    fun `given no site, when campaign list req, then empty list is return `(): Unit = runBlocking {
+        // then
+        val observedStatus = dao.getCampaigns(SITE_ID)
+
+        // when
+        assertThat(observedStatus).isEmpty()
+    }
+
+    private fun assertEmptyResult(campaigns: List<BlazeCampaignModel>) {
+        assertThat(campaigns).isNotNull
+        assertThat(campaigns).isEmpty()
+    }
+
+    private fun assertNotEmptyResult(campaigns: List<BlazeCampaignModel>) {
+        assertThat(campaigns).isNotNull
+        assertThat(campaigns).isNotEmpty
+    }
+
+    private companion object {
+        const val SITE_ID = 1234L
+        const val SECONDARY_TITLE = "secondary title"
+        const val CAMPAIGN_ID = "1234"
+        const val TITLE = "title"
+        const val IMAGE_URL = "imageUrl"
+        const val CREATED_AT = "2023-06-02T00:00:00.000Z"
+        const val DURATION_DAYS = 4
+        const val UI_STATUS = "rejected"
+        const val IMPRESSIONS = 0L
+        const val CLICKS = 0L
+        const val TOTAL_BUDGET = 100.0
+        const val SPENT_BUDGET = 0.0
+        const val TARGET_URN = "urn:wpcom:post:199247490:9"
+
+        const val SKIP = 0
+        const val TOTAL_ITEMS = 1
+
+        val BLAZE_CAMPAIGN_MODEL = BlazeCampaignModel(
+            campaignId = CAMPAIGN_ID,
+            title = TITLE,
+            imageUrl = IMAGE_URL,
+            startTime = BlazeCampaignsUtils.stringToDate(CREATED_AT),
+            durationInDays = DURATION_DAYS,
+            uiStatus = UI_STATUS,
+            impressions = IMPRESSIONS,
+            clicks = CLICKS,
+            targetUrn = TARGET_URN,
+            totalBudget = TOTAL_BUDGET,
+            spentBudget = SPENT_BUDGET,
+            isEndlessCampaign = false
+        )
+        val BLAZE_CAMPAIGNS_MODEL = BlazeCampaignsModel(
+            campaigns = listOf(BLAZE_CAMPAIGN_MODEL),
+            skipped = SKIP,
+            totalItems = TOTAL_ITEMS,
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BloggingPromptsDaoTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BloggingPromptsDaoTest.kt
new file mode 100644
index 00000000000..48d26d09d3b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/BloggingPromptsDaoTest.kt
@@ -0,0 +1,252 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.Room
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsUtils
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao.BloggingPromptEntity
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+class BloggingPromptsDaoTest {
+    private lateinit var promptsDao: BloggingPromptsDao
+    private lateinit var db: WPAndroidDatabase
+
+    @Before
+    fun createDb() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        db = Room.inMemoryDatabaseBuilder(
+            context, WPAndroidDatabase::class.java
+        ).allowMainThreadQueries().build()
+        promptsDao = db.bloggingPromptsDao()
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    fun `test prompt insert and update`(): Unit = runBlocking {
+        // when
+        var prompt = generateBloggingPrompt()
+        promptsDao.insert(listOf(prompt))
+
+        // then
+        var observedProduct = promptsDao.getPrompt(localSideId, prompt.id).first().first()
+        assertThat(observedProduct).isEqualTo(prompt)
+
+        // when
+        prompt = observedProduct.copy(text = "updated text")
+        promptsDao.insert(listOf(prompt))
+
+        // then
+        observedProduct = promptsDao.getPrompt(localSideId, prompt.id).first().first()
+        assertThat(observedProduct).isEqualTo(prompt)
+    }
+
+    @Test
+    fun `test prompt insertForSite and update`(): Unit = runBlocking {
+        // when
+        var promptEntity = generateBloggingPrompt()
+
+        var prompt = promptEntity.toBloggingPrompt()
+        promptsDao.insertForSite(localSideId, listOf(prompt))
+
+        // then
+        var observedProduct = promptsDao.getPrompt(localSideId, prompt.id).first().first()
+        assertThat(observedProduct).isEqualTo(promptEntity)
+
+        // when
+        promptEntity = promptEntity.copy(text = "updated text")
+        prompt = promptEntity.toBloggingPrompt()
+        promptsDao.insertForSite(localSideId, listOf(prompt))
+
+        // then
+        observedProduct = promptsDao.getPrompt(localSideId, prompt.id).first().first()
+        assertThat(observedProduct).isEqualTo(promptEntity)
+    }
+
+    @Test
+    fun `getPromptForDate returns correct prompt based on the date`(): Unit = runBlocking {
+        // when
+        val prompt1 = generateBloggingPrompt().copy(
+            id = 1,
+            date = BloggingPromptsUtils.stringToDate("2022-05-01")
+        )
+            .toBloggingPrompt()
+        val prompt2 = generateBloggingPrompt().copy(
+            id = 2,
+            date = BloggingPromptsUtils.stringToDate("2015-01-20"),
+            bloganuaryId = "bloganuary-2015-20"
+        )
+            .toBloggingPrompt()
+        val prompt3 = generateBloggingPrompt().copy(
+            id = 3,
+            date = BloggingPromptsUtils.stringToDate("2015-03-20")
+        )
+            .toBloggingPrompt()
+
+        promptsDao.insertForSite(localSideId, listOf(prompt1, prompt2, prompt3))
+
+        // then
+        val prompts = promptsDao.getPromptForDate(
+            localSideId,
+            BloggingPromptsUtils.stringToDate("2015-01-20")
+        ).first()
+
+        val specificPrompt = prompts.first()
+        assertThat(specificPrompt).isNotNull
+        assertThat(specificPrompt.toBloggingPrompt()).isEqualTo(prompt2)
+    }
+
+    @Test
+    fun `getPromptForDate returns correct prompt after update`(): Unit = runBlocking {
+        // when
+        val prompt1 = generateBloggingPrompt().copy(
+            id = 1,
+            date = BloggingPromptsUtils.stringToDate("2015-04-20")
+        )
+            .toBloggingPrompt()
+        val prompt2 = generateBloggingPrompt().copy(
+            id = 2,
+            date = BloggingPromptsUtils.stringToDate("2015-04-21")
+        )
+            .toBloggingPrompt()
+
+        promptsDao.insertForSite(localSideId, listOf(prompt1, prompt2))
+
+        val updatedPrompt2 = prompt2.copy(id = 3, text = "updated text")
+        promptsDao.insertForSite(localSideId, listOf(updatedPrompt2))
+
+        // then
+        val prompts = promptsDao.getPromptForDate(
+            localSideId,
+            BloggingPromptsUtils.stringToDate("2015-04-21")
+        ).first()
+
+        val specificPrompt = prompts.first()
+        assertThat(specificPrompt).isNotNull
+        assertThat(specificPrompt.toBloggingPrompt()).isEqualTo(updatedPrompt2)
+    }
+
+    @Test
+    fun `getAllPrompts returns all prompts`(): Unit = runBlocking {
+        // when
+        val prompt1 = generateBloggingPrompt().copy(
+            id = 1,
+            date = BloggingPromptsUtils.stringToDate("2022-05-01")
+        )
+            .toBloggingPrompt()
+        val prompt2 = generateBloggingPrompt().copy(
+            id = 2,
+            date = BloggingPromptsUtils.stringToDate("2015-04-20")
+        )
+            .toBloggingPrompt()
+        val prompt3 = generateBloggingPrompt().copy(
+            id = 3,
+            date = BloggingPromptsUtils.stringToDate("2015-03-20")
+        )
+            .toBloggingPrompt()
+
+        promptsDao.insertForSite(localSideId, listOf(prompt1, prompt2, prompt3))
+
+        // then
+        val prompts = promptsDao.getAllPrompts(
+            localSideId
+        ).first()
+
+        assertThat(prompts).isNotNull
+        assertThat(prompts.map { it.toBloggingPrompt() }).isEqualTo(
+            listOf(
+                prompt1,
+                prompt2,
+                prompt3
+            )
+        )
+    }
+
+    @Test
+    fun `clear removes all prompts`(): Unit = runBlocking {
+        // when
+        val prompt1 = generateBloggingPrompt().copy(
+            id = 1,
+            date = BloggingPromptsUtils.stringToDate("2022-05-01")
+        )
+            .toBloggingPrompt()
+        val prompt2 = generateBloggingPrompt().copy(
+            id = 2,
+            date = BloggingPromptsUtils.stringToDate("2015-04-20")
+        )
+            .toBloggingPrompt()
+        val prompt3 = generateBloggingPrompt().copy(
+            id = 3,
+            date = BloggingPromptsUtils.stringToDate("2015-03-20")
+        )
+            .toBloggingPrompt()
+
+        promptsDao.insertForSite(localSideId, listOf(prompt1, prompt2, prompt3))
+
+        // then
+        promptsDao.clear()
+
+        val prompts = promptsDao.getAllPrompts(
+            localSideId
+        ).first()
+
+        assertThat(prompts).isNotNull
+        assertThat(prompts).isEmpty()
+    }
+
+    @Test
+    fun `BloggingPromptEntity correctly converts to BloggingPromptModel`(): Unit = runBlocking {
+        val promptEntity = generateBloggingPrompt()
+        val prompt = promptEntity.toBloggingPrompt()
+
+        assertThat(promptEntity.id).isEqualTo(prompt.id)
+        assertThat(promptEntity.text).isEqualTo(prompt.text)
+        assertThat(promptEntity.date).isEqualTo(prompt.date)
+        assertThat(promptEntity.isAnswered).isEqualTo(prompt.isAnswered)
+        assertThat(promptEntity.respondentsCount).isEqualTo(prompt.respondentsCount)
+        assertThat(promptEntity.respondentsAvatars).isEqualTo(prompt.respondentsAvatarUrls)
+        assertThat(promptEntity.answeredLink).isEqualTo(prompt.answeredLink)
+    }
+
+    @Test
+    fun `BloggingPromptModel correctly converts to BloggingPromptEntity`(): Unit = runBlocking {
+        val promptEntity = generateBloggingPrompt()
+        val prompt = promptEntity.toBloggingPrompt()
+
+        val convertedEntity = BloggingPromptEntity.from(localSideId, prompt)
+
+        assertThat(promptEntity).isEqualTo(convertedEntity)
+    }
+
+    companion object {
+        private const val localSideId = 1234
+
+        private fun generateBloggingPrompt() = BloggingPromptEntity(
+            id = 1,
+            siteLocalId = localSideId,
+            text = "Cast the movie of your life.",
+            date = BloggingPromptsUtils.stringToDate("2015-01-12"),
+            isAnswered = false,
+            respondentsCount = 5,
+            attribution = "dayone",
+            respondentsAvatars = emptyList(),
+            answeredLink = "https://wordpress.com/tag/dailyprompt-1",
+            bloganuaryId = "bloganuary-2015-12",
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/CustomerSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/CustomerSqlUtilsTest.kt
new file mode 100644
index 00000000000..ddb20b51032
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/CustomerSqlUtilsTest.kt
@@ -0,0 +1,183 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.customer.WCCustomerModel
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class CustomerSqlUtilsTest {
+    val site = SiteModel().apply {
+        email = "test@example.org"
+        name = "Test Site"
+        id = 24
+    }
+
+    @Before
+    fun setUp() {
+        val appContext = ApplicationProvider.getApplicationContext<Context>()
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(WCCustomerModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `get customer by remote id returns null when there is no customer stored`() {
+        // given
+        val remoteCustomerId = 1L
+
+        // when & then
+        assertNull(CustomerSqlUtils.getCustomerByRemoteId(site, remoteCustomerId))
+    }
+
+    @Test
+    fun `get customer by remote id returns customer when there its stored`() {
+        // given
+        val remoteCustomerId = 1L
+        val username = "userName"
+        val customer = WCCustomerModel().apply {
+            this.remoteCustomerId = remoteCustomerId
+            this.localSiteId = site.id
+            this.username = username
+        }
+
+        // when
+        CustomerSqlUtils.insertOrUpdateCustomer(customer)
+
+        // then
+        val storedCustomer = CustomerSqlUtils.getCustomerByRemoteId(site, remoteCustomerId)
+        assertEquals(storedCustomer!!.remoteCustomerId, remoteCustomerId)
+        assertEquals(storedCustomer.localSiteId, site.id)
+        assertEquals(storedCustomer.username, username)
+    }
+
+    @Test
+    fun `get customer by remote id returns null when there another customer stored`() {
+        // given
+        val remoteCustomerId = 1L
+        val username = "userName"
+        val customer = WCCustomerModel().apply {
+            this.remoteCustomerId = remoteCustomerId
+            this.localSiteId = 3
+            this.username = username
+        }
+
+        // when
+        CustomerSqlUtils.insertOrUpdateCustomer(customer)
+
+        // then
+        val storedCustomer = CustomerSqlUtils.getCustomerByRemoteId(site, remoteCustomerId)
+        assertNull(storedCustomer)
+    }
+
+    @Test
+    fun `get customers by site returns null when no customers stored`() {
+        // when & then
+        assertTrue(CustomerSqlUtils.getCustomersForSite(site).isEmpty())
+    }
+
+    @Test
+    fun `get customer by site returns customer with site id provided`() {
+        // given
+        val usernameOne = "userNameOne"
+        val usernameTwo = "userNameTwo"
+        val customerOne = WCCustomerModel().apply {
+            this.remoteCustomerId = 1L
+            this.localSiteId = 3
+            this.username = usernameOne
+        }
+        val customerTwo = WCCustomerModel().apply {
+            this.remoteCustomerId = 2L
+            this.localSiteId = site.id
+            this.username = usernameTwo
+        }
+
+        // when
+        CustomerSqlUtils.insertOrUpdateCustomer(customerOne)
+        CustomerSqlUtils.insertOrUpdateCustomer(customerTwo)
+
+        // then
+        val storedCustomers = CustomerSqlUtils.getCustomersForSite(site)
+        assertEquals(1, storedCustomers.size)
+        assertEquals(usernameTwo, storedCustomers[0].username)
+        assertEquals(24, storedCustomers[0].localSiteId)
+        assertEquals(2L, storedCustomers[0].remoteCustomerId)
+    }
+
+    @Test
+    fun `get customers by remote ids returns null when no customers stored`() {
+        // when & then
+        assertTrue(CustomerSqlUtils.getCustomerByRemoteIds(site, listOf(1)).isEmpty())
+    }
+
+    @Test
+    fun `get customers by remote ids returns customers with remote ids`() {
+        // given
+        val usernameOne = "userNameOne"
+        val usernameTwo = "userNameTwo"
+        val customerOne = WCCustomerModel().apply {
+            this.remoteCustomerId = 1L
+            this.localSiteId = site.id
+            this.username = usernameOne
+        }
+        val customerTwo = WCCustomerModel().apply {
+            this.remoteCustomerId = 2L
+            this.localSiteId = site.id
+            this.username = usernameTwo
+        }
+
+        // when
+        CustomerSqlUtils.insertOrUpdateCustomer(customerOne)
+        CustomerSqlUtils.insertOrUpdateCustomer(customerTwo)
+
+        // then
+        val customerByRemoteIds = CustomerSqlUtils.getCustomerByRemoteIds(site, listOf(1, 2, 3))
+        assertEquals(customerByRemoteIds.size, 2)
+        assertEquals(customerByRemoteIds[0], customerOne)
+        assertEquals(customerByRemoteIds[1], customerTwo)
+    }
+
+    @Test
+    fun `delete customers for site deletes all customers for the site`() {
+        // given
+        val usernameOne = "userNameOne"
+        val usernameTwo = "userNameTwo"
+        val customerOne = WCCustomerModel().apply {
+            this.remoteCustomerId = 1L
+            this.localSiteId = 3
+            this.username = usernameOne
+        }
+        val customerTwo = WCCustomerModel().apply {
+            this.remoteCustomerId = 2L
+            this.localSiteId = site.id
+            this.username = usernameTwo
+        }
+
+        // when
+        CustomerSqlUtils.insertOrUpdateCustomer(customerOne)
+        CustomerSqlUtils.insertOrUpdateCustomer(customerTwo)
+        CustomerSqlUtils.deleteCustomersForSite(site)
+
+        // then
+        val storedCustomers = CustomerSqlUtils.getCustomersForSite(SiteModel().apply { id = customerOne.localSiteId })
+        assertEquals(1, storedCustomers.size)
+        assertEquals(usernameOne, storedCustomers[0].username)
+        assertEquals(3, storedCustomers[0].localSiteId)
+        assertEquals(1L, storedCustomers[0].remoteCustomerId)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PlanOffersDaoTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PlanOffersDaoTest.kt
new file mode 100644
index 00000000000..c884f5826d8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PlanOffersDaoTest.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.Room
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.model.plans.PlanOffersMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.areSame
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.getDatabaseModel
+
+@RunWith(RobolectricTestRunner::class)
+class PlanOffersDaoTest {
+    private lateinit var database: WPAndroidDatabase
+    private lateinit var planOffersDao: PlanOffersDao
+    private lateinit var mapper: PlanOffersMapper
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        database = Room.inMemoryDatabaseBuilder(
+                appContext,
+                WPAndroidDatabase::class.java
+        ).allowMainThreadQueries().build()
+
+        planOffersDao = database.planOffersDao()
+        mapper = PlanOffersMapper()
+    }
+
+    @Test
+    fun `dao inserted data are correct`() {
+        val databaseModel = getDatabaseModel()
+
+        planOffersDao.insertPlanOfferWithDetails(databaseModel)
+
+        val domainModelsFromCache = planOffersDao.getPlanOfferWithDetails()
+
+        assertThat(domainModelsFromCache).hasSize(1)
+        assertThat(areSame(mapper.toDomainModel(domainModelsFromCache[0]), databaseModel)).isTrue
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PostSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PostSqlUtilsTest.kt
new file mode 100644
index 00000000000..36231739804
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/PostSqlUtilsTest.kt
@@ -0,0 +1,220 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.model.LikeModel.Companion.TIMESTAMP_THRESHOLD
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRemoteAutoSaveModel
+import java.util.Date
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class PostSqlUtilsTest {
+    private val postSqlUtils = PostSqlUtils()
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `post autoSave fields get updated`() {
+        val remotePostId = 200L
+        val revisionId = 999L
+        val modifiedDate = "test date"
+        val previewUrl = "test url"
+
+        val site = createSite()
+
+        var post = PostModel()
+        post.setLocalSiteId(site.id)
+        post.setRemotePostId(remotePostId)
+
+        post = postSqlUtils.insertPostForResult(post)
+
+        assertNull(post.autoSaveModified)
+        assertNull(post.autoSavePreviewUrl)
+        assertEquals(0, post.autoSaveRevisionId)
+
+        postSqlUtils.updatePostsAutoSave(
+                site,
+                PostRemoteAutoSaveModel(revisionId, remotePostId, modifiedDate, previewUrl)
+        )
+
+        val postsForSite = postSqlUtils.getPostsForSite(site, false)
+
+        assertEquals(1, postsForSite.size)
+        assertEquals(revisionId, postsForSite.first().autoSaveRevisionId)
+        assertEquals(remotePostId, postsForSite.first().remotePostId)
+        assertEquals(modifiedDate, postsForSite.first().autoSaveModified)
+        assertEquals(modifiedDate, postsForSite.first().remoteAutoSaveModified)
+        assertEquals(previewUrl, postsForSite.first().autoSavePreviewUrl)
+    }
+
+    @Test
+    fun `insertOrUpdatePost deletes posts with duplicate REMOTE_POST_ID`() {
+        // Given
+        val site = createSite()
+
+        val localPost = createPost(localSiteId = site.id, localId = 900, remoteId = 8571)
+        postSqlUtils.insertPostForResult(localPost)
+
+        val postFromFetch = createPost(localSiteId = site.id, localId = 100_00, remoteId = localPost.remotePostId)
+        postSqlUtils.insertPostForResult(postFromFetch)
+
+        // When
+        val updatedRowsCount = postSqlUtils.insertOrUpdatePost(localPost, true)
+
+        // Then
+        // 2 row changes. First is the deleted row, second is the overwrite
+        assertThat(updatedRowsCount).isEqualTo(2)
+
+        // The postFromFetch should not exist anymore
+        assertThat(postSqlUtils.getPostsByLocalOrRemotePostIds(listOf(LocalId(postFromFetch.id)), site.id)).isEmpty()
+
+        // The localPost should still exist
+        assertThat(postSqlUtils.getPostsByLocalOrRemotePostIds(listOf(LocalId(localPost.id)), site.id)).hasSize(1)
+
+        // There is only one post with the remote id
+        val postsWithSameRemotePostId =
+                postSqlUtils.getPostsByLocalOrRemotePostIds(listOf(RemoteId(localPost.remotePostId)), site.id)
+        assertThat(postsWithSameRemotePostId).hasSize(1)
+    }
+
+    @Test
+    fun `insertOrUpdatePostLikes insert a new like`() {
+        val siteId = 100L
+        val postId = 1000L
+
+        val localLike = createLike(siteId, postId)
+
+        postSqlUtils.insertOrUpdatePostLikes(siteId, postId, localLike)
+
+        val postLikes = postSqlUtils.getPostLikesByPostId(siteId, postId)
+        assertThat(postLikes).hasSize(1)
+        assertThat(postLikes[0].isEqual(localLike)).isTrue
+    }
+
+    @Test
+    fun `insertOrUpdatePostLikes update a changed like`() {
+        val siteId = 100L
+        val postId = 1000L
+
+        val localLike = createLike(siteId, postId)
+        val localLikeChanged = createLike(siteId, postId).apply {
+            likerSiteUrl = "https://likerSiteUrl.wordpress.com"
+        }
+
+        postSqlUtils.insertOrUpdatePostLikes(siteId, postId, localLike)
+
+        var postLikes = postSqlUtils.getPostLikesByPostId(siteId, postId)
+        assertThat(postLikes).hasSize(1)
+        assertThat(postLikes[0].isEqual(localLike)).isTrue
+
+        postSqlUtils.insertOrUpdatePostLikes(siteId, postId, localLikeChanged)
+
+        postLikes = postSqlUtils.getPostLikesByPostId(siteId, postId)
+        assertThat(postLikes).hasSize(1)
+        assertThat(postLikes[0].isEqual(localLike)).isFalse
+        assertThat(postLikes[0].isEqual(localLikeChanged)).isTrue
+    }
+
+    @Test
+    fun `deletePostLikesAndPurgeExpired deletes currently fetched data`() {
+        val siteId = 100L
+        val postId = 1000L
+
+        val localLike = createLike(siteId, postId)
+
+        postSqlUtils.insertOrUpdatePostLikes(siteId, postId, localLike)
+        var postLikes = postSqlUtils.getPostLikesByPostId(siteId, postId)
+        assertThat(postLikes).hasSize(1)
+
+        postSqlUtils.deletePostLikesAndPurgeExpired(siteId, postId)
+        postLikes = postSqlUtils.getPostLikesByPostId(siteId, postId)
+        assertThat(postLikes).isEmpty()
+    }
+
+    @Test
+    fun `deletePostLikesAndPurgeExpired delete data older than threshold`() {
+        val siteId = 100L
+        val postId = 1000L
+
+        val sitePostList = listOf(
+                Triple(101L, 1000L, Date().time),
+                Triple(101L, 1001L, Date().time - TIMESTAMP_THRESHOLD / 2),
+                Triple(101L, 1002L, Date().time - TIMESTAMP_THRESHOLD * 2),
+                Triple(101L, 1003L, Date().time - TIMESTAMP_THRESHOLD * 2)
+        )
+
+        val expectedSizeList = listOf(1, 1, 0, 0)
+
+        val likeList = mutableListOf<LikeModel>()
+
+        for (sitePostTriple: Triple<Long, Long, Long> in sitePostList) {
+            likeList.add(createLike(sitePostTriple.first, sitePostTriple.second, sitePostTriple.third))
+        }
+
+        for (like: LikeModel in likeList) {
+            postSqlUtils.insertOrUpdatePostLikes(siteId, postId, like)
+        }
+
+        postSqlUtils.deletePostLikesAndPurgeExpired(siteId, postId)
+
+        sitePostList.forEachIndexed { index, element ->
+            assertThat(
+                    postSqlUtils.getPostLikesByPostId(
+                            element.first,
+                            element.second
+                    )
+            ).hasSize(expectedSizeList[index])
+        }
+    }
+
+    private fun createPost(localSiteId: Int, localId: Int, remoteId: Long) = PostModel().apply {
+        setId(localId)
+        setRemotePostId(remoteId)
+
+        setLocalSiteId(localSiteId)
+    }
+
+    private fun createSite() = SiteModel().apply {
+        id = 100
+    }
+
+    private fun createLike(siteId: Long, postId: Long, timeStamp: Long = Date().time) = LikeModel().apply {
+        type = POST_LIKE.typeName
+        remoteSiteId = siteId
+        remoteItemId = postId
+        likerId = 2000L
+        likerName = "likerName"
+        likerLogin = "likerLogin"
+        likerAvatarUrl = "likerAvatarUrl"
+        likerBio = "likerBio"
+        likerSiteId = 3000L
+        likerSiteUrl = "likerSiteUrl"
+        preferredBlogId = 4000L
+        preferredBlogName = "preferredBlogName"
+        preferredBlogUrl = "preferredBlogUrl"
+        preferredBlogBlavatarUrl = "preferredBlogBlavatarUrl"
+        dateLiked = "2020-04-04 11:22:34"
+        timestampFetched = timeStamp
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ScanStateSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ScanStateSqlUtilsTest.kt
new file mode 100644
index 00000000000..f59af7bd0da
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ScanStateSqlUtilsTest.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Reason
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.ScanProgressStatus
+import java.util.Date
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ScanStateSqlUtilsTest {
+    private val scanSqlUtils = ScanSqlUtils()
+    private lateinit var site: SiteModel
+
+    @Before
+    fun setUp() {
+        val appContext = ApplicationProvider.getApplicationContext<Application>()
+
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+
+        site = SiteModel().apply { id = 100 }
+    }
+
+    @Test
+    fun `given idle state scan state model, when model is saved, then save succeeds`() {
+        val scanStateModel = getScanStateModel(ScanStateModel.State.IDLE)
+
+        scanSqlUtils.replaceScanState(site, scanStateModel)
+        val scanStateFromDb = scanSqlUtils.getScanStateForSite(site)
+
+        assertEquals(scanStateModel, scanStateFromDb)
+    }
+
+    @Test
+    fun `given scanning state scan state model, when model is saved, then save succeeds`() {
+        val scanStateModel = getScanStateModel(ScanStateModel.State.SCANNING)
+
+        scanSqlUtils.replaceScanState(site, scanStateModel)
+        val scanStateFromDb = scanSqlUtils.getScanStateForSite(site)
+
+        assertEquals(scanStateModel, scanStateFromDb)
+    }
+
+    @Test
+    fun `given provisioning state scan state model, when model is saved, then save succeeds`() {
+        val scanStateModel = getScanStateModel(ScanStateModel.State.PROVISIONING)
+
+        scanSqlUtils.replaceScanState(site, scanStateModel)
+        val scanStateFromDb = scanSqlUtils.getScanStateForSite(site)
+
+        assertEquals(scanStateModel, scanStateFromDb)
+    }
+
+    private fun getScanStateModel(state: ScanStateModel.State): ScanStateModel {
+        var scanStateModel = ScanStateModel(
+                state = state,
+                reason = Reason.UNKNOWN,
+                hasCloud = true,
+                hasValidCredentials = true
+        )
+
+        if (state == ScanStateModel.State.IDLE) {
+            val mostRecentStatus = ScanProgressStatus(
+                    startDate = Date(),
+                    duration = 40,
+                    progress = 30,
+                    error = false,
+                    isInitial = true
+            )
+            scanStateModel = scanStateModel.copy(mostRecentStatus = mostRecentStatus)
+        } else if (state == ScanStateModel.State.SCANNING) {
+            val currentStatus = ScanProgressStatus(
+                    startDate = Date(),
+                    progress = 30,
+                    isInitial = true
+            )
+            scanStateModel = scanStateModel.copy(currentStatus = currentStatus)
+        }
+
+        return scanStateModel
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtilsTest.kt
new file mode 100644
index 00000000000..25679695ec9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtilsTest.kt
@@ -0,0 +1,194 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.BaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatMapper
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.CURRENT
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension
+import java.util.Date
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ThreatSqlUtilsTest {
+    private val gson = Gson()
+    private val threatMapper = ThreatMapper()
+    private val threatSqlUtils = ThreatSqlUtils(gson, threatMapper)
+    private lateinit var site: SiteModel
+
+    private val threatStatus = CURRENT
+    private val dummyBaseThreatModel = BaseThreatModel(
+        id = 1L,
+        signature = "test signature",
+        description = "test description",
+        status = threatStatus,
+        firstDetected = Date(0)
+    )
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+
+        site = SiteModel().apply { id = 100 }
+    }
+
+    @Test
+    fun `insert and retrieve for base threat properties work correctly`() {
+        val threat = GenericThreatModel(baseThreatModel = dummyBaseThreatModel)
+
+        threatSqlUtils.insertThreats(site, listOf(threat))
+        val threats = threatSqlUtils.getThreats(site, listOf(threatStatus))
+
+        assertEquals(1, threats.size)
+        with(threats.first().baseThreatModel) {
+            assertEquals(dummyBaseThreatModel.id, id)
+            assertEquals(dummyBaseThreatModel.signature, signature)
+            assertEquals(dummyBaseThreatModel.description, description)
+            assertEquals(dummyBaseThreatModel.status, status)
+            assertEquals(dummyBaseThreatModel.firstDetected, firstDetected)
+        }
+    }
+
+    @Test
+    fun `insert and retrieve for DatabaseThreatModel properties work correctly`() {
+        val dummyThreat = DatabaseThreatModel(
+            baseThreatModel = dummyBaseThreatModel,
+            rows = listOf(DatabaseThreatModel.Row(id = 1, rowNumber = 1))
+        )
+
+        threatSqlUtils.insertThreats(site, listOf(dummyThreat))
+        val threats = threatSqlUtils.getThreats(site, listOf(threatStatus))
+
+        assertEquals(1, threats.size)
+        assertThat(threats.first()).isInstanceOf(DatabaseThreatModel::class.java)
+        with(threats.first() as DatabaseThreatModel) {
+            assertEquals(dummyThreat.rows?.first()?.id, rows?.first()?.id)
+            assertEquals(dummyThreat.rows?.first()?.rowNumber, rows?.first()?.rowNumber)
+        }
+    }
+
+    @Test
+    fun `insert and retrieve for CoreFileModificationThreatModel properties work correctly`() {
+        val dummyThreat = CoreFileModificationThreatModel(
+            baseThreatModel = dummyBaseThreatModel,
+            fileName = "test filename",
+            diff = "test diff"
+        )
+
+        threatSqlUtils.insertThreats(site, listOf(dummyThreat))
+        val threats = threatSqlUtils.getThreats(site, listOf(threatStatus))
+
+        assertEquals(1, threats.size)
+        assertThat(threats.first()).isInstanceOf(CoreFileModificationThreatModel::class.java)
+        with(threats.first() as CoreFileModificationThreatModel) {
+            assertEquals(dummyThreat.fileName, fileName)
+            assertEquals(dummyThreat.diff, diff)
+        }
+    }
+
+    @Test
+    fun `insert and retrieve for VulnerableExtensionThreatModel properties work correctly`() {
+        val dummyThreat = VulnerableExtensionThreatModel(
+            baseThreatModel = dummyBaseThreatModel,
+            extension = Extension(
+                type = Extension.ExtensionType.PLUGIN,
+                slug = "test slug",
+                name = "test name",
+                version = "test version",
+                isPremium = false
+            )
+        )
+
+        threatSqlUtils.insertThreats(site, listOf(dummyThreat))
+        val threats = threatSqlUtils.getThreats(site, listOf(threatStatus))
+
+        assertEquals(1, threats.size)
+        assertThat(threats.first()).isInstanceOf(VulnerableExtensionThreatModel::class.java)
+        with((threats.first() as VulnerableExtensionThreatModel).extension) {
+            assertEquals(dummyThreat.extension.type, type)
+            assertEquals(dummyThreat.extension.slug, slug)
+            assertEquals(dummyThreat.extension.name, name)
+            assertEquals(dummyThreat.extension.version, version)
+            assertEquals(dummyThreat.extension.isPremium, isPremium)
+        }
+    }
+
+    @Test
+    fun `insert and retrieve for FileThreatModel properties work correctly`() {
+        val dummyThreat = FileThreatModel(
+            baseThreatModel = dummyBaseThreatModel,
+            fileName = "test fileName",
+            context = ThreatContext(
+                lines = listOf(ThreatContext.ContextLine(lineNumber = 1, contents = "test content"))
+            )
+        )
+
+        threatSqlUtils.insertThreats(site, listOf(dummyThreat))
+        val threats = threatSqlUtils.getThreats(site, listOf(threatStatus))
+
+        assertEquals(1, threats.size)
+        assertThat(threats.first()).isInstanceOf(FileThreatModel::class.java)
+        with((threats.first() as FileThreatModel)) {
+            assertEquals(dummyThreat.fileName, fileName)
+            assertEquals(dummyThreat.context.lines.first().lineNumber, context.lines.first().lineNumber)
+            assertEquals(dummyThreat.context.lines.first().contents, context.lines.first().contents)
+        }
+    }
+
+    @Test
+    fun `threat model gets retrieved for the given threat id`() {
+        val threatId = dummyBaseThreatModel.id
+        val dummyThreat = GenericThreatModel(baseThreatModel = dummyBaseThreatModel)
+        threatSqlUtils.insertThreats(site, listOf(dummyThreat))
+
+        val threat = threatSqlUtils.getThreatByThreatId(threatId)
+
+        assertThat(threat).isInstanceOf(GenericThreatModel::class.java)
+        assertEquals(threatId, threat?.baseThreatModel?.id)
+    }
+
+    @Test
+    fun `removeThreatsWithStatus() removes only corresponding threats`() {
+        val threat1 = GenericThreatModel(baseThreatModel = dummyBaseThreatModel.copy(status = CURRENT))
+        val threat2 = GenericThreatModel(baseThreatModel = dummyBaseThreatModel.copy(status = FIXED))
+        threatSqlUtils.insertThreats(site, listOf(threat1, threat2))
+
+        threatSqlUtils.removeThreatsWithStatus(site, listOf(CURRENT))
+        val threats = threatSqlUtils.getThreats(site, ThreatStatus.values().toList())
+
+        assertEquals(1, threats.size)
+    }
+
+    @Test
+    fun `getThreats returns only threats with corresponding status`() {
+        val threat1 = GenericThreatModel(baseThreatModel = dummyBaseThreatModel.copy(status = CURRENT))
+        val threat2 = GenericThreatModel(baseThreatModel = dummyBaseThreatModel.copy(status = FIXED))
+        threatSqlUtils.insertThreats(site, listOf(threat1, threat2))
+
+        val threats = threatSqlUtils.getThreats(site, listOf(CURRENT))
+
+        assertEquals(threats[0].baseThreatModel.status, CURRENT)
+        assertEquals(threats.size, 1)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapperTest.kt
new file mode 100644
index 00000000000..968d26ea068
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapperTest.kt
@@ -0,0 +1,282 @@
+package org.wordpress.android.fluxc.persistence.mappers
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverviewComposedEntities
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsAccountDepositSummary
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsBalance
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsCurrencyBalances
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsCurrencyDeposits
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDeposit
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDepositsOverviewApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDepositsSchedule
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsManualDeposit
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsSourceTypes
+import org.wordpress.android.fluxc.persistence.entity.BalanceType
+import org.wordpress.android.fluxc.persistence.entity.DepositType
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsAccountDepositSummaryEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsBalanceEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsOverviewEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEntity
+import org.wordpress.android.fluxc.persistence.entity.SourceTypes as WooPaymentsSourceTypesEntity
+import org.wordpress.android.fluxc.persistence.entity.WooPaymentsDepositsSchedule as WooPaymentsDepositsScheduleEntity
+
+class WooPaymentsDepositsOverviewMapperTest {
+    private val mapper = WooPaymentsDepositsOverviewMapper()
+
+    @Suppress("LongMethod")
+    @Test
+    fun `when mapApiResponseToModel, then api response mapped to model`() {
+        // GIVEN
+        val apiResponse = WooPaymentsDepositsOverviewApiResponse(
+            deposit = WooPaymentsCurrencyDeposits(
+                lastPaid = listOf(
+                    WooPaymentsDeposit(
+                        id = "id",
+                        date = 1L,
+                        type = "type",
+                        amount = 1L,
+                        status = "status",
+                        bankAccount = "bankAccount",
+                        currency = "currency",
+                        automatic = true,
+                        fee = 1L,
+                        feePercentage = 1.0,
+                        created = 1L
+                    )
+                ),
+                lastManualDeposits = listOf(
+                    WooPaymentsManualDeposit(
+                        currency = "currency",
+                        date = 1L
+                    )
+                )
+            ),
+            balance = WooPaymentsCurrencyBalances(
+                pending = listOf(
+                    WooPaymentsBalance(
+                        amount = 1L,
+                        currency = "rub",
+                        sourceTypes = WooPaymentsSourceTypes(
+                            card = 1
+                        ),
+                        feePercentage = 1.0,
+                        net = 1L,
+                        fee = 1L
+                    )
+                ),
+                available = listOf(
+                    WooPaymentsBalance(
+                        amount = 1L,
+                        currency = "usd",
+                        sourceTypes = WooPaymentsSourceTypes(
+                            card = 1
+                        ),
+                        feePercentage = 1.0,
+                        net = 1L,
+                        fee = 1L
+                    )
+                ),
+                instant = listOf(
+                    WooPaymentsBalance(
+                        amount = 1L,
+                        currency = "eur",
+                        sourceTypes = WooPaymentsSourceTypes(
+                            card = 1
+                        ),
+                        feePercentage = 1.0,
+                        net = 1L,
+                        fee = 1L
+                    )
+                )
+            ),
+            account = WooPaymentsAccountDepositSummary(
+                depositsEnabled = true,
+                depositsBlocked = true,
+                depositsSchedule = WooPaymentsDepositsSchedule(
+                    interval = "interval",
+                    weeklyAnchor = "monday",
+                    monthlyAnchor = 10,
+                    delayDays = 1
+                ),
+                defaultCurrency = "defaultCurrency"
+            )
+        )
+
+        // WHEN
+        val result = mapper.mapApiResponseToModel(apiResponse)
+
+        // THEN
+        assertThat(result.deposit?.lastManualDeposits?.get(0)?.currency).isEqualTo("currency")
+        assertThat(result.deposit?.lastManualDeposits?.get(0)?.date).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.automatic).isEqualTo(true)
+        assertThat(result.deposit?.lastPaid?.get(0)?.bankAccount).isEqualTo("bankAccount")
+        assertThat(result.deposit?.lastPaid?.get(0)?.created).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.currency).isEqualTo("currency")
+        assertThat(result.deposit?.lastPaid?.get(0)?.date).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.depositId).isEqualTo("id")
+        assertThat(result.deposit?.lastPaid?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.deposit?.lastPaid?.get(0)?.status).isEqualTo("status")
+        assertThat(result.deposit?.lastPaid?.get(0)?.type).isEqualTo("type")
+        assertThat(result.balance?.available?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.currency).isEqualTo("usd")
+        assertThat(result.balance?.available?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.available?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.balance?.instant?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.currency).isEqualTo("eur")
+        assertThat(result.balance?.instant?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.instant?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.balance?.pending?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.currency).isEqualTo("rub")
+        assertThat(result.balance?.pending?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.pending?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.account?.defaultCurrency).isEqualTo("defaultCurrency")
+        assertThat(result.account?.depositsBlocked).isEqualTo(true)
+        assertThat(result.account?.depositsEnabled).isEqualTo(true)
+        assertThat(result.account?.depositsSchedule?.delayDays).isEqualTo(1)
+        assertThat(result.account?.depositsSchedule?.monthlyAnchor).isEqualTo(10)
+        assertThat(result.account?.depositsSchedule?.weeklyAnchor).isEqualTo("monday")
+        assertThat(result.account?.depositsSchedule?.interval).isEqualTo("interval")
+    }
+
+    @Suppress("LongMethod")
+    @Test
+    fun `when mapEntityToModel, then entity mapped to model`() {
+        // GIVEN
+        val entity = WooPaymentsDepositsOverviewComposedEntities(
+            overview = WooPaymentsDepositsOverviewEntity(
+                localSiteId = LocalId(1),
+                account = WooPaymentsAccountDepositSummaryEntity(
+                    depositsEnabled = true,
+                    depositsBlocked = true,
+                    depositsSchedule = WooPaymentsDepositsScheduleEntity(
+                        delayDays = 1,
+                        interval = "interval",
+                        monthlyAnchor = null,
+                        weeklyAnchor = null,
+                    ),
+                    defaultCurrency = "defaultCurrency"
+                )
+            ),
+            lastPaidDeposits = listOf(
+                WooPaymentsDepositEntity(
+                    localSiteId = LocalId(1),
+                    depositId = "id",
+                    date = 1L,
+                    type = "type",
+                    amount = 1L,
+                    status = "status1",
+                    bankAccount = "bankAccount1",
+                    currency = "usd",
+                    automatic = true,
+                    fee = 1L,
+                    feePercentage = 1.0,
+                    created = 1L,
+                    depositType = DepositType.LAST_PAID
+                )
+            ),
+            lastManualDeposits = listOf(
+                WooPaymentsManualDepositEntity(
+                    localSiteId = LocalId(1),
+                    date = 1L,
+                    currency = "eur",
+                )
+            ),
+            pendingBalances = listOf(
+                WooPaymentsBalanceEntity(
+                    localSiteId = LocalId(1),
+                    amount = 1L,
+                    currency = "rub",
+                    sourceTypes = WooPaymentsSourceTypesEntity(
+                        card = 1
+                    ),
+                    feePercentage = 1.0,
+                    net = 1L,
+                    fee = 1L,
+                    balanceType = BalanceType.AVAILABLE,
+                )
+            ),
+            availableBalances = listOf(
+                WooPaymentsBalanceEntity(
+                    localSiteId = LocalId(1),
+                    amount = 1L,
+                    currency = "usd",
+                    sourceTypes = WooPaymentsSourceTypesEntity(
+                        card = 1
+                    ),
+                    feePercentage = 1.0,
+                    net = 1L,
+                    fee = 1L,
+                    balanceType = BalanceType.AVAILABLE,
+                )
+            ),
+            instantBalances = listOf(
+                WooPaymentsBalanceEntity(
+                    localSiteId = LocalId(1),
+                    amount = 1L,
+                    currency = "eur",
+                    sourceTypes = WooPaymentsSourceTypesEntity(
+                        card = 1
+                    ),
+                    feePercentage = 1.0,
+                    net = 1L,
+                    fee = 1L,
+                    balanceType = BalanceType.AVAILABLE,
+                )
+            ),
+        )
+
+        // WHEN
+        val result = mapper.mapEntityToModel(entity)!!
+
+        // THEN
+        assertThat(result.deposit?.lastManualDeposits?.get(0)?.currency).isEqualTo("eur")
+        assertThat(result.deposit?.lastManualDeposits?.get(0)?.date).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.automatic).isEqualTo(true)
+        assertThat(result.deposit?.lastPaid?.get(0)?.bankAccount).isEqualTo("bankAccount1")
+        assertThat(result.deposit?.lastPaid?.get(0)?.created).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.currency).isEqualTo("usd")
+        assertThat(result.deposit?.lastPaid?.get(0)?.date).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.depositId).isEqualTo("id")
+        assertThat(result.deposit?.lastPaid?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.deposit?.lastPaid?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.deposit?.lastPaid?.get(0)?.status).isEqualTo("status1")
+        assertThat(result.deposit?.lastPaid?.get(0)?.type).isEqualTo("type")
+        assertThat(result.balance?.available?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.currency).isEqualTo("usd")
+        assertThat(result.balance?.available?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.available?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.available?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.balance?.instant?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.currency).isEqualTo("eur")
+        assertThat(result.balance?.instant?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.instant?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.instant?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.balance?.pending?.get(0)?.amount).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.currency).isEqualTo("rub")
+        assertThat(result.balance?.pending?.get(0)?.fee).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.feePercentage).isEqualTo(1.0)
+        assertThat(result.balance?.pending?.get(0)?.net).isEqualTo(1L)
+        assertThat(result.balance?.pending?.get(0)?.sourceTypes?.card).isEqualTo(1)
+        assertThat(result.account?.defaultCurrency).isEqualTo("defaultCurrency")
+        assertThat(result.account?.depositsBlocked).isEqualTo(true)
+        assertThat(result.account?.depositsEnabled).isEqualTo(true)
+        assertThat(result.account?.depositsSchedule?.delayDays).isEqualTo(1)
+        assertThat(result.account?.depositsSchedule?.monthlyAnchor).isNull()
+        assertThat(result.account?.depositsSchedule?.weeklyAnchor).isNull()
+        assertThat(result.account?.depositsSchedule?.interval).isEqualTo("interval")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersMapperTest.kt
new file mode 100644
index 00000000000..327134c779f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersMapperTest.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.planoffers
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.fluxc.model.plans.PlanOffersMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.areSame
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.getDatabaseModel
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.getDomainModel
+
+class PlanOffersMapperTest {
+    private lateinit var mapper: PlanOffersMapper
+
+    @Before
+    fun setUp() {
+        mapper = PlanOffersMapper()
+    }
+
+    @Test
+    fun `model mapped to database`() {
+        val domainModel = getDomainModel()
+
+        val databaseModel = mapper.toDatabaseModel(20, domainModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+
+    @Test
+    fun `model mapped to database with empty planIds`() {
+        val domainModel = getDomainModel(emptyPlanIds = true, emptyFeatures = false)
+
+        val databaseModel = mapper.toDatabaseModel(20, domainModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+
+    @Test
+    fun `model mapped to database with empty features`() {
+        val domainModel = getDomainModel(emptyPlanIds = false, emptyFeatures = true)
+
+        val databaseModel = mapper.toDatabaseModel(20, domainModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+
+    @Test
+    fun `model mapped from database`() {
+        val databaseModel = getDatabaseModel()
+
+        val domainModel = mapper.toDomainModel(databaseModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+
+    @Test
+    fun `model mapped from database with empty planIds`() {
+        val databaseModel = getDatabaseModel(emptyPlanIds = true, emptyPlanFeatures = false)
+
+        val domainModel = mapper.toDomainModel(databaseModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+
+    @Test
+    fun `model mapped from database with empty planFatures`() {
+        val databaseModel = getDatabaseModel(emptyPlanIds = false, emptyPlanFeatures = true)
+
+        val domainModel = mapper.toDomainModel(databaseModel)
+
+        assertThat(areSame(domainModel, databaseModel)).isTrue
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersModelTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersModelTest.kt
new file mode 100644
index 00000000000..7aab0b8d911
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/planoffers/PlanOffersModelTest.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.planoffers
+
+import org.junit.Test
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PLAN_OFFER_MODELS
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+
+class PlanOffersModelTest {
+    @Test
+    fun testPlanOffersEquals() {
+        val samplePlanOffersModel1 = PLAN_OFFER_MODELS[0]
+        val samplePlanOffersModel2 = PLAN_OFFER_MODELS[0].copy()
+
+        assertEquals(samplePlanOffersModel1, samplePlanOffersModel2)
+        assertEquals(samplePlanOffersModel1.hashCode(), samplePlanOffersModel2.hashCode())
+
+        val samplePlanOffersModel3 = PLAN_OFFER_MODELS[0].copy(
+            description = "mismatched description"
+        )
+        assertNotEquals(samplePlanOffersModel1, samplePlanOffersModel3)
+        assertNotEquals(samplePlanOffersModel1.hashCode(), samplePlanOffersModel3.hashCode())
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/PluginDirectorySqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/PluginDirectorySqlUtilsTest.kt
new file mode 100644
index 00000000000..1e22e30bd78
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/PluginDirectorySqlUtilsTest.kt
@@ -0,0 +1,232 @@
+package org.wordpress.android.fluxc.plugin
+
+import com.yarolegovich.wellsql.WellSql
+import junit.framework.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType.NEW
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType.POPULAR
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel
+import org.wordpress.android.fluxc.persistence.PluginSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import java.lang.reflect.InvocationTargetException
+import java.util.Random
+import kotlin.math.max
+
+@RunWith(RobolectricTestRunner::class)
+class PluginDirectorySqlUtilsTest {
+    private val random = Random(System.currentTimeMillis())
+
+    @Before fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    @Throws(
+        NoSuchMethodException::class,
+        InvocationTargetException::class,
+        IllegalAccessException::class
+    )
+    fun testInsertPluginDirectoryList() {
+        val numberOfDirectories = 10
+        val pluginDirectoryList = arrayListOf<PluginDirectoryModel>()
+        val directoryType = NEW
+        for (i in 0 until numberOfDirectories) {
+            val directoryModel = PluginDirectoryModel()
+            directoryModel.slug = randomString("slug$i")
+            directoryModel.directoryType = directoryType.toString()
+            directoryModel.page = 1
+            pluginDirectoryList.add(directoryModel)
+        }
+        PluginSqlUtils.insertPluginDirectoryList(pluginDirectoryList)
+        Assert.assertEquals(numberOfDirectories, getPluginDirectoriesForType(directoryType).size)
+    }
+
+    @Test
+    @Throws(
+        NoSuchMethodException::class,
+        InvocationTargetException::class,
+        IllegalAccessException::class
+    )
+    fun testInsertSinglePluginDirectoryModel() {
+        val slug = randomString("slug")
+        val page = 5
+        val pluginDirectoryList = arrayListOf<PluginDirectoryModel>()
+        val directoryType = NEW
+        val directoryModel = PluginDirectoryModel()
+        directoryModel.slug = slug
+        directoryModel.directoryType = directoryType.toString()
+        directoryModel.page = page
+        pluginDirectoryList.add(directoryModel)
+        PluginSqlUtils.insertPluginDirectoryList(pluginDirectoryList)
+
+        val directoryList = getPluginDirectoriesForType(directoryType)
+        Assert.assertEquals(1, directoryList.size)
+        Assert.assertEquals(directoryList.first().page, page)
+    }
+
+    @Test
+    fun testGetLastRequestedPageForDirectoryType() {
+        val numberOfTimesToTry = 10
+        var lastRequestedPage = 0
+        val maxPossiblePage = 100
+        val directoryType = NEW
+        // We insert a PluginDirectoryModel in each iteration with a random page number and assert
+        // that the max value of the page we have set so far is always the last requested page
+        for (i in 0 until numberOfTimesToTry) {
+            val directoryModel = PluginDirectoryModel()
+            directoryModel.slug = randomString("slug$i")
+            directoryModel.directoryType = directoryType.toString()
+            val page = random.nextInt(maxPossiblePage)
+            directoryModel.page = page
+            // Add PluginDirectoryModels one by one
+            val pluginDirectoryList = arrayListOf<PluginDirectoryModel>()
+            pluginDirectoryList.add(directoryModel)
+            PluginSqlUtils.insertPluginDirectoryList(pluginDirectoryList)
+            // Last requested page is the max value of the `page` column for that directory type
+            lastRequestedPage = max(lastRequestedPage, page)
+            Assert.assertEquals(
+                lastRequestedPage,
+                PluginSqlUtils.getLastRequestedPageForDirectoryType(directoryType)
+            )
+        }
+    }
+
+    @Test
+    fun testGetWPOrgPluginsForDirectory() {
+        val slugList = randomSlugList()
+        // Insert random 50 wporg plugins
+        slugList.forEach {
+            val wpOrgPluginModel = WPOrgPluginModel()
+            wpOrgPluginModel.slug = it
+            Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateWPOrgPlugin(wpOrgPluginModel))
+        }
+
+        // A Plugin might be in both NEW and POPULAR list, in order to simulate that, we pick high
+        // numbers for the plugin list sizes. Since we have 50 items in total, picking 30 and 40
+        // will guarantee some duplicates
+        val numberOfNewPlugins = 30
+        val numberOfPopularPlugins = 40
+
+        // Assert empty state - SQLite's WHERE IN query could crash if the empty list is not handled properly
+        Assert.assertEquals(0, PluginSqlUtils.getWPOrgPluginsForDirectory(NEW).size)
+        Assert.assertEquals(0, PluginSqlUtils.getWPOrgPluginsForDirectory(POPULAR).size)
+
+        // Add plugin directory models for NEW type
+        val slugListForNewPlugins = randomSlugsFromList(slugList, numberOfNewPlugins)
+        val directoryListForNewPlugins = arrayListOf<PluginDirectoryModel>()
+        slugListForNewPlugins.forEach {
+            val directoryModel = PluginDirectoryModel()
+            directoryModel.slug = it
+            directoryModel.directoryType = NEW.toString()
+            directoryListForNewPlugins.add(directoryModel)
+        }
+        PluginSqlUtils.insertPluginDirectoryList(directoryListForNewPlugins)
+
+        // Add plugin directory models for POPULAR type
+        val slugListForPopularPlugins = randomSlugsFromList(slugList, numberOfPopularPlugins)
+        val directoryListForPopularPlugins: MutableList<PluginDirectoryModel> = ArrayList()
+        slugListForPopularPlugins.forEach {
+            val directoryModel = PluginDirectoryModel()
+            directoryModel.slug = it
+            directoryModel.directoryType = POPULAR.toString()
+            directoryListForPopularPlugins.add(directoryModel)
+        }
+        PluginSqlUtils.insertPluginDirectoryList(directoryListForPopularPlugins)
+
+        // Assert that getWPOrgPluginsForDirectory return the correct items
+
+        val insertedNewPlugins = PluginSqlUtils.getWPOrgPluginsForDirectory(NEW)
+        Assert.assertEquals(numberOfNewPlugins, insertedNewPlugins.size)
+        // The results should be in the order the PluginDirectoryModels were inserted in
+        for (i in 0 until numberOfNewPlugins) {
+            val slug = slugListForNewPlugins[i]
+            val wpOrgPluginModel = insertedNewPlugins[i]
+            Assert.assertEquals(wpOrgPluginModel.slug, slug)
+        }
+        val insertedPopularPlugins = PluginSqlUtils.getWPOrgPluginsForDirectory(POPULAR)
+        Assert.assertEquals(numberOfPopularPlugins, insertedPopularPlugins.size)
+        // The results should be in the order the PluginDirectoryModels were inserted in
+        for (i in 0 until numberOfPopularPlugins) {
+            val slug = slugListForPopularPlugins[i]
+            val wpOrgPluginModel = insertedPopularPlugins[i]
+            Assert.assertEquals(wpOrgPluginModel.slug, slug)
+        }
+    }
+
+    @Test
+    fun testTooManyVariablesForGetWPOrgPluginsForDirectory() {
+        val numberOfNewPlugins = 1000
+
+        val slugList: MutableList<String> = ArrayList()
+        for (i in 0 until numberOfNewPlugins) {
+            slugList.add(randomString("slug$i")) // ensure slugs are different
+        }
+        // Insert random wporg plugins
+        slugList.forEach {
+            val wpOrgPluginModel = WPOrgPluginModel()
+            wpOrgPluginModel.slug = it
+            PluginSqlUtils.insertOrUpdateWPOrgPlugin(wpOrgPluginModel)
+        }
+
+        // Add plugin directory models for NEW type
+        val directoryListForNewPlugins = arrayListOf<PluginDirectoryModel>()
+        slugList.forEach {
+            val directoryModel = PluginDirectoryModel()
+            directoryModel.slug = it
+            directoryModel.directoryType = NEW.toString()
+            directoryListForNewPlugins.add(directoryModel)
+        }
+        PluginSqlUtils.insertPluginDirectoryList(directoryListForNewPlugins)
+        val insertedNewPlugins = PluginSqlUtils.getWPOrgPluginsForDirectory(NEW)
+        Assert.assertEquals(numberOfNewPlugins, insertedNewPlugins.size)
+    }
+
+    @Throws(
+        NoSuchMethodException::class,
+        InvocationTargetException::class,
+        IllegalAccessException::class
+    )
+    private fun getPluginDirectoriesForType(
+        directoryType: PluginDirectoryType
+    ): List<PluginDirectoryModel> {
+        // Use reflection to assert PluginSqlUtils.getPluginDirectoriesForType
+        val getPluginDirectoriesForType = PluginSqlUtils::class.java.getDeclaredMethod(
+            "getPluginDirectoriesForType",
+            PluginDirectoryType::class.java
+        )
+        getPluginDirectoriesForType.isAccessible = true
+        val directoryList = getPluginDirectoriesForType.invoke(
+            PluginSqlUtils::class.java,
+            directoryType
+        )
+        Assert.assertTrue(directoryList is List<*>)
+        @Suppress("UNCHECKED_CAST")
+        return (directoryList as List<PluginDirectoryModel>)
+    }
+
+    private fun randomString(prefix: String): String = prefix + "-" + random.nextInt()
+
+    private fun randomSlugList(): List<String?> {
+        val list = arrayListOf<String?>()
+        for (i in 0..49) {
+            list.add(randomString("slug$i")) // ensure slugs are different
+        }
+        return list
+    }
+
+    private fun randomSlugsFromList(slugList: List<String?>, size: Int): List<String?> {
+        Assert.assertTrue(slugList.size > size)
+        ArrayList(slugList).shuffle() // copy the list so it's order is not changed
+        return slugList.subList(0, size)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/SitePluginSqlUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/SitePluginSqlUtilsTest.java
new file mode 100644
index 00000000000..02f7ec26f18
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/SitePluginSqlUtilsTest.java
@@ -0,0 +1,220 @@
+package org.wordpress.android.fluxc.plugin;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel;
+import org.wordpress.android.fluxc.persistence.PluginSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+@RunWith(RobolectricTestRunner.class)
+public class SitePluginSqlUtilsTest {
+    private static final int TEST_LOCAL_SITE_ID = 1;
+    private static final int SMALL_TEST_POOL = 10;
+
+    private final Random mRandom = new Random(System.currentTimeMillis());
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, SitePluginModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testInsertNullSitePlugin() {
+        SiteModel site = getTestSite();
+        Assert.assertEquals(0, PluginSqlUtils.insertOrUpdateSitePlugin(site, null));
+        Assert.assertTrue(PluginSqlUtils.getSitePlugins(site).isEmpty());
+    }
+
+    @Test
+    public void testInsertSitePlugin() {
+        // Create site and plugin
+        SiteModel site = getTestSite();
+        String slug = randomString("slug");
+        SitePluginModel plugin = getTestPluginBySlug(slug);
+
+        // Insert the plugin and assert that it was successful
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin));
+        List<SitePluginModel> sitePlugins = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(1, sitePlugins.size());
+
+        // Assert that the inserted plugin is not null and has the correct slug
+        SitePluginModel insertedPlugin = sitePlugins.get(0);
+        Assert.assertNotNull(insertedPlugin);
+        Assert.assertEquals(plugin.getSlug(), insertedPlugin.getSlug());
+        Assert.assertEquals(site.getId(), insertedPlugin.getLocalSiteId());
+    }
+
+    @Test
+    public void testUpdateSitePlugin() {
+        SiteModel site = getTestSite();
+        String slug = randomString("slug");
+        String displayName = randomString("displayName");
+
+        // First install a plugin and retrieve the DB copy
+        SitePluginModel plugin = getTestPluginBySlug(slug);
+        plugin.setDisplayName(displayName);
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin));
+        List<SitePluginModel> sitePlugins = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(1, sitePlugins.size());
+        SitePluginModel insertedPlugin = sitePlugins.get(0);
+        Assert.assertEquals(insertedPlugin.getDisplayName(), displayName);
+
+        // Then, update the plugin's display name
+        String newDisplayName = randomString("newDisplayName");
+        insertedPlugin.setDisplayName(newDisplayName);
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, insertedPlugin));
+
+        // Assert that we still have only one plugin in DB and it has the new display name
+        List<SitePluginModel> updatedSitePluginList = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(1, updatedSitePluginList.size());
+        SitePluginModel updatedPlugin = updatedSitePluginList.get(0);
+        Assert.assertEquals(updatedPlugin.getDisplayName(), newDisplayName);
+
+        // Verify that local id of the plugin didn't change
+        Assert.assertEquals(insertedPlugin.getId(), updatedPlugin.getId());
+    }
+
+    // Inserts 10 plugins with known IDs then retrieves all site plugins and validates slugs
+    @Test
+    public void testGetSitePlugins() {
+        SiteModel site = getTestSite();
+        List<String> pluginSlugs = insertBasicTestPlugins(site, SMALL_TEST_POOL);
+        List<SitePluginModel> sitePlugins = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(SMALL_TEST_POOL, sitePlugins.size());
+
+        for (int i = 0; i < pluginSlugs.size(); i++) {
+            SitePluginModel sitePlugin = sitePlugins.get(i);
+            Assert.assertNotNull(sitePlugin);
+            Assert.assertEquals(pluginSlugs.get(i), sitePlugin.getSlug());
+        }
+    }
+
+    @Test
+    public void testReplaceSitePlugins() {
+        // First insert small set of basic plugins and assert that
+        SiteModel site = getTestSite();
+        insertBasicTestPlugins(site, SMALL_TEST_POOL);
+        List<SitePluginModel> sitePlugins = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(sitePlugins.size(), SMALL_TEST_POOL);
+
+        // Create a single plugin and update the site plugin list and assert that now we have a single plugin
+        List<SitePluginModel> newSitePlugins = new ArrayList<>();
+        String newSitePluginSlug = randomString("newPluginSlug");
+        SitePluginModel singleSitePlugin = getTestPluginBySlug(newSitePluginSlug);
+        newSitePlugins.add(singleSitePlugin);
+        PluginSqlUtils.insertOrReplaceSitePlugins(site, newSitePlugins);
+
+        List<SitePluginModel> updatedSitePluginList = PluginSqlUtils.getSitePlugins(site);
+        Assert.assertEquals(1, updatedSitePluginList.size());
+        SitePluginModel onlyPluginFromUpdatedList = updatedSitePluginList.get(0);
+        Assert.assertEquals(onlyPluginFromUpdatedList.getSlug(), newSitePluginSlug);
+    }
+
+    @Test
+    public void testDeleteSitePlugin() {
+        // Create site and plugin
+        SiteModel site = getTestSite();
+        String slug = randomString("slug");
+        SitePluginModel plugin = getTestPluginBySlug(slug);
+
+        // Insert the plugin and verify that site plugin size is 1
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin));
+        Assert.assertEquals(1, PluginSqlUtils.getSitePlugins(site).size());
+
+        // Delete the plugin and verify that site plugin list is empty
+        Assert.assertEquals(1, PluginSqlUtils.deleteSitePlugin(site, slug));
+        Assert.assertTrue(PluginSqlUtils.getSitePlugins(site).isEmpty());
+    }
+
+    @Test
+    public void testDeleteSitePlugins() {
+        // Create site and plugin
+        SiteModel site = getTestSite();
+        SitePluginModel plugin1 = getTestPluginBySlug(randomString("slug"));
+        SitePluginModel plugin2 = getTestPluginBySlug(randomString("slug"));
+
+        // Insert the plugins and verify that site plugin size is 2
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin1));
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin2));
+        Assert.assertEquals(2, PluginSqlUtils.getSitePlugins(site).size());
+
+        // Delete the plugins and verify that site plugin list is empty
+        Assert.assertEquals(2, PluginSqlUtils.deleteSitePlugins(site));
+        Assert.assertTrue(PluginSqlUtils.getSitePlugins(site).isEmpty());
+    }
+
+    @Test
+    public void testGetSitePluginBySlug() {
+        // Create site and 2 plugins
+        SiteModel site = getTestSite();
+        String pluginSlug1 = randomString("slug1");
+        String pluginSlug2 = randomString("slug2");
+
+        SitePluginModel plugin1 = getTestPluginBySlug(pluginSlug1);
+        SitePluginModel plugin2 = getTestPluginBySlug(pluginSlug2);
+
+        // Insert the plugins and verify that site plugin size is 2
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin1));
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin2));
+        Assert.assertEquals(2, PluginSqlUtils.getSitePlugins(site).size());
+
+        // Assert that getSitePluginBySlug retrieves the correct plugins
+        SitePluginModel pluginBySlug1 = PluginSqlUtils.getSitePluginBySlug(site, pluginSlug1);
+        Assert.assertNotNull(pluginBySlug1);
+        Assert.assertEquals(pluginBySlug1.getSlug(), pluginSlug1);
+
+        SitePluginModel pluginBySlug2 = PluginSqlUtils.getSitePluginBySlug(site, pluginSlug2);
+        Assert.assertNotNull(pluginBySlug2);
+        Assert.assertEquals(pluginBySlug2.getSlug(), pluginSlug2);
+    }
+
+    // Helper methods
+
+    private SitePluginModel getTestPluginBySlug(String slug) {
+        SitePluginModel plugin = new SitePluginModel();
+        plugin.setLocalSiteId(TEST_LOCAL_SITE_ID);
+        plugin.setSlug(slug);
+        return plugin;
+    }
+
+    private List<String> insertBasicTestPlugins(SiteModel site, int numberOfPlugins) {
+        List<String> pluginSlugs = new ArrayList<>();
+        for (int i = 0; i < numberOfPlugins; i++) {
+            String slug = randomString("slug" + i + "-");
+            pluginSlugs.add(slug);
+            SitePluginModel plugin = getTestPluginBySlug(slug);
+            plugin.setLocalSiteId(site.getId());
+            Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin));
+        }
+        return pluginSlugs;
+    }
+
+    private String randomString(String prefix) {
+        return prefix + "-" + mRandom.nextInt();
+    }
+
+    private SiteModel getTestSite() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(TEST_LOCAL_SITE_ID);
+        return siteModel;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/WPOrgPluginSqlUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/WPOrgPluginSqlUtilsTest.java
new file mode 100644
index 00000000000..346caa40a0b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/plugin/WPOrgPluginSqlUtilsTest.java
@@ -0,0 +1,157 @@
+package org.wordpress.android.fluxc.plugin;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel;
+import org.wordpress.android.fluxc.persistence.PluginSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+@RunWith(RobolectricTestRunner.class)
+public class WPOrgPluginSqlUtilsTest {
+    private Random mRandom = new Random(System.currentTimeMillis());
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, WPOrgPluginModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testInsertNullWPOrgPlugin() {
+        Assert.assertEquals(0, PluginSqlUtils.insertOrUpdateWPOrgPlugin(null));
+    }
+
+    @Test
+    public void testInsertWPOrgPlugin() {
+        String slug = randomString("slug");
+        String displayName = randomString("displayName");
+
+        // Assert no plugin exist with the slug
+        Assert.assertNull(PluginSqlUtils.getWPOrgPluginBySlug(slug));
+
+        // Create wporg plugin
+        WPOrgPluginModel plugin = new WPOrgPluginModel();
+        plugin.setSlug(slug);
+        plugin.setDisplayName(displayName);
+
+        // Insert the plugin and assert that it was successful
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateWPOrgPlugin(plugin));
+        WPOrgPluginModel insertedPlugin = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+        Assert.assertNotNull(insertedPlugin);
+        Assert.assertEquals(insertedPlugin.getDisplayName(), displayName);
+    }
+
+    @Test
+    public void testUpdateWPOrgPlugin() {
+        String slug = randomString("slug");
+        String displayName = randomString("displayName");
+
+        WPOrgPluginModel plugin = new WPOrgPluginModel();
+        plugin.setSlug(slug);
+        plugin.setDisplayName(displayName);
+
+        // Insert a wporg plugin and assert the state
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateWPOrgPlugin(plugin));
+        WPOrgPluginModel insertedPlugin = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+        Assert.assertNotNull(insertedPlugin);
+        Assert.assertEquals(insertedPlugin.getDisplayName(), displayName);
+
+        // Update the name of the plugin and try insertOrUpdate and make sure the plugin is updated
+        String displayName2 = randomString("displayName2-");
+        Assert.assertTrue(!displayName.equals(displayName2));
+        insertedPlugin.setDisplayName(displayName2);
+        Assert.assertEquals(1, PluginSqlUtils.insertOrUpdateWPOrgPlugin(insertedPlugin));
+        WPOrgPluginModel updatedPlugin = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+        Assert.assertNotNull(updatedPlugin);
+        Assert.assertEquals(insertedPlugin.getSlug(), updatedPlugin.getSlug());
+        Assert.assertEquals(updatedPlugin.getDisplayName(), displayName2);
+    }
+
+    @Test
+    public void testInsertWPOrgPluginList() {
+        int numberOfPlugins = 10;
+        List<WPOrgPluginModel> plugins = new ArrayList<>();
+        List<String> slugList = new ArrayList<>();
+        for (int i = 0; i < numberOfPlugins; i++) {
+            String slug = randomString("slug") + i;
+            slugList.add(slug);
+            WPOrgPluginModel wpOrgPluginModel = new WPOrgPluginModel();
+            wpOrgPluginModel.setSlug(slug);
+            plugins.add(wpOrgPluginModel);
+        }
+        Assert.assertEquals(numberOfPlugins, PluginSqlUtils.insertOrUpdateWPOrgPluginList(plugins));
+
+        for (String slug : slugList) {
+            WPOrgPluginModel wpOrgPluginModel = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+            Assert.assertNotNull(wpOrgPluginModel);
+        }
+    }
+
+    @Test
+    public void testUpdateWPOrgPluginList() {
+        int numberOfPlugins = 2;
+        List<WPOrgPluginModel> plugins = new ArrayList<>();
+        List<String> slugList = new ArrayList<>();
+        List<String> displayNameList = new ArrayList<>();
+        for (int i = 0; i < numberOfPlugins; i++) {
+            String slug = randomString("slug") + i;
+            String displayName = randomString("name") + i;
+            slugList.add(slug);
+            displayNameList.add(displayName);
+            WPOrgPluginModel wpOrgPluginModel = new WPOrgPluginModel();
+            wpOrgPluginModel.setSlug(slug);
+            wpOrgPluginModel.setDisplayName(displayName);
+            plugins.add(wpOrgPluginModel);
+        }
+        // Insert plugins
+        Assert.assertEquals(numberOfPlugins, PluginSqlUtils.insertOrUpdateWPOrgPluginList(plugins));
+
+        List<String> updatedNameList = new ArrayList<>();
+        List<WPOrgPluginModel> updatedPlugins = new ArrayList<>();
+        for (int i = 0; i < slugList.size(); i++) {
+            String slug = slugList.get(i);
+            String newDisplayName = randomString("newDisplayName" + i + "-");
+            updatedNameList.add(newDisplayName);
+            WPOrgPluginModel wpOrgPluginModel = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+            Assert.assertNotNull(wpOrgPluginModel);
+            // Update plugin name
+            wpOrgPluginModel.setDisplayName(newDisplayName);
+            updatedPlugins.add(wpOrgPluginModel);
+        }
+        // Update plugins
+        Assert.assertEquals(numberOfPlugins, PluginSqlUtils.insertOrUpdateWPOrgPluginList(updatedPlugins));
+
+        // Assert the plugins are updated
+        for (int i = 0; i < numberOfPlugins; i++) {
+            String slug = slugList.get(i);
+            String previousName = displayNameList.get(i);
+            String expectedName = updatedNameList.get(i);
+            WPOrgPluginModel wpOrgPluginModel = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+            Assert.assertNotNull(wpOrgPluginModel);
+            Assert.assertFalse(StringUtils.equals(wpOrgPluginModel.getDisplayName(), previousName));
+            Assert.assertTrue(StringUtils.equals(wpOrgPluginModel.getDisplayName(), expectedName));
+        }
+    }
+
+    private String randomString(String prefix) {
+        return prefix + "-" + mRandom.nextInt();
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostLocationTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostLocationTest.java
new file mode 100644
index 00000000000..61c9022afca
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostLocationTest.java
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.post;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.post.PostLocation;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+public class PostLocationTest {
+    private static final double MAX_LAT = 90;
+    private static final double MIN_LAT = -90;
+    private static final double MAX_LNG = 180;
+    private static final double MIN_LNG = -180;
+    private static final double INVALID_LAT_MAX = 91;
+    private static final double INVALID_LAT_MIN = -91;
+    private static final double INVALID_LNG_MAX = 181;
+    private static final double INVALID_LNG_MIN = -181;
+    private static final double EQUATOR_LAT = 0;
+    private static final double EQUATOR_LNG = 0;
+
+    @Test
+    public void testInstantiateValidLocation() {
+        PostLocation locationZero = new PostLocation(EQUATOR_LAT, EQUATOR_LNG);
+        assertTrue("ZeroLoc did not instantiate valid location", locationZero.isValid());
+        assertEquals("ZeroLoc did not return correct lat", EQUATOR_LAT, locationZero.getLatitude());
+        assertEquals("ZeroLoc did not return correct lng", EQUATOR_LNG, locationZero.getLongitude());
+
+        PostLocation locationMax = new PostLocation(MAX_LAT, MAX_LNG);
+        assertTrue("MaxLoc did not instantiate valid location", locationMax.isValid());
+        assertEquals("MaxLoc did not return correct lat", MAX_LAT, locationMax.getLatitude());
+        assertEquals("MaxLoc did not return correct lng", MAX_LNG, locationMax.getLongitude());
+
+        PostLocation locationMin = new PostLocation(MIN_LAT, MIN_LNG);
+        assertTrue("MinLoc did not instantiate valid location", locationMin.isValid());
+        assertEquals("MinLoc did not return correct lat", MIN_LAT, locationMin.getLatitude());
+        assertEquals("MinLoc did not return correct lng", MIN_LNG, locationMin.getLongitude());
+
+        double miscLat = 34;
+        double miscLng = -60;
+        PostLocation locationMisc = new PostLocation(miscLat, miscLng);
+        assertTrue("MiscLoc did not instantiate valid location", locationMisc.isValid());
+        assertEquals("MiscLoc did not return correct lat", miscLat, locationMisc.getLatitude());
+        assertEquals("MiscLoc did not return correct lng", miscLng, locationMisc.getLongitude());
+    }
+
+    @Test
+    public void testDefaultLocationInvalid() {
+        PostLocation location = new PostLocation();
+        assertFalse("Empty location should be invalid", location.isValid());
+    }
+
+    @Test
+    public void testInvalidMaxLatitude() {
+        PostLocation location = new PostLocation(INVALID_LAT_MAX, 0.0);
+        assertFalse("Invalid Latitude and still valid", location.isValid());
+    }
+
+    @Test
+    public void testInvalidMinLatitude() {
+        PostLocation location = new PostLocation(INVALID_LAT_MIN, 0.0);
+        assertFalse("Invalid Latitude and still valid", location.isValid());
+    }
+
+    @Test
+    public void testInvalidMaxLongitude() {
+        PostLocation location = new PostLocation(0.0, INVALID_LNG_MAX);
+        assertFalse("Invalid Longitude and still valid", location.isValid());
+    }
+
+    @Test
+    public void testInvalidMinLongitude() {
+        PostLocation location = new PostLocation(0.0, INVALID_LNG_MIN);
+        assertFalse("Invalid Longitude and still valid", location.isValid());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostModelTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostModelTest.java
new file mode 100644
index 00000000000..095f8a5e8e3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostModelTest.java
@@ -0,0 +1,134 @@
+package org.wordpress.android.fluxc.post;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.post.PostLocation;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.fluxc.network.BaseRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.wordpress.android.fluxc.post.PostTestUtils.EXAMPLE_LATITUDE;
+import static org.wordpress.android.fluxc.post.PostTestUtils.EXAMPLE_LONGITUDE;
+
+public class PostModelTest {
+    @Test
+    public void testEquals() {
+        PostModel testPost = PostTestUtils.generateSampleUploadedPost();
+        PostModel testPost2 = PostTestUtils.generateSampleUploadedPost();
+
+        testPost2.setRemotePostId(testPost.getRemotePostId() + 1);
+        assertFalse(testPost.equals(testPost2));
+        testPost2.setRemotePostId(testPost.getRemotePostId());
+        assertTrue(testPost.equals(testPost2));
+    }
+
+    @Test
+    public void testClone() {
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+
+        // Fill a few more sample fields
+        testPost.setDateCreated("1955-11-05T06:15:00-0800");
+        testPost.setStatus(PostStatus.SCHEDULED.toString());
+        List<Long> categoryList = new ArrayList<>();
+        categoryList.add(45L);
+        testPost.setCategoryIdList(categoryList);
+
+        testPost.error = new BaseRequest.BaseNetworkError(BaseRequest.GenericErrorType.PARSE_ERROR);
+
+        PostModel clonedPost = testPost.clone();
+
+        assertFalse(testPost == clonedPost);
+        assertTrue(testPost.equals(clonedPost));
+
+        // The inherited error should also be cloned
+        assertFalse(testPost.error == clonedPost.error);
+    }
+
+    @Test
+    public void testTerms() {
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+
+        testPost.setCategoryIdList(null);
+        assertTrue(testPost.getCategoryIdList().isEmpty());
+
+        List<Long> categoryIds = new ArrayList<>();
+        testPost.setCategoryIdList(categoryIds);
+        assertTrue(testPost.getCategoryIdList().isEmpty());
+
+        categoryIds.add((long) 5);
+        categoryIds.add((long) 6);
+        testPost.setCategoryIdList(categoryIds);
+
+        assertEquals(2, testPost.getCategoryIdList().size());
+        assertTrue(categoryIds.containsAll(testPost.getCategoryIdList())
+                   && testPost.getCategoryIdList().containsAll(categoryIds));
+    }
+
+    @Test
+    public void testLocation() {
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+
+        // Expect no location if none was set
+        assertFalse(testPost.hasLocation());
+        assertFalse(testPost.getLocation().isValid());
+        assertFalse(testPost.shouldDeleteLatitude());
+        assertFalse(testPost.shouldDeleteLongitude());
+
+        // Verify state when location is set
+        testPost.setLocation(new PostLocation(EXAMPLE_LATITUDE, EXAMPLE_LONGITUDE));
+
+        assertTrue(testPost.hasLocation());
+        assertEquals(EXAMPLE_LATITUDE, testPost.getLatitude(), 0);
+        assertEquals(EXAMPLE_LONGITUDE, testPost.getLongitude(), 0);
+        assertEquals(new PostLocation(EXAMPLE_LATITUDE, EXAMPLE_LONGITUDE), testPost.getLocation());
+        assertFalse(testPost.shouldDeleteLatitude());
+        assertFalse(testPost.shouldDeleteLongitude());
+
+        // (0, 0) is a valid location
+        testPost.setLocation(0, 0);
+
+        assertTrue(testPost.hasLocation());
+        assertEquals(0, testPost.getLatitude(), 0);
+        assertEquals(0, testPost.getLongitude(), 0);
+        assertEquals(new PostLocation(0, 0), testPost.getLocation());
+        assertFalse(testPost.shouldDeleteLatitude());
+        assertFalse(testPost.shouldDeleteLongitude());
+
+        // Clearing the location should remove the location, and flag it for deletion on the server
+        testPost.clearLocation();
+
+        assertFalse(testPost.hasLocation());
+        assertFalse(testPost.getLocation().isValid());
+        assertTrue(testPost.shouldDeleteLatitude());
+        assertTrue(testPost.shouldDeleteLongitude());
+    }
+
+    @Test
+    public void testFilterEmptyTagsOnGetTagNameList() {
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+
+        testPost.setTagNames("pony,             ,ponies");
+        List<String> tags = testPost.getTagNameList();
+        assertTrue(tags.contains("pony"));
+        assertTrue(tags.contains("ponies"));
+        assertEquals(2, tags.size());
+    }
+
+    @Test
+    public void testStripTagsOnGetTagNameList() {
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+
+        testPost.setTagNames("    pony   , ponies    , #popopopopopony");
+        List<String> tags = testPost.getTagNameList();
+
+        assertTrue(tags.contains("pony"));
+        assertTrue(tags.contains("ponies"));
+        assertTrue(tags.contains("#popopopopopony"));
+        assertEquals(3, tags.size());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostRevisionModelTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostRevisionModelTest.kt
new file mode 100644
index 00000000000..298f8d3ac00
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostRevisionModelTest.kt
@@ -0,0 +1,117 @@
+package org.wordpress.android.fluxc.post
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.revisions.Diff
+import org.wordpress.android.fluxc.model.revisions.DiffOperations
+import org.wordpress.android.fluxc.model.revisions.LocalDiffModel
+import org.wordpress.android.fluxc.model.revisions.LocalDiffType
+import org.wordpress.android.fluxc.model.revisions.LocalRevisionModel
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import kotlin.test.assertNotNull
+
+class PostRevisionModelTest {
+    @Test
+    fun testSampleRevisionModel() {
+        val revision = PostTestUtils.generateSamplePostRevision()
+        assertNotNull(revision)
+        assertEquals(1, revision.revisionId)
+        assertEquals(2, revision.diffFromVersion)
+        assertEquals(5, revision.totalAdditions)
+        assertEquals(6, revision.totalDeletions)
+        assertEquals("post content", revision.postContent)
+        assertEquals("post excerpt", revision.postExcerpt)
+        assertEquals("post title", revision.postTitle)
+        assertEquals("2018-09-04 12:19:34Z", revision.postDateGmt)
+        assertEquals("2018-09-05 13:19:34Z", revision.postModifiedGmt)
+        assertEquals("111111111", revision.postAuthorId)
+
+        val titleDiffs = revision.titleDiffs
+        assertNotNull(titleDiffs)
+        assertEquals(5, titleDiffs.size)
+
+        assertEquals(DiffOperations.COPY, titleDiffs[0].operation)
+        assertEquals("copy title", titleDiffs[0].value)
+
+        assertEquals(DiffOperations.COPY, titleDiffs[1].operation)
+        assertEquals("copy another title", titleDiffs[1].value)
+
+        assertEquals(DiffOperations.ADD, titleDiffs[2].operation)
+        assertEquals("add new title", titleDiffs[2].value)
+
+        assertEquals(DiffOperations.DELETE, titleDiffs[3].operation)
+        assertEquals("del title", titleDiffs[3].value)
+
+        assertEquals(DiffOperations.ADD, titleDiffs[4].operation)
+        assertEquals("add different title", titleDiffs[4].value)
+
+        val contentDiffs = revision.contentDiffs
+        assertNotNull(contentDiffs)
+        assertEquals(3, contentDiffs.size)
+
+        assertEquals(DiffOperations.COPY, contentDiffs[0].operation)
+        assertEquals("copy some content", contentDiffs[0].value)
+
+        assertEquals(DiffOperations.ADD, contentDiffs[1].operation)
+        assertEquals("add new content", contentDiffs[1].value)
+
+        assertEquals(DiffOperations.DELETE, contentDiffs[2].operation)
+        assertEquals("del all the content", contentDiffs[2].value)
+    }
+
+    @Test
+    fun testRevisionModelEquals() {
+        val sampleRevision1 = PostTestUtils.generateSamplePostRevision()
+        val sampleRevision2 = PostTestUtils.generateSamplePostRevision()
+
+        assertEquals(sampleRevision1, sampleRevision2)
+        assertEquals(sampleRevision1.hashCode(), sampleRevision2.hashCode())
+
+        sampleRevision1.titleDiffs[0] = Diff(DiffOperations.COPY, "wrong value")
+        assertNotEquals(sampleRevision1, sampleRevision2)
+        assertNotEquals(sampleRevision1.hashCode(), sampleRevision2.hashCode())
+    }
+
+    @Test
+    fun testRevisionToLocalRevision() {
+        val sampleRevision = PostTestUtils.generateSamplePostRevision()
+        val postModel = PostTestUtils.generateSampleLocalDraftPost()
+
+        val site = SiteModel()
+        site.siteId = 77
+
+        val localRevisionModel = LocalRevisionModel.fromRevisionModel(sampleRevision, site, postModel)
+
+        assertNotNull(localRevisionModel)
+        assertEquals(sampleRevision.revisionId, localRevisionModel.revisionId)
+        assertEquals(site.siteId, localRevisionModel.siteId)
+        assertEquals(postModel.remotePostId, localRevisionModel.postId)
+        assertEquals(sampleRevision.diffFromVersion, localRevisionModel.diffFromVersion)
+        assertEquals(sampleRevision.totalAdditions, localRevisionModel.totalAdditions)
+        assertEquals(sampleRevision.totalDeletions, localRevisionModel.totalDeletions)
+        assertEquals(sampleRevision.postContent, localRevisionModel.postContent)
+        assertEquals(sampleRevision.postExcerpt, localRevisionModel.postExcerpt)
+        assertEquals(sampleRevision.postTitle, localRevisionModel.postTitle)
+        assertEquals(sampleRevision.postDateGmt, localRevisionModel.postDateGmt)
+        assertEquals(sampleRevision.postModifiedGmt, localRevisionModel.postModifiedGmt)
+        assertEquals(sampleRevision.postAuthorId, localRevisionModel.postAuthorId)
+    }
+
+    @Test
+    fun testDiffToLocalDiff() {
+        val site = SiteModel()
+        site.siteId = 77
+        val postModel = PostTestUtils.generateSampleLocalDraftPost()
+
+        val revision = PostTestUtils.generateSamplePostRevision()
+        val diff = revision.titleDiffs[0]
+
+        val localDiff = LocalDiffModel.fromDiffAndLocalRevision(
+                diff, LocalDiffType.TITLE, LocalRevisionModel.fromRevisionModel(revision, site, postModel))
+
+        assertNotNull(localDiff)
+        assertEquals(diff.operation, DiffOperations.fromString(localDiff.operation))
+        assertEquals(diff.value, localDiff.value)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStatusTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStatusTest.java
new file mode 100644
index 00000000000..715585349ee
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStatusTest.java
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.post;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
+
+public class PostStatusTest {
+    @Test
+    public void testPostStatusFromPost() {
+        PostModel post = new PostModel();
+        post.setStatus("publish");
+
+        // Test published post with past date
+        post.setDateCreated(DateTimeUtils.iso8601UTCFromDate(new Date()));
+        assertEquals(PostStatus.PUBLISHED, PostStatus.fromPost(post));
+
+        // Test "published" post with future date
+        post.setDateCreated(DateTimeUtils.iso8601UTCFromDate(new Date(System.currentTimeMillis() + 500000)));
+        assertEquals(PostStatus.SCHEDULED, PostStatus.fromPost(post));
+    }
+
+    @Test
+    public void testPostStatusFromPostWithNoDateCreated() {
+        PostModel post = new PostModel();
+        post.setStatus("publish");
+
+        assertEquals(PostStatus.PUBLISHED, PostStatus.fromPost(post));
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreDbIntegrationTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreDbIntegrationTest.java
new file mode 100644
index 00000000000..6136ad72346
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreDbIntegrationTest.java
@@ -0,0 +1,622 @@
+package org.wordpress.android.fluxc.post;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.core.Identifiable;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.fluxc.model.revisions.Diff;
+import org.wordpress.android.fluxc.model.revisions.DiffOperations;
+import org.wordpress.android.fluxc.model.revisions.LocalDiffModel;
+import org.wordpress.android.fluxc.model.revisions.LocalRevisionModel;
+import org.wordpress.android.fluxc.model.revisions.RevisionModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.post.PostXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.PostSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.store.PostStore;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+@RunWith(RobolectricTestRunner.class)
+public class PostStoreDbIntegrationTest {
+    private PostSqlUtils mPostSqlUtils = new PostSqlUtils();
+    private PostStore mPostStore = new PostStore(new Dispatcher(), Mockito.mock(PostRestClient.class),
+            Mockito.mock(PostXMLRPCClient.class), mPostSqlUtils);
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        List<Class<? extends Identifiable>> modelsToTest = new ArrayList<>();
+        modelsToTest.add(PostModel.class);
+        modelsToTest.add(LocalDiffModel.class);
+        modelsToTest.add(LocalRevisionModel.class);
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, modelsToTest, "");
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testInsertNullPost() {
+        assertEquals(0, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(null));
+
+        assertEquals(0, PostTestUtils.getPostsCount());
+    }
+
+    @Test
+    public void testSimpleInsertionAndRetrieval() {
+        PostModel postModel = new PostModel();
+        postModel.setRemotePostId(42);
+        PostModel result = mPostSqlUtils.insertPostForResult(postModel);
+
+        assertEquals(1, PostTestUtils.getPostsCount());
+        assertEquals(42, PostTestUtils.getPosts().get(0).getRemotePostId());
+        assertEquals(postModel, result);
+    }
+
+    @Test
+    public void testInsertWithLocalChanges() {
+        PostModel postModel = PostTestUtils.generateSampleUploadedPost();
+        postModel.setIsLocallyChanged(true);
+        mPostSqlUtils.insertPostForResult(postModel);
+
+        String newTitle = "A different title";
+        postModel.setTitle(newTitle);
+
+        assertEquals(0, mPostSqlUtils.insertOrUpdatePostKeepingLocalChanges(postModel));
+        assertEquals("A test post", PostTestUtils.getPosts().get(0).getTitle());
+
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel));
+        assertEquals(newTitle, PostTestUtils.getPosts().get(0).getTitle());
+    }
+
+    @Test
+    public void testUpdateChangesConfirmedForHashcode() {
+        // Arrange
+        PostModel postModel = new PostModel();
+        postModel.setChangesConfirmedContentHashcode(postModel.contentHashcode());
+
+        // Act
+        mPostSqlUtils.insertPostForResult(postModel);
+
+        // Assert
+        assertEquals(postModel.getChangesConfirmedContentHashcode(),
+                PostTestUtils.getPosts().get(0).getChangesConfirmedContentHashcode());
+    }
+
+    @Test
+    public void testPushAndFetchCollision() throws InterruptedException {
+        // Test uploading a post, fetching remote posts and updating the db from the fetch first
+
+        PostModel postModel = PostTestUtils.generateSampleLocalDraftPost();
+        mPostSqlUtils.insertPostForResult(postModel);
+
+        // The post after uploading, updated with the remote post ID, about to be saved locally
+        PostModel postFromUploadResponse = PostTestUtils.getPosts().get(0);
+        postFromUploadResponse.setIsLocalDraft(false);
+        postFromUploadResponse.setRemotePostId(42);
+
+        // The same post, but fetched from the server from FETCH_POSTS (so no local ID until insertion)
+        final PostModel postFromPostListFetch = postFromUploadResponse.clone();
+        postFromPostListFetch.setId(0);
+
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postFromPostListFetch);
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postFromUploadResponse);
+
+        assertEquals(1, PostTestUtils.getPosts().size());
+
+        PostModel finalPost = PostTestUtils.getPosts().get(0);
+        assertEquals(42, finalPost.getRemotePostId());
+        assertEquals(postModel.getLocalSiteId(), finalPost.getLocalSiteId());
+    }
+
+    @Test
+    public void testInsertWithoutLocalChanges() {
+        PostModel postModel = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(postModel);
+
+        String newTitle = "A different title";
+        postModel.setTitle(newTitle);
+
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostKeepingLocalChanges(postModel));
+        assertEquals(newTitle, PostTestUtils.getPosts().get(0).getTitle());
+
+        newTitle = "Another different title";
+        postModel.setTitle(newTitle);
+
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel));
+        assertEquals(newTitle, PostTestUtils.getPosts().get(0).getTitle());
+    }
+
+    @Test
+    public void testGetPostsForSite() {
+        PostModel uploadedPost1 = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost1);
+
+        PostModel uploadedPost2 = PostTestUtils.generateSampleUploadedPost();
+        uploadedPost2.setLocalSiteId(8);
+        mPostSqlUtils.insertPostForResult(uploadedPost2);
+
+        SiteModel site1 = new SiteModel();
+        site1.setId(uploadedPost1.getLocalSiteId());
+
+        SiteModel site2 = new SiteModel();
+        site2.setId(uploadedPost2.getLocalSiteId());
+
+        assertEquals(2, PostTestUtils.getPostsCount());
+
+        assertEquals(1, mPostStore.getPostsCountForSite(site1));
+        assertEquals(1, mPostStore.getPostsCountForSite(site2));
+    }
+
+    @Test
+    public void testGetPostsWithFormatForSite() {
+        PostModel textPost = PostTestUtils.generateSampleUploadedPost();
+        PostModel imagePost = PostTestUtils.generateSampleUploadedPost("image");
+        PostModel videoPost = PostTestUtils.generateSampleUploadedPost("video");
+        mPostSqlUtils.insertPostForResult(textPost);
+        mPostSqlUtils.insertPostForResult(imagePost);
+        mPostSqlUtils.insertPostForResult(videoPost);
+
+        SiteModel site = new SiteModel();
+        site.setId(textPost.getLocalSiteId());
+
+        ArrayList<String> postFormat = new ArrayList<>();
+        postFormat.add("image");
+        postFormat.add("video");
+        List<PostModel> postList = mPostStore.getPostsForSiteWithFormat(site, postFormat);
+
+        assertEquals(2, postList.size());
+        assertTrue(postList.contains(imagePost));
+        assertTrue(postList.contains(videoPost));
+        assertFalse(postList.contains(textPost));
+    }
+
+    @Test
+    public void testGetPublishedPosts() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        PostModel uploadedPost = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost);
+
+        PostModel localDraft = PostTestUtils.generateSampleLocalDraftPost();
+        mPostSqlUtils.insertPostForResult(localDraft);
+
+        assertEquals(2, PostTestUtils.getPostsCount());
+        assertEquals(2, mPostStore.getPostsCountForSite(site));
+
+        assertEquals(1, mPostStore.getUploadedPostsCountForSite(site));
+    }
+
+    @Test
+    public void testGetPostByLocalId() {
+        PostModel post = PostTestUtils.generateSampleLocalDraftPost();
+        mPostSqlUtils.insertPostForResult(post);
+
+        assertEquals(post, mPostStore.getPostByLocalPostId(post.getId()));
+    }
+
+    @Test
+    public void testGetPostByRemoteId() {
+        PostModel post = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(post);
+
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        assertEquals(post, mPostStore.getPostByRemotePostId(post.getRemotePostId(), site));
+    }
+
+    @Test
+    public void testDeleteUploadedPosts() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        PostModel uploadedPost1 = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost1);
+
+        PostModel uploadedPost2 = PostTestUtils.generateSampleUploadedPost();
+        uploadedPost2.setRemotePostId(9);
+        mPostSqlUtils.insertPostForResult(uploadedPost2);
+
+        PostModel localDraft = PostTestUtils.generateSampleLocalDraftPost();
+        mPostSqlUtils.insertPostForResult(localDraft);
+
+        PostModel locallyChangedPost = PostTestUtils.generateSampleLocallyChangedPost();
+        mPostSqlUtils.insertPostForResult(locallyChangedPost);
+
+        assertEquals(4, mPostStore.getPostsCountForSite(site));
+
+        mPostSqlUtils.deleteUploadedPostsForSite(site, false);
+
+        assertEquals(2, mPostStore.getPostsCountForSite(site));
+    }
+
+    @Test
+    public void testDeletePost() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        PostModel uploadedPost1 = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost1);
+
+        PostModel uploadedPost2 = PostTestUtils.generateSampleUploadedPost();
+        uploadedPost2.setRemotePostId(9);
+        mPostSqlUtils.insertPostForResult(uploadedPost2);
+
+        PostModel localDraft = PostTestUtils.generateSampleLocalDraftPost();
+        mPostSqlUtils.insertPostForResult(localDraft);
+
+        PostModel locallyChangedPost = PostTestUtils.generateSampleLocallyChangedPost();
+        mPostSqlUtils.insertPostForResult(locallyChangedPost);
+
+        assertEquals(4, mPostStore.getPostsCountForSite(site));
+
+        mPostSqlUtils.deletePost(uploadedPost1);
+
+        assertEquals(null, mPostStore.getPostByLocalPostId(uploadedPost1.getId()));
+        assertEquals(3, mPostStore.getPostsCountForSite(site));
+
+        mPostSqlUtils.deletePost(uploadedPost2);
+        mPostSqlUtils.deletePost(localDraft);
+
+        assertNotEquals(null, mPostStore.getPostByLocalPostId(locallyChangedPost.getId()));
+        assertEquals(1, mPostStore.getPostsCountForSite(site));
+
+        mPostSqlUtils.deletePost(locallyChangedPost);
+
+        assertEquals(null, mPostStore.getPostByLocalPostId(locallyChangedPost.getId()));
+        assertEquals(0, mPostStore.getPostsCountForSite(site));
+        assertEquals(0, PostTestUtils.getPostsCount());
+    }
+
+    @Test
+    public void testPostAndPageSeparation() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        PostModel post = new PostModel();
+        post.setLocalSiteId(6);
+        post.setRemotePostId(42);
+        mPostSqlUtils.insertPostForResult(post);
+
+        PostModel page = new PostModel();
+        page.setIsPage(true);
+        page.setLocalSiteId(6);
+        page.setRemotePostId(43);
+        mPostSqlUtils.insertPostForResult(page);
+
+        assertEquals(2, PostTestUtils.getPostsCount());
+
+        assertEquals(1, mPostStore.getPostsCountForSite(site));
+        assertEquals(1, mPostStore.getPagesCountForSite(site));
+
+        assertFalse(PostTestUtils.getPosts().get(0).isPage());
+        assertTrue(PostTestUtils.getPosts().get(1).isPage());
+
+        assertEquals(1, mPostStore.getUploadedPostsCountForSite(site));
+        assertEquals(1, mPostStore.getUploadedPagesCountForSite(site));
+    }
+
+    @Test
+    public void testPostOrder() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        PostModel post = new PostModel();
+        post.setLocalSiteId(6);
+        post.setRemotePostId(42);
+        post.setDateCreated(DateTimeUtils.iso8601UTCFromDate(new Date()));
+        mPostSqlUtils.insertPostForResult(post);
+
+        PostModel localDraft = new PostModel();
+        localDraft.setLocalSiteId(6);
+        localDraft.setIsLocalDraft(true);
+        localDraft.setDateCreated("2016-01-01T07:00:00+00:00");
+        mPostSqlUtils.insertPostForResult(localDraft);
+
+        PostModel scheduledPost = new PostModel();
+        scheduledPost.setLocalSiteId(6);
+        scheduledPost.setRemotePostId(23);
+        scheduledPost.setDateCreated("2056-01-01T07:00:00+00:00");
+        mPostSqlUtils.insertPostForResult(scheduledPost);
+
+        List<PostModel> posts = mPostSqlUtils.getPostsForSite(site, false);
+
+        // Expect order draft > scheduled > published
+        assertTrue(posts.get(0).isLocalDraft());
+        assertEquals(23, posts.get(1).getRemotePostId());
+        assertEquals(42, posts.get(2).getRemotePostId());
+    }
+
+    @Test
+    public void testRemoveAllPosts() {
+        PostModel uploadedPost1 = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost1);
+
+        PostModel uploadedPost2 = PostTestUtils.generateSampleUploadedPost();
+        uploadedPost2.setLocalSiteId(8);
+        mPostSqlUtils.insertPostForResult(uploadedPost2);
+
+        assertEquals(2, PostTestUtils.getPostsCount());
+
+        mPostSqlUtils.deleteAllPosts();
+
+        assertEquals(0, PostTestUtils.getPostsCount());
+    }
+
+    @Test
+    public void testNumLocalChanges() {
+        // first make sure there aren't any local changes
+        assertEquals(mPostStore.getNumLocalChanges(), 0);
+
+        // then add a post with local changes and ensure we get the correct count
+        PostModel testPost = PostTestUtils.generateSampleLocalDraftPost();
+        testPost.setIsLocallyChanged(true);
+        mPostSqlUtils.insertOrUpdatePost(testPost, true);
+        assertEquals(mPostStore.getNumLocalChanges(), 1);
+
+        // delete the post and again check the count
+        mPostSqlUtils.deletePost(testPost);
+        assertEquals(mPostStore.getNumLocalChanges(), 0);
+    }
+
+    @Test
+    public void testSavingAndRetrievalOfLocalRevision() {
+        RevisionModel testRevisionModel = PostTestUtils.generateSamplePostRevision();
+        SiteModel site = new SiteModel();
+        site.setSiteId(77);
+
+        PostModel postModel = PostTestUtils.generateSampleLocalDraftPost();
+        mPostStore.setLocalRevision(testRevisionModel, site, postModel);
+
+        RevisionModel retrievedRevision = mPostStore.getLocalRevision(site, postModel);
+
+        assertTrue(testRevisionModel.equals(retrievedRevision));
+    }
+
+    @Test
+    public void testUpdatingLocalRevision() {
+        RevisionModel testRevisionModel = PostTestUtils.generateSamplePostRevision();
+        SiteModel site = new SiteModel();
+        site.setSiteId(77);
+
+        PostModel postModel = PostTestUtils.generateSampleLocalDraftPost();
+        mPostStore.setLocalRevision(testRevisionModel, site, postModel);
+
+        testRevisionModel.setPostContent("new content");
+        testRevisionModel.getContentDiffs().add(new Diff(DiffOperations.ADD, "new line"));
+        mPostStore.setLocalRevision(testRevisionModel, site, postModel);
+
+        RevisionModel retrievedRevision = mPostStore.getLocalRevision(site, postModel);
+
+        assertTrue(testRevisionModel.equals(retrievedRevision));
+    }
+
+    @Test
+    public void testDeleteLocalRevision() {
+        RevisionModel testRevisionModel = PostTestUtils.generateSamplePostRevision();
+        SiteModel site = new SiteModel();
+        site.setSiteId(77);
+
+        PostModel postModel = PostTestUtils.generateSampleLocalDraftPost();
+
+        mPostStore.setLocalRevision(testRevisionModel, site, postModel);
+        assertNotNull(mPostStore.getLocalRevision(site, postModel));
+
+        mPostStore.deleteLocalRevision(testRevisionModel, site, postModel);
+        assertNull(mPostStore.getLocalRevision(site, postModel));
+    }
+
+    @Test
+    public void testDeleteLocalRevisionOfAPostOrPage() {
+        RevisionModel testRevisionModel = PostTestUtils.generateSamplePostRevision();
+        SiteModel site = new SiteModel();
+        site.setSiteId(77);
+
+        PostModel postModel = PostTestUtils.generateSampleLocalDraftPost();
+        postModel.setRemoteSiteId(77);
+
+        mPostStore.setLocalRevision(testRevisionModel, site, postModel);
+        assertNotNull(mPostStore.getLocalRevision(site, postModel));
+
+        mPostStore.deleteLocalRevisionOfAPostOrPage(postModel);
+        assertNull(mPostStore.getLocalRevision(site, postModel));
+    }
+
+    @Test
+    public void testGetLocalDraftPostsMethodOnlyReturnsLocalDrafts() {
+        // Arrange
+        final String baseTitle = "Alexandrine Thiel";
+        for (int i = 0; i < 3; i++) {
+            final String compoundTitle = baseTitle.concat(":").concat(UUID.randomUUID().toString());
+            final PostModel post = PostTestUtils.generateSampleLocalDraftPost(compoundTitle);
+            mPostSqlUtils.insertPostForResult(post);
+        }
+
+        final PostModel localDraftPage = PostTestUtils.generateSampleLocalDraftPost();
+        localDraftPage.setIsPage(true);
+        mPostSqlUtils.insertPostForResult(localDraftPage);
+
+        final PostModel uploadedPost = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(uploadedPost);
+
+        final SiteModel site = new SiteModel();
+        site.setId(PostTestUtils.DEFAULT_LOCAL_SITE_ID);
+
+        // Act
+        final List<PostModel> localDraftPosts = mPostStore.getLocalDraftPosts(site);
+
+        // Assert
+        assertEquals(3, localDraftPosts.size());
+        for (PostModel localDraftPost : localDraftPosts) {
+            assertTrue(localDraftPost.isLocalDraft());
+            assertTrue(localDraftPost.getTitle().startsWith(baseTitle));
+
+            assertNotEquals(uploadedPost.getId(), localDraftPost.getId());
+            assertNotEquals(localDraftPage.getId(), localDraftPost.getId());
+        }
+    }
+
+    @Test
+    public void testGetPostsWithLocalChangesReturnsLocalDraftsAndChangedPostsOnly() {
+        // Arrange
+        final SiteModel site = new SiteModel();
+        site.setId(PostTestUtils.DEFAULT_LOCAL_SITE_ID);
+
+        // Objects that should be included
+        final ArrayList<Integer> expectedPostIds = new ArrayList<>();
+        final String baseTitle = "Rerum";
+        for (int i = 0; i < 3; i++) {
+            final String compoundTitle = baseTitle.concat(":").concat(UUID.randomUUID().toString());
+            final PostModel post = PostTestUtils.generateSampleLocalDraftPost(compoundTitle);
+            mPostSqlUtils.insertPostForResult(post);
+            expectedPostIds.add(post.getId());
+        }
+        for (int i = 0; i < 5; i++) {
+            final String compoundTitle = baseTitle.concat(":").concat(UUID.randomUUID().toString());
+            final PostModel post = PostTestUtils.generateSampleLocallyChangedPost(compoundTitle);
+            mPostSqlUtils.insertPostForResult(post);
+            expectedPostIds.add(post.getId());
+        }
+
+        final PostModel modifiedUploadPost = PostTestUtils.generateSampleUploadedPost();
+        modifiedUploadPost.setTitle(baseTitle.concat("-c_up_post"));
+        modifiedUploadPost.setIsLocallyChanged(true);
+        mPostSqlUtils.insertPostForResult(modifiedUploadPost);
+        expectedPostIds.add(modifiedUploadPost.getId());
+
+        final PostModel modifiedPublishedPost = PostTestUtils.generateSampleUploadedPost();
+        modifiedPublishedPost.setTitle(baseTitle.concat("-mpp"));
+        modifiedPublishedPost.setIsLocallyChanged(true);
+        modifiedPublishedPost.setStatus(PostStatus.PUBLISHED.toString());
+        mPostSqlUtils.insertPostForResult(modifiedPublishedPost);
+        expectedPostIds.add(modifiedPublishedPost.getId());
+
+        // Objects that should not be included
+        final PostModel localDraftPage = PostTestUtils.generateSampleLocalDraftPost();
+        localDraftPage.setIsPage(true);
+        mPostSqlUtils.insertPostForResult(localDraftPage);
+
+        final PostModel unchangedUploadedPost = PostTestUtils.generateSampleUploadedPost();
+        mPostSqlUtils.insertPostForResult(unchangedUploadedPost);
+
+        final PostModel unchangedPublishedPost = PostTestUtils.generateSampleUploadedPost();
+        modifiedPublishedPost.setStatus(PostStatus.PUBLISHED.toString());
+        mPostSqlUtils.insertPostForResult(unchangedPublishedPost);
+
+        final List<Integer> unexpectedPostIds = Arrays.asList(
+                localDraftPage.getId(),
+                unchangedUploadedPost.getId(),
+                unchangedPublishedPost.getId());
+
+        // Act
+        final List<PostModel> locallyChangedPosts = mPostStore.getPostsWithLocalChanges(site);
+
+        // Assert
+        assertEquals(expectedPostIds.size(), locallyChangedPosts.size());
+        for (PostModel locallyChangedPost : locallyChangedPosts) {
+            assertThat(locallyChangedPost.getId()).isNotIn(unexpectedPostIds);
+            assertThat(locallyChangedPost.getId()).isIn(expectedPostIds);
+
+            assertTrue(locallyChangedPost.isLocalDraft() || locallyChangedPost.isLocallyChanged());
+            assertThat(locallyChangedPost.getTitle()).startsWith(baseTitle);
+        }
+    }
+
+
+    /**
+     * Tests that getPostsByLocalOrRemotePostIds works correctly in various situations.
+     * <p>
+     * Normally it's not a good idea to combine multiple tests like this, however due to Java's verbosity the tests
+     * are combined to avoid having too much boilerplate code.
+     */
+    @Test
+    public void testGetPostsByLocalOrRemoteIdsForOnlyLocalIds() {
+        int localSiteId = 123;
+        SiteModel site = new SiteModel();
+        site.setId(localSiteId);
+        int numberOfLocalPosts = 12;
+        int numberOfRemotePosts = 129;
+
+        // Setup local and remote ids
+        List<LocalId> localIds = new ArrayList<>(numberOfLocalPosts);
+        for (int i = 1; i <= numberOfLocalPosts; i++) {
+            localIds.add(new LocalId(i));
+        }
+        ArrayList<RemoteId> remoteIds = new ArrayList<>(numberOfRemotePosts);
+        for (int i = 1; i <= numberOfRemotePosts; i++) {
+            remoteIds.add(new RemoteId(i));
+        }
+        List<LocalOrRemoteId> localAndRemoteIds = new ArrayList<>(localIds.size() + remoteIds.size());
+        localAndRemoteIds.addAll(localIds);
+        localAndRemoteIds.addAll(remoteIds);
+
+        // Insert the posts for the local and remote ids
+        generateAndInsertPosts(localSiteId, localIds, remoteIds);
+
+        // Assert that querying localIds will only return local posts
+        List<PostModel> retrievedLocalPosts = mPostStore.getPostsByLocalOrRemotePostIds(localIds, site);
+        assertEquals(localIds.size(), retrievedLocalPosts.size());
+        for (PostModel localPost : retrievedLocalPosts) {
+            assertTrue(localPost.isLocalDraft());
+        }
+
+        // Assert that querying remoteIds only return remote posts
+        List<PostModel> retrievedRemotePosts = mPostStore.getPostsByLocalOrRemotePostIds(remoteIds, site);
+        assertEquals(remoteIds.size(), retrievedRemotePosts.size());
+        for (PostModel remotePost : retrievedRemotePosts) {
+            assertFalse(remotePost.isLocalDraft());
+        }
+
+        // Assert that querying both local and remote ids we retrieve all the posts
+        List<PostModel> retrievedLocalAndRemotePosts =
+                mPostStore.getPostsByLocalOrRemotePostIds(localAndRemoteIds, site);
+        assertEquals(localIds.size() + remoteIds.size(), retrievedLocalAndRemotePosts.size());
+    }
+
+    private void generateAndInsertPosts(int localSiteId, List<LocalId> localIds, List<RemoteId> remoteIds) {
+        for (int i = 1; i <= localIds.size(); i++) {
+            PostModel post = PostTestUtils.generateSampleLocalDraftPost();
+            post.setLocalSiteId(localSiteId);
+            mPostSqlUtils.insertOrUpdatePost(post, false);
+        }
+
+        for (RemoteId remoteId : remoteIds) {
+            PostModel post = PostTestUtils.generateSampleUploadedPost();
+            post.setLocalSiteId(localSiteId);
+            post.setRemotePostId(remoteId.getValue());
+            mPostSqlUtils.insertOrUpdatePost(post, false);
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreTest.kt
new file mode 100644
index 00000000000..c772ab2cace
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostStoreTest.kt
@@ -0,0 +1,393 @@
+package org.wordpress.android.fluxc.post
+
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.ListAction
+import org.wordpress.android.fluxc.action.PostAction
+import org.wordpress.android.fluxc.generated.PostActionBuilder
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.PostListDescriptor
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.model.post.PostStatus.PUBLISHED
+import org.wordpress.android.fluxc.model.revisions.LocalDiffModel
+import org.wordpress.android.fluxc.model.revisions.LocalRevisionModel
+import org.wordpress.android.fluxc.model.revisions.RevisionModel
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.store.ListStore.FetchedListItemsPayload
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.fluxc.store.PostStore.PostError
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.PostStore.PostListItem
+
+@RunWith(MockitoJUnitRunner::class)
+class PostStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var postSqlUtils: PostSqlUtils
+    @Mock lateinit var dispatcher: Dispatcher
+    private lateinit var store: PostStore
+    @Mock lateinit var mockedListDescriptor: PostListDescriptor
+
+    @Before
+    fun setUp() {
+        store = PostStore(dispatcher, mock(), mock(), postSqlUtils)
+        whenever(mockedListDescriptor.site).thenReturn(mock())
+        // verify "register" so we can use verifyNoMoreInteractions in all the test methods
+        verify(dispatcher).register(any())
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchedListItemsAction on success`() {
+        // Arrange
+        val action = createFetchedPostListAction()
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchedListItemsAction on error`() {
+        // Arrange
+        val action = createFetchedPostListAction(postError = PostError(GENERIC_ERROR))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchedListItemsAction with an error field set on error`() {
+        // Arrange
+        val action = createFetchedPostListAction(postError = PostError(GENERIC_ERROR))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.payload as FetchedListItemsPayload).isError
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits just FetchedListItemsAction when post not changed`() {
+        // Arrange
+        val postInLocalDb = createPostModel()
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb)
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchPostAction when post changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel()
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, lastModified = "modified in remote")
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.FETCH_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits UpdatePostAction when post changed in both remote and local`() {
+        // Arrange
+        val postInLocalDb = createPostModel(isLocallyChanged = true)
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, lastModified = "modified in remote")
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.UPDATE_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits UpdatePostAction when post changed locally and post status changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel(isLocallyChanged = true)
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, status = PostStatus.TRASHED.toString())
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.UPDATE_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList sets remoteLastModified field when post changed in both remote and local`() {
+        // Arrange
+        val postInLocalDb = createPostModel(isLocallyChanged = true)
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, lastModified = "modified in remote")
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            ((this.payload as? PostModel)?.remoteLastModified == remotePostListItem.lastModified)
+        })
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchPostAction when post status changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel()
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, status = PostStatus.TRASHED.toString())
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.FETCH_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `handleFetchedPostList emits FetchPostAction when autosave object changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel()
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, autoSaveModified = "modified in remote")
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.FETCH_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    /**
+     *  We can't fetch the post from the remote as we'd override the local changes. The plan is to introduce improved
+     *  conflict resolution on the UI and handle even the scenario for cases when the only thing that has changed is
+     *  the autosave object. The current (temporary) solution simply ignores the fact that the auto-save object was
+     *  updated in the remote.
+     */
+    @Test
+    fun `handleFetchedPostList doesn't emit UpdatePostAction when changed locally and autosave changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel(isLocallyChanged = true)
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(postInLocalDb, autoSaveModified = "modified in remote")
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    /**
+     * This is handled as if the only thing that has changed was the post status - we invoke UpdatePostAction and
+     * the UI needs to take care of conflict resolution. The fact that the autosave object has changed is being
+     * currently ignored.
+     */
+    @Test
+    fun `handleFetchedPostList emits UpdatePostAction when changed locally and status + autosave changed in remote`() {
+        // Arrange
+        val postInLocalDb = createPostModel(isLocallyChanged = true)
+        whenever(postSqlUtils.getPostsByRemoteIds(any(), any())).thenReturn(listOf(postInLocalDb))
+
+        val remotePostListItem = createRemotePostListItem(
+                postInLocalDb,
+                status = PostStatus.TRASHED.toString(),
+                autoSaveModified = "modified in remote"
+        )
+        val action = createFetchedPostListAction(postListItems = listOf(remotePostListItem))
+
+        // Act
+        store.onAction(action)
+
+        // Assert
+        verify(dispatcher).dispatch(argThat {
+            (this.type == PostAction.UPDATE_POST)
+        })
+        verify(dispatcher).dispatch(argThat {
+            (this.type == ListAction.FETCHED_LIST_ITEMS)
+        })
+        verifyNoMoreInteractions(dispatcher)
+    }
+
+    @Test
+    fun `Should return mapped RevisionModel when getRevisionById is called`() {
+        // Arrange
+        val localRevision = LocalRevisionModel(1)
+        val localDiffs = listOf<LocalDiffModel>(LocalDiffModel(1))
+        whenever(postSqlUtils.getRevisionById(any(), any(), any())).thenReturn(localRevision)
+        whenever(postSqlUtils.getLocalRevisionDiffs(any())).thenReturn(localDiffs)
+
+        // Act
+        val expected = RevisionModel.fromLocalRevisionAndDiffs(localRevision, localDiffs)
+        val actual = store.getRevisionById(1L, 1L, 1L)
+
+        // Assert
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `Should return null when PostSqlUtils getRevisionById returns null`() {
+        // Arrange
+        whenever(postSqlUtils.getRevisionById(any(), any(), any())).thenReturn(null)
+
+        // Act
+        val expected = null
+        val actual = store.getRevisionById(1L, 1L, 1L)
+
+        // Assert
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `Should call PostSqlUtils getRevisionById when getRevisionById is called`() {
+        // Arrange
+        whenever(postSqlUtils.getRevisionById(any(), any(), any())).thenReturn(LocalRevisionModel())
+
+        // Act
+        store.getRevisionById(1L, 1L, 1L)
+
+        // Assert
+        verify(postSqlUtils).getRevisionById("1", 1L, 1L)
+    }
+
+    @Test
+    fun `Should delete all revisions and diffs of a Post when removePost is called`() {
+        // Arrange
+        whenever(postSqlUtils.deletePost(any())).thenReturn(1)
+        val postModel = createPostModel()
+
+        // Act
+        store.onAction(PostActionBuilder.newRemovePostAction(postModel))
+
+        // Assert
+        verify(postSqlUtils).deleteLocalRevisionAndDiffsOfAPostOrPage(postModel)
+    }
+
+    @Test
+    fun `Should remove all revisions and diffs when removeAllPosts is called`() {
+        // Arrange
+        val postModel = createPostModel()
+
+        // Act
+        store.onAction(PostActionBuilder.newRemoveAllPostsAction())
+
+        // Assert
+        verify(postSqlUtils).deleteAllLocalRevisionsAndDiffs()
+    }
+
+    private fun createFetchedPostListAction(
+        postListItems: List<PostListItem> = listOf(),
+        listDescriptor: PostListDescriptor = mockedListDescriptor,
+        postError: PostError? = null
+    ) = PostActionBuilder.newFetchedPostListAction(
+        PostStore.FetchPostListResponsePayload(
+            listDescriptor,
+            postListItems,
+            false,
+            false,
+            postError
+        )
+    )
+
+    private fun createPostModel(isLocallyChanged: Boolean = false, postStatus: PostStatus = PUBLISHED): PostModel {
+        val post = PostModel()
+        post.setRemotePostId(1)
+        post.setStatus(postStatus.toString())
+        post.setIsLocallyChanged(isLocallyChanged)
+        post.setAutoSaveModified("1955-11-05T14:15:00Z")
+        return post
+    }
+
+    private fun createRemotePostListItem(
+        post: PostModel,
+        status: String = post.status,
+        lastModified: String = post.lastModified,
+        autoSaveModified: String? = post.autoSaveModified
+    ) = PostListItem(post.remotePostId, lastModified, status, autoSaveModified)
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostTestUtils.java
new file mode 100644
index 00000000000..08f7d82db2a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/post/PostTestUtils.java
@@ -0,0 +1,98 @@
+package org.wordpress.android.fluxc.post;
+
+import androidx.annotation.NonNull;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.revisions.Diff;
+import org.wordpress.android.fluxc.model.revisions.DiffOperations;
+import org.wordpress.android.fluxc.model.revisions.RevisionModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PostTestUtils {
+    public static final double EXAMPLE_LATITUDE = 44.8378;
+    public static final double EXAMPLE_LONGITUDE = -0.5792;
+
+    static final int DEFAULT_LOCAL_SITE_ID = 6;
+
+    public static PostModel generateSampleUploadedPost() {
+        return generateSampleUploadedPost("text");
+    }
+
+    public static PostModel generateSampleUploadedPost(String postFormat) {
+        PostModel example = new PostModel();
+        example.setLocalSiteId(DEFAULT_LOCAL_SITE_ID);
+        example.setRemotePostId(5);
+        example.setTitle("A test post");
+        example.setContent("Bunch of content here");
+        example.setPostFormat(postFormat);
+        return example;
+    }
+
+    public static PostModel generateSampleLocalDraftPost() {
+        return generateSampleLocalDraftPost("A test post");
+    }
+
+    static PostModel generateSampleLocalDraftPost(@NonNull String title) {
+        PostModel example = new PostModel();
+        example.setLocalSiteId(DEFAULT_LOCAL_SITE_ID);
+        example.setTitle(title);
+        example.setContent("Bunch of content here");
+        example.setIsLocalDraft(true);
+        return example;
+    }
+
+    static PostModel generateSampleLocallyChangedPost() {
+        return generateSampleLocallyChangedPost("A test post");
+    }
+
+    static PostModel generateSampleLocallyChangedPost(@NonNull String title) {
+        PostModel example = new PostModel();
+        example.setLocalSiteId(DEFAULT_LOCAL_SITE_ID);
+        example.setRemotePostId(7);
+        example.setTitle(title);
+        example.setContent("Bunch of content here");
+        example.setIsLocallyChanged(true);
+        return example;
+    }
+
+    public static List<PostModel> getPosts() {
+        return WellSql.select(PostModel.class).getAsModel();
+    }
+
+    public static int getPostsCount() {
+        return getPosts().size();
+    }
+
+    public static RevisionModel generateSamplePostRevision() {
+        ArrayList<Diff> testTitleDiffs = new ArrayList<>();
+        testTitleDiffs.add(new Diff(DiffOperations.COPY, "copy title"));
+        testTitleDiffs.add(new Diff(DiffOperations.COPY, "copy another title"));
+        testTitleDiffs.add(new Diff(DiffOperations.ADD, "add new title"));
+        testTitleDiffs.add(new Diff(DiffOperations.DELETE, "del title"));
+        testTitleDiffs.add(new Diff(DiffOperations.ADD, "add different title"));
+
+        ArrayList<Diff> testContentDiff = new ArrayList<>();
+        testContentDiff.add(new Diff(DiffOperations.COPY, "copy some content"));
+        testContentDiff.add(new Diff(DiffOperations.ADD, "add new content"));
+        testContentDiff.add(new Diff(DiffOperations.DELETE, "del all the content"));
+
+        return new RevisionModel(
+                1,
+                2,
+                5,
+                6,
+                "post content",
+                "post excerpt",
+                "post title",
+                "2018-09-04 12:19:34Z",
+                "2018-09-05 13:19:34Z",
+                "111111111",
+                testTitleDiffs,
+                testContentDiff
+        );
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/quickstart/QuickStartStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/quickstart/QuickStartStoreTest.kt
new file mode 100644
index 00000000000..b1edf43b47d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/quickstart/QuickStartStoreTest.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.quickstart
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.QuickStartTaskModel
+import org.wordpress.android.fluxc.persistence.QuickStartSqlUtils
+import org.wordpress.android.fluxc.store.QuickStartStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.CHECK_STATS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.CREATE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.ENABLE_POST_SHARING
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.FOLLOW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.REVIEW_PAGES
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.UPLOAD_SITE_ICON
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.VIEW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.fluxc.test
+
+@RunWith(RobolectricTestRunner::class)
+class QuickStartStoreTest {
+    private val testLocalSiteId: Long = 72
+    private lateinit var quickStartStore: QuickStartStore
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(QuickStartTaskModel::class.java), ""
+        )
+        WellSql.init(config)
+        config.reset()
+
+        quickStartStore = QuickStartStore(QuickStartSqlUtils(), Dispatcher())
+    }
+
+    @Test
+    fun orderOfDoneTasks() = test {
+        // marking tasks as done in random order
+        quickStartStore.setDoneTask(testLocalSiteId, VIEW_SITE, true)
+        quickStartStore.setDoneTask(testLocalSiteId, FOLLOW_SITE, true)
+        quickStartStore.setDoneTask(testLocalSiteId, CREATE_SITE, true)
+
+        // making sure done tasks are retrieved in a correct order
+        val completedCustomizeTasks = quickStartStore.getCompletedTasksByType(testLocalSiteId, CUSTOMIZE)
+        assertEquals(2, completedCustomizeTasks.size)
+        assertEquals(CREATE_SITE, completedCustomizeTasks[0])
+        assertEquals(VIEW_SITE, completedCustomizeTasks[1])
+
+        val completedGrowTasks = quickStartStore.getCompletedTasksByType(testLocalSiteId, GROW)
+        assertEquals(1, completedGrowTasks.size)
+        assertEquals(FOLLOW_SITE, completedGrowTasks[0])
+
+        // making sure undone tasks are retrieved in a correct order
+        val uncompletedCustomizeTasks = quickStartStore.getUncompletedTasksByType(testLocalSiteId, CUSTOMIZE)
+        assertEquals(3, uncompletedCustomizeTasks.size)
+        assertEquals(UPDATE_SITE_TITLE, uncompletedCustomizeTasks[0])
+        assertEquals(UPLOAD_SITE_ICON, uncompletedCustomizeTasks[1])
+        assertEquals(REVIEW_PAGES, uncompletedCustomizeTasks[2])
+
+        val uncompletedGrowTasks = quickStartStore.getUncompletedTasksByType(testLocalSiteId, GROW)
+        assertEquals(3, uncompletedGrowTasks.size)
+        assertEquals(ENABLE_POST_SHARING, uncompletedGrowTasks[0])
+        assertEquals(PUBLISH_POST, uncompletedGrowTasks[1])
+        assertEquals(CHECK_STATS, uncompletedGrowTasks[2])
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/PrivateAtomicCookieTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/PrivateAtomicCookieTest.kt
new file mode 100644
index 00000000000..9df32fd031a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/PrivateAtomicCookieTest.kt
@@ -0,0 +1,132 @@
+package org.wordpress.android.fluxc.site
+
+import android.content.SharedPreferences
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.rest.wpcom.site.AtomicCookie
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class PrivateAtomicCookieTest {
+    @Mock lateinit var sharedPreferences: SharedPreferences
+    @Mock lateinit var sharedPreferencesEditor: SharedPreferences.Editor
+    @Mock lateinit var preferenceUtilsWrapper: PreferenceUtilsWrapper
+    private lateinit var privateAtomicCookie: PrivateAtomicCookie
+
+    private var testCookie = AtomicCookie("1586725400", "/", "wordrpess.org", "cookie_name", "cookie_value")
+    private val testCookieAsJsonString = "{\"expires\":\"1586725400\",\"path\":\"/\",\"domain\":\"wordrpess.org\"," +
+            "\"name\":\"cookie_name\",\"value\":\"cookie_value\"}"
+
+    @Before
+    fun setUp() {
+        whenever(preferenceUtilsWrapper.getFluxCPreferences()).thenReturn(sharedPreferences)
+        whenever(sharedPreferences.edit()).thenReturn(sharedPreferencesEditor)
+        whenever(sharedPreferencesEditor.putString(any(), any())).thenReturn(sharedPreferencesEditor)
+        whenever(sharedPreferencesEditor.remove(any())).thenReturn(sharedPreferencesEditor)
+
+        privateAtomicCookie = PrivateAtomicCookie(preferenceUtilsWrapper)
+    }
+
+    @Test
+    fun `setting cookie stores it in memory and shared preferences`() {
+        privateAtomicCookie.set(testCookie)
+
+        verify(sharedPreferences, times(1)).edit()
+        Mockito.inOrder(sharedPreferencesEditor).apply {
+            this.verify(sharedPreferencesEditor).putString(anyString(), eq(testCookieAsJsonString))
+            this.verify(sharedPreferencesEditor).apply()
+        }
+
+        assertThat(privateAtomicCookie.exists()).isTrue()
+        assertThat(privateAtomicCookie.getDomain()).isEqualTo("wordrpess.org")
+        assertThat(privateAtomicCookie.getExpirationDateEpoch()).isEqualTo("1586725400")
+        assertThat(privateAtomicCookie.getName()).isEqualTo("cookie_name")
+        assertThat(privateAtomicCookie.getValue()).isEqualTo("cookie_value")
+    }
+
+    @Test
+    fun `clearing cookie removes it from memory and shared preferences`() {
+        privateAtomicCookie.set(testCookie)
+        assertThat(privateAtomicCookie.exists()).isTrue()
+
+        privateAtomicCookie.clearCookie()
+
+        verify(sharedPreferences, times(2)).edit()
+        Mockito.inOrder(sharedPreferencesEditor).apply {
+            this.verify(sharedPreferencesEditor).remove(anyString())
+            this.verify(sharedPreferencesEditor).apply()
+        }
+
+        assertThat(privateAtomicCookie.exists()).isFalse()
+    }
+
+    @Test
+    fun `cookie expires if its expiration time is before current time`() {
+        val currentTime = System.currentTimeMillis() / 1000
+        val cookieExpirationTime = currentTime - 3600 // cookie expired one hour ago
+
+        privateAtomicCookie.set(getCookieWithSpecificExpirationTime(cookieExpirationTime))
+        assertThat(privateAtomicCookie.exists()).isTrue()
+        assertThat(privateAtomicCookie.isExpired()).isTrue()
+    }
+
+    @Test
+    fun `cookie is not expired if its expiration time if after current time`() {
+        val currentTime = System.currentTimeMillis() / 1000
+        val cookieExpirationTime = currentTime + 3600 // cookie expires in one hour
+
+        privateAtomicCookie.set(getCookieWithSpecificExpirationTime(cookieExpirationTime))
+        assertThat(privateAtomicCookie.exists()).isTrue()
+        assertThat(privateAtomicCookie.isExpired()).isFalse()
+    }
+
+    @Test
+    fun `cookie expires soon if its expiration time is within 6 hours from now`() {
+        val currentTime = System.currentTimeMillis() / 1000
+        val cookieExpirationTime = currentTime + 3600 * 6 // cookie will expire in 6 hours
+
+        privateAtomicCookie.set(getCookieWithSpecificExpirationTime(cookieExpirationTime))
+        assertThat(privateAtomicCookie.exists()).isTrue()
+        assertThat(privateAtomicCookie.isExpired()).isFalse()
+        assertThat(privateAtomicCookie.isCookieRefreshRequired()).isTrue()
+    }
+
+    @Test
+    fun `cookie is not expiring soon if its expiration time is more than 6 hours from now`() {
+        val currentTime = System.currentTimeMillis() / 1000
+        val cookieExpirationTime = currentTime + 3600 * 7 // cookie will expire in 7 hours
+
+        privateAtomicCookie.set(getCookieWithSpecificExpirationTime(cookieExpirationTime))
+        assertThat(privateAtomicCookie.exists()).isTrue()
+        assertThat(privateAtomicCookie.isExpired()).isFalse()
+        assertThat(privateAtomicCookie.isCookieRefreshRequired()).isFalse()
+    }
+
+    @Test
+    fun `cookie content is its name and value separated by =`() {
+        privateAtomicCookie.set(testCookie)
+        assertThat(privateAtomicCookie.getCookieContent()).isEqualTo("cookie_name=cookie_value")
+    }
+
+    private fun getCookieWithSpecificExpirationTime(expirationTime: Long): AtomicCookie {
+        return AtomicCookie(
+                expirationTime.toString(),
+                testCookie.path,
+                testCookie.domain,
+                testCookie.name,
+                testCookie.value
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteStoreUnitTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteStoreUnitTest.java
new file mode 100644
index 00000000000..049e6fd0fcf
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteStoreUnitTest.java
@@ -0,0 +1,867 @@
+package org.wordpress.android.fluxc.site;
+
+import android.content.Context;
+
+import com.wellsql.generated.SiteModelTable;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.WellSqlTestUtils;
+import org.wordpress.android.fluxc.model.PostFormatModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.SitesModel;
+import org.wordpress.android.fluxc.model.jetpacksocial.JetpackSocialMapper;
+import org.wordpress.android.fluxc.network.rest.wpapi.site.SiteWPAPIRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.site.SiteXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao;
+import org.wordpress.android.fluxc.persistence.PostSqlUtils;
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils;
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils.DuplicateSiteException;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.persistence.domains.DomainDao;
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao;
+import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.UpdateSitesResult;
+import org.wordpress.android.fluxc.tools.CoroutineEngineUtilsKt;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateJetpackSiteOverRestOnly;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateJetpackSiteOverXMLRPC;
+import static org.wordpress.android.fluxc.site.SiteUtils.generatePostFormats;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateSelfHostedNonJPSite;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateSelfHostedSiteFutureJetpack;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateSiteWithZendeskMetaData;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateTestSite;
+import static org.wordpress.android.fluxc.site.SiteUtils.generateWPComSite;
+
+@RunWith(RobolectricTestRunner.class)
+public class SiteStoreUnitTest {
+    private PostSqlUtils mPostSqlUtils = new PostSqlUtils();
+    private SiteSqlUtils mSiteSqlUtils = new SiteSqlUtils();
+    private SiteStore mSiteStore = new SiteStore(
+            new Dispatcher(),
+            mPostSqlUtils,
+            Mockito.mock(SiteRestClient.class),
+            Mockito.mock(SiteXMLRPCClient.class),
+            Mockito.mock(SiteWPAPIRestClient.class),
+            Mockito.mock(PrivateAtomicCookie.class),
+            mSiteSqlUtils,
+            Mockito.mock(JetpackCPConnectedSitesDao.class),
+            Mockito.mock(DomainDao.class),
+            Mockito.mock(JetpackSocialDao.class),
+            Mockito.mock(JetpackSocialMapper.class),
+            CoroutineEngineUtilsKt.initCoroutineEngine()
+    );
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new WellSqlConfig(appContext);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testSimpleInsertionAndRetrieval() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setSiteId(42);
+        WellSql.insert(siteModel).execute();
+
+        assertEquals(1, mSiteStore.getSitesCount());
+
+        assertEquals(42, mSiteStore.getSites().get(0).getSiteId());
+    }
+
+    @Test
+    public void testInsertOrUpdateSite() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel site = generateWPComSite();
+        mSiteSqlUtils.insertOrUpdateSite(site);
+
+        assertTrue(mSiteStore.hasSiteWithLocalId(site.getId()));
+        assertEquals(site.getSiteId(), mSiteStore.getSiteByLocalId(site.getId()).getSiteId());
+    }
+
+    @Test
+    public void testHasSiteAndgetCountMethods() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        assertFalse(mSiteStore.hasSite());
+        assertTrue(mSiteStore.getSites().isEmpty());
+
+        // Test counts with .COM site
+        SiteModel wpComSite = generateWPComSite();
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+
+        assertTrue(mSiteStore.hasSite());
+        assertTrue(mSiteStore.hasWPComSite());
+        assertFalse(mSiteStore.hasSiteAccessedViaXMLRPC());
+
+        assertEquals(1, mSiteStore.getSitesCount());
+        assertEquals(1, mSiteStore.getWPComSitesCount());
+
+        // Test counts with one .COM and one self-hosted site
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+
+        assertTrue(mSiteStore.hasSite());
+        assertTrue(mSiteStore.hasWPComSite());
+        assertTrue(mSiteStore.hasSiteAccessedViaXMLRPC());
+
+        assertEquals(2, mSiteStore.getSitesCount());
+        assertEquals(1, mSiteStore.getWPComSitesCount());
+        assertEquals(1, mSiteStore.getSitesAccessedViaXMLRPCCount());
+        assertEquals(1, mSiteStore.getSitesAccessedViaWPComRestCount());
+
+        // Test counts with one .COM, one self-hosted and one Jetpack site
+        SiteModel jetpackSiteOverRest = generateJetpackSiteOverRestOnly();
+        mSiteSqlUtils.insertOrUpdateSite(jetpackSiteOverRest);
+
+        assertTrue(mSiteStore.hasSite());
+        assertTrue(mSiteStore.hasWPComSite());
+        assertTrue(mSiteStore.hasSiteAccessedViaXMLRPC());
+
+        assertEquals(3, mSiteStore.getSitesCount());
+        assertEquals(1, mSiteStore.getWPComSitesCount());
+        assertEquals(1, mSiteStore.getSitesAccessedViaXMLRPCCount());
+        assertEquals(2, mSiteStore.getSitesAccessedViaWPComRestCount());
+    }
+
+    @Test
+    public void testSelfHostedAndJetpackSites() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        // Note: not using the helper methods to make sure of the SiteModel definition
+        SiteModel ponySite = new SiteModel();
+        ponySite.setXmlRpcUrl("http://pony.com/xmlrpc.php");
+        ponySite.setSiteId(1);
+        ponySite.setIsWPCom(false);
+        ponySite.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        mSiteSqlUtils.insertOrUpdateSite(ponySite);
+
+        SiteModel jetpackOverXMLRPC = new SiteModel();
+        jetpackOverXMLRPC.setXmlRpcUrl("http://pony2.com/xmlrpc.php");
+        jetpackOverXMLRPC.setSiteId(2);
+        jetpackOverXMLRPC.setIsWPCom(false);
+        jetpackOverXMLRPC.setIsJetpackInstalled(true);
+        jetpackOverXMLRPC.setIsJetpackConnected(true);
+        jetpackOverXMLRPC.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackOverXMLRPC);
+
+        SiteModel jetpackOverRest = new SiteModel();
+        jetpackOverRest.setXmlRpcUrl("http://pony3.com/xmlrpc.php");
+        jetpackOverRest.setSiteId(3);
+        jetpackOverRest.setIsWPCom(false);
+        jetpackOverRest.setIsJetpackInstalled(true);
+        jetpackOverRest.setIsJetpackConnected(true);
+        jetpackOverRest.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackOverRest);
+
+        assertEquals(3, mSiteStore.getSitesCount());
+        assertEquals(0, mSiteStore.getWPComSitesCount());
+        assertEquals(2, mSiteStore.getSitesAccessedViaXMLRPCCount());
+        assertEquals(1, mSiteStore.getSitesAccessedViaWPComRestCount());
+
+        // User "install and connect" ponySite site to Jetpack via his connected .com account
+
+        ponySite.setIsJetpackInstalled(true);
+        ponySite.setIsJetpackConnected(true);
+        ponySite.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        mSiteSqlUtils.insertOrUpdateSite(ponySite);
+
+        assertEquals(3, mSiteStore.getSitesCount());
+        assertEquals(0, mSiteStore.getWPComSitesCount());
+        assertEquals(1, mSiteStore.getSitesAccessedViaXMLRPCCount());
+        // Now ponySite is accessed via the WPCom REST API
+        assertEquals(2, mSiteStore.getSitesAccessedViaWPComRestCount());
+    }
+
+    @Test
+    public void testWPComSiteVisibility() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        // Should not cause any errors
+        mSiteStore.isWPComSiteVisibleByLocalId(45);
+        mSiteSqlUtils.setSiteVisibility(null, true);
+
+        SiteModel selfHostedNonJPSite = generateSelfHostedNonJPSite();
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedNonJPSite);
+
+        // Attempt to use with id of self-hosted site
+        mSiteSqlUtils.setSiteVisibility(selfHostedNonJPSite, false);
+        // The self-hosted site should not be affected
+        assertTrue(mSiteStore.getSiteByLocalId(selfHostedNonJPSite.getId()).isVisible());
+
+
+        SiteModel wpComSite = generateWPComSite();
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+
+        // Attempt to use with legitimate .com site
+        mSiteSqlUtils.setSiteVisibility(selfHostedNonJPSite, false);
+        assertFalse(mSiteStore.getSiteByLocalId(wpComSite.getId()).isVisible());
+        assertFalse(mSiteStore.isWPComSiteVisibleByLocalId(wpComSite.getId()));
+    }
+
+    @Test
+    public void testSetAllWPComSitesVisibility() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel selfHostedNonJPSite = generateSelfHostedNonJPSite();
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedNonJPSite);
+
+        // Attempt to use with id of self-hosted site
+        for (SiteModel site : mSiteStore.getWPComSites()) {
+            mSiteSqlUtils.setSiteVisibility(site, false);
+        }
+        // The self-hosted site should not be affected
+        assertTrue(mSiteStore.getSiteByLocalId(selfHostedNonJPSite.getId()).isVisible());
+
+        SiteModel wpComSite1 = generateWPComSite();
+        SiteModel wpComSite2 = generateWPComSite();
+        wpComSite2.setId(44);
+        wpComSite2.setSiteId(284);
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite1);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite2);
+
+        // Attempt to use with legitimate .com site
+        for (SiteModel site : mSiteStore.getWPComSites()) {
+            mSiteSqlUtils.setSiteVisibility(site, false);
+        }
+        assertTrue(mSiteStore.getSiteByLocalId(selfHostedNonJPSite.getId()).isVisible());
+        assertFalse(mSiteStore.getSiteByLocalId(wpComSite1.getId()).isVisible());
+        assertFalse(mSiteStore.getSiteByLocalId(wpComSite2.getId()).isVisible());
+    }
+
+    @Test
+    public void testGetIdForIdMethods() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        assertEquals(0, mSiteStore.getLocalIdForRemoteSiteId(555));
+        assertEquals(0, mSiteStore.getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(2626, ""));
+        assertEquals(0, mSiteStore.getSiteIdForLocalId(5577));
+
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+        SiteModel wpComSite = generateWPComSite();
+        SiteModel jetpackSite = generateJetpackSiteOverXMLRPC();
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackSite);
+
+        assertEquals(selfHostedSite.getId(),
+                mSiteStore.getLocalIdForRemoteSiteId(selfHostedSite.getSelfHostedSiteId()));
+        assertEquals(wpComSite.getId(), mSiteStore.getLocalIdForRemoteSiteId(wpComSite.getSiteId()));
+
+        // Should be able to look up a Jetpack site by .com and by .org id (assuming it's been set)
+        assertEquals(jetpackSite.getId(), mSiteStore.getLocalIdForRemoteSiteId(jetpackSite.getSiteId()));
+        assertEquals(jetpackSite.getId(), mSiteStore.getLocalIdForRemoteSiteId(jetpackSite.getSelfHostedSiteId()));
+
+        assertEquals(selfHostedSite.getId(), mSiteStore.getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(
+                selfHostedSite.getSelfHostedSiteId(), selfHostedSite.getXmlRpcUrl()));
+        assertEquals(jetpackSite.getId(), mSiteStore.getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(
+                jetpackSite.getSelfHostedSiteId(), jetpackSite.getXmlRpcUrl()));
+
+        assertEquals(selfHostedSite.getSelfHostedSiteId(), mSiteStore.getSiteIdForLocalId(selfHostedSite.getId()));
+        assertEquals(wpComSite.getSiteId(), mSiteStore.getSiteIdForLocalId(wpComSite.getId()));
+        assertEquals(jetpackSite.getSiteId(), mSiteStore.getSiteIdForLocalId(jetpackSite.getId()));
+    }
+
+    @Test
+    public void testGetSiteBySiteId() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        assertNull(mSiteStore.getSiteBySiteId(555));
+
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+        SiteModel wpComSite = generateWPComSite();
+        SiteModel jetpackSiteOverXMLRPC = generateJetpackSiteOverXMLRPC();
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackSiteOverXMLRPC);
+
+        assertEquals(1, mSiteSqlUtils.getSitesAccessedViaWPComRest().getAsCursor().getCount());
+        assertNotNull(mSiteStore.getSiteBySiteId(wpComSite.getSiteId()));
+        assertNotNull(mSiteStore.getSiteBySiteId(jetpackSiteOverXMLRPC.getSiteId()));
+        assertNull(mSiteStore.getSiteBySiteId(selfHostedSite.getSiteId()));
+    }
+
+    @Test
+    public void testDeleteSite() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite = generateWPComSite();
+
+        // Should not cause any errors
+        mSiteSqlUtils.deleteSite(wpComSite);
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+        int affectedRows = mSiteSqlUtils.deleteSite(wpComSite);
+
+        assertEquals(1, affectedRows);
+        assertEquals(0, mSiteStore.getSitesCount());
+    }
+
+    @Test
+    public void testGetWPComSites() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite = generateWPComSite();
+        SiteModel jetpackSiteOverXMLRPC = generateJetpackSiteOverXMLRPC();
+        SiteModel jetpackSiteOverRestOnly = generateJetpackSiteOverRestOnly();
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackSiteOverXMLRPC);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackSiteOverRestOnly);
+
+        assertEquals(2, mSiteSqlUtils.getSitesAccessedViaWPComRest().getAsCursor().getCount());
+
+        List<SiteModel> wpComSites = mSiteSqlUtils.getWPComSites().getAsModel();
+        assertEquals(1, wpComSites.size());
+        for (SiteModel site : wpComSites) {
+            assertNotEquals(jetpackSiteOverXMLRPC.getId(), site.getId());
+        }
+    }
+
+    @Test
+    public void testInsertDuplicateSites() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel futureJetpack = generateSelfHostedSiteFutureJetpack();
+        SiteModel jetpack = generateJetpackSiteOverRestOnly();
+
+        // Insert a self hosted site that will later be converted to Jetpack
+        mSiteSqlUtils.insertOrUpdateSite(futureJetpack);
+
+        // Insert the same site but Jetpack powered this time
+        mSiteSqlUtils.insertOrUpdateSite(jetpack);
+
+        // Previous site should be converted to a Jetpack site and we should see only one site
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+
+        List<SiteModel> wpComSites = mSiteSqlUtils.getWPComSites().getAsModel();
+        assertEquals(0, wpComSites.size());
+        assertEquals(1, mSiteSqlUtils.getSitesAccessedViaWPComRest().getAsCursor().getCount());
+        List<SiteModel> jetpackSites =
+                mSiteSqlUtils.getSitesWith(SiteModelTable.IS_JETPACK_CONNECTED, true).getAsModel();
+        assertEquals(jetpack.getSiteId(), jetpackSites.get(0).getSiteId());
+        assertTrue(jetpackSites.get(0).isJetpackConnected());
+        assertFalse(jetpackSites.get(0).isWPCom());
+    }
+
+    @Test
+    public void testInsertDuplicateSitesError() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel futureJetpack = generateSelfHostedSiteFutureJetpack();
+        SiteModel jetpack = generateJetpackSiteOverRestOnly();
+
+        // Insert a Jetpack powered site
+        mSiteSqlUtils.insertOrUpdateSite(jetpack);
+        boolean duplicate = false;
+        try {
+            // Insert the same site but via self hosted this time (this should fail)
+            mSiteSqlUtils.insertOrUpdateSite(futureJetpack);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertTrue(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testInsertDuplicateSitesDifferentSchemesError1() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel futureJetpack = generateSelfHostedSiteFutureJetpack();
+        SiteModel jetpack = generateJetpackSiteOverRestOnly();
+
+        futureJetpack.setXmlRpcUrl("https://pony.com/xmlrpc.php");
+        jetpack.setXmlRpcUrl("http://pony.com/xmlrpc.php");
+
+        // Insert a Jetpack powered site
+        mSiteSqlUtils.insertOrUpdateSite(jetpack);
+        boolean duplicate = false;
+        try {
+            // Insert the same site but via self hosted this time (this should fail)
+            mSiteSqlUtils.insertOrUpdateSite(futureJetpack);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertTrue(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testInsertDuplicateSitesDifferentSchemesError2() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel futureJetpack = generateSelfHostedSiteFutureJetpack();
+        SiteModel jetpack = generateJetpackSiteOverRestOnly();
+
+        futureJetpack.setXmlRpcUrl("http://pony.com/xmlrpc.php");
+        jetpack.setXmlRpcUrl("https://pony.com/xmlrpc.php");
+
+        // Insert a Jetpack powered site
+        mSiteSqlUtils.insertOrUpdateSite(jetpack);
+        boolean duplicate = false;
+        try {
+            // Insert the same site but via self hosted this time (this should fail)
+            mSiteSqlUtils.insertOrUpdateSite(futureJetpack);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertTrue(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testInsertDuplicateXmlRpcJetpackSite() throws DuplicateSiteException {
+        SiteModel jetpackXmlRpcSite = generateJetpackSiteOverXMLRPC();
+
+        jetpackXmlRpcSite.setUrl("http://some.url");
+
+        // Insert a Jetpack powered site over XML-RPC
+        mSiteSqlUtils.insertOrUpdateSite(jetpackXmlRpcSite);
+
+        // Set up the same site (by URL/XML-RPC URL), but don't identify it as a Jetpack site
+        // This simulates sites resulting from wp.getUsersBlogs, which don't have the site ID and can't be identified
+        // as Jetpack or not (wp.getOptions is the call that returns that information)
+        SiteModel jetpackXmlRpcSite2 = generateSelfHostedNonJPSite();
+        jetpackXmlRpcSite2.setXmlRpcUrl(jetpackXmlRpcSite.getXmlRpcUrl());
+        jetpackXmlRpcSite2.setUrl(jetpackXmlRpcSite.getUrl());
+        jetpackXmlRpcSite2.setSelfHostedSiteId(jetpackXmlRpcSite.getSelfHostedSiteId());
+        jetpackXmlRpcSite2.setUsername(jetpackXmlRpcSite.getUsername());
+        jetpackXmlRpcSite2.setPassword(jetpackXmlRpcSite.getPassword());
+
+        boolean duplicate = false;
+        try {
+            // Insert the same site but not identified as a Jetpack site
+            // (this should succeed, replacing the existing site, because the site replaced is not using the REST API)
+            mSiteSqlUtils.insertOrUpdateSite(jetpackXmlRpcSite2);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertFalse(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testGetPostFormats() throws DuplicateSiteException {
+        SiteModel site = generateWPComSite();
+        mSiteSqlUtils.insertOrUpdateSite(site);
+
+        // Set 3 post formats
+        mSiteSqlUtils.insertOrReplacePostFormats(site, generatePostFormats("Video", "Image", "Standard"));
+        List<PostFormatModel> postFormats = mSiteStore.getPostFormats(site);
+        assertEquals(3, postFormats.size());
+
+        // Set 1 post format
+        mSiteSqlUtils.insertOrReplacePostFormats(site, generatePostFormats("Standard"));
+        postFormats = mSiteStore.getPostFormats(site);
+        assertEquals("Standard", postFormats.get(0).getDisplayName());
+    }
+
+    @Test
+    public void testSearchSitesByNameMatching() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite1 = generateWPComSite();
+        wpComSite1.setName("Doctor Emmet Brown Homepage");
+        SiteModel wpComSite2 = generateWPComSite();
+        wpComSite2.setName("Shield Eyes from light");
+        wpComSite2.setSiteId(557);
+        SiteModel wpComSite3 = generateWPComSite();
+        wpComSite3.setName("I remember when this was all farmland as far as the eye could see");
+        wpComSite2.setSiteId(558);
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite1);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite2);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite3);
+
+        List<SiteModel> matchingSites = mSiteSqlUtils.getSitesByNameOrUrlMatching("eye");
+        assertEquals(2, matchingSites.size());
+
+        matchingSites = mSiteSqlUtils.getSitesByNameOrUrlMatching("EYE");
+        assertEquals(2, matchingSites.size());
+    }
+
+    @Test
+    public void testSearchSitesByNameOrUrlMatching() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite1 = generateWPComSite();
+        wpComSite1.setName("Doctor Emmet Brown Homepage");
+        SiteModel wpComSite2 = generateWPComSite();
+        wpComSite2.setUrl("shieldeyesfromlight.wordpress.com");
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+        selfHostedSite.setName("I remember when this was all farmland as far as the eye could see.");
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite1);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite2);
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+
+        List<SiteModel> matchingSites = mSiteSqlUtils.getSitesByNameOrUrlMatching("eye");
+        assertEquals(2, matchingSites.size());
+
+        matchingSites = mSiteSqlUtils.getSitesByNameOrUrlMatching("EYE");
+        assertEquals(2, matchingSites.size());
+    }
+
+    @Test
+    public void testSearchWPComSitesByNameOrUrlMatching() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite1 = generateWPComSite();
+        wpComSite1.setName("Doctor Emmet Brown Homepage");
+        SiteModel wpComSite2 = generateWPComSite();
+        wpComSite2.setUrl("shieldeyesfromlight.wordpress.com");
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+        selfHostedSite.setName("I remember when this was all farmland as far as the eye could see.");
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite1);
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite2);
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+
+        List<SiteModel> matchingSites = mSiteSqlUtils.getSitesAccessedViaWPComRestByNameOrUrlMatching("eye");
+        assertEquals(1, matchingSites.size());
+
+        matchingSites = mSiteSqlUtils.getSitesAccessedViaWPComRestByNameOrUrlMatching("EYE");
+        assertEquals(1, matchingSites.size());
+    }
+
+    @Test
+    public void testRemoveAllSites() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite = generateWPComSite();
+        SiteModel jetpackXMLRPCSite = generateJetpackSiteOverXMLRPC();
+        SiteModel jetpackRestSite = generateJetpackSiteOverRestOnly();
+        SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackXMLRPCSite);
+        mSiteSqlUtils.insertOrUpdateSite(jetpackRestSite);
+        mSiteSqlUtils.insertOrUpdateSite(selfHostedSite);
+
+        // first make sure sites are inserted successfully
+        assertEquals(4, mSiteStore.getSitesCount());
+
+        mSiteSqlUtils.deleteAllSites();
+
+        assertEquals(0, mSiteStore.getSitesCount());
+    }
+
+    @Test
+    public void testWPComAutomatedTransfer() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        SiteModel wpComSite = generateWPComSite();
+        mSiteSqlUtils.insertOrUpdateSite(wpComSite);
+
+        // Turn WP.com site into an Automated Transfer (Jetpack) site
+        SiteModel automatedTransferSite = generateWPComSite();
+        automatedTransferSite.setIsJetpackInstalled(true);
+        automatedTransferSite.setIsJetpackConnected(true);
+        automatedTransferSite.setIsWPCom(false);
+        automatedTransferSite.setIsAutomatedTransfer(true);
+
+        mSiteSqlUtils.insertOrUpdateSite(automatedTransferSite);
+
+        assertEquals(1, mSiteStore.getSitesCount());
+        assertEquals(0, mSiteStore.getWPComSitesCount());
+    }
+
+    @Test
+    public void testBatchInsertSiteNoDuplicateWPCom()
+            throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        List<SiteModel> siteList = new ArrayList<>();
+        siteList.add(generateTestSite(1, "https://pony1.com", "https://pony1.com/xmlrpc.php", true, true));
+        siteList.add(generateTestSite(2, "https://pony2.com", "https://pony2.com/xmlrpc.php", true, true));
+        siteList.add(generateTestSite(3, "https://pony3.com", "https://pony3.com/xmlrpc.php", true, true));
+        siteList.add(generateTestSite(4, "https://pony4.com", "https://pony4.com/xmlrpc.php", true, true));
+        siteList.add(generateTestSite(5, "https://pony5.com", "https://pony5.com/xmlrpc.php", true, true));
+
+        SitesModel sites = new SitesModel(siteList);
+
+        // Use reflection to call a private Store method: equivalent to mSiteStore.updateSites(sites)
+        Method createOrUpdateSites = SiteStore.class.getDeclaredMethod("createOrUpdateSites", SitesModel.class);
+        createOrUpdateSites.setAccessible(true);
+        UpdateSitesResult res = (UpdateSitesResult) createOrUpdateSites.invoke(mSiteStore, sites);
+
+        assertFalse(res.duplicateSiteFound);
+        assertEquals(5, res.rowsAffected);
+        assertEquals(5, mSiteStore.getSitesCount());
+    }
+
+    @Test
+    public void testInsertSiteDuplicateXmlRpcTrailingSlash() throws DuplicateSiteException {
+        // It's possible for the URL in `wp.getOptions` to be different from the URL in `wp.getUsersBlogs`,
+        // sometimes just by a trailing slash
+        // This test checks that we can still identify two sites as being identical in this case, and that we quietly
+        // update the existing site rather than throw a duplicate site exception
+        SiteModel selfhostedSite = generateSelfHostedNonJPSite();
+        selfhostedSite.setUrl("http://some.url");
+
+        mSiteSqlUtils.insertOrUpdateSite(selfhostedSite);
+
+        SiteModel selfhostedSite2 = generateSelfHostedNonJPSite();
+        selfhostedSite2.setUrl("http://some.url/");
+
+        boolean duplicate = false;
+        try {
+            // Insert the same site with a trailing slash (this should succeed, replacing the existing site)
+            mSiteSqlUtils.insertOrUpdateSite(selfhostedSite2);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertFalse(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testInsertSiteDuplicateXmlRpcDifferentUrl() throws DuplicateSiteException {
+        // It's possible for the URL in `wp.getOptions` to be different from the URL in `wp.getUsersBlogs`
+        // This test checks that we can still identify two sites as being identical in this case, and that we quietly
+        // update the existing site rather than throw a duplicate site exception
+        SiteModel selfhostedSite = generateSelfHostedNonJPSite();
+        selfhostedSite.setUrl("http://some.url");
+        selfhostedSite.setXmlRpcUrl("http://some.url/xmlrpc.php");
+
+        mSiteSqlUtils.insertOrUpdateSite(selfhostedSite);
+
+        SiteModel selfhostedSite2 = generateSelfHostedNonJPSite();
+        selfhostedSite2.setUrl("http://user5242.stagingsite.url");
+        selfhostedSite2.setXmlRpcUrl("http://some.url/xmlrpc.php");
+
+        boolean duplicate = false;
+        try {
+            // Insert the same site with a different URL, but the same XML-RPC URL
+            // (this should succeed, replacing the existing site)
+            mSiteSqlUtils.insertOrUpdateSite(selfhostedSite2);
+        } catch (DuplicateSiteException e) {
+            // Caught !
+            duplicate = true;
+        }
+        assertFalse(duplicate);
+        int sitesCount = WellSql.select(SiteModel.class).getAsCursor().getCount();
+        assertEquals(1, sitesCount);
+    }
+
+    @Test
+    public void testUpdateSiteUniqueConstraintFail() throws DuplicateSiteException {
+        // Create 2 test sites
+        SiteModel site1 = generateTestSite(0, "https://pony1.com", "https://pony1.com/xmlrpc.php", false, true);
+        mSiteSqlUtils.insertOrUpdateSite(site1);
+        SiteModel site2 = generateTestSite(0, "https://pony2.com", "https://pony2.com/xmlrpc.php", false, true);
+        mSiteSqlUtils.insertOrUpdateSite(site2);
+
+        // Update the second site and reuse the site url and id from the first
+        site2.setUrl("https://pony1.com");
+        boolean duplicate = false;
+        try {
+            mSiteSqlUtils.insertOrUpdateSite(site2);
+        } catch (DuplicateSiteException e) {
+            duplicate = true;
+        }
+        assertTrue(duplicate);
+    }
+
+    @Test
+    public void testInsertOrReplaceBlockLayouts() {
+        // Test data
+        SiteModel site = generateWPComSite();
+        GutenbergLayoutCategory cat1 = new GutenbergLayoutCategory("a", "About", "About", "👋");
+        GutenbergLayoutCategory cat2 = new GutenbergLayoutCategory("b", "Blog", "Blog", "📰");
+        List<GutenbergLayoutCategory> categories = Arrays.asList(cat1, cat2);
+        GutenbergLayout layout = new GutenbergLayout("l", "Layout", "img", "img", "img", "content", "url", categories);
+        List<GutenbergLayout> layouts = Collections.singletonList(layout);
+        // Store
+        mSiteSqlUtils.insertOrReplaceBlockLayouts(site, categories, layouts);
+        // Retrieve
+        List<GutenbergLayoutCategory> retrievedCategories = mSiteSqlUtils.getBlockLayoutCategories(site);
+        List<GutenbergLayout> retrievedLayouts = mSiteSqlUtils.getBlockLayouts(site);
+        // Check
+        assertEquals(categories, retrievedCategories);
+        assertEquals(layouts, retrievedLayouts);
+    }
+
+    @Test
+    public void testInsertBlockLayoutWithNullCategoryEmoji() {
+        // Test data
+        SiteModel site = generateWPComSite();
+        GutenbergLayoutCategory cat = new GutenbergLayoutCategory("a", "About", "About", null);
+        List<GutenbergLayoutCategory> categories = Collections.singletonList(cat);
+        GutenbergLayout layout = new GutenbergLayout("l", "Layout", "img", "img", "img", "content", "url", categories);
+        List<GutenbergLayout> layouts = Collections.singletonList(layout);
+        // Store
+        mSiteSqlUtils.insertOrReplaceBlockLayouts(site, categories, layouts);
+        // Retrieve
+        List<GutenbergLayoutCategory> retrievedCategories = mSiteSqlUtils.getBlockLayoutCategories(site);
+        // Check
+        assertEquals(retrievedCategories.get(0).getEmoji(), "");
+    }
+
+    @Test
+    public void testJetpackSelfHostedAndForceXMLRPC() {
+        SiteModel jetpackSite = generateJetpackSiteOverXMLRPC();
+        jetpackSite.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        assertTrue(jetpackSite.isUsingWpComRestApi());
+
+        // Force the origin, it should now use XMLRPC instead of REST.
+        jetpackSite.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        assertFalse(jetpackSite.isUsingWpComRestApi());
+    }
+
+    @Test
+    public void testDefaultUsageWpComRestApi() {
+        SiteModel wpComSite = generateWPComSite();
+        assertTrue(wpComSite.isUsingWpComRestApi());
+
+        SiteModel jetpack1 = generateJetpackSiteOverRestOnly();
+        assertTrue(jetpack1.isUsingWpComRestApi());
+
+        SiteModel jetpack2 = generateJetpackSiteOverXMLRPC();
+        assertFalse(jetpack2.isUsingWpComRestApi());
+
+        SiteModel pureSelfHosted1 = generateSelfHostedNonJPSite();
+        assertFalse(pureSelfHosted1.isUsingWpComRestApi());
+
+        SiteModel pureSelfHosted2 = generateSelfHostedSiteFutureJetpack();
+        assertFalse(pureSelfHosted2.isUsingWpComRestApi());
+    }
+
+    @Test
+    public void testRemoveWPComRestSitesAbsentFromList()
+            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        WellSqlTestUtils.setupWordPressComAccount();
+
+        final List<SiteModel> allSites = new ArrayList<>();
+        final List<SiteModel> sitesToKeep = new ArrayList<>();
+
+        for (int i = 0; i < 15; ++i) {
+            switch (i % 3) {
+                case 0:
+                    // add a .com site
+                    SiteModel wpComSite = generateWPComSite();
+                    wpComSite.setSiteId(i + 1);
+                    wpComSite.setUrl("https://pony" + i + ".com");
+                    wpComSite.setXmlRpcUrl("https://pony" + i + ".com/xmlrpc.php");
+                    allSites.add(wpComSite);
+                    break;
+                case 1:
+                    // add a self-hosted Jetpack site
+                    SiteModel jetpackSite = generateJetpackSiteOverRestOnly();
+                    jetpackSite.setSiteId(i + 1);
+                    jetpackSite.setUrl("https://pony" + i + ".com");
+                    jetpackSite.setXmlRpcUrl("https://pony" + i + ".com/xmlrpc.php");
+                    allSites.add(jetpackSite);
+                    break;
+                case 2:
+                    // add a self-hosted non-Jetpack site
+                    SiteModel selfHostedSite = generateSelfHostedNonJPSite();
+                    selfHostedSite.setSiteId(i + 1);
+                    selfHostedSite.setUrl("https://pony" + i + ".com");
+                    selfHostedSite.setXmlRpcUrl("https://pony" + i + ".com/xmlrpc.php");
+                    allSites.add(selfHostedSite);
+                    break;
+            }
+        }
+
+        // add all sites to DB
+        Method createOrUpdateSites = SiteStore.class.getDeclaredMethod("createOrUpdateSites", SitesModel.class);
+        createOrUpdateSites.setAccessible(true);
+        UpdateSitesResult res = (UpdateSitesResult) createOrUpdateSites.invoke(mSiteStore, new SitesModel(allSites));
+
+        assertFalse(res.duplicateSiteFound);
+        assertTrue(res.rowsAffected == 15);
+        assertTrue(mSiteStore.getSitesCount() == 15);
+
+        // add 2 of each kind of site to keep
+        sitesToKeep.addAll(allSites.subList(0, 6));
+
+        // remove six sites (2/3 * (15 - 6))
+        mSiteSqlUtils.removeWPComRestSitesAbsentFromList(mPostSqlUtils, sitesToKeep);
+
+        assertTrue(mSiteStore.getSitesCount() == 9);
+
+        // make sure all sites in sitesToKeep are in the store
+        for (SiteModel site : sitesToKeep) {
+            assertTrue(mSiteStore.getSiteBySiteId(site.getSiteId()) != null);
+        }
+    }
+
+    @Test
+    public void testInsertAndRetrieveForActiveModules() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+        SiteModel site = generateWPComSite();
+        String activeModules = SiteModel.ACTIVE_MODULES_KEY_PUBLICIZE
+                               + ","
+                               + SiteModel.ACTIVE_MODULES_KEY_SHARING_BUTTONS;
+        site.setActiveModules(activeModules);
+
+        mSiteSqlUtils.insertOrUpdateSite(site);
+
+        SiteModel siteFromDb = mSiteSqlUtils.getSites().get(0);
+        assertTrue(siteFromDb.isActiveModuleEnabled(SiteModel.ACTIVE_MODULES_KEY_PUBLICIZE));
+        assertTrue(siteFromDb.isActiveModuleEnabled(SiteModel.ACTIVE_MODULES_KEY_SHARING_BUTTONS));
+    }
+
+    @Test
+    public void testInsertAndRetrieveForPublicizePermanentlyDisabled() throws DuplicateSiteException {
+        WellSqlTestUtils.setupWordPressComAccount();
+        SiteModel site = generateWPComSite();
+        site.setIsPublicizePermanentlyDisabled(true);
+
+        mSiteSqlUtils.insertOrUpdateSite(site);
+
+        SiteModel siteFromDb = mSiteSqlUtils.getSites().get(0);
+        assertTrue(siteFromDb.isPublicizePermanentlyDisabled());
+    }
+
+    @Test
+    public void testZendeskPlanAndAddonsInsertionAndRetrieval() {
+        SiteModel siteModel = generateSiteWithZendeskMetaData();
+        WellSql.insert(siteModel).execute();
+
+        SiteModel siteFromDb = mSiteStore.getSites().get(0);
+        assertEquals(siteModel.getZendeskPlan(), siteFromDb.getZendeskPlan());
+        assertEquals(siteModel.getZendeskAddOns(), siteFromDb.getZendeskAddOns());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteUtils.java
new file mode 100644
index 00000000000..12dd76ff268
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteUtils.java
@@ -0,0 +1,120 @@
+package org.wordpress.android.fluxc.site;
+
+import org.wordpress.android.fluxc.model.PostFormatModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SiteUtils {
+    private static final String ZENDESK_PLAN_BUSINESS_PROFESSIONAL = "business_professional";
+    private static final String ZENDESK_ADDON_BACKUP_DAILY = "jetpack_addon_backup_daily";
+    private static final String ZENDESK_ADDON_SCAN_DAILY = "jetpack_addon_scan_daily";
+
+    public static SiteModel generateWPComSite() {
+        return generateTestSite(556, "", "", true, true);
+    }
+
+    public static SiteModel generateTestSite(long remoteId, String url, String xmlRpcUrl, boolean isWPCom,
+                                             boolean isVisible) {
+        SiteModel example = new SiteModel();
+        example.setUrl(url);
+        example.setXmlRpcUrl(xmlRpcUrl);
+        example.setSiteId(remoteId);
+        example.setIsWPCom(isWPCom);
+        example.setIsVisible(isVisible);
+        if (isWPCom) {
+            example.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        } else {
+            example.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        }
+        return example;
+    }
+
+    public static SiteModel generateSelfHostedNonJPSite() {
+        SiteModel example = new SiteModel();
+        example.setSelfHostedSiteId(6);
+        example.setIsWPCom(false);
+        example.setIsJetpackInstalled(false);
+        example.setIsJetpackConnected(false);
+        example.setIsVisible(true);
+        example.setUrl("http://some.url");
+        example.setXmlRpcUrl("http://some.url/xmlrpc.php");
+        example.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        return example;
+    }
+
+    public static SiteModel generateJetpackSiteOverXMLRPC() {
+        SiteModel example = new SiteModel();
+        example.setSiteId(982);
+        example.setSelfHostedSiteId(8);
+        example.setIsWPCom(false);
+        example.setIsJetpackInstalled(true);
+        example.setIsJetpackConnected(true);
+        example.setIsVisible(true);
+        example.setUsername("ponyuser");
+        example.setPassword("ponypass");
+        example.setUrl("http://jetpack.url");
+        example.setXmlRpcUrl("http://jetpack.url/xmlrpc.php");
+        example.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        return example;
+    }
+
+    public static SiteModel generateJetpackSiteOverRestOnly() {
+        SiteModel example = new SiteModel();
+        example.setSiteId(5623);
+        example.setIsWPCom(false);
+        example.setIsJetpackInstalled(true);
+        example.setIsJetpackConnected(true);
+        example.setIsVisible(true);
+        example.setUrl("http://jetpack2.url");
+        example.setXmlRpcUrl("http://jetpack2.url/xmlrpc.php");
+        example.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        return example;
+    }
+
+    public static SiteModel generateJetpackCPSite() {
+        SiteModel example = new SiteModel();
+        example.setSiteId(5623);
+        example.setIsWPCom(false);
+        example.setIsJetpackInstalled(false);
+        example.setIsJetpackConnected(false);
+        example.setIsJetpackCPConnected(true);
+        example.setIsVisible(true);
+        example.setUrl("http://jetpackcp.url");
+        example.setXmlRpcUrl("http://jetpackcp.url/xmlrpc.php");
+        example.setOrigin(SiteModel.ORIGIN_WPCOM_REST);
+        return example;
+    }
+
+    public static SiteModel generateSelfHostedSiteFutureJetpack() {
+        SiteModel example = new SiteModel();
+        example.setSelfHostedSiteId(8);
+        example.setIsWPCom(false);
+        example.setIsJetpackInstalled(false);
+        example.setIsJetpackConnected(false);
+        example.setIsVisible(true);
+        example.setUrl("http://jetpack2.url");
+        example.setXmlRpcUrl("http://jetpack2.url/xmlrpc.php");
+        example.setOrigin(SiteModel.ORIGIN_XMLRPC);
+        return example;
+    }
+
+    public static List<PostFormatModel> generatePostFormats(String... names) {
+        List<PostFormatModel> res = new ArrayList<>();
+        for (String name : names) {
+            PostFormatModel postFormat = new PostFormatModel();
+            postFormat.setSlug(name.toLowerCase());
+            postFormat.setDisplayName(name);
+            res.add(postFormat);
+        }
+        return res;
+    }
+
+    public static SiteModel generateSiteWithZendeskMetaData() {
+        SiteModel site = generateJetpackSiteOverRestOnly();
+        site.setZendeskPlan(ZENDESK_PLAN_BUSINESS_PROFESSIONAL);
+        site.setZendeskAddOns(ZENDESK_ADDON_BACKUP_DAILY + "," + ZENDESK_ADDON_SCAN_DAILY);
+        return site;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteXMLRPCClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteXMLRPCClientTest.kt
new file mode 100644
index 00000000000..4d257006c56
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/site/SiteXMLRPCClientTest.kt
@@ -0,0 +1,198 @@
+package org.wordpress.android.fluxc.site
+
+import com.android.volley.NetworkResponse
+import com.android.volley.RequestQueue
+import com.android.volley.Response
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.shadows.ShadowLog
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.HTTPAuthManager
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder
+import org.wordpress.android.fluxc.network.xmlrpc.site.SiteXMLRPCClient
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit.MILLISECONDS
+
+@RunWith(RobolectricTestRunner::class)
+class SiteXMLRPCClientTest {
+    private lateinit var mSiteXMLRPCClient: SiteXMLRPCClient
+    private lateinit var mDispatcher: Dispatcher
+    private lateinit var mMockedQueue: RequestQueue
+    private var mMockedResponse = ""
+    private var mCountDownLatch: CountDownLatch? = null
+    @Before fun setUp() {
+        ShadowLog.stream = System.out
+        mMockedQueue = Mockito.mock(RequestQueue::class.java)
+        mDispatcher = Mockito.mock(Dispatcher::class.java)
+        doAnswer { invocation ->
+            val request = invocation.arguments[0] as XMLRPCRequest
+            try {
+                val requestClass = Class.forName(
+                        "org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest"
+                ) as Class<XMLRPCRequest>
+                // Reflection code equivalent to:
+                // Object o = request.parseNetworkResponse(data)
+                val parseNetworkResponse = requestClass.getDeclaredMethod(
+                        "parseNetworkResponse",
+                        NetworkResponse::class.java
+                )
+                parseNetworkResponse.isAccessible = true
+                val nr = NetworkResponse(mMockedResponse.toByteArray())
+                val o = parseNetworkResponse.invoke(request, nr) as Response<Any>
+                // Reflection code equivalent to:
+                // request.deliverResponse(o)
+                val deliverResponse = requestClass.getDeclaredMethod("deliverResponse", Any::class.java)
+                deliverResponse.isAccessible = true
+                deliverResponse.invoke(request, o.result)
+            } catch (e: Exception) {
+                Assert.assertTrue("Unexpected exception: $e", false)
+            }
+            mCountDownLatch?.countDown()
+            null
+        }.whenever(mMockedQueue).add<Any>(any())
+
+        mSiteXMLRPCClient = SiteXMLRPCClient(
+                mDispatcher, mMockedQueue, Mockito.mock(UserAgent::class.java),
+                Mockito.mock(HTTPAuthManager::class.java), XMLRPCRequestBuilder()
+        )
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = WellSqlConfig(appContext)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test @Throws(Exception::class) fun testFetchSite() = test {
+        val site = SiteUtils.generateSelfHostedNonJPSite()
+        mMockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+<methodResponse><params><param><value>
+  <struct>
+  <member><name>post_thumbnail</name><value><struct>
+  <member><name>value</name><value><boolean>1</boolean></value></member>
+  </struct></value></member>
+  
+  <member><name>time_zone</name><value><struct>
+  <member><name>value</name><value><string>0</string></value></member>
+  </struct></value></member>
+  
+  <member><name>login_url</name><value><struct>
+  <member><name>value</name><value>
+  <string>https://taliwutblog.wordpress.com/wp-login.php</string>
+  </value></member></struct></value></member>
+  
+  <member><name>blog_public</name><value><struct>
+  <member><name>value</name><value><string>0</string></value></member></struct>
+  </value></member>
+  
+  <member><name>blog_title</name><value><struct>
+  <member><name>value</name><value><string>@tal&amp;amp;wut blog</string>
+  </value></member></struct></value></member>
+  
+  <member><name>admin_url</name><value><struct>
+  <member><name>readonly</name><value><boolean>1</boolean></value></member>
+  <member><name>value</name><value>
+  <string>https://taliwutblog.wordpress.com/wp-admin/</string>
+  </value></member></struct></value></member>
+  
+  <member><name>software_version</name><value><struct>
+  <member><name>value</name><value><string>4.5.3-20160628</string></value></member>
+  </struct></value></member>
+  
+  <member><name>jetpack_client_id</name><value><struct>
+  <member><name>value</name><value><string>false</string></value></member></struct>
+  </value></member>
+  
+  <member><name>home_url</name><value><struct>
+  <member><name>value</name><value><string>http://taliwutblog.wordpress.com</string>
+  </value></member></struct></value></member>
+  </struct>
+</value></param></params></methodResponse>"""
+        val result = mSiteXMLRPCClient.fetchSite(site)
+
+        assertThat(result.isError).isFalse()
+    }
+
+    @Test @Throws(Exception::class)
+    fun testFetchSiteBadResponseFormat() = test {
+        // If wp.getOptions returns a String instead of a Map, make sure we:
+        // 1. Don't crash
+        // 2. Emit an UPDATE_SITE action with an INVALID_RESPONSE error
+        // 3. Report the parse error and its details in an OnUnexpectedError
+        val site = SiteUtils.generateSelfHostedNonJPSite()
+        mMockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+<methodResponse><params><param><value>
+  <string>whoops</string>
+</value></param></params></methodResponse>"""
+
+        val result = mSiteXMLRPCClient.fetchSite(site)
+
+        Assert.assertTrue(result.isError)
+        Assert.assertEquals(INVALID_RESPONSE, result.error.type)
+    }
+
+    @Test
+    fun testFetchSites() = test {
+        mMockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+<methodResponse><params><param><value>
+<array><data><value><struct>
+<member><name>isAdmin</name><value><boolean>1</boolean></value></member>
+<member><name>url</name><value>
+<string>http://docbrown.url/</string>
+</value></member>
+<member><name>blogid</name><value><string>1</string></value></member>
+<member><name>blogName</name><value><string>Doc Brown Testing</string></value></member>
+<member><name>xmlrpc</name><value>
+<string>http://docbrown.url/xmlrpc.php</string>
+</value></member></struct></value></data></array>
+</value></param></params></methodResponse>"""
+        val xmlrpcUrl = "http://docbrown.url/xmlrpc.php"
+        val fetchedSites = mSiteXMLRPCClient.fetchSites(xmlrpcUrl, "thedoc", "gr3@tsc0tt")
+
+        assertThat(fetchedSites.sites).isNotEmpty
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun testFetchSitesResponseNotArray() = test {
+        mMockedResponse = """<?xml version="1.0" encoding="UTF-8"?>
+<methodResponse><params><param><value>
+<string>disaster!</string>
+</value></param></params></methodResponse>"""
+        val xmlrpcUrl = "http://docbrown.url/xmlrpc.php"
+
+        doAnswer { invocation -> // Expect an OnUnexpectedError to be emitted with a parse error
+            val event = invocation.getArgument<OnUnexpectedError>(0)
+            Assert.assertEquals(xmlrpcUrl, event.extras[OnUnexpectedError.KEY_URL])
+            Assert.assertEquals("disaster!", event.extras[OnUnexpectedError.KEY_RESPONSE])
+            Assert.assertEquals(java.lang.ClassCastException::class.java, event.exception.javaClass)
+            mCountDownLatch?.countDown()
+            null
+        }.whenever(mDispatcher).emitChange(any())
+
+        mCountDownLatch = CountDownLatch(2)
+
+        mSiteXMLRPCClient.fetchSites(xmlrpcUrl, "thedoc", "gr3@tsc0tt")
+
+        val result = mSiteXMLRPCClient.fetchSites(xmlrpcUrl, "thedoc", "gr3@tsc0tt")
+
+        assertThat(result.isError).isTrue()
+        assertThat(result.error.type).isEqualTo(INVALID_RESPONSE)
+        Assert.assertTrue(mCountDownLatch!!.await(UnitTestUtils.DEFAULT_TIMEOUT_MS.toLong(), MILLISECONDS))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ActivityLogStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ActivityLogStoreTest.kt
new file mode 100644
index 00000000000..e1cece2a062
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ActivityLogStoreTest.kt
@@ -0,0 +1,514 @@
+package org.wordpress.android.fluxc.store
+
+import com.yarolegovich.wellsql.SelectQuery
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.ActivityLogAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.generated.ActivityLogActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient
+import org.wordpress.android.fluxc.persistence.ActivityLogSqlUtils
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchBackupDownloadStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedBackupDownloadStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedRewindStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindResultPayload
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class ActivityLogStoreTest {
+    @Mock private lateinit var activityLogRestClient: ActivityLogRestClient
+    @Mock private lateinit var activityLogSqlUtils: ActivityLogSqlUtils
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var siteModel: SiteModel
+    private lateinit var activityLogStore: ActivityLogStore
+
+    @Before
+    fun setUp() {
+        activityLogStore = ActivityLogStore(activityLogRestClient, activityLogSqlUtils,
+                initCoroutineEngine(), dispatcher)
+    }
+
+    @Test
+    fun onFetchActivityLogFirstPageActionCleanupDbAndCallRestClient() = test {
+        val payload = FetchActivityLogPayload(siteModel)
+        whenever(activityLogRestClient.fetchActivity(eq(payload), any(), any())).thenReturn(
+                FetchedActivityLogPayload(
+                        listOf(),
+                        siteModel,
+                        0,
+                        0,
+                        0
+                )
+        )
+
+        val action = ActivityLogActionBuilder.newFetchActivitiesAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).fetchActivity(payload, PAGE_SIZE, OFFSET)
+    }
+
+    @Test
+    fun onFetchActivityLogNextActionReadCurrentDataAndCallRestClient() = test {
+        val payload = FetchActivityLogPayload(siteModel, loadMore = true)
+        whenever(activityLogRestClient.fetchActivity(eq(payload), any(), any())).thenReturn(
+                FetchedActivityLogPayload(
+                        listOf(),
+                        siteModel,
+                        0,
+                        0,
+                        0
+                )
+        )
+
+        val existingActivities = listOf<ActivityLogModel>(mock())
+        whenever(activityLogSqlUtils.getActivitiesForSite(siteModel, SelectQuery.ORDER_ASCENDING))
+                .thenReturn(existingActivities)
+
+        val action = ActivityLogActionBuilder.newFetchActivitiesAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).fetchActivity(payload, PAGE_SIZE, existingActivities.size)
+    }
+
+    @Test
+    fun onFetchRewindStatusActionCallRestClient() = test {
+        val payload = FetchRewindStatePayload(siteModel)
+        whenever(activityLogRestClient.fetchActivityRewind(siteModel)).thenReturn(
+                FetchedRewindStatePayload(
+                        null,
+                        siteModel
+                )
+        )
+        val action = ActivityLogActionBuilder.newFetchRewindStateAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).fetchActivityRewind(siteModel)
+    }
+
+    @Test
+    fun onRewindActionCallRestClient() = test {
+        whenever(activityLogRestClient.rewind(eq(siteModel), any(), anyOrNull())).thenReturn(
+                RewindResultPayload(
+                        "rewindId",
+                        null,
+                        siteModel
+                )
+        )
+
+        val rewindId = "rewindId"
+        val payload = RewindPayload(siteModel, rewindId, null)
+        val action = ActivityLogActionBuilder.newRewindAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).rewind(siteModel, rewindId)
+    }
+
+    @Test
+    fun storeFetchedActivityLogToDbAndSetsLoadMoreToFalse() = test {
+        val rowsAffected = 1
+        val activityModels = listOf<ActivityLogModel>(mock())
+
+        val action = initRestClient(activityModels, rowsAffected)
+
+        activityLogStore.onAction(action)
+
+        verify(activityLogSqlUtils).insertOrUpdateActivities(siteModel, activityModels)
+        val expectedChangeEvent = ActivityLogStore.OnActivityLogFetched(rowsAffected,
+                false,
+                ActivityLogAction.FETCH_ACTIVITIES)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+        verify(activityLogSqlUtils).deleteActivityLog(siteModel)
+    }
+
+    @Test
+    fun cannotLoadMoreWhenResponseEmpty() = test {
+        val rowsAffected = 0
+        val activityModels = listOf<ActivityLogModel>(mock())
+
+        val action = initRestClient(activityModels, rowsAffected)
+
+        activityLogStore.onAction(action)
+
+        val expectedChangeEvent = ActivityLogStore.OnActivityLogFetched(0,
+                false,
+                ActivityLogAction.FETCH_ACTIVITIES)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun setsLoadMoreToTrueOnMoreItems() = test {
+        val rowsAffected = 1
+        val activityModels = listOf<ActivityLogModel>(mock())
+
+        val action = initRestClient(activityModels, rowsAffected, totalItems = 500)
+        whenever(activityLogSqlUtils.insertOrUpdateActivities(any(), any())).thenReturn(rowsAffected)
+
+        activityLogStore.onAction(action)
+
+        val expectedChangeEvent = ActivityLogStore.OnActivityLogFetched(rowsAffected,
+                true,
+                ActivityLogAction.FETCH_ACTIVITIES)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun returnActivitiesFromDb() {
+        val activityModels = listOf<ActivityLogModel>(mock())
+        whenever(activityLogSqlUtils.getActivitiesForSite(siteModel, SelectQuery.ORDER_DESCENDING))
+                .thenReturn(activityModels)
+
+        val activityModelsFromDb = activityLogStore.getActivityLogForSite(
+                site = siteModel,
+                ascending = false,
+                rewindableOnly = false
+        )
+
+        verify(activityLogSqlUtils).getActivitiesForSite(siteModel, SelectQuery.ORDER_DESCENDING)
+        assertEquals(activityModels, activityModelsFromDb)
+    }
+
+    @Test
+    fun returnRewindableOnlyActivitiesFromDb() {
+        val rewindableActivityModels = listOf<ActivityLogModel>(mock())
+        whenever(activityLogSqlUtils.getRewindableActivitiesForSite(siteModel, SelectQuery.ORDER_DESCENDING))
+                .thenReturn(rewindableActivityModels)
+
+        val activityModelsFromDb = activityLogStore.getActivityLogForSite(
+                site = siteModel,
+                ascending = false,
+                rewindableOnly = true
+        )
+
+        verify(activityLogSqlUtils).getRewindableActivitiesForSite(siteModel, SelectQuery.ORDER_DESCENDING)
+        assertEquals(rewindableActivityModels, activityModelsFromDb)
+    }
+
+    @Test
+    fun storeFetchedRewindStatusToDb() = test {
+        val rewindStatusModel = mock<RewindStatusModel>()
+        val payload = FetchedRewindStatePayload(rewindStatusModel, siteModel)
+        whenever(activityLogRestClient.fetchActivityRewind(siteModel)).thenReturn(payload)
+
+        val fetchAction = ActivityLogActionBuilder.newFetchRewindStateAction(FetchRewindStatePayload(siteModel))
+        activityLogStore.onAction(fetchAction)
+
+        verify(activityLogSqlUtils).replaceRewindStatus(siteModel, rewindStatusModel)
+        val expectedChangeEvent = ActivityLogStore.OnRewindStatusFetched(ActivityLogAction.FETCH_REWIND_STATE)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun returnRewindStatusFromDb() {
+        val rewindStatusModel = mock<RewindStatusModel>()
+        whenever(activityLogSqlUtils.getRewindStatusForSite(siteModel))
+                .thenReturn(rewindStatusModel)
+
+        val rewindStatusFromDb = activityLogStore.getRewindStatusForSite(siteModel)
+
+        verify(activityLogSqlUtils).getRewindStatusForSite(siteModel)
+        assertEquals(rewindStatusModel, rewindStatusFromDb)
+    }
+
+    @Test
+    fun emitsRewindResult() = test {
+        val rewindId = "rewindId"
+        val restoreId = 10L
+
+        val payload = RewindResultPayload(rewindId, restoreId, siteModel)
+        whenever(activityLogRestClient.rewind(siteModel, rewindId)).thenReturn(payload)
+
+        activityLogStore.onAction(ActivityLogActionBuilder.newRewindAction(RewindPayload(
+                siteModel,
+                rewindId,
+                null)))
+
+        val expectedChangeEvent = ActivityLogStore.OnRewind(rewindId, restoreId, ActivityLogAction.REWIND)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun returnsActivityLogItemFromDbByRewindId() {
+        val rewindId = "rewindId"
+        val activityLogModel = mock<ActivityLogModel>()
+        whenever(activityLogSqlUtils.getActivityByRewindId(rewindId)).thenReturn(activityLogModel)
+
+        val returnedItem = activityLogStore.getActivityLogItemByRewindId(rewindId)
+
+        assertEquals(activityLogModel, returnedItem)
+        verify(activityLogSqlUtils).getActivityByRewindId(rewindId)
+    }
+
+    @Test
+    fun returnsActivityLogItemFromDbByActivityId() {
+        val rewindId = "activityId"
+        val activityLogModel = mock<ActivityLogModel>()
+        whenever(activityLogSqlUtils.getActivityByActivityId(rewindId)).thenReturn(activityLogModel)
+
+        val returnedItem = activityLogStore.getActivityLogItemByActivityId(rewindId)
+
+        assertEquals(activityLogModel, returnedItem)
+        verify(activityLogSqlUtils).getActivityByActivityId(rewindId)
+    }
+
+    @Test
+    fun onRewindActionWithTypesCallRestClient() = test {
+        whenever(activityLogRestClient.rewind(eq(siteModel), any(), any())).thenReturn(
+                RewindResultPayload(
+                        "rewindId",
+                        null,
+                        siteModel
+                )
+        )
+
+        val rewindId = "rewindId"
+        val types = RewindRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        val payload = RewindPayload(siteModel, rewindId, types)
+        val action = ActivityLogActionBuilder.newRewindAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).rewind(siteModel, rewindId, types)
+    }
+
+    @Test
+    fun emitsRewindResultWhenSendingTypes() = test {
+        val rewindId = "rewindId"
+        val restoreId = 10L
+        val types = RewindRequestTypes(themes = true,
+                    plugins = true,
+                    uploads = true,
+                    sqls = true,
+                    roots = true,
+                    contents = true)
+
+        val payload = RewindResultPayload(rewindId, restoreId, siteModel)
+        whenever(activityLogRestClient.rewind(siteModel, rewindId, types)).thenReturn(payload)
+
+        activityLogStore.onAction(ActivityLogActionBuilder.newRewindAction(RewindPayload(siteModel, rewindId, types)))
+
+        val expectedChangeEvent = ActivityLogStore.OnRewind(rewindId, restoreId, ActivityLogAction.REWIND)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun onBackupDownloadActionCallRestClient() = test {
+        whenever(activityLogRestClient.backupDownload(eq(siteModel), any(), any())).thenReturn(
+                BackupDownloadResultPayload(
+                        "rewindId",
+                        10L,
+                        "backupPoint",
+                        "startedAt",
+                        50,
+                        siteModel
+                )
+        )
+
+        val types = BackupDownloadRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+        val rewindId = "rewindId"
+        val payload = BackupDownloadPayload(siteModel, rewindId, types)
+        val action = ActivityLogActionBuilder.newBackupDownloadAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).backupDownload(siteModel, rewindId, types)
+    }
+
+    @Test
+    fun emitsBackupDownloadResult() = test {
+        val rewindId = "rewindId"
+        val downloadId = 10L
+        val backupPoint = "backup_point"
+        val startedAt = "started_at"
+        val progress = 50
+        val types = BackupDownloadRequestTypes(themes = true,
+                plugins = true,
+                uploads = true,
+                sqls = true,
+                roots = true,
+                contents = true)
+
+        val payload = BackupDownloadResultPayload(
+                rewindId,
+                downloadId,
+                backupPoint,
+                startedAt,
+                progress,
+                siteModel)
+        whenever(activityLogRestClient.backupDownload(siteModel, rewindId, types)).thenReturn(payload)
+
+        activityLogStore.onAction(ActivityLogActionBuilder.newBackupDownloadAction(BackupDownloadPayload(
+                siteModel,
+                rewindId,
+                types)))
+
+        val expectedChangeEvent = ActivityLogStore.OnBackupDownload(
+                rewindId,
+                downloadId,
+                backupPoint,
+                startedAt,
+                progress,
+                ActivityLogAction.BACKUP_DOWNLOAD)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun onFetchBackupDownloadStatusActionCallRestClient() = test {
+        val payload = FetchBackupDownloadStatePayload(siteModel)
+        whenever(activityLogRestClient.fetchBackupDownloadState(siteModel)).thenReturn(
+                FetchedBackupDownloadStatePayload(
+                        null,
+                        siteModel
+                )
+        )
+        val action = ActivityLogActionBuilder.newFetchBackupDownloadStateAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).fetchBackupDownloadState(siteModel)
+    }
+
+    @Test
+    fun storeFetchedBackupDownloadStatusToDb() = test {
+        val backupDownloadStatusModel = mock<BackupDownloadStatusModel>()
+        val payload = FetchedBackupDownloadStatePayload(backupDownloadStatusModel, siteModel)
+        whenever(activityLogRestClient.fetchBackupDownloadState(siteModel)).thenReturn(payload)
+
+        val fetchAction =
+                ActivityLogActionBuilder.newFetchBackupDownloadStateAction(FetchBackupDownloadStatePayload(siteModel))
+        activityLogStore.onAction(fetchAction)
+
+        verify(activityLogSqlUtils).replaceBackupDownloadStatus(siteModel, backupDownloadStatusModel)
+        val expectedChangeEvent =
+                ActivityLogStore.OnBackupDownloadStatusFetched(ActivityLogAction.FETCH_BACKUP_DOWNLOAD_STATE)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun returnBackupDownloadStatusFromDb() {
+        val backupDownloadStatusModel = mock<BackupDownloadStatusModel>()
+        whenever(activityLogSqlUtils.getBackupDownloadStatusForSite(siteModel))
+                .thenReturn(backupDownloadStatusModel)
+
+        val backDownloadStatusFromDb = activityLogStore.getBackupDownloadStatusForSite(siteModel)
+
+        verify(activityLogSqlUtils).getBackupDownloadStatusForSite(siteModel)
+        assertEquals(backupDownloadStatusModel, backDownloadStatusFromDb)
+    }
+
+    @Test
+    fun storeFetchedEmptyRewindStatusRemoveFromDb() = test {
+        whenever(activityLogRestClient.fetchActivityRewind(siteModel))
+                .thenReturn(FetchedRewindStatePayload(null, siteModel))
+
+        val fetchAction = ActivityLogActionBuilder.newFetchRewindStateAction(FetchRewindStatePayload(siteModel))
+        activityLogStore.onAction(fetchAction)
+
+        verify(activityLogSqlUtils).deleteRewindStatus(siteModel)
+    }
+
+    @Test
+    fun storeFetchedEmptyBackupDownloadStatusRemoveFromDb() = test {
+        whenever(activityLogRestClient.fetchBackupDownloadState(siteModel))
+                .thenReturn(FetchedBackupDownloadStatePayload(null, siteModel))
+
+        val fetchAction =
+                ActivityLogActionBuilder.newFetchBackupDownloadStateAction(FetchBackupDownloadStatePayload(siteModel))
+        activityLogStore.onAction(fetchAction)
+
+        verify(activityLogSqlUtils).deleteBackupDownloadStatus(siteModel)
+    }
+
+    @Test
+    fun onDismissBackupDownloadActionCallRestClient() = test {
+        whenever(activityLogRestClient.dismissBackupDownload(eq(siteModel), any())).thenReturn(
+                DismissBackupDownloadResultPayload(
+                        100L,
+                        10L,
+                        true
+                )
+        )
+
+        val downloadId = 10L
+        val payload = DismissBackupDownloadPayload(siteModel, downloadId)
+        val action = ActivityLogActionBuilder.newDismissBackupDownloadAction(payload)
+        activityLogStore.onAction(action)
+
+        verify(activityLogRestClient).dismissBackupDownload(siteModel, downloadId)
+    }
+
+    @Test
+    fun emitsDismissBackupDownloadResult() = test {
+        val downloadId = 10L
+        val isDismissed = true
+
+        val payload = DismissBackupDownloadResultPayload(
+                siteModel.siteId,
+                downloadId,
+                isDismissed)
+        whenever(activityLogRestClient.dismissBackupDownload(siteModel, downloadId)).thenReturn(payload)
+
+        activityLogStore.onAction(ActivityLogActionBuilder.newDismissBackupDownloadAction(DismissBackupDownloadPayload(
+                siteModel,
+                downloadId)))
+
+        val expectedChangeEvent = ActivityLogStore.OnDismissBackupDownload(
+                downloadId,
+                isDismissed,
+                ActivityLogAction.DISMISS_BACKUP_DOWNLOAD)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    private suspend fun initRestClient(
+        activityModels: List<ActivityLogModel>,
+        rowsAffected: Int,
+        offset: Int = OFFSET,
+        number: Int = PAGE_SIZE,
+        totalItems: Int = PAGE_SIZE
+    ): Action<*> {
+        val requestPayload = FetchActivityLogPayload(siteModel)
+        val action = ActivityLogActionBuilder.newFetchActivitiesAction(requestPayload)
+
+        val payload = FetchedActivityLogPayload(activityModels, siteModel, totalItems, number, offset)
+        whenever(activityLogRestClient.fetchActivity(requestPayload, number, offset)).thenReturn(payload)
+        whenever(activityLogSqlUtils.insertOrUpdateActivities(any(), any())).thenReturn(rowsAffected)
+        return action
+    }
+
+    companion object {
+        private const val OFFSET = 0
+        private const val PAGE_SIZE = 100
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/BloggingRemindersStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/BloggingRemindersStoreTest.kt
new file mode 100644
index 00000000000..ded24ecc25a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/BloggingRemindersStoreTest.kt
@@ -0,0 +1,136 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.single
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.BloggingRemindersMapper
+import org.wordpress.android.fluxc.model.BloggingRemindersModel
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.MONDAY
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao.BloggingReminders
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class BloggingRemindersStoreTest {
+    @Mock lateinit var bloggingRemindersDao: BloggingRemindersDao
+    @Mock lateinit var mapper: BloggingRemindersMapper
+    @Mock lateinit var siteStore: SiteStore
+    private lateinit var store: BloggingRemindersStore
+    private val siteId = 1
+    private val secondSiteId = 2
+    private val testHour = 10
+    private val testMinute = 0
+
+    @Before
+    fun setUp() {
+        store = BloggingRemindersStore(
+            bloggingRemindersDao,
+            mapper,
+            siteStore,
+            initCoroutineEngine(),
+        )
+    }
+
+    @Test
+    fun `maps all items emitted from dao`() = test {
+        val dbEntity1 = BloggingReminders(
+            siteId,
+            monday = true,
+            hour = testHour,
+            minute = testMinute
+        )
+        val dbEntity2 = BloggingReminders(
+            secondSiteId,
+            monday = true,
+            hour = testHour,
+            minute = testMinute
+        )
+        val domainModel1 = BloggingRemindersModel(siteId, setOf(MONDAY))
+        val domainModel2 = BloggingRemindersModel(secondSiteId, setOf(MONDAY))
+        whenever(bloggingRemindersDao.getAll()).thenReturn(flowOf(listOf(dbEntity1, dbEntity2)))
+        whenever(mapper.toDomainModel(dbEntity1)).thenReturn(domainModel1)
+        whenever(mapper.toDomainModel(dbEntity2)).thenReturn(domainModel2)
+
+        assertThat(store.getAll().single()).isEqualTo(listOf(domainModel1, domainModel2))
+    }
+
+    @Test
+    fun `maps single item emitted from dao`() = test {
+        val dbEntity = BloggingReminders(
+            siteId,
+            monday = true,
+            hour = testHour,
+            minute = testMinute,
+            isPromptRemindersOptedIn = false,
+        )
+        val domainModel = BloggingRemindersModel(
+            siteId,
+            setOf(MONDAY),
+            isPromptsCardEnabled = false
+        )
+        whenever(bloggingRemindersDao.liveGetBySiteId(siteId)).thenReturn(flowOf(dbEntity))
+        whenever(mapper.toDomainModel(dbEntity)).thenReturn(domainModel)
+
+        assertThat(store.bloggingRemindersModel(siteId).single()).isEqualTo(domainModel)
+    }
+
+    @Test
+    fun `maps null value to empty model emitted from dao`() = test {
+        whenever(bloggingRemindersDao.liveGetBySiteId(siteId)).thenReturn(flowOf(null))
+        whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(
+            SiteModel().apply { setIsPotentialBloggingSite(false) }
+        )
+
+        assertThat(store.bloggingRemindersModel(siteId).single()).isEqualTo(
+            BloggingRemindersModel(
+                siteId,
+                isPromptsCardEnabled = false,
+            )
+        )
+    }
+
+    @Test
+    fun `maps items stored to dao`() = test {
+        val dbEntity = BloggingReminders(
+            siteId,
+            monday = true,
+            hour = testHour,
+            minute = testMinute
+        )
+        val domainModel = BloggingRemindersModel(siteId, setOf(MONDAY))
+        whenever(mapper.toDatabaseModel(domainModel)).thenReturn(dbEntity)
+
+        store.updateBloggingReminders(domainModel)
+
+        verify(bloggingRemindersDao).insert(dbEntity)
+    }
+
+    @Test
+    fun `has modified blogging reminders when DAO returns data`() = test {
+        val dbEntity = BloggingReminders(
+            siteId,
+            monday = true,
+            hour = testHour,
+            minute = testMinute
+        )
+        whenever(bloggingRemindersDao.getBySiteId(siteId)).thenReturn(listOf(dbEntity))
+
+        assertThat(store.hasModifiedBloggingReminders(siteId)).isTrue
+    }
+
+    @Test
+    fun `does not have modified blogging reminders when DAO returns no data`() = test {
+        whenever(bloggingRemindersDao.getBySiteId(siteId)).thenReturn(listOf())
+
+        assertThat(store.hasModifiedBloggingReminders(siteId)).isFalse
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/CouponStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/CouponStoreTest.kt
new file mode 100644
index 00000000000..3d1c1389930
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/CouponStoreTest.kt
@@ -0,0 +1,214 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.CouponDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.CouponReportDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.coupons.CouponRestClient
+import org.wordpress.android.fluxc.persistence.TransactionExecutor
+import org.wordpress.android.fluxc.persistence.dao.CouponsDao
+import org.wordpress.android.fluxc.persistence.entity.CouponEmailEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity
+import org.wordpress.android.fluxc.persistence.entity.CouponEntity.DiscountType
+import org.wordpress.android.fluxc.persistence.entity.CouponWithEmails
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.math.BigDecimal
+
+@RunWith(MockitoJUnitRunner::class)
+class CouponStoreTest {
+    @Mock private lateinit var restClient: CouponRestClient
+    @Mock private lateinit var couponsDao: CouponsDao
+
+    private val transactionExecutor: TransactionExecutor = mock {
+        val blockArg1 = argumentCaptor<suspend () -> Unit>()
+        onBlocking { executeInTransaction(blockArg1.capture()) }.then {
+            runBlocking {
+                blockArg1.lastValue.invoke()
+            }
+        }
+    }
+
+    private lateinit var couponStore: CouponStore
+
+    private val site = SiteModel().apply { siteId = 123 }
+
+    private val couponDto = CouponDto(
+        id = 1L,
+        code = "CODE",
+        amount = "10",
+        dateCreated = "2021-12-27 11:33:55",
+        dateCreatedGmt = "2021-12-27 11:33:55Z",
+        dateModified = "2021-12-27 11:33:55",
+        dateModifiedGmt = "2021-12-27 11:33:55Z",
+        discountType = "percent",
+        description = "Description",
+        dateExpires = "2023-12-27 11:33:55",
+        dateExpiresGmt = "2023-12-27 11:33:55Z",
+        usageCount = 1,
+        isForIndividualUse = false,
+        productIds = listOf(2L, 3L),
+        excludedProductIds = listOf(4L, 5L),
+        usageLimit = 3,
+        usageLimitPerUser = 1,
+        limitUsageToXItems = 2,
+        isShippingFree = false,
+        productCategoryIds = listOf(2L, 3L),
+        excludedProductCategoryIds = listOf(4L, 5L),
+        areSaleItemsExcluded = true,
+        minimumAmount = "5",
+        maximumAmount = "50",
+        restrictedEmails = listOf("email@email.com"),
+        usedBy = null
+    )
+
+    private val expectedCoupon = CouponEntity(
+        id = RemoteId(couponDto.id),
+        localSiteId = site.localId(),
+        code = couponDto.code,
+        amount = couponDto.amount?.toBigDecimal(),
+        dateCreated = couponDto.dateCreated,
+        dateCreatedGmt = couponDto.dateCreatedGmt,
+        dateModified = couponDto.dateModified,
+        dateModifiedGmt = couponDto.dateModifiedGmt,
+        discountType = couponDto.discountType?.let { DiscountType.fromString(it) },
+        description = couponDto.description,
+        dateExpires = couponDto.dateExpires,
+        dateExpiresGmt = couponDto.dateExpiresGmt,
+        usageCount = couponDto.usageCount,
+        isForIndividualUse = couponDto.isForIndividualUse,
+        usageLimit = couponDto.usageLimit,
+        usageLimitPerUser = couponDto.usageLimitPerUser,
+        limitUsageToXItems = couponDto.limitUsageToXItems,
+        isShippingFree = couponDto.isShippingFree,
+        areSaleItemsExcluded = couponDto.areSaleItemsExcluded,
+        minimumAmount = couponDto.minimumAmount?.toBigDecimal(),
+        maximumAmount = couponDto.maximumAmount?.toBigDecimal(),
+        includedProductIds = couponDto.productIds,
+        excludedProductIds = couponDto.excludedProductIds,
+        includedCategoryIds = couponDto.productCategoryIds,
+        excludedCategoryIds = couponDto.excludedProductCategoryIds
+    )
+
+    private val expectedEmail = CouponEmailEntity(
+        couponId = RemoteId(couponDto.id),
+        localSiteId = site.localId(),
+        email = couponDto.restrictedEmails!!.first()
+    )
+
+    @Before
+    fun setUp() {
+        couponStore = CouponStore(
+            restClient,
+            couponsDao,
+            initCoroutineEngine(),
+            transactionExecutor
+        )
+    }
+
+    @Test
+    fun `Coupons is fetched with a correct result`() = test {
+        whenever(restClient.fetchCoupons(
+            site,
+            CouponStore.DEFAULT_PAGE,
+            CouponStore.DEFAULT_PAGE_SIZE
+        )).thenReturn(WooPayload(arrayOf(couponDto)))
+
+        val result = couponStore.fetchCoupons(site)
+
+        assertThat(result).isEqualTo(WooResult(false))
+    }
+
+    @Test
+    fun `Coupon is inserted in DB correctly`() = test {
+        whenever(restClient.fetchCoupons(
+            site,
+            CouponStore.DEFAULT_PAGE,
+            CouponStore.DEFAULT_PAGE_SIZE
+        )).thenReturn(WooPayload(arrayOf(couponDto)))
+
+        couponStore.fetchCoupons(site, page = CouponStore.DEFAULT_PAGE)
+
+        verify(couponsDao).insertOrUpdateCoupon(expectedCoupon)
+    }
+
+    @Test
+    fun `Coupon emails are inserted in DB correctly`() = test {
+        whenever(restClient.fetchCoupons(
+            site,
+            CouponStore.DEFAULT_PAGE,
+            CouponStore.DEFAULT_PAGE_SIZE
+        )).thenReturn(WooPayload(arrayOf(couponDto)))
+
+        couponStore.fetchCoupons(site)
+
+        verify(couponsDao).insertOrUpdateCouponEmail(expectedEmail)
+    }
+
+    @Test
+    fun `Observing the DB changes returns the correct coupon data model`(): Unit = test {
+        val expectedDataModel = listOf(
+            CouponWithEmails(
+                expectedCoupon,
+                listOf(expectedEmail)
+            )
+        )
+
+        whenever(couponsDao.observeCoupons(site.localId())).thenReturn(flowOf(expectedDataModel))
+
+        val observedDataModel = couponStore.observeCoupons(site).first()
+
+        assertThat(observedDataModel).isEqualTo(expectedDataModel)
+    }
+
+    @Test
+    fun `Observing a specific coupon returns the correct coupon data model`(): Unit = test {
+        val expectedDataModel = CouponWithEmails(
+            expectedCoupon,
+            listOf(expectedEmail)
+        )
+
+        whenever(couponsDao.observeCoupon(site.localId(), expectedCoupon.id)).thenReturn(
+            flowOf(expectedDataModel)
+        )
+
+        val observedDataModel = couponStore.observeCoupon(site, expectedCoupon.id.value).first()
+
+        assertThat(observedDataModel).isEqualTo(expectedDataModel)
+    }
+
+    @Test
+    fun `fetching coupon report should return the correct data`() = test {
+        whenever(restClient.fetchCouponReport(any(), any(), any())).thenReturn(
+            WooPayload(
+                CouponReportDto(
+                    couponId = expectedCoupon.id.value,
+                    amount = "10",
+                    ordersCount = 2
+                )
+            )
+        )
+
+        val couponReport = couponStore.fetchCouponReport(site, expectedCoupon.id.value).model!!
+
+        assertThat(couponReport.couponId).isEqualTo(expectedCoupon.id.value)
+        assertThat(couponReport.amount).isEqualByComparingTo(BigDecimal.TEN)
+        assertThat(couponReport.ordersCount).isEqualTo(2)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatusTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatusTest.kt
new file mode 100644
index 00000000000..4f9a2e6d901
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatusTest.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.store
+
+import android.content.SharedPreferences
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.store.NotificationStore.Companion.WPCOM_PUSH_DEVICE_SERVER_ID
+import org.wordpress.android.fluxc.utils.PreferenceUtils
+
+@RunWith(MockitoJUnitRunner::class)
+class GetDeviceRegistrationStatusTest {
+    private val preferences: SharedPreferences = mock()
+    private val preferencesWrapper: PreferenceUtils.PreferenceUtilsWrapper = mock {
+        on { getFluxCPreferences() } doReturn preferences
+    }
+
+    private val sut = GetDeviceRegistrationStatus(preferencesWrapper)
+
+    @Test
+    fun `when device id is not empty, return registered status`() {
+        // given
+        whenever(preferences.getString(WPCOM_PUSH_DEVICE_SERVER_ID, null)).doReturn("not-empty-id")
+
+        // when
+        val result = sut.invoke()
+
+        // then
+        assertEquals(GetDeviceRegistrationStatus.Status.REGISTERED, result)
+    }
+
+    @Test
+    fun `when device id is empty, return unregistered status`() {
+        // given
+        whenever(preferences.getString(WPCOM_PUSH_DEVICE_SERVER_ID, null)).doReturn("")
+
+        // when
+        val result = sut.invoke()
+
+        // then
+        assertEquals(GetDeviceRegistrationStatus.Status.UNREGISTERED, result)
+    }
+
+    @Test
+    fun `when device id is null, return unregistered status`() {
+        // given
+        whenever(preferences.getString(WPCOM_PUSH_DEVICE_SERVER_ID, null)).doReturn(null)
+
+        // when
+        val result = sut.invoke()
+
+        // then
+        assertEquals(GetDeviceRegistrationStatus.Status.UNREGISTERED, result)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistrationTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistrationTest.kt
new file mode 100644
index 00000000000..16c4be5455d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistrationTest.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.store
+
+import android.content.SharedPreferences
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.wordpress.android.fluxc.store.NotificationStore.Companion.WPCOM_PUSH_DEVICE_SERVER_ID
+import org.wordpress.android.fluxc.utils.PreferenceUtils
+
+class InvalidateDeviceRegistrationTest {
+    private val preferencesEditor: SharedPreferences.Editor = mock {
+        on { remove(any()) } doReturn mock
+    }
+    private val preferences: SharedPreferences = mock {
+        on { edit() } doReturn preferencesEditor
+    }
+    private val preferencesWrapper: PreferenceUtils.PreferenceUtilsWrapper = mock {
+        on { getFluxCPreferences() } doReturn preferences
+    }
+
+    lateinit var sut: InvalidateDeviceRegistration
+
+    @Before
+    fun setUp() {
+        sut = InvalidateDeviceRegistration(preferencesWrapper)
+    }
+
+    @Test
+    fun `remove device id when executed`() {
+        // when
+        sut.invoke()
+
+        // then
+        verify(preferencesEditor).remove(WPCOM_PUSH_DEVICE_SERVER_ID)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/JetpackStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/JetpackStoreTest.kt
new file mode 100644
index 00000000000..df8ca963195
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/JetpackStoreTest.kt
@@ -0,0 +1,200 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.JetpackAction.ACTIVATE_STATS_MODULE
+import org.wordpress.android.fluxc.action.JetpackAction.INSTALL_JETPACK
+import org.wordpress.android.fluxc.generated.JetpackActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.jetpack.JetpackWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackRestClient
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleError
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModulePayload
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleResultPayload
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallError
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstalledPayload
+import org.wordpress.android.fluxc.store.JetpackStore.OnJetpackInstalled
+import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class JetpackStoreTest {
+    @Mock private lateinit var jetpackRestClient: JetpackRestClient
+    @Mock private lateinit var jetpackWPAPIRestClient: JetpackWPAPIRestClient
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var siteStore: SiteStore
+    @Mock private lateinit var site: SiteModel
+    private lateinit var jetpackStore: JetpackStore
+
+    @Before
+    fun setUp() {
+        jetpackStore = JetpackStore(
+            jetpackRestClient,
+            jetpackWPAPIRestClient,
+            siteStore,
+            initCoroutineEngine(),
+            dispatcher
+        )
+        val siteId = 1
+        whenever(site.id).thenReturn(siteId)
+        whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(site)
+    }
+
+    @Test
+    fun `on install triggers rest client and returns success`() = test {
+        val success = true
+        whenever(jetpackRestClient.installJetpack(site)).thenReturn(JetpackInstalledPayload(site, success))
+
+        var result: OnJetpackInstalled? = null
+        launch(Dispatchers.Unconfined) { result = jetpackStore.install(site, INSTALL_JETPACK) }
+
+        jetpackStore.onSiteChanged(OnSiteChanged(1))
+
+        assertThat(result!!.success).isTrue
+        val expectedChangeEvent = OnJetpackInstalled(success, INSTALL_JETPACK)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun `on install action triggers rest client and returns success`() = test {
+        val success = true
+        whenever(jetpackRestClient.installJetpack(site)).thenReturn(JetpackInstalledPayload(site, success))
+
+        jetpackStore.onAction(JetpackActionBuilder.newInstallJetpackAction(site))
+
+        jetpackStore.onSiteChanged(OnSiteChanged(1))
+
+        val expectedChangeEvent = OnJetpackInstalled(success, INSTALL_JETPACK)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun `on install triggers rest client and returns error`() = test {
+        val installError = JetpackInstallError(GENERIC_ERROR)
+        val payload = JetpackInstalledPayload(installError, site)
+        whenever(jetpackRestClient.installJetpack(site)).thenReturn(payload)
+
+        var result: OnJetpackInstalled? = null
+        launch(Dispatchers.Unconfined) { result = jetpackStore.install(site, INSTALL_JETPACK) }
+
+        jetpackStore.onSiteChanged(OnSiteChanged(1))
+
+        assertThat(result!!.success).isFalse
+        val expectedChangeEvent = OnJetpackInstalled(installError, INSTALL_JETPACK)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun `on install action triggers rest client and returns error`() = test {
+        val installError = JetpackInstallError(GENERIC_ERROR)
+        val payload = JetpackInstalledPayload(installError, site)
+        whenever(jetpackRestClient.installJetpack(site)).thenReturn(payload)
+
+        jetpackStore.onAction(JetpackActionBuilder.newInstallJetpackAction(site))
+
+        jetpackStore.onSiteChanged(OnSiteChanged(1))
+
+        val expectedChangeEvent = OnJetpackInstalled(installError, INSTALL_JETPACK)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun `given activate stats request, then rest client is triggered`() = test {
+        val requestPayload = ActivateStatsModulePayload(site)
+        val successPayload = ActivateStatsModuleResultPayload(true, site)
+        val enabled = "stats,other"
+
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(successPayload)
+        whenever(site.activeModules).thenReturn(enabled)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+        verify(jetpackRestClient).activateStatsModule(requestPayload)
+    }
+
+    @Test
+    fun `given activate stats request, when rest client is triggered successfully, then success is returned`() = test {
+        val requestPayload = ActivateStatsModulePayload(site)
+        val successPayload = ActivateStatsModuleResultPayload(true, site)
+        val enabled = "stats,other"
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(successPayload)
+        whenever(site.activeModules).thenReturn(enabled)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+
+        val expected = JetpackStore.OnActivateStatsModule(ACTIVATE_STATS_MODULE)
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `given activate stats request, when rest client triggers invalid response, then error is returned`() = test {
+        val error = ActivateStatsModuleError(INVALID_RESPONSE, "error")
+        val requestPayload = ActivateStatsModulePayload(site)
+        val resultPayload = ActivateStatsModuleResultPayload(error, site)
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(resultPayload)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+
+        val expectedEventWithError = JetpackStore.OnActivateStatsModule(resultPayload.error, ACTIVATE_STATS_MODULE)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `given activate stats request, when rest client triggers api error, then error is returned`() = test {
+        val error = ActivateStatsModuleError(API_ERROR, "error")
+        val requestPayload = ActivateStatsModulePayload(site)
+        val resultPayload = ActivateStatsModuleResultPayload(error, site)
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(resultPayload)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+
+        val expectedEventWithError = JetpackStore.OnActivateStatsModule(resultPayload.error, ACTIVATE_STATS_MODULE)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `given activate stats request, when rest client triggers generic error, then error is returned`() = test {
+        val error = ActivateStatsModuleError(ActivateStatsModuleErrorType.GENERIC_ERROR, "error")
+        val requestPayload = ActivateStatsModulePayload(site)
+        val resultPayload = ActivateStatsModuleResultPayload(error, site)
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(resultPayload)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+
+        val expectedEventWithError = JetpackStore.OnActivateStatsModule(resultPayload.error, ACTIVATE_STATS_MODULE)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `given activate stats request, when rest client triggers auth error, then error is returned`() = test {
+        val error = ActivateStatsModuleError(ActivateStatsModuleErrorType.AUTHORIZATION_REQUIRED, "error")
+        val requestPayload = ActivateStatsModulePayload(site)
+        val resultPayload = ActivateStatsModuleResultPayload(error, site)
+        whenever(jetpackRestClient.activateStatsModule(eq(requestPayload))).thenReturn(resultPayload)
+
+        val action = JetpackActionBuilder.newActivateStatsModuleAction(requestPayload)
+        jetpackStore.onAction(action)
+
+        val expectedEventWithError = JetpackStore.OnActivateStatsModule(resultPayload.error, ACTIVATE_STATS_MODULE)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PlanOffersStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PlanOffersStoreTest.kt
new file mode 100644
index 00000000000..2e0f0d385f7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PlanOffersStoreTest.kt
@@ -0,0 +1,98 @@
+package org.wordpress.android.fluxc.store
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.PlanOffersAction
+import org.wordpress.android.fluxc.generated.PlanOffersActionBuilder
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PLAN_OFFER_MODELS
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient
+import org.wordpress.android.fluxc.persistence.PlanOffersSqlUtils
+import org.wordpress.android.fluxc.store.PlanOffersStore.PlanOffersErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.PlanOffersStore.PlanOffersFetchedPayload
+import org.wordpress.android.fluxc.store.PlanOffersStore.PlansFetchError
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class PlanOffersStoreTest {
+    @Mock private lateinit var planOffersRestClient: PlanOffersRestClient
+    @Mock private lateinit var planOffersSqlUtils: PlanOffersSqlUtils
+    @Mock private lateinit var dispatcher: Dispatcher
+    private lateinit var planOffersStore: PlanOffersStore
+
+    @Before
+    fun setUp() {
+        planOffersStore = PlanOffersStore(planOffersRestClient, planOffersSqlUtils, initCoroutineEngine(), dispatcher)
+    }
+
+    @Test
+    fun fetchPlanOffers() = test {
+        initRestClient(PLAN_OFFER_MODELS)
+
+        val action = PlanOffersActionBuilder.generateNoPayloadAction(PlanOffersAction.FETCH_PLAN_OFFERS)
+
+        planOffersStore.onAction(action)
+
+        verify(planOffersRestClient).fetchPlanOffers()
+        verify(planOffersSqlUtils).storePlanOffers(PLAN_OFFER_MODELS)
+
+        val expectedEvent = PlanOffersStore.OnPlanOffersFetched(PLAN_OFFER_MODELS)
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+
+    @Test
+    fun fetchCachedPlanOffersAfterError() = test {
+        initRestClient(PLAN_OFFER_MODELS)
+
+        val action = PlanOffersActionBuilder.generateNoPayloadAction(PlanOffersAction.FETCH_PLAN_OFFERS)
+
+        planOffersStore.onAction(action)
+
+        val error = WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR))
+        error.message = "NETWORK_ERROR"
+
+        // tell REST client to return error and no plan offers
+        initRestClient(error = error)
+
+        val expectedEventWithoutError = PlanOffersStore.OnPlanOffersFetched(PLAN_OFFER_MODELS)
+        verify(dispatcher, times(1)).emitChange(eq(expectedEventWithoutError)) // sanity check
+
+        planOffersStore.onAction(action)
+
+        verify(planOffersRestClient, times(2)).fetchPlanOffers()
+        // plan offers should not be stored on error
+        verify(planOffersSqlUtils, times(1)).storePlanOffers(PLAN_OFFER_MODELS)
+
+        val expectedEventWithError = PlanOffersStore.OnPlanOffersFetched(
+                PLAN_OFFER_MODELS,
+                PlansFetchError(GENERIC_ERROR, "NETWORK_ERROR")
+        )
+        verify(dispatcher, times(1)).emitChange(eq(expectedEventWithError))
+    }
+
+    private suspend fun initRestClient(
+        planOffers: List<PlanOffersModel>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val payload = PlanOffersFetchedPayload(planOffers)
+
+        if (error != null) {
+            payload.error = error
+        }
+
+        whenever(planOffersRestClient.fetchPlanOffers()).thenReturn(payload)
+        whenever(planOffersSqlUtils.getPlanOffers()).thenReturn(PLAN_OFFER_MODELS)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PluginCoroutineStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PluginCoroutineStoreTest.kt
new file mode 100644
index 00000000000..71003e3dc0d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PluginCoroutineStoreTest.kt
@@ -0,0 +1,321 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType.SITE
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.HTTP_AUTH_ERROR
+import org.wordpress.android.fluxc.network.rest.wpapi.plugin.PluginWPAPIRestClient
+import org.wordpress.android.fluxc.persistence.PluginSqlUtilsWrapper
+import org.wordpress.android.fluxc.store.PluginCoroutineStore.WPApiPluginsPayload
+import org.wordpress.android.fluxc.store.PluginStore.ConfigureSitePluginErrorType
+import org.wordpress.android.fluxc.store.PluginStore.DeleteSitePluginErrorType
+import org.wordpress.android.fluxc.store.PluginStore.InstallSitePluginErrorType
+import org.wordpress.android.fluxc.store.PluginStore.OnPluginDirectoryFetched
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginConfigured
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginDeleted
+import org.wordpress.android.fluxc.store.PluginStore.PluginDirectoryErrorType.UNAUTHORIZED
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class PluginCoroutineStoreTest {
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var pluginWPAPIRestClient: PluginWPAPIRestClient
+    @Mock lateinit var pluginSqlUtils: PluginSqlUtilsWrapper
+    private lateinit var store: PluginCoroutineStore
+    private val site: SiteModel = SiteModel().apply {
+        url = "site.com"
+        username = "username"
+    }
+    private lateinit var onFetchedEventCaptor: KArgumentCaptor<OnPluginDirectoryFetched>
+    private lateinit var onDeletedEventCaptor: KArgumentCaptor<OnSitePluginDeleted>
+    private lateinit var onConfiguredEventCaptor: KArgumentCaptor<OnSitePluginConfigured>
+
+    @Before
+    fun setUp() {
+        store = PluginCoroutineStore(
+            initCoroutineEngine(),
+            dispatcher,
+            pluginWPAPIRestClient,
+            pluginSqlUtils
+        )
+        onFetchedEventCaptor = argumentCaptor()
+        onDeletedEventCaptor = argumentCaptor()
+        onConfiguredEventCaptor = argumentCaptor()
+    }
+
+    @Test
+    fun `fetches WP Api plugins with success`() = test {
+        val fetchedPlugins = listOf(
+            SitePluginModel()
+        )
+        whenever(pluginWPAPIRestClient.fetchPlugins(site)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                fetchedPlugins
+            )
+        )
+
+        val result = store.syncFetchWPApiPlugins(site)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.type).isEqualTo(SITE)
+        verify(pluginSqlUtils).insertOrReplaceSitePlugins(site, fetchedPlugins)
+    }
+
+    @Test
+    fun `fetches WP Api plugins with error `() = test {
+        whenever(pluginWPAPIRestClient.fetchPlugins(site)).thenReturn(
+            WPApiPluginsPayload(
+                BaseNetworkError(
+                    GenericErrorType.AUTHORIZATION_REQUIRED
+                )
+            )
+        )
+
+        val result = store.syncFetchWPApiPlugins(site)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(UNAUTHORIZED)
+        verifyNoInteractions(pluginSqlUtils)
+    }
+
+    @Test
+    fun `fetches WP Api plugins and emits event`() = test {
+        val fetchedPlugins = listOf(
+            SitePluginModel()
+        )
+        whenever(pluginWPAPIRestClient.fetchPlugins(site)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                fetchedPlugins
+            )
+        )
+
+        store.fetchWPApiPlugins(site)
+
+        verify(dispatcher).emitChange(onFetchedEventCaptor.capture())
+        assertThat(onFetchedEventCaptor.lastValue.isError).isFalse
+        assertThat(onFetchedEventCaptor.lastValue.type).isEqualTo(SITE)
+        verify(pluginSqlUtils).insertOrReplaceSitePlugins(site, fetchedPlugins)
+    }
+
+    @Test
+    fun `deletes a plugin with success`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        whenever(pluginWPAPIRestClient.deletePlugin(site, pluginName)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+
+        val result = store.syncDeleteSitePlugin(site, pluginName, slug)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.pluginName).isEqualTo(pluginName)
+        assertThat(result.slug).isEqualTo(slug)
+        verify(pluginSqlUtils).deleteSitePlugin(site, slug)
+    }
+
+    @Test
+    fun `deletes a plugin and emits an event`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        sitePluginModel.name = pluginName
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        whenever(pluginWPAPIRestClient.deletePlugin(site, pluginName)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+
+        store.deleteSitePlugin(site, pluginName, slug)
+
+        verify(dispatcher).emitChange(onDeletedEventCaptor.capture())
+        assertThat(onDeletedEventCaptor.lastValue.isError).isFalse
+        assertThat(onDeletedEventCaptor.lastValue.pluginName).isEqualTo(pluginName)
+        assertThat(onDeletedEventCaptor.lastValue.slug).isEqualTo(slug)
+        verify(pluginSqlUtils).deleteSitePlugin(site, slug)
+    }
+
+    @Test
+    fun `does not delete a plugin with a failure`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        whenever(pluginWPAPIRestClient.deletePlugin(site, pluginName)).thenReturn(
+            WPApiPluginsPayload(
+                BaseNetworkError(HTTP_AUTH_ERROR)
+            )
+        )
+
+        val result = store.syncDeleteSitePlugin(site, pluginName, slug)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(DeleteSitePluginErrorType.UNAUTHORIZED)
+        verify(pluginSqlUtils, never()).deleteSitePlugin(eq(site), any())
+    }
+
+    @Test
+    fun `deletes a plugin with a UNKNOWN_PLUGIN failure`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        whenever(pluginWPAPIRestClient.deletePlugin(site, pluginName)).thenReturn(
+            WPApiPluginsPayload(
+                BaseNetworkError(GenericErrorType.NOT_FOUND)
+            )
+        )
+
+        val result = store.syncDeleteSitePlugin(site, pluginName, slug)
+
+        assertThat(result.isError).isFalse
+        verify(pluginSqlUtils).deleteSitePlugin(site, slug)
+    }
+
+    @Test
+    fun `configures a plugin with success`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        val active = true
+        whenever(pluginWPAPIRestClient.updatePlugin(site, pluginName, active)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+
+        val result = store.syncConfigureSitePlugin(site, pluginName, slug, active)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.pluginName).isEqualTo(pluginName)
+        assertThat(result.slug).isEqualTo(slug)
+        verify(pluginSqlUtils).insertOrUpdateSitePlugin(site, sitePluginModel)
+    }
+
+    @Test
+    fun `configures a plugin and emits an event`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        sitePluginModel.name = pluginName
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        val active = true
+        whenever(pluginWPAPIRestClient.updatePlugin(site, pluginName, active)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+
+        store.configureSitePlugin(site, pluginName, slug, active)
+
+        verify(dispatcher).emitChange(onConfiguredEventCaptor.capture())
+        assertThat(onConfiguredEventCaptor.lastValue.isError).isFalse
+        assertThat(onConfiguredEventCaptor.lastValue.pluginName).isEqualTo(pluginName)
+        assertThat(onConfiguredEventCaptor.lastValue.slug).isEqualTo(slug)
+        verify(pluginSqlUtils).insertOrUpdateSitePlugin(site, sitePluginModel)
+    }
+
+    @Test
+    fun `does not configure a plugin with a failure`() = test {
+        val pluginName = "plugin_name"
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        whenever(pluginSqlUtils.getSitePluginBySlug(site, slug)).thenReturn(sitePluginModel)
+        val active = true
+        whenever(pluginWPAPIRestClient.updatePlugin(site, pluginName, active)).thenReturn(
+            WPApiPluginsPayload(
+                BaseNetworkError(HTTP_AUTH_ERROR)
+            )
+        )
+
+        val result = store.syncConfigureSitePlugin(site, pluginName, slug, active)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.error.type).isEqualTo(ConfigureSitePluginErrorType.UNAUTHORIZED)
+        verify(pluginSqlUtils, never()).insertOrUpdateSitePlugin(eq(site), any())
+    }
+
+    @Test
+    fun `installs and activates a plugin with success`() = test {
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        val name = "plugin_name"
+        sitePluginModel.name = name
+        sitePluginModel.slug = slug
+        whenever(pluginWPAPIRestClient.installPlugin(site, slug)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+        whenever(pluginWPAPIRestClient.updatePlugin(site, name, true)).thenReturn(
+            WPApiPluginsPayload(
+                site,
+                sitePluginModel
+            )
+        )
+
+        val result = store.syncInstallSitePlugin(site, slug)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.slug).isEqualTo(slug)
+        verify(pluginSqlUtils, times(2)).insertOrUpdateSitePlugin(site, sitePluginModel)
+        verify(pluginWPAPIRestClient).updatePlugin(site, name, true)
+        verify(dispatcher, times(2)).emitChange(any())
+    }
+
+    @Test
+    fun `does not activate plugin on install failure`() = test {
+        val slug = "plugin_slug"
+        val sitePluginModel = SitePluginModel()
+        val name = "plugin_name"
+        sitePluginModel.name = name
+        sitePluginModel.slug = slug
+        whenever(
+            pluginWPAPIRestClient.installPlugin(
+                site,
+
+                slug
+            )
+        ).thenReturn(WPApiPluginsPayload(BaseNetworkError(HTTP_AUTH_ERROR)))
+
+        val result = store.syncInstallSitePlugin(site, slug)
+
+        assertThat(result.isError).isTrue
+        assertThat(result.slug).isEqualTo(slug)
+        assertThat(result.error.type).isEqualTo(InstallSitePluginErrorType.UNAUTHORIZED)
+        verifyNoInteractions(pluginSqlUtils)
+        verify(pluginWPAPIRestClient, never()).updatePlugin(eq(site), any(), any())
+        verify(dispatcher, times(1)).emitChange(any())
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStoreTest.kt
new file mode 100644
index 00000000000..dbb10721f62
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStoreTest.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.persistence.PostSchedulingNotificationSqlUtils
+import org.wordpress.android.fluxc.persistence.PostSchedulingNotificationSqlUtils.SchedulingReminderDbModel
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel
+
+@RunWith(MockitoJUnitRunner::class)
+class PostSchedulingNotificationStoreTest {
+    @Mock lateinit var sqlUtils: PostSchedulingNotificationSqlUtils
+    private lateinit var store: PostSchedulingNotificationStore
+    private val postId = 1
+    private val notificationId = 2
+    private val periodMappings = mapOf(
+            SchedulingReminderModel.Period.ONE_HOUR to SchedulingReminderDbModel.Period.ONE_HOUR,
+            SchedulingReminderModel.Period.TEN_MINUTES to SchedulingReminderDbModel.Period.TEN_MINUTES,
+            SchedulingReminderModel.Period.WHEN_PUBLISHED to SchedulingReminderDbModel.Period.WHEN_PUBLISHED
+    )
+
+    @Before
+    fun setUp() {
+        store = PostSchedulingNotificationStore(sqlUtils)
+    }
+
+    @Test
+    fun `schedule deletes previous notification and inserts update when set`() {
+        periodMappings.entries.forEach { (schedulingReminderModel, dbModel) ->
+            store.schedule(postId, schedulingReminderModel)
+
+            inOrder(sqlUtils).apply {
+                this.verify(sqlUtils).deleteSchedulingReminders(postId)
+                this.verify(sqlUtils).insert(postId, dbModel)
+            }
+        }
+    }
+
+    @Test
+    fun `schedule deletes previous notification when OFF`() {
+        store.schedule(postId, SchedulingReminderModel.Period.OFF)
+
+        verify(sqlUtils).deleteSchedulingReminders(postId)
+        verify(sqlUtils, never()).insert(any(), any())
+    }
+
+    @Test
+    fun `deletes notification per post`() {
+        store.deleteSchedulingReminders(postId)
+
+        verify(sqlUtils).deleteSchedulingReminders(postId)
+    }
+
+    @Test
+    fun `returns notification from database`() {
+        periodMappings.entries.forEach { (schedulingReminderModel, dbModel) ->
+            whenever(sqlUtils.getSchedulingReminder(notificationId)).thenReturn(
+                    SchedulingReminderDbModel(
+                            notificationId,
+                            postId,
+                            dbModel
+                    )
+            )
+            val schedulingReminder = store.getSchedulingReminder(notificationId)
+
+            assertThat(schedulingReminder!!.notificationId).isEqualTo(notificationId)
+            assertThat(schedulingReminder.postId).isEqualTo(postId)
+            assertThat(schedulingReminder.scheduledTime).isEqualTo(schedulingReminderModel)
+        }
+    }
+
+    @Test
+    fun `returns scheduling reminder period from database`() {
+        periodMappings.entries.forEach { (schedulingReminderModel, dbModel) ->
+            whenever(sqlUtils.getSchedulingReminderPeriodDbModel(postId)).thenReturn(dbModel)
+            val schedulingReminderPeriod = store.getSchedulingReminderPeriod(postId)
+
+            assertThat(schedulingReminderPeriod).isEqualTo(schedulingReminderModel)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ProductsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ProductsStoreTest.kt
new file mode 100644
index 00000000000..8750cd52078
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ProductsStoreTest.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.store
+
+import com.android.volley.VolleyError
+import junit.framework.Assert.assertTrue
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.ProductAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.products.Product
+import org.wordpress.android.fluxc.model.products.ProductsResponse
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.products.ProductsRestClient
+import org.wordpress.android.fluxc.store.ProductsStore.OnProductsFetched
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class ProductsStoreTest {
+    @Mock private lateinit var productsRestClient: ProductsRestClient
+    @Mock private lateinit var dispatcher: Dispatcher
+
+    private lateinit var productsStore: ProductsStore
+
+    @Before
+    fun setUp() {
+        productsStore = ProductsStore(productsRestClient, initCoroutineEngine(), dispatcher)
+    }
+
+    @Test
+    fun fetchProductsAction() = test {
+        initRestClient(data = Success(ProductsResponse(listOf(Product()))))
+
+        productsStore.onAction(Action(ProductAction.FETCH_PRODUCTS, null))
+
+        verify(productsRestClient).fetchProducts()
+    }
+
+    @Test
+    fun fetchProductsSuccess() = test {
+        initRestClient(data = Success(ProductsResponse(listOf(Product()))))
+
+        val response = productsStore.fetchProducts()
+
+        verify(productsRestClient).fetchProducts()
+        assertThat(response).isInstanceOf(OnProductsFetched::class.java)
+        assertThat(response.products).isNotEmpty
+    }
+
+    @Test
+    fun fetchProductsFail() = test {
+        initRestClient(Error(WPComGsonNetworkError(
+                BaseNetworkError(NETWORK_ERROR, "error", VolleyError("")))))
+
+        val response = productsStore.fetchProducts()
+
+        verify(productsRestClient).fetchProducts()
+        assertThat(response.products).isNull()
+        assertTrue(response.isError)
+        assertThat(response.error.message).isEqualTo("error")
+    }
+
+    private suspend fun initRestClient(
+        data: Response<ProductsResponse>? = null,
+        error: WPComGsonNetworkError? = null
+    ) {
+        val response = if (error != null) Error(error) else data
+
+        whenever(productsRestClient.fetchProducts()).thenReturn(response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWPAPITest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWPAPITest.kt
new file mode 100644
index 00000000000..c44564a7e18
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWPAPITest.kt
@@ -0,0 +1,513 @@
+package org.wordpress.android.fluxc.store
+
+import android.net.Uri
+import com.android.volley.NetworkResponse
+import com.android.volley.VolleyError
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.discovery.DiscoveryWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Available
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.FailedRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Unknown
+import org.wordpress.android.fluxc.network.rest.wpapi.NonceRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.reactnative.ReactNativeWPAPIRestClient
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Error
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Success
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ReactNativeStoreWPAPITest {
+    private val queryKey = "a_key"
+    private val queryValue = "a_value"
+    private val restPath = "rest_path"
+    private val restPathWithParams = "$restPath?$queryKey=$queryValue"
+    private val paramMap = mapOf(queryKey to queryValue)
+    private val bodyMap = mapOf("b_key" to "b_value")
+    private val currentTime = 1000000000L
+
+    private val wpApiRestClient = mock<ReactNativeWPAPIRestClient>()
+    private val discoveryWPAPIRestClient = mock<DiscoveryWPAPIRestClient>()
+    private val nonceRestClient = mock<NonceRestClient>()
+
+    private lateinit var store: ReactNativeStore
+    private lateinit var site: SiteModel
+
+    private interface SitePersister : (SiteModel) -> Int
+
+    private lateinit var sitePersistenceMock: SitePersister
+
+    @Before
+    fun setup() {
+        site = SiteModel().apply {
+            url = "https://site_url.com/mysite"
+            wpApiRestUrl = "http://site_url.com/mysite/a_url_path_with_a_custom_rest_api_extension"
+            username = "username"
+        }
+        initStore(null)
+    }
+
+    private fun initStore(nonce: Nonce?) {
+        whenever(nonceRestClient.getNonce(any<SiteModel>())).thenReturn(nonce)
+        sitePersistenceMock = mock()
+        store = ReactNativeStore(
+                mock(),
+                wpApiRestClient,
+                nonceRestClient,
+                discoveryWPAPIRestClient,
+                TestSiteSqlUtils.siteSqlUtils,
+                initCoroutineEngine(),
+                { currentTime },
+                sitePersistenceMock
+        )
+    }
+
+    @Test
+    fun `discovers rest endpoint, authenticates, and performs GET request`() = test {
+        // no saved endpoint
+        site.wpApiRestUrl = null
+
+        // discovers proper rest url since no saved endpoint
+        val restUrl = "a_url_path_with_a_custom_rest_api_extension"
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url))
+                .thenReturn(restUrl)
+
+        // retrieves nonce
+        val nonce = Available("a_nonce", site.username)
+        whenever(nonceRestClient.requestNonce(site))
+                .thenReturn(nonce)
+
+        // uses updated nonce to make successful call
+        val callWithSuccess = mock<Success>()
+        val fetchUrl = "$restUrl/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl, nonce.value))
+                .thenReturn(callWithSuccess)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(callWithSuccess, actualResponse)
+        assertEquals(restUrl, site.wpApiRestUrl, "site should be updated with rest endpoint used for successful call")
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient, nonceRestClient) {
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist site after discovering wpApiRestUrl
+            verify(nonceRestClient).requestNonce(site)
+            verify(wpApiRestClient).getRequest(fetchUrl, nonce.value)
+        }
+    }
+
+    @Test
+    fun `discovers rest endpoint, authenticates, and performs POST request`() = test {
+        // no saved endpoint
+        site.wpApiRestUrl = null
+
+        // discovers proper rest url since no saved endpoint
+        val restUrl = "a_url_path_with_a_custom_rest_api_extension"
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url))
+            .thenReturn(restUrl)
+
+        // retrieves nonce
+        val nonce = Available("a_nonce", site.username)
+        whenever(nonceRestClient.requestNonce(site))
+            .thenReturn(nonce)
+
+        // uses updated nonce to make successful call
+        val callWithSuccess = mock<Success>()
+        val postURL = "$restUrl/$restPath"
+        whenever(wpApiRestClient.postRequest(postURL, nonce.value))
+            .thenReturn(callWithSuccess)
+
+        val actualResponse = store.executePostRequest(site, restPathWithParams, bodyMap)
+        assertEquals(callWithSuccess, actualResponse)
+        assertEquals(restUrl, site.wpApiRestUrl, "site should be updated with rest endpoint used for successful call")
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient, nonceRestClient) {
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist site after discovering wpApiRestUrl
+            verify(nonceRestClient).requestNonce(site)
+            verify(wpApiRestClient).postRequest(postURL, nonce.value)
+        }
+    }
+
+    @Test
+    fun `uses saved rest endpoint if available`() = test {
+        // site has wpApiRestEndpoint, so uses that instead of discovering endpoint with api call
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+
+        val initialResponseWithSuccess = mock<Success>()
+        whenever(wpApiRestClient.getRequest(fetchUrl))
+                .thenReturn(initialResponseWithSuccess)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(initialResponseWithSuccess, actualResponse)
+        verify(wpApiRestClient).getRequest(fetchUrl)
+        verify(sitePersistenceMock, never())(any()) // no wpApiRestUrl updates, so no persistence
+        verify(discoveryWPAPIRestClient, never()).discoverWPAPIBaseURL(any())
+    }
+
+    @Test
+    fun `uses discovery if no saved rest endpoint`() = test {
+        // no saved endpoint
+        site.wpApiRestUrl = null
+
+        // discovers rest endpoint because site.wpApiRestEndpoint is null
+        val restUrl = "a_url_path_with_a_custom_rest_api_extension"
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url))
+                .thenReturn(restUrl)
+
+        // performs successful call using discovered restUrl
+        val initialResponseWithSuccess = mock<Success>()
+        val fetchUrl = "$restUrl/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl))
+                .thenReturn(initialResponseWithSuccess)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(initialResponseWithSuccess, actualResponse)
+        assertEquals(restUrl, site.wpApiRestUrl, "site should be updated with rest endpoint used for successful call")
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient) {
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist site after discovering wpApiRestUrl
+            verify(wpApiRestClient).getRequest(fetchUrl)
+        }
+    }
+
+    @Test
+    fun `uses default endpoint if no endpoint saved and discovery fails`() = test {
+        // no saved endpoint
+        site.wpApiRestUrl = null
+
+        // discovery fails
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url))
+                .thenReturn(null)
+
+        // makes successful call using fallback rest url
+        val successfulResponse = mock<Success>()
+        val fallbackRestUrl = "${site.url}/wp-json/"
+        val fetchUrl = "$fallbackRestUrl$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl))
+                .thenReturn(successfulResponse)
+
+        val actualResponse = store.executeGetRequest(site, "$restPath?$queryKey=$queryValue")
+        assertEquals(successfulResponse, actualResponse)
+        assertEquals(
+                fallbackRestUrl, site.wpApiRestUrl,
+                "site should be updated with rest endpoint used for successful call"
+        )
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient) {
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist default endpoint after failed discovery
+            verify(wpApiRestClient).getRequest(fetchUrl)
+        }
+    }
+
+    @Test
+    fun `'not found' error after using saved endpoint, use discovery and try again`() = test {
+        val incorrectRestEndpoint = "not_the_right_endpoint"
+        site.wpApiRestUrl = incorrectRestEndpoint
+
+        // does not use discovery initially because there is a saved wpApiRestEndpoint
+        // call fails with not found (404) error
+        val incorrectUrl = "$incorrectRestEndpoint/$restPath"
+        val initialResponseWithNotFoundError = errorResponse(StatusCode.NOT_FOUND_404)
+        whenever(wpApiRestClient.getRequest(incorrectUrl))
+                .thenReturn(initialResponseWithNotFoundError)
+
+        // try to discover endpoint because failure was with a previously saved restUrl
+        val restUrl = "a_url_path_with_a_custom_rest_api_extension"
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(any()))
+                .thenReturn(restUrl)
+
+        // second call using newly discovered rest url succeeds
+        val correctUrl = "$restUrl/$restPath"
+        val secondResponseWithSuccess = mock<Success>()
+        whenever(wpApiRestClient.getRequest(correctUrl))
+                .thenReturn(secondResponseWithSuccess)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(secondResponseWithSuccess, actualResponse)
+        assertEquals(restUrl, site.wpApiRestUrl, "should save rest endpoint used for successful call")
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient) {
+            verify(wpApiRestClient).getRequest(incorrectUrl)
+            verify(sitePersistenceMock)(site) // persist site after clearing wpApiRestUrl that resulted in 404 failure
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist site after discovering wpApiRestUrl
+            verify(wpApiRestClient).getRequest(correctUrl)
+        }
+    }
+
+    @Test
+    fun `'not found' error after using discovery, just returns error`() = test {
+        // no previously saved endpoint
+        site.wpApiRestUrl = null
+
+        // discovers proper rest url
+        val restUrl = "a_url_path_with_a_custom_rest_api_extension"
+        whenever(discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url))
+                .thenReturn(restUrl)
+
+        // call using discovered rest url fails with not found (404)
+        val responseWithNotFoundError = errorResponse(StatusCode.NOT_FOUND_404)
+        val fetchUrl = "$restUrl/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl))
+                .thenReturn(responseWithNotFoundError)
+
+        // 'not found' error does not lead to discovery call because we already did discovery
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(responseWithNotFoundError, actualResponse)
+        assertNull(site.wpApiRestUrl, "should not update site wpApiRestEndpoint when call fails")
+        inOrder(discoveryWPAPIRestClient, sitePersistenceMock, wpApiRestClient) {
+            verify(discoveryWPAPIRestClient).discoverWPAPIBaseURL(site.url)
+            verify(sitePersistenceMock)(site) // persist site after discovering wpApiRestUrl
+            verify(wpApiRestClient).getRequest(fetchUrl)
+            verify(sitePersistenceMock)(site) // persist site after clearing wpApiRestUrl that resulted in 404 failure
+        }
+    }
+
+    @Test
+    fun `if error is NEITHER 'not found' nor unauthenticated, returns error`() = test {
+        val responseWithUnknownError = errorResponse(StatusCode.UNKNOWN)
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl))
+                .thenReturn(responseWithUnknownError)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(responseWithUnknownError, actualResponse)
+        verify(wpApiRestClient).getRequest(fetchUrl)
+    }
+
+    //
+    // Nonce tests
+    //
+
+    @Test
+    fun `refreshed nonce leads to unauthorized error, so returns error`() = test {
+        // nonce never requested, so retrieves nonce
+        initStore(null)
+        val nonce = Available("a_nonce", site.username)
+        whenever(nonceRestClient.getNonce(site))
+                .thenReturn(nonce)
+
+        // initial fetch uses saved nonce and fails with unauthorized
+        val initialResponseWithUnauthorizedError = errorResponse(StatusCode.UNAUTHORIZED_401)
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl, nonce.value))
+                .thenReturn(initialResponseWithUnauthorizedError)
+
+        // Already refreshed nonce, so just returns unauthorized error
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(initialResponseWithUnauthorizedError, actualResponse)
+        inOrder(wpApiRestClient) {
+            verify(wpApiRestClient).getRequest(fetchUrl, nonce.value)
+        }
+    }
+
+    @Test
+    fun `reusing saved nonce leads to unauthorized error, updates nonce but nonce is same, so returns error`() = test {
+        val savedNonce = Available("saved_nonce", site.username)
+        initStore(savedNonce)
+
+        // initial fetch uses saved nonce and fails with unauthorized
+        val initialResponseWithUnauthorizedError = errorResponse(StatusCode.UNAUTHORIZED_401)
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl, savedNonce.value))
+                .thenReturn(initialResponseWithUnauthorizedError)
+
+        // fetching nonce returns already used nonce
+        whenever(nonceRestClient.getNonce(site))
+                .thenReturn(savedNonce)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(initialResponseWithUnauthorizedError, actualResponse)
+        inOrder(wpApiRestClient, nonceRestClient) {
+            verify(wpApiRestClient).getRequest(fetchUrl, savedNonce.value)
+            verify(nonceRestClient).requestNonce(site)
+        }
+    }
+
+    @Test
+    fun `reusing saved nonce leads to unauthorized error, successfully updates nonce, so tries call again`() = test {
+        val savedNonce = Available("saved_nonce", site.username)
+        initStore(savedNonce)
+
+        // initial fetch uses saved nonce and fails with unauthorized
+        val initialResponseWithUnauthorizedError = errorResponse(StatusCode.UNAUTHORIZED_401)
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl, savedNonce.value))
+                .thenReturn(initialResponseWithUnauthorizedError)
+
+        // fetches new nonce successfully
+        val updatedNonce = Available("updated_nonce", site.username)
+        whenever(nonceRestClient.requestNonce(site))
+                .thenReturn(updatedNonce)
+
+        // retries original call
+        val secondResponseWithSuccess = mock<Success>()
+        whenever(wpApiRestClient.getRequest(fetchUrl, updatedNonce.value))
+                .thenReturn(secondResponseWithSuccess)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(secondResponseWithSuccess, actualResponse)
+        inOrder(wpApiRestClient, nonceRestClient) {
+            verify(nonceRestClient).getNonce(site)
+            verify(wpApiRestClient).getRequest(fetchUrl, savedNonce.value)
+            verify(nonceRestClient).requestNonce(site)
+            verify(wpApiRestClient).getRequest(fetchUrl, updatedNonce.value)
+        }
+    }
+
+    @Test
+    fun `reusing saved nonce leads to unauthorized error, fails to update nonce, so returns original error`() = test {
+        val savedNonce = Available("saved_nonce", site.username)
+        initStore(savedNonce)
+
+        // initial fetch uses saved nonce and fails with unauthorized
+        val initialResponseWithUnauthorizedError = errorResponse(StatusCode.UNAUTHORIZED_401)
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        whenever(wpApiRestClient.getRequest(fetchUrl, savedNonce.value))
+                .thenReturn(initialResponseWithUnauthorizedError)
+
+        // fails to fetch new nonce
+        whenever(nonceRestClient.getNonce(site))
+                .thenReturn(savedNonce, null)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(initialResponseWithUnauthorizedError, actualResponse)
+        inOrder(wpApiRestClient, nonceRestClient) {
+            verify(wpApiRestClient).getRequest(fetchUrl, savedNonce.value)
+            verify(nonceRestClient).requestNonce(site)
+        }
+    }
+
+    @Test
+    fun `nonce unavailable from recent request, so does not request nonce`() = test {
+        // previous nonce faield, and was "recent"
+        val fourMinuteOldFailedNonceRequest = FailedRequest(
+            currentTime - 4 * 60 * 1000,
+            site.username,
+            Nonce.CookieNonceErrorType.GENERIC_ERROR
+        )
+        initStore(fourMinuteOldFailedNonceRequest)
+
+        // does not use nonce to make request because of recent unsuccessful attempt to refresh nonce
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        val successResponse = mock<Success>()
+        whenever(wpApiRestClient.getRequest(fetchUrl, null)) // passes null for nonce
+                .thenReturn(successResponse)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(successResponse, actualResponse)
+        verify(wpApiRestClient).getRequest(fetchUrl, null)
+        verify(nonceRestClient, never()).requestNonce(any())
+    }
+
+    @Test
+    fun `nonce unavailable from older request, so requests nonce`() = test {
+        // previous nonce request failed, but was not "recent"
+        val sixMinuteOldUnavailableNonce = FailedRequest(
+            currentTime - 6 * 60 * 1000,
+            site.username,
+            Nonce.CookieNonceErrorType.GENERIC_ERROR
+        )
+        initStore(sixMinuteOldUnavailableNonce)
+
+        // refreshes nonce because latest attempt to refresh nonce was not recent
+        val nonce = Available("a_nonce", site.username)
+        whenever(nonceRestClient.requestNonce(site))
+                .thenReturn(nonce)
+
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        val successResponse = mock<Success>()
+        whenever(wpApiRestClient.getRequest(fetchUrl, nonce.value)) // passes null for nonce
+                .thenReturn(successResponse)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(successResponse, actualResponse)
+        inOrder(nonceRestClient, wpApiRestClient) {
+            verify(nonceRestClient).requestNonce(site)
+            verify(wpApiRestClient).getRequest(fetchUrl, nonce.value)
+        }
+    }
+
+    @Test
+    fun `nonce unknown, so requests nonce`() = test {
+        // previous nonce request unknown
+        initStore(Unknown(site.username))
+
+        // refreshes nonce because latest attempt to refresh nonce was not recent
+        val nonce = Available("a_nonce", site.username)
+        whenever(nonceRestClient.requestNonce(site))
+                .thenReturn(nonce)
+
+        val fetchUrl = "${site.wpApiRestUrl}/$restPath"
+        val successResponse = mock<Success>()
+        whenever(wpApiRestClient.getRequest(fetchUrl, nonce.value)) // passes null for nonce
+                .thenReturn(successResponse)
+
+        val actualResponse = store.executeGetRequest(site, restPathWithParams)
+        assertEquals(successResponse, actualResponse)
+        inOrder(wpApiRestClient, nonceRestClient) {
+            verify(nonceRestClient).requestNonce(site)
+            verify(wpApiRestClient).getRequest(fetchUrl, nonce.value)
+        }
+    }
+
+    @Test
+    fun `test slashJoin`() {
+        assertEquals("begin/end", ReactNativeStore.slashJoin("begin", "end"))
+        assertEquals("begin/end", ReactNativeStore.slashJoin("begin/", "end"))
+        assertEquals("begin/end", ReactNativeStore.slashJoin("begin", "/end"))
+        assertEquals("begin/end", ReactNativeStore.slashJoin("begin/", "/end"))
+    }
+
+    @Test
+    fun `handles failure to parse path`() = test {
+        val mockUri = mock<Uri>()
+        assertNull(mockUri.path, "path must be null to represent failure to parse the path in this test")
+        val uriParser = { _: String -> mockUri }
+
+        store = ReactNativeStore(
+                mock(),
+                wpApiRestClient,
+                nonceRestClient,
+                discoveryWPAPIRestClient,
+                TestSiteSqlUtils.siteSqlUtils,
+                initCoroutineEngine(),
+                { currentTime },
+                sitePersistenceMock,
+                uriParser
+        )
+
+        val response = store.executeGetRequest(mock(), "")
+        val errorType = (response as? Error)?.error?.type
+        assertEquals(UNKNOWN, errorType)
+    }
+
+    private suspend fun ReactNativeWPAPIRestClient.getRequest(url: String, nonce: String? = null) =
+        getRequest(url, paramMap, ReactNativeFetchResponse::Success, ReactNativeFetchResponse::Error, nonce)
+
+    private suspend fun ReactNativeWPAPIRestClient.postRequest(url: String, nonce: String? = null) =
+        postRequest(url, bodyMap, ReactNativeFetchResponse::Success, ReactNativeFetchResponse::Error, nonce)
+
+    private fun errorResponse(statusCode: Int): ReactNativeFetchResponse = Error(mock()).apply {
+        error.volleyError = VolleyError(NetworkResponse(statusCode, null, false, 0L, null))
+    }
+
+    private object StatusCode {
+        const val UNAUTHORIZED_401 = 401
+        const val NOT_FOUND_404 = 404
+        const val UNKNOWN = 99999
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWpComTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWpComTest.kt
new file mode 100644
index 00000000000..557d89f7c38
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ReactNativeStoreWpComTest.kt
@@ -0,0 +1,103 @@
+package org.wordpress.android.fluxc.store
+
+import android.net.Uri
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.discovery.DiscoveryWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.NonceRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.reactnative.ReactNativeWPComRestClient
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Error
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Success
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ReactNativeStoreWpComTest {
+    private val wpComRestClient = mock<ReactNativeWPComRestClient>()
+    private val discoveryWPAPIRestClient = mock<DiscoveryWPAPIRestClient>()
+    private val nonceRestClient = mock<NonceRestClient>()
+
+    private lateinit var store: ReactNativeStore
+
+    @Before
+    fun setup() {
+        store = ReactNativeStore(
+                wpComRestClient,
+                mock(),
+                nonceRestClient,
+                discoveryWPAPIRestClient,
+                TestSiteSqlUtils.siteSqlUtils,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `makes call to WPcom`() = test {
+        val expectedResponse = mock<ReactNativeFetchResponse>()
+
+        val site = mock<SiteModel>()
+        whenever(site.siteId).thenReturn(123456L)
+        whenever(site.isUsingWpComRestApi).thenReturn(true)
+
+        val expectedUrl = "https://public-api.wordpress.com/wp/v2/sites/${site.siteId}/media"
+        whenever(wpComRestClient.getRequest(expectedUrl, mapOf("paramKey" to "paramValue"), ::Success, ::Error))
+                .thenReturn(expectedResponse)
+
+        val actualResponse = store.executeGetRequest(site, "/wp/v2/media?paramKey=paramValue")
+        assertEquals(expectedResponse, actualResponse)
+    }
+
+    @Test
+    fun `makes POST request to WPCOM`() = test {
+        val expectedResponse = mock<ReactNativeFetchResponse>()
+
+        val site = mock<SiteModel>()
+        whenever(site.siteId).thenReturn(123456L)
+        whenever(site.isUsingWpComRestApi).thenReturn(true)
+
+        val expectedUrl = "https://public-api.wordpress.com/wp/v2/sites/${site.siteId}/media/100"
+        whenever(wpComRestClient.postRequest(
+            expectedUrl,
+            mapOf("paramKey" to "paramValue"),
+            mapOf("title" to "newTitle"),
+            ::Success, ::Error))
+            .thenReturn(expectedResponse)
+
+        val actualResponse = store.executePostRequest(
+            site,
+            "/wp/v2/media/100?paramKey=paramValue",
+            mapOf("title" to "newTitle"))
+        assertEquals(expectedResponse, actualResponse)
+    }
+
+    @Test
+    fun `handles failure to parse path`() = test {
+        val mockUri = mock<Uri>()
+        assertNull(mockUri.path, "path must be null to represent failure to parse the path in this test")
+        val uriParser = { _: String -> mockUri }
+
+        store = ReactNativeStore(
+                wpComRestClient,
+                mock(),
+                nonceRestClient,
+                discoveryWPAPIRestClient,
+                TestSiteSqlUtils.siteSqlUtils,
+                initCoroutineEngine(),
+                uriParser = uriParser)
+
+        val response = store.executeGetRequest(mock(), "")
+        val errorType = (response as? Error)?.error?.type
+        assertEquals(UNKNOWN, errorType)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ScanStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ScanStoreTest.kt
new file mode 100644
index 00000000000..41ae9cbd1ff
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/ScanStoreTest.kt
@@ -0,0 +1,318 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.ScanAction
+import org.wordpress.android.fluxc.generated.ScanActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Reason
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.model.scan.threat.BaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.CURRENT
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.IGNORED
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.ScanRestClient
+import org.wordpress.android.fluxc.persistence.ScanSqlUtils
+import org.wordpress.android.fluxc.persistence.ThreatSqlUtils
+import org.wordpress.android.fluxc.store.ScanStore.FetchFixThreatsStatusPayload
+import org.wordpress.android.fluxc.store.ScanStore.FetchFixThreatsStatusResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanStatePayload
+import org.wordpress.android.fluxc.store.ScanStore.FetchedScanStatePayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsErrorType
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsPayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusErrorType
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatError
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatErrorType
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatPayload
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartErrorType
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartPayload
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateErrorType
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.BuildConfigWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class ScanStoreTest {
+    @Mock private lateinit var scanRestClient: ScanRestClient
+    @Mock private lateinit var scanSqlUtils: ScanSqlUtils
+    @Mock private lateinit var threatSqlUtils: ThreatSqlUtils
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var siteModel: SiteModel
+    @Mock private lateinit var buildConfigWrapper: BuildConfigWrapper
+
+    private val threatInCurrentState: ThreatModel = GenericThreatModel(
+            BaseThreatModel(
+                    1L,
+                    "",
+                    "",
+                    CURRENT,
+                    mock(),
+                    mock(),
+                    mock()
+            )
+    )
+    private val threatInFixedState: ThreatModel = GenericThreatModel(
+            threatInCurrentState.baseThreatModel.copy(status = FIXED)
+
+    )
+
+    private lateinit var scanStore: ScanStore
+    private val siteId = 11L
+    private val threatId = 1L
+    private val threatIds = listOf(threatId)
+
+    @Before
+    fun setUp() {
+        scanStore = ScanStore(
+            scanRestClient,
+            scanSqlUtils,
+            threatSqlUtils,
+            initCoroutineEngine(),
+            mock(),
+            buildConfigWrapper,
+            dispatcher
+        )
+    }
+
+    @Test
+    fun `success on fetch scan state returns the success`() = test {
+        val payload = FetchScanStatePayload(siteModel)
+        whenever(scanRestClient.fetchScanState(siteModel)).thenReturn(FetchedScanStatePayload(null, siteModel))
+
+        val action = ScanActionBuilder.newFetchScanStateAction(payload)
+        scanStore.onAction(action)
+
+        val expected = ScanStore.OnScanStateFetched(ScanAction.FETCH_SCAN_STATE)
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `error on fetch scan state returns the error`() = test {
+        val error = ScanStateError(ScanStateErrorType.INVALID_RESPONSE, "error")
+        val payload = FetchedScanStatePayload(error, siteModel)
+        whenever(scanRestClient.fetchScanState(siteModel)).thenReturn(payload)
+
+        val fetchAction = ScanActionBuilder.newFetchScanStateAction(FetchScanStatePayload(siteModel))
+        scanStore.onAction(fetchAction)
+
+        val expectedEventWithError = ScanStore.OnScanStateFetched(payload.error, ScanAction.FETCH_SCAN_STATE)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `fetch scan state replaces state and threats for site in the db on success`() = test {
+        val scanStateModel = mock<ScanStateModel>()
+        val payload = FetchedScanStatePayload(scanStateModel, siteModel)
+        whenever(scanRestClient.fetchScanState(siteModel)).thenReturn(payload)
+        whenever(scanStateModel.threats).thenReturn(listOf(threatInCurrentState))
+
+        val fetchAction = ScanActionBuilder.newFetchScanStateAction(FetchScanStatePayload(siteModel))
+        scanStore.onAction(fetchAction)
+
+        verify(scanSqlUtils).replaceScanState(siteModel, scanStateModel)
+        verify(threatSqlUtils).removeThreatsWithStatus(siteModel, listOf(CURRENT))
+        verify(threatSqlUtils).insertThreats(siteModel, listOf(threatInCurrentState))
+        val expectedChangeEvent = ScanStore.OnScanStateFetched(ScanAction.FETCH_SCAN_STATE)
+        verify(dispatcher).emitChange(eq(expectedChangeEvent))
+    }
+
+    @Test
+    fun `fetch scan state filters out threats which do not have CURRENT status`() = test {
+        whenever(buildConfigWrapper.isDebug()).thenReturn(false)
+        val threatsInResponse = listOf(
+                threatInCurrentState,
+                threatInFixedState
+        )
+        val expectedThreatsInDb = listOf(threatsInResponse[0])
+        val scanStateModel = mock<ScanStateModel>()
+        val payload = FetchedScanStatePayload(scanStateModel, siteModel)
+        whenever(scanRestClient.fetchScanState(siteModel)).thenReturn(payload)
+        whenever(scanStateModel.threats).thenReturn(threatsInResponse)
+
+        val fetchAction = ScanActionBuilder.newFetchScanStateAction(FetchScanStatePayload(siteModel))
+        scanStore.onAction(fetchAction)
+
+        verify(threatSqlUtils).insertThreats(siteModel, expectedThreatsInDb)
+    }
+
+    @Test
+    fun `get scan state returns state and threats from the db`() = test {
+        val scanStateModel = ScanStateModel(
+                state = State.IDLE,
+                hasCloud = true,
+                threats = listOf(threatInCurrentState),
+                reason = Reason.NO_REASON
+        )
+        whenever(scanSqlUtils.getScanStateForSite(siteModel)).thenReturn(scanStateModel)
+        whenever(threatSqlUtils.getThreats(siteModel, listOf(CURRENT))).thenReturn(listOf(threatInCurrentState))
+
+        val scanStateFromDb = scanStore.getScanStateForSite(siteModel)
+
+        verify(scanSqlUtils).getScanStateForSite(siteModel)
+        verify(threatSqlUtils).getThreats(siteModel, listOf(CURRENT))
+        assertEquals(scanStateModel, scanStateFromDb)
+    }
+
+    @Test
+    fun `get valid credentials status returns corresponding status from the db`() = test {
+        val expectedHasValidCredentials = true
+        val scanStateModel = ScanStateModel(
+                state = State.IDLE,
+                hasValidCredentials = expectedHasValidCredentials,
+                reason = Reason.NO_REASON
+        )
+        whenever(scanSqlUtils.getScanStateForSite(siteModel)).thenReturn(scanStateModel)
+
+        val hasValidCredentials = scanStore.hasValidCredentials(siteModel)
+
+        assertEquals(expectedHasValidCredentials, hasValidCredentials)
+    }
+
+    @Test
+    fun `success on start scan returns the success`() = test {
+        val payload = ScanStartPayload(siteModel)
+        whenever(scanRestClient.startScan(siteModel)).thenReturn(ScanStartResultPayload(siteModel))
+
+        val action = ScanActionBuilder.newStartScanAction(payload)
+        scanStore.onAction(action)
+
+        val expected = ScanStore.OnScanStarted(ScanAction.START_SCAN)
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `error on start scan returns the error`() = test {
+        val error = ScanStartError(ScanStartErrorType.GENERIC_ERROR, "error")
+        val payload = ScanStartResultPayload(error, siteModel)
+        whenever(scanRestClient.startScan(siteModel)).thenReturn(payload)
+
+        val fetchAction = ScanActionBuilder.newStartScanAction(ScanStartPayload(siteModel))
+        scanStore.onAction(fetchAction)
+
+        val expectedEventWithError = ScanStore.OnScanStarted(payload.error, ScanAction.START_SCAN)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `success on fix threats return the success`() = test {
+        val payload = FixThreatsPayload(siteId, threatIds)
+        whenever(scanRestClient.fixThreats(siteId, threatIds)).thenReturn(
+            FixThreatsResultPayload(siteId)
+        )
+
+        val action = ScanActionBuilder.newFixThreatsAction(payload)
+        scanStore.onAction(action)
+
+        val expected = ScanStore.OnFixThreatsStarted(ScanAction.FIX_THREATS)
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `error on fix threats returns the error`() = test {
+        val error = FixThreatsError(FixThreatsErrorType.GENERIC_ERROR, "error")
+        val payload = FixThreatsResultPayload(error, siteId)
+        whenever(scanRestClient.fixThreats(siteId, threatIds)).thenReturn(payload)
+
+        val fetchAction = ScanActionBuilder.newFixThreatsAction(FixThreatsPayload(siteId, threatIds))
+        scanStore.onAction(fetchAction)
+
+        val expectedEventWithError = ScanStore.OnFixThreatsStarted(payload.error, ScanAction.FIX_THREATS)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `success on ignore threat returns the success`() = test {
+        val payload = IgnoreThreatPayload(siteId, threatId)
+        whenever(scanRestClient.ignoreThreat(siteId, threatId)).thenReturn(
+            IgnoreThreatResultPayload(siteId)
+        )
+
+        val action = ScanActionBuilder.newIgnoreThreatAction(payload)
+        scanStore.onAction(action)
+
+        val expected = ScanStore.OnIgnoreThreatStarted(ScanAction.IGNORE_THREAT)
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `error on ignore threat returns the error`() = test {
+        val error = IgnoreThreatError(IgnoreThreatErrorType.GENERIC_ERROR, "error")
+        val payload = IgnoreThreatResultPayload(error, siteId)
+        whenever(scanRestClient.ignoreThreat(siteId, threatId)).thenReturn(payload)
+
+        val fetchAction = ScanActionBuilder.newIgnoreThreatAction(IgnoreThreatPayload(siteId, threatId))
+        scanStore.onAction(fetchAction)
+
+        val expectedEventWithError = ScanStore.OnIgnoreThreatStarted(payload.error, ScanAction.IGNORE_THREAT)
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `success on fetch fix threats status returns the success`() = test {
+        val payload = FetchFixThreatsStatusPayload(siteId, listOf(threatId))
+        val resultPayload = FetchFixThreatsStatusResultPayload(siteId, mock())
+        whenever(scanRestClient.fetchFixThreatsStatus(siteId, listOf(threatId))).thenReturn(resultPayload)
+
+        val action = ScanActionBuilder.newFetchFixThreatsStatusAction(payload)
+        scanStore.onAction(action)
+
+        val expected = ScanStore.OnFixThreatsStatusFetched(
+            siteId,
+            resultPayload.fixThreatStatusModels,
+            ScanAction.FETCH_FIX_THREATS_STATUS
+        )
+        verify(dispatcher).emitChange(expected)
+    }
+
+    @Test
+    fun `error on fetch fix threats status returns the error`() = test {
+        val error = FixThreatsStatusError(FixThreatsStatusErrorType.GENERIC_ERROR, "error")
+        val payload = FetchFixThreatsStatusResultPayload(siteId, mock(), error)
+        whenever(scanRestClient.fetchFixThreatsStatus(siteId, listOf(threatId))).thenReturn(payload)
+
+        val fetchAction = ScanActionBuilder.newFetchFixThreatsStatusAction(
+            FetchFixThreatsStatusPayload(siteId, listOf(threatId))
+        )
+        scanStore.onAction(fetchAction)
+
+        val expectedEventWithError = ScanStore.OnFixThreatsStatusFetched(
+            siteId,
+            payload.error,
+            ScanAction.FETCH_FIX_THREATS_STATUS
+        )
+        verify(dispatcher).emitChange(expectedEventWithError)
+    }
+
+    @Test
+    fun `getScanHistoryForSite returns only FIXED and IGNORED threats`() = test {
+        val captor = argumentCaptor<List<ThreatStatus>>()
+        whenever(threatSqlUtils.getThreats(anyOrNull(), captor.capture())).thenReturn(mock())
+
+        scanStore.getScanHistoryForSite(siteModel)
+
+        assertThat(captor.firstValue).isEqualTo(listOf(IGNORED, FIXED))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteOptionsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteOptionsStoreTest.kt
new file mode 100644
index 00000000000..65de3a89712
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteOptionsStoreTest.kt
@@ -0,0 +1,208 @@
+package org.wordpress.android.fluxc.store
+
+import com.android.volley.VolleyError
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.KArgumentCaptor
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.SiteAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteHomepageSettings
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
+import org.wordpress.android.fluxc.model.SiteHomepageSettingsMapper
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient.UpdateHomepageResponse
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsError
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsErrorType
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteOptionsStoreTest {
+    @Mock lateinit var siteHomepageRestClient: SiteHomepageRestClient
+    @Mock lateinit var siteHomepageSettingsMapper: SiteHomepageSettingsMapper
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var homepageSettings: SiteHomepageSettings
+    @Mock lateinit var successResponse: Response.Success<UpdateHomepageResponse>
+    @Mock lateinit var errorResponse: Response.Error<UpdateHomepageResponse>
+    @Mock lateinit var responseData: UpdateHomepageResponse
+    private lateinit var store: SiteOptionsStore
+    private lateinit var actionCaptor: KArgumentCaptor<Action<Any>>
+    private lateinit var wpComSite: SiteModel
+    private lateinit var selfHostedSite: SiteModel
+
+    @Before
+    fun setUp() {
+        store = SiteOptionsStore(
+                initCoroutineEngine(),
+                dispatcher,
+                siteHomepageSettingsMapper,
+                siteHomepageRestClient
+        )
+        wpComSite = SiteModel()
+        wpComSite.setIsWPCom(true)
+        selfHostedSite = SiteModel()
+        selfHostedSite.setIsWPCom(false)
+        actionCaptor = argumentCaptor()
+    }
+
+    @Test
+    fun `calls rest client, updates site and returns success response`() = test {
+        val pageForPostsId: Long = 1
+        val pageOnFrontId: Long = 2
+        val updatedSettings = SiteHomepageSettings.StaticPage(pageForPostsId, pageOnFrontId)
+        initSuccessResponse(updatedSettings)
+
+        val updatedPayload = store.updateHomepage(wpComSite, homepageSettings)
+
+        assertThat(updatedPayload.homepageSettings).isEqualTo(updatedSettings)
+        verify(siteHomepageRestClient).updateHomepage(wpComSite, homepageSettings)
+        assertThat(wpComSite.showOnFront).isEqualTo(ShowOnFront.PAGE.value)
+        assertThat(wpComSite.pageOnFront).isEqualTo(pageOnFrontId)
+        assertThat(wpComSite.pageForPosts).isEqualTo(pageForPostsId)
+
+        verify(dispatcher).dispatch(actionCaptor.capture())
+        assertThat(actionCaptor.lastValue.type).isEqualTo(SiteAction.UPDATE_SITE)
+        assertThat(actionCaptor.lastValue.payload).isEqualTo(wpComSite)
+    }
+
+    @Test
+    fun `calls rest client and returns error response`() = test {
+        val errorMessage = "Message"
+        initErrorResponse(
+                WPComGsonNetworkError(
+                        BaseNetworkError(
+                                NETWORK_ERROR,
+                                errorMessage,
+                                VolleyError(errorMessage)
+                        )
+                )
+        )
+
+        val updatedPayload = store.updateHomepage(wpComSite, homepageSettings)
+
+        assertThat(updatedPayload.isError).isTrue()
+        assertThat(updatedPayload.error.type).isEqualTo(SiteOptionsErrorType.API_ERROR)
+        assertThat(updatedPayload.error.message).isEqualTo(errorMessage)
+        verify(siteHomepageRestClient).updateHomepage(wpComSite, homepageSettings)
+        verifyNoInteractions(dispatcher)
+    }
+
+    @Test
+    fun `call fails when page for posts and homepage are the same`() = test {
+        val invalidHomepageSettings = SiteHomepageSettings.StaticPage(pageForPostsId = 1L, pageOnFrontId = 1L)
+
+        val homepageUpdatedPayload = store.updateHomepage(wpComSite, invalidHomepageSettings)
+
+        assertThat(homepageUpdatedPayload.isError).isTrue()
+        assertThat(homepageUpdatedPayload.error).isEqualTo(
+                SiteOptionsError(
+                        SiteOptionsErrorType.INVALID_PARAMETERS,
+                        "Page for posts and page on front cannot be the same"
+                )
+        )
+        verifyNoInteractions(siteHomepageRestClient)
+    }
+
+    @Test
+    fun `updates page for posts and keeps page on front when they are different`() = test {
+        val updatedPageForPosts: Long = 1
+        val currentPageOnFront: Long = 2
+        wpComSite.pageOnFront = currentPageOnFront
+        initSuccessResponse(SiteHomepageSettings.StaticPage(updatedPageForPosts, currentPageOnFront))
+        val expectedHomepageSettings = SiteHomepageSettings.StaticPage(
+                updatedPageForPosts, currentPageOnFront
+        )
+
+        val homepageUpdatedPayload = store.updatePageForPosts(wpComSite, updatedPageForPosts)
+
+        assertThat(homepageUpdatedPayload.homepageSettings).isEqualTo(
+                expectedHomepageSettings
+        )
+        verify(siteHomepageRestClient).updateHomepage(eq(wpComSite), eq(expectedHomepageSettings))
+    }
+
+    @Test
+    fun `updates page on front ID to 0 when it is the same as page for posts`() = test {
+        val updatedPageForPosts: Long = 1
+        val currentPageOnFront: Long = 1
+        wpComSite.pageOnFront = currentPageOnFront
+        val expectedHomepageSettings = SiteHomepageSettings.StaticPage(
+                updatedPageForPosts, pageOnFrontId = 0
+        )
+        initSuccessResponse(expectedHomepageSettings)
+
+        val homepageUpdatedPayload = store.updatePageForPosts(wpComSite, updatedPageForPosts)
+
+        assertThat(homepageUpdatedPayload.homepageSettings).isEqualTo(
+                expectedHomepageSettings
+        )
+        verify(siteHomepageRestClient).updateHomepage(eq(wpComSite), eq(expectedHomepageSettings))
+    }
+
+    @Test
+    fun `updates page for posts ID to 0 when it is the same as page on front`() = test {
+        val updatedPageOnFront: Long = 1
+        val currentPageForPosts: Long = 1
+        wpComSite.pageForPosts = currentPageForPosts
+        val expectedHomepageSettings = SiteHomepageSettings.StaticPage(
+                pageForPostsId = 0, pageOnFrontId = updatedPageOnFront
+        )
+        initSuccessResponse(expectedHomepageSettings)
+
+        val homepageUpdatedPayload = store.updatePageOnFront(wpComSite, updatedPageOnFront)
+
+        assertThat(homepageUpdatedPayload.homepageSettings).isEqualTo(
+                expectedHomepageSettings
+        )
+        verify(siteHomepageRestClient).updateHomepage(eq(wpComSite), eq(expectedHomepageSettings))
+    }
+
+    @Test
+    fun `updates page on front and keeps page for posts when they are different`() = test {
+        val updatedPageOnFront: Long = 1
+        val currentPageForPosts: Long = 2
+        wpComSite.pageForPosts = currentPageForPosts
+        val expectedHomepageSettings = SiteHomepageSettings.StaticPage(
+                currentPageForPosts, updatedPageOnFront
+        )
+        initSuccessResponse(expectedHomepageSettings)
+
+        val homepageUpdatedPayload = store.updatePageOnFront(wpComSite, updatedPageOnFront)
+
+        assertThat(homepageUpdatedPayload.homepageSettings).isEqualTo(
+                expectedHomepageSettings
+        )
+        verify(siteHomepageRestClient).updateHomepage(eq(wpComSite), eq(expectedHomepageSettings))
+    }
+
+    private suspend fun initSuccessResponse(
+        updatedSettings: SiteHomepageSettings
+    ) {
+        whenever(siteHomepageRestClient.updateHomepage(eq(wpComSite), any())).thenReturn(successResponse)
+        whenever(successResponse.data).thenReturn(responseData)
+        whenever(siteHomepageSettingsMapper.map(responseData)).thenReturn(updatedSettings)
+    }
+
+    private suspend fun initErrorResponse(
+        error: WPComGsonNetworkError? = null
+    ) {
+        whenever(siteHomepageRestClient.updateHomepage(eq(wpComSite), any())).thenReturn(errorResponse)
+        whenever(errorResponse.error).thenReturn(error)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteStoreTest.kt
new file mode 100644
index 00000000000..7f071a22a21
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/SiteStoreTest.kt
@@ -0,0 +1,522 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.argWhere
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.PostFormatModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.SitesModel
+import org.wordpress.android.fluxc.model.asDomainModel
+import org.wordpress.android.fluxc.model.jetpacksocial.JetpackSocialMapper
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.network.rest.wpapi.site.SiteWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.site.AllDomainsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.Domain
+import org.wordpress.android.fluxc.network.rest.wpcom.site.DomainsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PlansResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.NewSiteResponsePayload
+import org.wordpress.android.fluxc.network.xmlrpc.site.SiteXMLRPCClient
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.domains.DomainDao
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao
+import org.wordpress.android.fluxc.store.SiteStore.AllDomainsError
+import org.wordpress.android.fluxc.store.SiteStore.AllDomainsErrorType
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedAllDomainsPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedDomainsPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPlansPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPostFormatsPayload
+import org.wordpress.android.fluxc.store.SiteStore.NewSiteError
+import org.wordpress.android.fluxc.store.SiteStore.NewSiteErrorType.SITE_NAME_INVALID
+import org.wordpress.android.fluxc.store.SiteStore.NewSitePayload
+import org.wordpress.android.fluxc.store.SiteStore.OnPostFormatsChanged
+import org.wordpress.android.fluxc.store.SiteStore.PlansError
+import org.wordpress.android.fluxc.store.SiteStore.PlansErrorType
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsError
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType.INVALID_SITE
+import org.wordpress.android.fluxc.store.SiteStore.SiteError
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteStore.SiteFilter.WPCOM
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PUBLIC
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteStoreTest {
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var postSqlUtils: PostSqlUtils
+    @Mock lateinit var siteRestClient: SiteRestClient
+    @Mock lateinit var siteXMLRPCClient: SiteXMLRPCClient
+    @Mock lateinit var siteWPAPIClient: SiteWPAPIRestClient
+    @Mock lateinit var privateAtomicCookie: PrivateAtomicCookie
+    @Mock lateinit var siteSqlUtils: SiteSqlUtils
+    @Mock lateinit var jetpackCPConnectedSitesDao: JetpackCPConnectedSitesDao
+    @Mock lateinit var domainsDao: DomainDao
+    @Mock lateinit var jetpackSocialDao: JetpackSocialDao
+    @Mock lateinit var jetpackSocialMapper: JetpackSocialMapper
+    @Mock lateinit var domainsSuccessResponse: Response.Success<DomainsResponse>
+    @Mock lateinit var allDomainsSuccessResponse: Response.Success<AllDomainsResponse>
+    @Mock lateinit var plansSuccessResponse: Response.Success<PlansResponse>
+    @Mock lateinit var domainsErrorResponse: Response.Error<DomainsResponse>
+    @Mock lateinit var allDomainsErrorResponse: Response.Error<AllDomainsResponse>
+    @Mock lateinit var plansErrorResponse: Response.Error<PlansResponse>
+    private lateinit var siteStore: SiteStore
+
+    @Before
+    fun setUp() {
+        siteStore = SiteStore(
+            dispatcher,
+            postSqlUtils,
+            siteRestClient,
+            siteXMLRPCClient,
+            siteWPAPIClient,
+            privateAtomicCookie,
+            siteSqlUtils,
+            jetpackCPConnectedSitesDao,
+            domainsDao,
+            jetpackSocialDao,
+            jetpackSocialMapper,
+            initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `fetchSite from WPCom endpoint and stores it to DB`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+        site.origin = SiteModel.ORIGIN_WPCOM_REST
+        val updatedSite = SiteModel()
+        whenever(siteRestClient.fetchSite(site)).thenReturn(updatedSite)
+
+        assertSiteFetched(updatedSite, site)
+    }
+
+    @Test
+    fun `fetchSite error from WPCom endpoint returns error`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+        site.origin = SiteModel.ORIGIN_WPCOM_REST
+        val errorSite = SiteModel()
+        errorSite.error = BaseNetworkError(PARSE_ERROR)
+        whenever(siteRestClient.fetchSite(site)).thenReturn(errorSite)
+
+        assertSiteFetchError(site)
+    }
+
+    @Test
+    fun `fetchSite from XMLRPC endpoint and stores it to DB`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(false)
+        val updatedSite = SiteModel()
+        whenever(siteXMLRPCClient.fetchSite(site)).thenReturn(updatedSite)
+
+        assertSiteFetched(updatedSite, site)
+    }
+
+    @Test
+    fun `fetchSite error from XMLRPC endpoint returns error`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(false)
+        val errorSite = SiteModel()
+        errorSite.error = BaseNetworkError(PARSE_ERROR)
+        whenever(siteXMLRPCClient.fetchSite(site)).thenReturn(errorSite)
+
+        assertSiteFetchError(site)
+    }
+
+    private suspend fun assertSiteFetchError(site: SiteModel) {
+        val onSiteChanged = siteStore.fetchSite(site)
+
+        assertThat(onSiteChanged.rowsAffected).isEqualTo(0)
+        assertThat(onSiteChanged.error).isEqualTo(SiteError(GENERIC_ERROR, null))
+        verifyNoInteractions(siteSqlUtils)
+    }
+
+    private suspend fun assertSiteFetched(
+        updatedSite: SiteModel,
+        site: SiteModel
+    ) {
+        val rowsChanged = 1
+        whenever(siteSqlUtils.insertOrUpdateSite(updatedSite)).thenReturn(rowsChanged)
+
+        val onSiteChanged = siteStore.fetchSite(site)
+
+        assertThat(onSiteChanged.rowsAffected).isEqualTo(rowsChanged)
+        assertThat(onSiteChanged.error).isNull()
+        verify(siteSqlUtils).insertOrUpdateSite(updatedSite)
+    }
+
+    @Test
+    fun `fetchSites saves fetched sites to DB and removes absent sites`() = test {
+        val payload = FetchSitesPayload(listOf(WPCOM))
+        val sitesModel = SitesModel()
+        val siteA = SiteModel()
+        val siteB = SiteModel()
+        sitesModel.sites = listOf(siteA, siteB)
+        whenever(siteRestClient.fetchSites(payload.filters, false)).thenReturn(sitesModel)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteA)).thenReturn(1)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteB)).thenReturn(1)
+
+        val onSiteChanged = siteStore.fetchSites(payload)
+
+        assertThat(onSiteChanged.rowsAffected).isEqualTo(2)
+        assertThat(onSiteChanged.error).isNull()
+        val inOrder = inOrder(siteSqlUtils)
+        inOrder.verify(siteSqlUtils).insertOrUpdateSite(siteA)
+        inOrder.verify(siteSqlUtils).insertOrUpdateSite(siteB)
+        inOrder.verify(siteSqlUtils).removeWPComRestSitesAbsentFromList(postSqlUtils, sitesModel.sites)
+    }
+
+    @Test
+    fun `fetchSites saves jetpack CP connected sites to DB`() = test {
+        val payload = FetchSitesPayload(listOf(WPCOM))
+        val sitesModel = SitesModel()
+        val siteA = SiteModel().apply {
+            siteId = 1
+            url = "http://A"
+            name = "A"
+            description = "A description"
+            setIsJetpackCPConnected(false)
+        }
+        val siteB = SiteModel().apply {
+            siteId = 2
+            url = "http://B"
+            name = "B"
+            description = "B description"
+            setIsJetpackCPConnected(false)
+        }
+        val siteC = SiteModel().apply {
+            siteId = 3
+            url = "http://C"
+            name = "C"
+            description = "C description"
+            activeJetpackConnectionPlugins = "jetpack-boost"
+            setIsJetpackCPConnected(true)
+        }
+        sitesModel.sites = listOf(siteA, siteB)
+        sitesModel.jetpackCPSites = listOf(siteC)
+        whenever(siteRestClient.fetchSites(payload.filters, false)).thenReturn(sitesModel)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteA)).thenReturn(1)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteB)).thenReturn(1)
+
+        siteStore.fetchSites(payload)
+
+        val inOrder = inOrder(jetpackCPConnectedSitesDao)
+        inOrder.verify(jetpackCPConnectedSitesDao).deleteAll()
+        inOrder.verify(jetpackCPConnectedSitesDao).insert(argWhere { it.size == 1 })
+    }
+
+    @Test
+    fun `fetchSites doesn't save jetpack CP connected sites to DB`() = test {
+        val payload = FetchSitesPayload(listOf(WPCOM))
+        val sitesModel = SitesModel()
+        val siteA = SiteModel().apply {
+            siteId = 1
+            url = "http://A"
+            name = "A"
+            description = "A description"
+            setIsJetpackCPConnected(false)
+        }
+        val siteB = SiteModel().apply {
+            siteId = 2
+            url = "http://B"
+            name = "B"
+            description = "B description"
+            setIsJetpackCPConnected(false)
+        }
+        sitesModel.sites = listOf(siteA, siteB)
+        whenever(siteRestClient.fetchSites(payload.filters, false)).thenReturn(sitesModel)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteA)).thenReturn(1)
+        whenever(siteSqlUtils.insertOrUpdateSite(siteB)).thenReturn(1)
+
+        siteStore.fetchSites(payload)
+
+        verify(jetpackCPConnectedSitesDao, never()).deleteAll()
+        verify(jetpackCPConnectedSitesDao, never()).insert(argWhere { it.size == 1 })
+    }
+
+    @Test
+    fun `fetchSites returns error`() = test {
+        val payload = FetchSitesPayload(listOf(WPCOM))
+        val sitesModel = SitesModel()
+        sitesModel.error = BaseNetworkError(PARSE_ERROR)
+        whenever(siteRestClient.fetchSites(payload.filters, false)).thenReturn(sitesModel)
+
+        val onSiteChanged = siteStore.fetchSites(payload)
+
+        assertThat(onSiteChanged.rowsAffected).isEqualTo(0)
+        assertThat(onSiteChanged.error).isEqualTo(SiteError(GENERIC_ERROR, null))
+        verifyNoInteractions(siteSqlUtils)
+    }
+
+    @Test
+    fun `creates a new site`() = test {
+        val dryRun = false
+        val name = "New site"
+        val payload = NewSitePayload(name, null, "CZ", "Europe/London", PUBLIC, null, dryRun)
+        val newSiteRemoteId: Long = 123
+        val url = "new.wp.com"
+        val response = NewSiteResponsePayload(newSiteRemoteId, siteUrl = url, dryRun)
+        whenever(
+                siteRestClient.newSite(
+                        name,
+                        null,
+                        payload.language,
+                        payload.timeZoneId,
+                        payload.visibility,
+                        null,
+                        null,
+                        null,
+                        payload.dryRun
+                )
+        ).thenReturn(response)
+
+        val result = siteStore.createNewSite(payload)
+
+        assertThat(result.dryRun).isEqualTo(dryRun)
+        assertThat(result.newSiteRemoteId).isEqualTo(newSiteRemoteId)
+        assertEquals(url, result.url)
+    }
+
+    @Test
+    fun `fails to create a new site`() = test {
+        val dryRun = false
+        val payload = NewSitePayload("New site", "CZ", "Europe/London", PUBLIC, dryRun)
+        val response = NewSiteResponsePayload()
+        val newSiteError = NewSiteError(SITE_NAME_INVALID, "Site name invalid")
+        response.error = newSiteError
+        whenever(
+                siteRestClient.newSite(
+                        payload.siteName,
+                        null,
+                        payload.language,
+                        payload.timeZoneId,
+                        payload.visibility,
+                        null,
+                        null,
+                        null,
+                        payload.dryRun
+                )
+        ).thenReturn(response)
+
+        val result = siteStore.createNewSite(payload)
+
+        assertThat(result.dryRun).isEqualTo(dryRun)
+        assertThat(result.newSiteRemoteId).isEqualTo(0)
+        assertThat(result.error).isEqualTo(newSiteError)
+    }
+
+    @Test
+    fun `fetches post formats for WPCom site`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+        val postFormatModel = PostFormatModel(123)
+        postFormatModel.slug = "Slug"
+        postFormatModel.displayName = "Display name"
+        postFormatModel.siteId = 123
+        val postFormats = listOf(
+                postFormatModel
+        )
+        val payload = FetchedPostFormatsPayload(site, postFormats)
+        whenever(siteRestClient.fetchPostFormats(site)).thenReturn(payload)
+
+        assertPostFormatsFetched(site, payload)
+    }
+
+    @Test
+    fun `fetches post formats for XMLRPC site`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(false)
+        val postFormatModel = PostFormatModel(123)
+        postFormatModel.slug = "Slug"
+        postFormatModel.displayName = "Display name"
+        postFormatModel.siteId = 123
+        val postFormats = listOf(
+                postFormatModel
+        )
+        val payload = FetchedPostFormatsPayload(site, postFormats)
+        whenever(siteXMLRPCClient.fetchPostFormats(site)).thenReturn(payload)
+
+        assertPostFormatsFetched(site, payload)
+    }
+
+    private suspend fun assertPostFormatsFetched(
+        site: SiteModel,
+        payload: FetchedPostFormatsPayload
+    ) {
+        val onPostFormatsChanged: OnPostFormatsChanged = siteStore.fetchPostFormats(site)
+
+        assertThat(onPostFormatsChanged.site).isEqualTo(site)
+        assertThat(onPostFormatsChanged.error).isNull()
+        verify(siteSqlUtils).insertOrReplacePostFormats(payload.site, payload.postFormats)
+    }
+
+    @Test
+    fun `fails to fetch post formats for WPCom site`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+        val payload = FetchedPostFormatsPayload(site, emptyList())
+        payload.error = PostFormatsError(INVALID_SITE, "Invalid site")
+        whenever(siteRestClient.fetchPostFormats(site)).thenReturn(payload)
+
+        assertPostFormatsFetchFailed(site, payload)
+    }
+
+    @Test
+    fun `fails to fetch post formats from XMLRPC`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(false)
+        val payload = FetchedPostFormatsPayload(site, emptyList())
+        payload.error = PostFormatsError(INVALID_SITE, "Invalid site")
+        whenever(siteXMLRPCClient.fetchPostFormats(site)).thenReturn(payload)
+
+        assertPostFormatsFetchFailed(site, payload)
+    }
+
+    private suspend fun assertPostFormatsFetchFailed(
+        site: SiteModel,
+        payload: FetchedPostFormatsPayload
+    ) {
+        val onPostFormatsChanged: OnPostFormatsChanged = siteStore.fetchPostFormats(site)
+
+        assertThat(onPostFormatsChanged.site).isEqualTo(site)
+        assertThat(onPostFormatsChanged.error).isEqualTo(payload.error)
+        verifyNoInteractions(siteSqlUtils)
+    }
+
+    @Test
+    fun `fetchSiteDomains from WPCom endpoint`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+
+        whenever(siteRestClient.fetchSiteDomains(site)).thenReturn(domainsSuccessResponse)
+        whenever(domainsSuccessResponse.data).thenReturn(DomainsResponse(listOf()))
+
+        val onSiteDomainsFetched = siteStore.fetchSiteDomains(site)
+
+        assertThat(onSiteDomainsFetched.domains).isNotNull
+        assertThat(onSiteDomainsFetched.error).isNull()
+    }
+
+    @Test
+    fun `fetchSiteDomains error from WPCom endpoint returns error`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+
+        whenever(siteRestClient.fetchSiteDomains(site)).thenReturn(domainsErrorResponse)
+        whenever(domainsErrorResponse.error).thenReturn(WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val onSiteDomainsFetched = siteStore.fetchSiteDomains(site)
+
+        verifyNoInteractions(domainsDao)
+        assertThat(onSiteDomainsFetched.error).isEqualTo(SiteError(GENERIC_ERROR, null))
+        assertThat(onSiteDomainsFetched).isEqualTo(FetchedDomainsPayload(site, onSiteDomainsFetched.domains))
+    }
+
+    @Test
+    fun `getSiteDomains is backed by DomainsDao`() = test {
+        val siteLocalId = 1234
+        val domainEntity = DomainDao.DomainEntity(
+            siteLocalId = siteLocalId,
+            domain = "example.wordpress.com",
+            primaryDomain = true,
+            wpcomDomain = true
+        )
+
+        whenever(domainsDao.getDomains(siteLocalId)).thenReturn(flowOf(listOf(domainEntity)))
+
+        assertEquals(
+            domainsDao.getDomains(siteLocalId).first().map(DomainDao.DomainEntity::toDomainModel),
+            siteStore.getSiteDomains(siteLocalId).first()
+        )
+    }
+
+    @Test
+    fun `fetchSiteDomains updates stored domains`() = test {
+        val siteLocalId = 1234
+        val site = SiteModel()
+        site.id = siteLocalId
+        val domains = listOf(Domain(domain = "example.wordpress.com", primaryDomain = true, wpcomDomain = true))
+
+        whenever(siteRestClient.fetchSiteDomains(site)).thenReturn(Response.Success(DomainsResponse(domains)))
+
+        siteStore.fetchSiteDomains(site)
+
+        verify(domainsDao).insert(siteLocalId, domains.map(Domain::asDomainModel))
+    }
+
+    @Test
+    fun `fetchSitePlans from WPCom endpoint`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+
+        whenever(siteRestClient.fetchSitePlans(site)).thenReturn(plansSuccessResponse)
+        whenever(plansSuccessResponse.data).thenReturn(PlansResponse(listOf()))
+
+        val onSitePlansFetched = siteStore.fetchSitePlans(site)
+
+        assertThat(onSitePlansFetched.plans).isNotNull
+        assertThat(onSitePlansFetched.error).isNull()
+        assertThat(onSitePlansFetched).isEqualTo(FetchedPlansPayload(site, onSitePlansFetched.plans))
+    }
+
+    @Test
+    fun `fetchSitePlans error from WPCom endpoint returns error`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+
+        whenever(siteRestClient.fetchSitePlans(site)).thenReturn(plansErrorResponse)
+        whenever(plansErrorResponse.error).thenReturn(WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val onSitePlansFetched = siteStore.fetchSitePlans(site)
+
+        assertThat(onSitePlansFetched.error.type).isEqualTo(PlansError(PlansErrorType.GENERIC_ERROR, null).type)
+    }
+
+    @Test
+    fun `fetchAllDomains from WPCom endpoint`() = test {
+        whenever(siteRestClient.fetchAllDomains()).thenReturn(allDomainsSuccessResponse)
+        whenever(allDomainsSuccessResponse.data).thenReturn(AllDomainsResponse(listOf()))
+
+        val onAllDomainsFetched = siteStore.fetchAllDomains()
+
+        assertThat(onAllDomainsFetched.domains).isNotNull
+        assertThat(onAllDomainsFetched.error).isNull()
+        assertThat(onAllDomainsFetched).isEqualTo(FetchedAllDomainsPayload(onAllDomainsFetched.domains))
+    }
+
+    @Test
+    fun `fetchAllDomains error from WPCom endpoint returns error`() = test {
+        val site = SiteModel()
+        site.setIsWPCom(true)
+
+        whenever(siteRestClient.fetchAllDomains()).thenReturn(allDomainsErrorResponse)
+        whenever(allDomainsErrorResponse.error).thenReturn(WPComGsonNetworkError(BaseNetworkError(NETWORK_ERROR)))
+
+        val onAllDomainsFetched = siteStore.fetchAllDomains()
+
+        val expectedErrorType = AllDomainsError(AllDomainsErrorType.GENERIC_ERROR, null).type
+        assertThat(onAllDomainsFetched.error.type).isEqualTo(expectedErrorType)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StatsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StatsStoreTest.kt
new file mode 100644
index 00000000000..5e6d8c304aa
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StatsStoreTest.kt
@@ -0,0 +1,257 @@
+package org.wordpress.android.fluxc.store
+
+import android.content.SharedPreferences
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.InsightTypeSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.COMMENTS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWERS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.MOST_POPULAR_DAY_AND_HOUR
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.POSTING_ACTIVITY
+import org.wordpress.android.fluxc.store.StatsStore.ManagementType
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.FILE_DOWNLOADS
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class StatsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var insightTypesSqlUtils: InsightTypeSqlUtils
+    @Mock lateinit var preferenceUtilsWrapper: PreferenceUtilsWrapper
+    @Mock lateinit var sharedPreferences: SharedPreferences
+    @Mock lateinit var sharedPreferencesEditor: SharedPreferences.Editor
+    @Mock lateinit var statsSqlUtils: StatsSqlUtils
+    private lateinit var store: StatsStore
+
+    @Before
+    fun setUp() {
+        store = StatsStore(
+                initCoroutineEngine(),
+                insightTypesSqlUtils,
+                preferenceUtilsWrapper,
+                statsSqlUtils
+        )
+        whenever(preferenceUtilsWrapper.getFluxCPreferences()).thenReturn(sharedPreferences)
+        whenever(sharedPreferences.edit()).thenReturn(sharedPreferencesEditor)
+    }
+
+    @Test
+    fun `returns default stats types when DB is empty`() = test {
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(listOf())
+
+        val result = store.getAddedInsights(site)
+
+        assertThat(result).containsExactly(*DEFAULT_INSIGHTS.toTypedArray())
+    }
+
+    @Test
+    fun `returns updated stats types from DB`() = test {
+        whenever(insightTypesSqlUtils
+                .selectAddedItemsOrderedByStatus(site))
+                .thenReturn(listOf(MOST_POPULAR_DAY_AND_HOUR))
+
+        val result = store.getAddedInsights(site)
+
+        assertThat(result).containsExactly(MOST_POPULAR_DAY_AND_HOUR)
+    }
+
+    @Test
+    fun `updates types with added and removed`() = test {
+        val addedTypes = listOf(
+                MOST_POPULAR_DAY_AND_HOUR
+        )
+        val removedTypes = store.getRemovedInsights(addedTypes)
+        store.updateTypes(site, addedTypes)
+
+        verify(insightTypesSqlUtils).insertOrReplaceAddedItems(site, addedTypes)
+        verify(insightTypesSqlUtils).insertOrReplaceRemovedItems(site, removedTypes)
+    }
+
+    @Test
+    fun `moves type up in the list when it is last`() = test {
+        val insightType = listOf(
+                MOST_POPULAR_DAY_AND_HOUR,
+                FOLLOWERS,
+                COMMENTS
+        )
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(insightType)
+
+        store.moveTypeUp(site, COMMENTS)
+
+        verify(insightTypesSqlUtils).insertOrReplaceAddedItems(
+                site,
+                listOf(MOST_POPULAR_DAY_AND_HOUR, COMMENTS, FOLLOWERS
+        ))
+    }
+
+    @Test
+    fun `does not move type up in the list when it is first`() = test {
+        val insightType = listOf(
+                COMMENTS,
+                MOST_POPULAR_DAY_AND_HOUR,
+                FOLLOWERS
+        )
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(insightType)
+
+        store.moveTypeUp(site, COMMENTS)
+
+        verify(insightTypesSqlUtils, never()).insertOrReplaceAddedItems(eq(site), any())
+    }
+
+    @Test
+    fun `moves type down in the list when it is first`() = test {
+        val insightType = listOf(
+                MOST_POPULAR_DAY_AND_HOUR,
+                FOLLOWERS,
+                COMMENTS
+        )
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(insightType)
+
+        store.moveTypeDown(site, MOST_POPULAR_DAY_AND_HOUR)
+
+        verify(insightTypesSqlUtils).insertOrReplaceAddedItems(
+                site, listOf(FOLLOWERS, MOST_POPULAR_DAY_AND_HOUR, COMMENTS
+        ))
+    }
+
+    @Test
+    fun `does not move type down in the list when it is last`() = test {
+        val insightType = listOf(
+                COMMENTS,
+                FOLLOWERS,
+                MOST_POPULAR_DAY_AND_HOUR
+        )
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(insightType)
+
+        store.moveTypeDown(site, MOST_POPULAR_DAY_AND_HOUR)
+
+        verify(insightTypesSqlUtils, never()).insertOrReplaceAddedItems(eq(site), any())
+    }
+
+    @Test
+    fun `removes type from list`() = test {
+        store.removeType(site, MOST_POPULAR_DAY_AND_HOUR)
+
+        val addedTypes = DEFAULT_INSIGHTS - MOST_POPULAR_DAY_AND_HOUR
+
+        // executed twice, because the first time the default list is inserted first
+        verify(insightTypesSqlUtils).insertOrReplaceAddedItems(
+                site,
+                addedTypes
+        )
+
+        verify(insightTypesSqlUtils).insertOrReplaceRemovedItems(
+                site,
+                store.getRemovedInsights(addedTypes)
+        )
+
+        store.removeType(site, POSTING_ACTIVITY)
+
+        verify(insightTypesSqlUtils).insertOrReplaceAddedItems(
+                site,
+                addedTypes - POSTING_ACTIVITY
+        )
+        verify(insightTypesSqlUtils).insertOrReplaceRemovedItems(
+                site,
+                store.getRemovedInsights(addedTypes - POSTING_ACTIVITY)
+        )
+    }
+
+    @Test @Ignore
+    fun `insight types starts with news type and ends with control type when news card was not shown`() = test {
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(listOf(COMMENTS))
+        whenever(sharedPreferences.getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, false)).thenReturn(false)
+
+        val insightTypes = store.getInsightTypes(site)
+
+        assertThat(insightTypes).hasSize(3)
+        assertThat(insightTypes[0]).isEqualTo(ManagementType.NEWS_CARD)
+        assertThat(insightTypes[1]).isEqualTo(COMMENTS)
+        assertThat(insightTypes[2]).isEqualTo(ManagementType.CONTROL)
+    }
+
+    @Test @Ignore
+    fun `insight types does not start with news type when news card was shown`() = test {
+        whenever(insightTypesSqlUtils.selectAddedItemsOrderedByStatus(site)).thenReturn(listOf(COMMENTS))
+        whenever(sharedPreferences.getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, false)).thenReturn(true)
+
+        val insightTypes = store.getInsightTypes(site)
+
+        assertThat(insightTypes).hasSize(2)
+        assertThat(insightTypes[0]).isEqualTo(COMMENTS)
+        assertThat(insightTypes[1]).isEqualTo(ManagementType.CONTROL)
+    }
+
+    @Test
+    fun `hide news card sets shared prefs`() {
+        whenever(sharedPreferencesEditor.putBoolean(any(), any())).thenReturn(sharedPreferencesEditor)
+
+        store.hideInsightsManagementNewsCard()
+
+        verify(sharedPreferences).edit()
+        Mockito.inOrder(sharedPreferencesEditor).apply {
+            this.verify(sharedPreferencesEditor).putBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, true)
+            this.verify(sharedPreferencesEditor).apply()
+        }
+    }
+
+    @Test
+    fun `is news card showing returns from shared prefs`() {
+        val prefsValue = true
+        whenever(sharedPreferences.getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, true)).thenReturn(prefsValue)
+
+        val insightsManagementNewsCardShowing = store.isInsightsManagementNewsCardShowing()
+
+        assertThat(insightsManagementNewsCardShowing).isEqualTo(prefsValue)
+    }
+
+    @Test
+    fun `deletes all stats`() = test {
+        store.deleteAllData()
+
+        verify(statsSqlUtils).deleteAllStats()
+    }
+
+    @Test
+    fun `deletes all stats for a site`() = test {
+        val site = SiteModel()
+
+        store.deleteSiteData(site)
+
+        verify(statsSqlUtils).deleteSiteStats(site)
+    }
+
+    @Test
+    fun `filters out file downloads on Jetpack site`() = test {
+        val site = SiteModel()
+        site.setIsJetpackConnected(true)
+
+        val timeStatsTypes = store.getTimeStatsTypes(site)
+
+        assertThat(timeStatsTypes).doesNotContain(FILE_DOWNLOADS)
+    }
+
+    @Test
+    fun `does not filter out file downloads on non-Jetpack site`() = test {
+        val site = SiteModel()
+        site.setIsJetpackConnected(false)
+
+        val timeStatsTypes = store.getTimeStatsTypes(site)
+
+        assertThat(timeStatsTypes).contains(FILE_DOWNLOADS)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StockMediaStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StockMediaStoreTest.kt
new file mode 100644
index 00000000000..17faa67f6ef
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/StockMediaStoreTest.kt
@@ -0,0 +1,146 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.AssertionsForClassTypes.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.StockMediaModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stockmedia.StockMediaRestClient
+import org.wordpress.android.fluxc.persistence.StockMediaSqlUtils
+import org.wordpress.android.fluxc.store.StockMediaStore.FetchedStockMediaListPayload
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class StockMediaStoreTest {
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var restClient: StockMediaRestClient
+    @Mock lateinit var sqlUtils: StockMediaSqlUtils
+    @Mock lateinit var mediaStore: MediaStore
+    private lateinit var store: StockMediaStore
+    private val stockMediaModel = StockMediaModel()
+    private lateinit var stockMediaItem: StockMediaItem
+    private val id = "id"
+    private val name = "name"
+    private val title = "title"
+    private val date = "date"
+    private val url = "url"
+    private val thumbnail = "thumbnail"
+
+    @Before
+    fun setUp() {
+        store = StockMediaStore(
+                dispatcher,
+                restClient,
+                initCoroutineEngine(),
+                sqlUtils,
+                mediaStore
+        )
+        stockMediaModel.id = id
+        stockMediaModel.name = name
+        stockMediaModel.title = title
+        stockMediaModel.date = date
+        stockMediaModel.url = url
+        stockMediaModel.thumbnail = thumbnail
+        stockMediaItem = StockMediaItem(id, name, title, url, date, thumbnail)
+    }
+
+    @Test
+    fun `fetches first page with load more when next page available`() = test {
+        val filter = "filter"
+        val mediaList = listOf(stockMediaModel)
+        whenever(restClient.searchStockMedia(filter, 0, StockMediaStore.PAGE_SIZE)).thenReturn(
+                FetchedStockMediaListPayload(mediaList, filter, 1, true)
+        )
+
+        val result = store.fetchStockMedia(filter, false)
+
+        verify(sqlUtils).insert(0, 1, listOf(stockMediaItem))
+
+        assertThat(result.searchTerm).isEqualTo(filter)
+        assertThat(result.canLoadMore).isTrue()
+        assertThat(result.nextPage).isEqualTo(1)
+        assertThat(result.mediaList).isEqualTo(mediaList)
+    }
+
+    @Test
+    fun `fetches first page without load more when next page not available`() = test {
+        val filter = "filter"
+        val mediaList = listOf(stockMediaModel)
+        whenever(restClient.searchStockMedia(filter, 0, StockMediaStore.PAGE_SIZE)).thenReturn(
+                FetchedStockMediaListPayload(mediaList, filter, 0, false)
+        )
+
+        val result = store.fetchStockMedia(filter, false)
+
+        verify(sqlUtils).insert(0, null, listOf(stockMediaItem))
+
+        assertThat(result.searchTerm).isEqualTo(filter)
+        assertThat(result.canLoadMore).isFalse()
+        assertThat(result.nextPage).isEqualTo(0)
+        assertThat(result.mediaList).isEqualTo(mediaList)
+    }
+
+    @Test
+    fun `fetches next page when available when loadMore is true`() = test {
+        val filter = "filter"
+        val mediaList = listOf(stockMediaModel)
+        val nextPage = 2
+        whenever(sqlUtils.getNextPage()).thenReturn(nextPage)
+        whenever(restClient.searchStockMedia(filter, nextPage, StockMediaStore.PAGE_SIZE)).thenReturn(
+                FetchedStockMediaListPayload(mediaList, filter, 0, false)
+        )
+
+        val result = store.fetchStockMedia(filter, true)
+
+        verify(sqlUtils).insert(2, null, listOf(stockMediaItem))
+        verify(sqlUtils, never()).clear()
+
+        assertThat(result.searchTerm).isEqualTo(filter)
+        assertThat(result.canLoadMore).isFalse()
+        assertThat(result.nextPage).isEqualTo(0)
+        assertThat(result.mediaList).isEqualTo(mediaList)
+    }
+
+    @Test
+    fun `fetches first page when next page not available and loadMore is true`() = test {
+        val filter = "filter"
+        val mediaList = listOf(stockMediaModel)
+        whenever(sqlUtils.getNextPage()).thenReturn(null)
+        whenever(restClient.searchStockMedia(filter, 0, StockMediaStore.PAGE_SIZE)).thenReturn(
+                FetchedStockMediaListPayload(mediaList, filter, 0, false)
+        )
+
+        val result = store.fetchStockMedia(filter, true)
+
+        inOrder(sqlUtils) {
+            verify(sqlUtils).clear()
+            verify(sqlUtils).insert(0, null, listOf(stockMediaItem))
+        }
+
+        assertThat(result.searchTerm).isEqualTo(filter)
+        assertThat(result.canLoadMore).isFalse()
+        assertThat(result.nextPage).isEqualTo(0)
+        assertThat(result.mediaList).isEqualTo(mediaList)
+    }
+
+    @Test
+    fun `first page fetch clears old data`() = test {
+        val filter = "filter"
+        val mediaList = listOf(stockMediaModel)
+        whenever(restClient.searchStockMedia(filter, 0, StockMediaStore.PAGE_SIZE)).thenReturn(
+                FetchedStockMediaListPayload(mediaList, filter, 1, true)
+        )
+
+        store.fetchStockMedia(filter, false)
+
+        verify(sqlUtils).clear()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/TransactionsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/TransactionsStoreTest.kt
new file mode 100644
index 00000000000..ed24e32974c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/TransactionsStoreTest.kt
@@ -0,0 +1,207 @@
+package org.wordpress.android.fluxc.store
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.TransactionAction
+import org.wordpress.android.fluxc.generated.TransactionActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.CREATE_SHOPPING_CART_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.CREATE_SHOPPING_CART_WITH_NO_SITE_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.CREATE_SHOPPING_CART_WITH_PLAN_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.DOMAIN_CONTACT_INFORMATION
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.SUPPORTED_COUNTRIES_MODEL
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient
+import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartWithDomainAndPlanPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.CreatedShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.FetchedSupportedCountriesPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.RedeemShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.RedeemedShoppingCartPayload
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class TransactionsStoreTest {
+    @Mock private lateinit var transactionsRestClient: TransactionsRestClient
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var siteModel: SiteModel
+    private lateinit var transactionsStore: TransactionsStore
+
+    companion object {
+        private const val TEST_DOMAIN_NAME = "superraredomainname156726.blog"
+        private const val TEST_DOMAIN_PRODUCT_ID = 76
+        private const val TEST_PLAN_PRODUCT_ID = 1009
+    }
+
+    @Before
+    fun setUp() {
+        transactionsStore = TransactionsStore(transactionsRestClient, initCoroutineEngine(), dispatcher)
+    }
+
+    @Test
+    fun fetchSupportedCountries() = test {
+        whenever(transactionsRestClient.fetchSupportedCountries()).thenReturn(
+                FetchedSupportedCountriesPayload(
+                        SUPPORTED_COUNTRIES_MODEL
+                )
+        )
+        val action = TransactionActionBuilder.generateNoPayloadAction(TransactionAction.FETCH_SUPPORTED_COUNTRIES)
+        transactionsStore.onAction(action)
+
+        verify(transactionsRestClient).fetchSupportedCountries()
+
+        val expectedEvent = TransactionsStore.OnSupportedCountriesFetched(SUPPORTED_COUNTRIES_MODEL.toMutableList())
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+
+    @Test
+    fun createShoppingCartWithDomain() = test {
+        whenever(
+                transactionsRestClient.createShoppingCart(
+                        siteModel,
+                        TEST_DOMAIN_PRODUCT_ID,
+                        TEST_DOMAIN_NAME,
+                        isDomainPrivacyProtectionEnabled = true,
+                        isTemporary = true
+                )
+        ).thenReturn(
+                CreatedShoppingCartPayload(
+                        CREATE_SHOPPING_CART_RESPONSE
+                )
+        )
+
+        val payload = CreateShoppingCartPayload(
+                siteModel,
+                TEST_DOMAIN_PRODUCT_ID,
+                TEST_DOMAIN_NAME,
+                isPrivacyEnabled = true,
+                isTemporary = true
+        )
+
+        val action = TransactionActionBuilder.newCreateShoppingCartAction(payload)
+        transactionsStore.onAction(action)
+
+        verify(transactionsRestClient).createShoppingCart(
+                payload.site,
+                payload.productId,
+                payload.domainName,
+                payload.isPrivacyEnabled,
+                payload.isTemporary
+        )
+
+        val expectedEvent = TransactionsStore.OnShoppingCartCreated(CREATE_SHOPPING_CART_RESPONSE)
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+
+    @Test
+    fun createShoppingCartWithDomainAndPlan() = test {
+        whenever(
+            transactionsRestClient.createShoppingCart(
+                siteModel,
+                TEST_DOMAIN_PRODUCT_ID,
+                TEST_DOMAIN_NAME,
+                isDomainPrivacyProtectionEnabled = true,
+                isTemporary = true,
+                planProductId = TEST_PLAN_PRODUCT_ID
+            )
+        ).thenReturn(
+            CreatedShoppingCartPayload(
+                CREATE_SHOPPING_CART_WITH_PLAN_RESPONSE
+            )
+        )
+
+        val payload = CreateShoppingCartWithDomainAndPlanPayload(
+            site = siteModel,
+            domainProductId = TEST_DOMAIN_PRODUCT_ID,
+            domainName = TEST_DOMAIN_NAME,
+            isDomainPrivacyEnabled = true,
+            planProductId = TEST_PLAN_PRODUCT_ID,
+            isTemporary = true
+        )
+
+        val action = TransactionActionBuilder.newCreateShoppingCartWithDomainAndPlanAction(payload)
+        transactionsStore.onAction(action)
+
+        verify(transactionsRestClient).createShoppingCart(
+            site = payload.site,
+            domainProductId = payload.domainProductId,
+            domainName = payload.domainName,
+            isDomainPrivacyProtectionEnabled = payload.isDomainPrivacyEnabled,
+            isTemporary = payload.isTemporary,
+            planProductId = payload.planProductId
+        )
+
+        val expectedEvent = TransactionsStore.OnShoppingCartCreated(
+            CREATE_SHOPPING_CART_WITH_PLAN_RESPONSE
+        )
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+
+    @Test
+    fun createShoppingCartWithDomainAndNoSite() = test {
+        whenever(
+            transactionsRestClient.createShoppingCart(
+                null,
+                TEST_DOMAIN_PRODUCT_ID,
+                TEST_DOMAIN_NAME,
+                isDomainPrivacyProtectionEnabled = true,
+                isTemporary = true
+            )
+        ).thenReturn(
+            CreatedShoppingCartPayload(
+                CREATE_SHOPPING_CART_WITH_NO_SITE_RESPONSE
+            )
+        )
+
+        val payload = CreateShoppingCartWithDomainAndPlanPayload(
+            site = null,
+            domainProductId = TEST_DOMAIN_PRODUCT_ID,
+            domainName = TEST_DOMAIN_NAME,
+            isDomainPrivacyEnabled = true,
+            isTemporary = true
+        )
+
+        val action = TransactionActionBuilder.newCreateShoppingCartWithDomainAndPlanAction(payload)
+        transactionsStore.onAction(action)
+
+        verify(transactionsRestClient).createShoppingCart(
+            site = payload.site,
+            domainProductId = payload.domainProductId,
+            domainName = payload.domainName,
+            isDomainPrivacyProtectionEnabled = payload.isDomainPrivacyEnabled,
+            isTemporary = payload.isTemporary,
+            planProductId = payload.planProductId
+        )
+
+        val expectedEvent = TransactionsStore.OnShoppingCartCreated(
+            CREATE_SHOPPING_CART_WITH_NO_SITE_RESPONSE
+        )
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+
+    @Test
+    fun redeemShoppingCartWithCredits() = test {
+        whenever(
+                transactionsRestClient.redeemCartUsingCredits(CREATE_SHOPPING_CART_RESPONSE, DOMAIN_CONTACT_INFORMATION)
+        ).thenReturn(
+                RedeemedShoppingCartPayload(true)
+        )
+
+        val payload = RedeemShoppingCartPayload(CREATE_SHOPPING_CART_RESPONSE, DOMAIN_CONTACT_INFORMATION)
+
+        val action = TransactionActionBuilder.newRedeemCartWithCreditsAction(payload)
+        transactionsStore.onAction(action)
+
+        verify(transactionsRestClient).redeemCartUsingCredits(CREATE_SHOPPING_CART_RESPONSE, DOMAIN_CONTACT_INFORMATION)
+
+        val expectedEvent = TransactionsStore.OnShoppingCartRedeemed(true)
+        verify(dispatcher).emitChange(eq(expectedEvent))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCCustomerStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCCustomerStoreTest.kt
new file mode 100644
index 00000000000..466f737a210
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCCustomerStoreTest.kt
@@ -0,0 +1,424 @@
+package org.wordpress.android.fluxc.store
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.customer.WCCustomerFromAnalyticsMapper
+import org.wordpress.android.fluxc.model.customer.WCCustomerMapper
+import org.wordpress.android.fluxc.model.customer.WCCustomerModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.CustomerRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.customer.dto.CustomerDTO
+import org.wordpress.android.fluxc.persistence.CustomerSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.persistence.dao.CustomerFromAnalyticsDao
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCCustomerStoreTest {
+    val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+
+    private val restClient: CustomerRestClient = mock()
+    private val mapper: WCCustomerMapper = mock()
+    private val analyticsMapper: WCCustomerFromAnalyticsMapper= mock()
+    private val customerFromAnalyticsDao: CustomerFromAnalyticsDao = mock()
+
+    private lateinit var store: WCCustomerStore
+
+    @Before
+    fun setUp() {
+        val appContext = ApplicationProvider.getApplicationContext<Context>()
+        val config = SingleStoreWellSqlConfigForTests(
+            appContext,
+            listOf(WCCustomerModel::class.java),
+            WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCCustomerStore(
+            restClient,
+            initCoroutineEngine(),
+            mapper,
+            customerFromAnalyticsDao,
+            analyticsMapper
+        )
+    }
+
+    @Test
+    fun `fetch single customer with success returns success`() = test {
+        // given
+        val siteModelId = 1
+        val remoteCustomerId = 2L
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        val response: CustomerDTO = mock()
+        whenever(restClient.fetchSingleCustomer(siteModel, remoteCustomerId))
+            .thenReturn(WooPayload(response))
+        val model: WCCustomerModel = mock()
+        whenever(mapper.mapToModel(siteModel, response)).thenReturn(model)
+
+        // when
+        val result = store.fetchSingleCustomer(siteModel, remoteCustomerId)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(model, result.model)
+    }
+
+    @Test
+    fun `fetch single customer with error returns error`() = test {
+        // given
+        val siteModelId = 1
+        val remoteCustomerId = 2L
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        whenever(restClient.fetchSingleCustomer(siteModel, remoteCustomerId)).thenReturn(
+            WooPayload(
+                error
+            )
+        )
+
+        // when
+        val result = store.fetchSingleCustomer(siteModel, remoteCustomerId)
+
+        // then
+        assertTrue(result.isError)
+        assertEquals(error, result.error)
+    }
+
+    @Test
+    fun `fetch customers with success returns success and cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        val customerOne: CustomerDTO = mock()
+        val customerTwo: CustomerDTO = mock()
+        val response = arrayOf(customerOne, customerTwo)
+        whenever(restClient.fetchCustomers(siteModel, 25))
+            .thenReturn(WooPayload(response))
+        val modelOne = WCCustomerModel().apply {
+            remoteCustomerId = 1L
+            localSiteId = siteModelId
+        }
+        val modelTwo = WCCustomerModel().apply {
+            remoteCustomerId = 2L
+            localSiteId = siteModelId
+        }
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(listOf(modelOne, modelTwo), result.model)
+        assertEquals(modelOne, CustomerSqlUtils.getCustomersForSite(siteModel)[0])
+        assertEquals(modelTwo, CustomerSqlUtils.getCustomersForSite(siteModel)[1])
+    }
+
+    @Test
+    fun `fetch customers with and search success returns success and does not cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val searchQuery = "searchQuery"
+
+        val customerOne: CustomerDTO = mock()
+        val customerTwo: CustomerDTO = mock()
+        val response = arrayOf(customerOne, customerTwo)
+        whenever(restClient.fetchCustomers(siteModel, 25, searchQuery = searchQuery))
+            .thenReturn(WooPayload(response))
+        val modelOne: WCCustomerModel = mock()
+        val modelTwo: WCCustomerModel = mock()
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25, searchQuery = searchQuery)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(listOf(modelOne, modelTwo), result.model)
+        assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+    }
+
+    @Test
+    fun `fetch customers with and email success returns success and does not cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val email = "email"
+
+        val customerOne: CustomerDTO = mock()
+        val customerTwo: CustomerDTO = mock()
+        val response = arrayOf(customerOne, customerTwo)
+        whenever(restClient.fetchCustomers(siteModel, 25, email = email))
+            .thenReturn(WooPayload(response))
+        val modelOne: WCCustomerModel = mock()
+        val modelTwo: WCCustomerModel = mock()
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25, email = email)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(listOf(modelOne, modelTwo), result.model)
+        assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+    }
+
+    @Test
+    fun `fetch customers with and role success returns success and does not cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val role = "role"
+
+        val customerOne: CustomerDTO = mock()
+        val customerTwo: CustomerDTO = mock()
+        val response = arrayOf(customerOne, customerTwo)
+        whenever(restClient.fetchCustomers(siteModel, 25, role = role))
+            .thenReturn(WooPayload(response))
+        val modelOne: WCCustomerModel = mock()
+        val modelTwo: WCCustomerModel = mock()
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25, role = role)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(listOf(modelOne, modelTwo), result.model)
+        assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+    }
+
+    @Test
+    fun `fetch customers with and remote ids success returns success and does not cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val remoteCustomerIds = listOf(1L)
+
+        val customerOne: CustomerDTO = mock()
+        val customerTwo: CustomerDTO = mock()
+        val response = arrayOf(customerOne, customerTwo)
+        whenever(restClient.fetchCustomers(siteModel, 25, remoteCustomerIds = remoteCustomerIds))
+            .thenReturn(WooPayload(response))
+        val modelOne: WCCustomerModel = mock()
+        val modelTwo: WCCustomerModel = mock()
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25, remoteCustomerIds = remoteCustomerIds)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(listOf(modelOne, modelTwo), result.model)
+        assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+    }
+
+    @Test
+    fun `fetch customers with and excluded ids success returns success and does not cache`() =
+        test {
+            // given
+            val siteModelId = 1
+            val siteModel = SiteModel().apply { id = siteModelId }
+            val excludedCustomerIds = listOf(1L)
+
+            val customerOne: CustomerDTO = mock()
+            val customerTwo: CustomerDTO = mock()
+            val response = arrayOf(customerOne, customerTwo)
+            whenever(
+                restClient.fetchCustomers(
+                    siteModel,
+                    25,
+                    excludedCustomerIds = excludedCustomerIds
+                )
+            )
+                .thenReturn(WooPayload(response))
+            val modelOne: WCCustomerModel = mock()
+            val modelTwo: WCCustomerModel = mock()
+            whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+            whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+            // when
+            val result = store.fetchCustomers(
+                siteModel,
+                25,
+                excludedCustomerIds = excludedCustomerIds
+            )
+
+            // then
+            assertFalse(result.isError)
+            assertEquals(listOf(modelOne, modelTwo), result.model)
+            assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+        }
+
+    @Test
+    fun `fetch customers with error returns error and not cache`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        whenever(restClient.fetchCustomers(siteModel, 25)).thenReturn(WooPayload(error))
+
+        // when
+        val result = store.fetchCustomers(siteModel, 25)
+
+        // then
+        assertTrue(result.isError)
+        assertTrue(CustomerSqlUtils.getCustomersForSite(siteModel).isEmpty())
+    }
+
+    @Test
+    fun `fetch customers by id with one error and one success returns error`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        whenever(restClient.fetchCustomers(siteModel, 2, remoteCustomerIds = listOf(1, 2)))
+            .thenReturn(WooPayload(error))
+
+        val model = WCCustomerModel().apply {
+            remoteCustomerId = 1L
+            localSiteId = siteModelId
+        }
+        val customer: CustomerDTO = mock()
+        whenever(mapper.mapToModel(siteModel, customer)).thenReturn(model)
+        whenever(restClient.fetchCustomers(siteModel, 2, remoteCustomerIds = listOf(3, 4)))
+            .thenReturn(WooPayload(arrayOf(customer)))
+
+        // when
+        val result = store.fetchCustomersByIdsAndCache(siteModel, 2, listOf(1, 2, 3, 4))
+
+        // then
+        assertTrue(result.isError)
+        assertEquals(CustomerSqlUtils.getCustomersForSite(siteModel).size, 1)
+    }
+
+    @Test
+    fun `fetch customers by id with two success returns success`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+
+        val modelOne = WCCustomerModel().apply {
+            remoteCustomerId = 1L
+            localSiteId = siteModelId
+        }
+        val customerOne: CustomerDTO = mock()
+        whenever(mapper.mapToModel(siteModel, customerOne)).thenReturn(modelOne)
+
+        val modelTwo = WCCustomerModel().apply {
+            remoteCustomerId = 2L
+            localSiteId = siteModelId
+        }
+        val customerTwo: CustomerDTO = mock()
+        whenever(mapper.mapToModel(siteModel, customerTwo)).thenReturn(modelTwo)
+
+        whenever(restClient.fetchCustomers(siteModel, 2, remoteCustomerIds = listOf(1, 2)))
+            .thenReturn(WooPayload(arrayOf(customerOne)))
+
+        whenever(restClient.fetchCustomers(siteModel, 2, remoteCustomerIds = listOf(3, 4)))
+            .thenReturn(WooPayload(arrayOf(customerTwo)))
+
+        // when
+        val result = store.fetchCustomersByIdsAndCache(siteModel, 2, listOf(1, 2, 3, 4))
+
+        // then
+        assertFalse(result.isError)
+        val customersForSite = CustomerSqlUtils.getCustomersForSite(siteModel)
+        assertEquals(customersForSite.size, 2)
+        assertTrue(customersForSite.contains(modelOne))
+        assertTrue(customersForSite.contains(modelTwo))
+    }
+
+    @Test
+    fun `create customer with error returns error`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val customerDto: CustomerDTO = mock()
+        val customerModel: WCCustomerModel = mock()
+
+        whenever(mapper.mapToDTO(customerModel)).thenReturn(customerDto)
+        whenever(restClient.createCustomer(siteModel, customerDto)).thenReturn(WooPayload(error))
+
+        // when
+        val result = store.createCustomer(siteModel, customerModel)
+
+        // then
+        assertTrue(result.isError)
+    }
+
+    @Test
+    fun `create customer with success returns dto`() = test {
+        // given
+        val siteModelId = 1
+        val siteModel = SiteModel().apply { id = siteModelId }
+        val customerDto: CustomerDTO = mock()
+        val customerDtoResponse: CustomerDTO = mock()
+        val customerModel: WCCustomerModel = mock()
+
+        whenever(mapper.mapToDTO(customerModel)).thenReturn(customerDto)
+        whenever(mapper.mapToModel(siteModel, customerDtoResponse)).thenReturn(customerModel)
+        whenever(restClient.createCustomer(siteModel, customerDto)).thenReturn(
+            WooPayload(
+                customerDtoResponse
+            )
+        )
+
+        // when
+        val result = store.createCustomer(siteModel, customerModel)
+
+        // then
+        assertFalse(result.isError)
+        assertEquals(customerModel, result.model)
+    }
+
+    @Test
+    fun `given error, when fetchCustomersFromAnalytics, then nothing is stored and error`() =
+        test {
+            // given
+            val siteModelId = 1
+            val siteModel = SiteModel().apply { id = siteModelId }
+            whenever(
+                restClient.fetchCustomersFromAnalytics(
+                    siteModel,
+                    page = 1,
+                    pageSize = 25
+                )
+            ).thenReturn(WooPayload(error))
+
+            // when
+            val result = store.fetchCustomersFromAnalytics(siteModel, 1)
+
+            // then
+            assertThat(result.isError).isTrue
+            assertThat(CustomerSqlUtils.getCustomersForSite(siteModel)).isEmpty()
+        }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCInboxStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCInboxStoreTest.kt
new file mode 100644
index 00000000000..f5f5737246d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCInboxStoreTest.kt
@@ -0,0 +1,205 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox.InboxNoteActionDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox.InboxNoteDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.inbox.InboxRestClient
+import org.wordpress.android.fluxc.persistence.dao.InboxNotesDao
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteEntity.LocalInboxNoteStatus.Unactioned
+import org.wordpress.android.fluxc.persistence.entity.InboxNoteWithActions
+import org.wordpress.android.fluxc.store.WCInboxStore.Companion.DEFAULT_PAGE
+import org.wordpress.android.fluxc.store.WCInboxStore.Companion.DEFAULT_PAGE_SIZE
+import org.wordpress.android.fluxc.store.WCInboxStore.Companion.INBOX_NOTE_TYPES_FOR_APPS
+import org.wordpress.android.fluxc.store.WCInboxStore.Companion.MAX_PAGE_SIZE_FOR_DELETING_NOTES
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+class WCInboxStoreTest {
+    private val restClient: InboxRestClient = mock()
+    private val inboxNotesDao: InboxNotesDao = mock()
+
+    private val sut = WCInboxStore(
+        restClient,
+        initCoroutineEngine(),
+        inboxNotesDao
+    )
+
+    @Test
+    fun `Given notes are fetched successfully, when notes fetched, then save them into DB`() =
+        test {
+            givenNotesAreFetchedSuccesfully()
+
+            sut.fetchInboxNotes(ANY_SITE_MODEL)
+
+            verify(inboxNotesDao).deleteAllAndInsertInboxNotes(
+                ANY_SITE_MODEL.localId(), *INBOX_NOTES_WITH_ACTIONS_ENTITY.toTypedArray()
+            )
+        }
+
+    @Test
+    fun `Given notes are fetched successfully, when notes fetched, then return WooResult`() =
+        test {
+            givenNotesAreFetchedSuccesfully()
+
+            val result = sut.fetchInboxNotes(ANY_SITE_MODEL)
+
+            Assertions.assertThat(result).isEqualTo(WooResult(Unit))
+        }
+
+    @Test
+    fun `Given notes fetching error, when notes fetched, then notes are not saved`() =
+        test {
+            givenErrorFetchingNotes()
+
+            sut.fetchInboxNotes(ANY_SITE_MODEL)
+
+            verify(inboxNotesDao, never()).insertOrUpdateInboxNote(any())
+        }
+
+    @Test
+    fun `Given notes fetching error, when notes fetched, then returns WooResult error`() =
+        test {
+            givenErrorFetchingNotes()
+
+            val result = sut.fetchInboxNotes(ANY_SITE_MODEL)
+
+            Assertions.assertThat(result).isEqualTo(ANY_WOO_RESULT_WITH_ERROR)
+        }
+
+    @Test
+    fun `Given notes loaded, when delete all notes, then clears cached notes from db`() =
+        test {
+            givenNotesSavedInDbForSite(A_SITE_ID)
+            givenNotesDeletedSuccessfully()
+
+            sut.deleteNotesForSite(ANY_SITE_MODEL)
+
+            verify(inboxNotesDao).deleteInboxNotesForSite(LocalId(A_SITE_ID))
+        }
+
+    @Test
+    fun `Given notes loaded, when delete all notes, requests notes deletion for site to the API`() =
+        test {
+            givenNotesSavedInDbForSite(A_SITE_ID)
+            givenNotesDeletedSuccessfully()
+
+            sut.deleteNotesForSite(ANY_SITE_MODEL)
+
+            verify(restClient).deleteAllNotesForSite(
+                ANY_SITE_MODEL,
+                DEFAULT_PAGE,
+                MAX_PAGE_SIZE_FOR_DELETING_NOTES,
+                INBOX_NOTE_TYPES_FOR_APPS
+            )
+        }
+
+    private suspend fun givenNotesAreFetchedSuccesfully() {
+        whenever(
+            restClient.fetchInboxNotes(
+                ANY_SITE_MODEL,
+                DEFAULT_PAGE,
+                DEFAULT_PAGE_SIZE,
+                INBOX_NOTE_TYPES_FOR_APPS
+            )
+        ).thenReturn(WooPayload(arrayOf(ANY_INBOX_NOTE_DTO)))
+    }
+
+    private suspend fun givenNotesDeletedSuccessfully() {
+        whenever(
+            restClient.deleteAllNotesForSite(
+                ANY_SITE_MODEL,
+                DEFAULT_PAGE,
+                MAX_PAGE_SIZE_FOR_DELETING_NOTES,
+                INBOX_NOTE_TYPES_FOR_APPS
+            )
+        ).thenReturn(WooPayload(Unit))
+    }
+
+    private suspend fun givenErrorFetchingNotes() {
+        whenever(
+            restClient.fetchInboxNotes(
+                ANY_SITE_MODEL,
+                DEFAULT_PAGE,
+                DEFAULT_PAGE_SIZE,
+                INBOX_NOTE_TYPES_FOR_APPS
+            )
+        ).thenReturn(WooPayload(ANY_WOO_API_ERROR))
+    }
+
+    private fun givenNotesSavedInDbForSite(localSiteId: Int) {
+        whenever(
+            inboxNotesDao.getInboxNotesForSite(LocalId(localSiteId))
+        ).thenReturn(listOf(ANY_INBOX_NOTE_ENTITY))
+    }
+
+    private companion object {
+        const val AN_INBOX_NOTE_REMOTE_ID: Long = 1
+        const val A_SITE_ID: Int = 12324
+        val ANY_SITE_MODEL = SiteModel().apply { id = A_SITE_ID }
+        val ANY_WOO_API_ERROR = WooError(GENERIC_ERROR, UNKNOWN)
+        val ANY_WOO_RESULT_WITH_ERROR: WooResult<Unit> = WooResult(ANY_WOO_API_ERROR)
+        val ANY_INBOX_NOTE_ACTION_DTO = InboxNoteActionDto(
+            id = 2,
+            name = "action",
+            label = "action",
+            query = "",
+            status = null,
+            primary = true,
+            actionedText = "",
+            nonceAction = "",
+            nonceName = "",
+            url = "www.automattic.com"
+        )
+        val ANY_INBOX_NOTE_DTO = InboxNoteDto(
+            id = AN_INBOX_NOTE_REMOTE_ID,
+            name = "",
+            type = "",
+            status = "",
+            source = "",
+            actions = listOf(ANY_INBOX_NOTE_ACTION_DTO),
+            locale = "",
+            title = "",
+            content = "",
+            layout = "",
+            dateCreated = "",
+            dateReminder = ""
+        )
+        val ANY_INBOX_NOTE_ENTITY = InboxNoteEntity(
+            localId = 1,
+            remoteId = AN_INBOX_NOTE_REMOTE_ID,
+            localSiteId = LocalId(A_SITE_ID),
+            name = "",
+            type = "",
+            status = Unactioned,
+            source = "",
+            title = "",
+            content = "",
+            dateCreated = "",
+            dateReminder = ""
+        )
+        val INBOX_NOTES_WITH_ACTIONS_ENTITY = listOf(
+            InboxNoteWithActions(
+                inboxNote = ANY_INBOX_NOTE_DTO.toInboxNoteEntity(ANY_SITE_MODEL.localId()),
+                noteActions = listOf(
+                    ANY_INBOX_NOTE_ACTION_DTO.toDataModel(
+                        ANY_SITE_MODEL.localId()
+                    )
+                )
+            )
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCWooPaymentsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCWooPaymentsStoreTest.kt
new file mode 100644
index 00000000000..b41d892e304
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/WCWooPaymentsStoreTest.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.store
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.payments.woo.WooPaymentsDepositsOverview
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsDepositsOverviewApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.woo.WooPaymentsRestClient
+import org.wordpress.android.fluxc.persistence.dao.WooPaymentsDepositsOverviewDao
+import org.wordpress.android.fluxc.persistence.mappers.WooPaymentsDepositsOverviewMapper
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+class WCWooPaymentsStoreTest {
+    private val restClient = mock<WooPaymentsRestClient>()
+    private val dao: WooPaymentsDepositsOverviewDao = mock()
+    private val mapper: WooPaymentsDepositsOverviewMapper = mock()
+
+    private val store = WCWooPaymentsStore(
+        initCoroutineEngine(),
+        restClient,
+        dao,
+        mapper,
+    )
+
+    @Test
+    fun `given rest returns error, when fetchConnectionToken, then error returned`() = test {
+        // GIVEN
+        val error = mock<WooError>()
+        val restResult = WooPayload<WooPaymentsDepositsOverviewApiResponse>(error)
+        whenever(restClient.fetchDepositsOverview(any())).thenReturn(restResult)
+
+        // WHEN
+        val result = store.fetchDepositsOverview(mock())
+
+        // THEN
+        assertThat(result.isError).isTrue
+        assertThat(result.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `given rest returns success, when fetchConnectionToken, then success returned`() = test {
+        // GIVEN
+        val response = mock<WooPaymentsDepositsOverviewApiResponse>()
+        val mappedModel = mock<WooPaymentsDepositsOverview>()
+        val restResult = WooPayload(response)
+        whenever(restClient.fetchDepositsOverview(any())).thenReturn(restResult)
+        whenever(mapper.mapApiResponseToModel(response)).thenReturn(mappedModel)
+
+        // WHEN
+        val result = store.fetchDepositsOverview(mock())
+
+        // THEN
+        assertThat(result).isEqualTo(WooPayload(mappedModel))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/XPostsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/XPostsStoreTest.kt
new file mode 100644
index 00000000000..cf9f446b9cf
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/XPostsStoreTest.kt
@@ -0,0 +1,137 @@
+package org.wordpress.android.fluxc.store
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.site.XPostsRestClient
+import org.wordpress.android.fluxc.persistence.XPostsSqlUtils
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class XPostsStoreTest {
+    private lateinit var store: XPostsStore
+    private val restClient = mock<XPostsRestClient>()
+    private val sqlUtils = mock<XPostsSqlUtils>()
+    private val site = mock<SiteModel>()
+
+    @Before
+    fun setup() {
+        store = XPostsStore(initCoroutineEngine(), restClient, sqlUtils)
+    }
+
+    @Test
+    fun `fetchXPosts handles successful result`() = test {
+        val apiData = arrayOf(mock<XPostSiteModel>())
+        val restResponse = WPComGsonRequestBuilder.Response.Success(apiData)
+        whenever(restClient.fetch(site)).thenReturn(restResponse)
+
+        val result = store.fetchXPosts(site)
+
+        inOrder(restClient, sqlUtils) {
+            verify(restClient).fetch(site)
+            verify(sqlUtils).setXPostsForSite(apiData.toList(), site)
+        }
+
+        val expected = XPostsResult.apiResult(apiData.toList())
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `fetchXPosts handles unauthorized`() = test {
+        stubResponseWithError("unauthorized")
+
+        val result = store.fetchXPosts(site)
+
+        inOrder(restClient, sqlUtils) {
+            verify(restClient).fetch(site)
+            verify(sqlUtils).persistNoXpostsForSite(site)
+        }
+
+        val expected = XPostsResult.apiResult(emptyList())
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `fetchXPosts handles o2_disabled`() = test {
+        stubResponseWithError("xposts_require_o2_enabled")
+
+        val result = store.fetchXPosts(site)
+
+        inOrder(restClient, sqlUtils) {
+            verify(restClient).fetch(site)
+            verify(sqlUtils).persistNoXpostsForSite(site)
+        }
+
+        val expected = XPostsResult.apiResult(emptyList())
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `fetchXPosts handles unexpected errors when db returns null`() = test {
+        stubResponseWithError("an_unexpected_error")
+        whenever(sqlUtils.selectXPostsForSite(site)).thenReturn(null)
+
+        val result = store.fetchXPosts(site)
+
+        assertEquals(XPostsResult.Unknown, result)
+    }
+
+    @Test
+    fun `fetchXPosts handles unexpected errors when db returns list`() = test {
+        stubResponseWithError("an_unexpected_error")
+        val xPosts = listOf(mock<XPostSiteModel>())
+        whenever(sqlUtils.selectXPostsForSite(site)).thenReturn(xPosts)
+
+        val result = store.fetchXPosts(site)
+
+        val expected = XPostsResult.dbResult(xPosts)
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `savedXPosts returns Unknown when db returns null`() = test {
+        whenever(sqlUtils.selectXPostsForSite(site)).thenReturn(null)
+        val result = store.getXPostsFromDb(site)
+        assertEquals(XPostsResult.Unknown, result)
+    }
+
+    @Test
+    fun `savedXPosts returns dbResult when db has empty List`() = test {
+        whenever(sqlUtils.selectXPostsForSite(site)).thenReturn(emptyList())
+
+        val result = store.getXPostsFromDb(site)
+
+        val expected = XPostsResult.dbResult(emptyList())
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `savedXPosts returns dbResult when db has xposts`() = test {
+        val xPosts = listOf(mock<XPostSiteModel>())
+        whenever(sqlUtils.selectXPostsForSite(site)).thenReturn(xPosts)
+
+        val result = store.getXPostsFromDb(site)
+
+        val expected = XPostsResult.dbResult(xPosts)
+        assertEquals(expected, result)
+    }
+
+    private suspend fun stubResponseWithError(apiError: String) {
+        val error = mock<WPComGsonRequest.WPComGsonNetworkError>()
+        error.apiError = apiError
+        val restResponse = WPComGsonRequestBuilder.Response.Error<Array<XPostSiteModel>>(error)
+        whenever(restClient.fetch(site)).thenReturn(restResponse)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt
new file mode 100644
index 00000000000..f01250ec493
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt
@@ -0,0 +1,523 @@
+package org.wordpress.android.fluxc.store.blaze
+
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.blaze.BlazeAdForecast
+import org.wordpress.android.fluxc.model.blaze.BlazeAdSuggestion
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignObjective
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignsModel
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethod
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethodUrls
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethods
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingDevice
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingLanguage
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingLocation
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingTopic
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaign
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignListResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsError
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsFetchedPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsRestClient.Companion.DEFAULT_PER_PAGE
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCreationRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.CampaignImage
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao.BlazeCampaignEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao.BlazeCampaignObjectiveEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDeviceEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingLanguageEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingTopicEntity
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.time.Duration.Companion.days
+
+const val SITE_ID = 1L
+
+/* Campaign */
+private const val CAMPAIGN_ID = "1234"
+private const val TITLE = "title"
+private const val IMAGE_URL = "imageUrl"
+private const val CREATED_AT = "2023-06-02T00:00:00.000Z"
+private const val DURATION_IN_DAYS = 10
+private const val UI_STATUS = "rejected"
+private const val IMPRESSIONS = 0L
+private const val CLICKS = 0L
+private const val TOTAL_BUDGET = 100.0
+private const val SPENT_BUDGET = 0.0
+private const val TARGET_URN = "urn:wpcom:post:199247490:9"
+
+private const val SKIP = 0
+private const val TOTAL_ITEMS = 1
+
+private val CAMPAIGN_IMAGE = CampaignImage(
+    height = 100f,
+    width = 100f,
+    mimeType = "image/jpeg",
+    url = IMAGE_URL
+)
+
+private val CAMPAIGN_RESPONSE = BlazeCampaign(
+    id = CAMPAIGN_ID,
+    image = CAMPAIGN_IMAGE,
+    targetUrl = "https://example.com",
+    textSnippet = "Text snippet",
+    siteName = TITLE,
+    clicks = CLICKS,
+    impressions = IMPRESSIONS,
+    spentBudget = SPENT_BUDGET,
+    totalBudget = TOTAL_BUDGET,
+    durationDays = DURATION_IN_DAYS,
+    startTime = CREATED_AT,
+    targetUrn = TARGET_URN,
+    status = UI_STATUS,
+    isEvergreen = false
+)
+
+private val BLAZE_CAMPAIGNS_RESPONSE = BlazeCampaignListResponse(
+    campaigns = listOf(CAMPAIGN_RESPONSE),
+    skipped = SKIP,
+    totalCount = TOTAL_ITEMS,
+)
+
+private val BLAZE_CAMPAIGN_ENTITY = BlazeCampaignEntity(
+    siteId = SITE_ID,
+    campaignId = CAMPAIGN_ID,
+    title = TITLE,
+    imageUrl = IMAGE_URL,
+    startTime = BlazeCampaignsUtils.stringToDate(CREATED_AT),
+    durationInDays = DURATION_IN_DAYS,
+    uiStatus = UI_STATUS,
+    impressions = IMPRESSIONS,
+    clicks = CLICKS,
+    targetUrn = TARGET_URN,
+    totalBudget = TOTAL_BUDGET,
+    spentBudget = SPENT_BUDGET,
+    isEndlessCampaign = false
+)
+private val BLAZE_CAMPAIGNS_MODEL = BlazeCampaignsModel(
+    campaigns = listOf(BLAZE_CAMPAIGN_ENTITY.toDomainModel()),
+    skipped = SKIP,
+    totalItems = TOTAL_ITEMS,
+)
+
+class BlazeCampaignsStoreTest {
+    private val blazeCampaignsRestClient: BlazeCampaignsRestClient = mock()
+    private val creationRestClient: BlazeCreationRestClient = mock()
+    private val blazeCampaignsDao: BlazeCampaignsDao = mock()
+    private val blazeTargetingDao: BlazeTargetingDao = mock()
+    private val blazeObjectivesDao: BlazeObjectivesDao = mock()
+    private val siteModel = SiteModel().apply { siteId = SITE_ID }
+
+    private lateinit var store: BlazeCampaignsStore
+
+    private val successResponse = BLAZE_CAMPAIGNS_RESPONSE
+    private val errorResponse = BlazeCampaignsError(type = GENERIC_ERROR)
+
+    @Before
+    fun setUp() {
+        store = BlazeCampaignsStore(
+            campaignsRestClient = blazeCampaignsRestClient,
+            creationRestClient = creationRestClient,
+            campaignsDao = blazeCampaignsDao,
+            targetingDao = blazeTargetingDao,
+            coroutineEngine = initCoroutineEngine(),
+            blazeObjectivesDao = blazeObjectivesDao
+        )
+    }
+
+    @Test
+    fun `given success, when fetch blaze campaigns is triggered, then values are inserted`() =
+        test {
+            val payload = BlazeCampaignsFetchedPayload(successResponse)
+            whenever(
+                blazeCampaignsRestClient.fetchBlazeCampaigns(
+                    siteModel.siteId, SKIP, DEFAULT_PER_PAGE, "en", null
+                )
+            ).thenReturn(payload)
+
+            store.fetchBlazeCampaigns(siteModel, SKIP)
+
+            verify(blazeCampaignsDao).insertCampaigns(
+                SITE_ID,
+                BLAZE_CAMPAIGNS_MODEL
+            )
+        }
+
+    @Test
+    fun `given error, when fetch blaze campaigns is triggered, then error result is returned`() =
+        test {
+            whenever(
+                blazeCampaignsRestClient.fetchBlazeCampaigns(
+                    any(), any(), any(), any(),  eq(null)
+                )
+            ).thenReturn(
+                BlazeCampaignsFetchedPayload(errorResponse)
+            )
+            val result = store.fetchBlazeCampaigns(siteModel)
+
+            verifyNoInteractions(blazeCampaignsDao)
+            assertThat(result.model).isNull()
+            assertEquals(GENERIC_ERROR, result.error.type)
+            assertNull(result.error.message)
+        }
+
+    @Test
+    fun `given unmatched site, when get is triggered, then empty campaigns list returned`() = test {
+        whenever(blazeCampaignsDao.getCachedCampaigns(SITE_ID)).thenReturn(emptyList())
+
+        val campaigns = store.getBlazeCampaigns(siteModel)
+
+        assertThat(campaigns).isNotNull
+        assertThat(campaigns).isEmpty()
+    }
+
+    @Test
+    fun `given matched site, when get recent is triggered, then campaign is returned`() = test {
+        whenever(blazeCampaignsDao.getMostRecentCampaignForSite(SITE_ID)).thenReturn(
+            BLAZE_CAMPAIGN_ENTITY
+        )
+
+        val result = store.getMostRecentBlazeCampaign(siteModel)
+
+        assertThat(result).isNotNull
+        assertEquals(result?.campaignId, CAMPAIGN_ID)
+        assertEquals(result?.title, TITLE)
+        assertEquals(result?.imageUrl, IMAGE_URL)
+        assertEquals(result?.startTime, BlazeCampaignsUtils.stringToDate(CREATED_AT))
+        assertEquals(result?.durationInDays, DURATION_IN_DAYS)
+        assertEquals(result?.uiStatus, UI_STATUS)
+        assertEquals(result?.impressions, IMPRESSIONS)
+        assertEquals(result?.clicks, CLICKS)
+        assertEquals(result?.targetUrn, TARGET_URN)
+        assertEquals(result?.totalBudget, TOTAL_BUDGET)
+        assertEquals(result?.spentBudget, SPENT_BUDGET)
+    }
+
+    @Test
+    fun `given unmatched site, when get recent is triggered, then campaign is returned`() = test {
+        val result = store.getMostRecentBlazeCampaign(siteModel)
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `when fetching campaign objectives, then persist data in DB`() = test {
+        whenever(creationRestClient.fetchCampaignObjectives(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(
+                List(4) {
+                    BlazeCampaignObjective(
+                        id = it.toString(),
+                        title = "Title $it",
+                        description = "Description $it",
+                        suitableForDescription = "Suitable for description $it"
+                    )
+                }
+            )
+        )
+
+        store.fetchBlazeCampaignObjectives(siteModel)
+
+        verify(blazeObjectivesDao).replaceObjectives(any())
+    }
+
+    @Test
+    fun `when observing campaign objectives, then return data from DB`() = test {
+        whenever(blazeObjectivesDao.observeObjectives(any())).thenReturn(
+            flowOf(
+                List(4) {
+                    BlazeCampaignObjectiveEntity(
+                        id = it.toString(),
+                        title = "Title $it",
+                        description = "Description $it",
+                        suitableForDescription = "Suitable for description $it",
+                        locale = "en"
+                    )
+                }
+            )
+        )
+
+        val objectives = store.observeBlazeCampaignObjectives().first()
+
+        assertThat(objectives).isNotNull
+        assertThat(objectives.size).isEqualTo(4)
+    }
+
+    @Test
+    fun `when fetching targeting locations, then locations are returned`() = test {
+        whenever(creationRestClient.fetchTargetingLocations(any(), any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(
+                List(10) {
+                    BlazeTargetingLocation(
+                        id = it.toLong(),
+                        name = "location",
+                        type = "city",
+                        parent = null
+                    )
+                }
+            )
+        )
+
+        val locations = store.fetchBlazeTargetingLocations(siteModel, "query")
+
+        assertThat(locations.isError).isFalse()
+        assertThat(locations.model).isNotNull
+        assertThat(locations.model?.size).isEqualTo(10)
+    }
+
+    @Test
+    fun `when fetching targeting topics, then persist data in DB`() = test {
+        whenever(creationRestClient.fetchTargetingTopics(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(
+                List(10) {
+                    BlazeTargetingTopic(
+                        id = it.toString(),
+                        description = "Topic $it"
+                    )
+                }
+            )
+        )
+
+        store.fetchBlazeTargetingTopics(siteModel)
+
+        verify(blazeTargetingDao).replaceTopics(any())
+    }
+
+    @Test
+    fun `when observing targeting topics, then return data from DB`() = test {
+        whenever(blazeTargetingDao.observeTopics(any())).thenReturn(
+            flowOf(
+                List(10) {
+                    BlazeTargetingTopicEntity(
+                        id = it.toString(),
+                        description = "Topic $it",
+                        locale = "en"
+                    )
+                }
+            )
+        )
+
+        val topics = store.observeBlazeTargetingTopics().first()
+
+        assertThat(topics).isNotNull
+        assertThat(topics.size).isEqualTo(10)
+    }
+
+    @Test
+    fun `when fetching targeting languages, then persist data in DB`() = test {
+        whenever(creationRestClient.fetchTargetingLanguages(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(
+                List(10) {
+                    BlazeTargetingLanguage(
+                        id = it.toString(),
+                        name = "Language $it"
+                    )
+                }
+            )
+        )
+
+        store.fetchBlazeTargetingLanguages(siteModel)
+
+        verify(blazeTargetingDao).replaceLanguages(any())
+    }
+
+    @Test
+    fun `when observing targeting languages, then return data from DB`() = test {
+        whenever(blazeTargetingDao.observeLanguages(any())).thenReturn(
+            flowOf(
+                List(10) {
+                    BlazeTargetingLanguageEntity(
+                        id = it.toString(),
+                        name = "Language $it",
+                        locale = "en"
+                    )
+                }
+            )
+        )
+
+        val languages = store.observeBlazeTargetingLanguages().first()
+
+        assertThat(languages).isNotNull
+        assertThat(languages.size).isEqualTo(10)
+    }
+
+    @Test
+    fun `when fetching targeting devices, then persist data in DB`() = test {
+        whenever(creationRestClient.fetchTargetingDevices(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(
+                List(10) {
+                    BlazeTargetingDevice(
+                        id = it.toString(),
+                        name = "Device $it"
+                    )
+                }
+            )
+        )
+
+        store.fetchBlazeTargetingDevices(siteModel)
+
+        verify(blazeTargetingDao).replaceDevices(any())
+    }
+
+    @Test
+    fun `when observing targeting devices, then return data from DB`() = test {
+        whenever(blazeTargetingDao.observeDevices(any())).thenReturn(
+            flowOf(
+                List(10) {
+                    BlazeTargetingDeviceEntity(
+                        id = it.toString(),
+                        name = "Device $it",
+                        locale = "en"
+                    )
+                }
+            )
+        )
+
+        val devices = store.observeBlazeTargetingDevices().first()
+
+        assertThat(devices).isNotNull
+        assertThat(devices.size).isEqualTo(10)
+    }
+
+    @Test
+    fun `when fetching targeting ad suggestions, then return data successfully`() = test {
+        val suggestions = List(10) {
+            BlazeAdSuggestion(
+                tagLine = it.toString(),
+                description = "Ad $it",
+                ctaText = "CTA $it"
+            )
+        }
+
+        whenever(creationRestClient.fetchAdSuggestions(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(suggestions)
+        )
+
+        val suggestionsResult = store.fetchBlazeAdSuggestions(siteModel, 1L)
+
+        assertThat(suggestionsResult.isError).isFalse()
+        assertThat(suggestionsResult.model).isEqualTo(suggestions)
+    }
+
+    @Test
+    fun `when fetching ad forecast, then return data successfully`() = test {
+        val forecast = BlazeAdForecast(
+            minImpressions = 100,
+            maxImpressions = 200
+        )
+
+        whenever(
+            creationRestClient.fetchAdForecast(
+                site = any(),
+                startDate = any(),
+                endDate = any(),
+                totalBudget = any(),
+                timeZoneId = any(),
+                targetingParameters = anyOrNull()
+            )
+        ).thenReturn(
+            BlazeCreationRestClient.BlazePayload(forecast)
+        )
+
+        val forecastResult = store.fetchBlazeAdForecast(
+            siteModel,
+            Date(),
+            Date(System.currentTimeMillis() + 7.days.inWholeMilliseconds),
+            100.0,
+        )
+
+        assertThat(forecastResult.isError).isFalse()
+        assertThat(forecastResult.model).isEqualTo(forecast)
+    }
+
+    @Test
+    fun `when fetching payment methods, then return data successfully`() = test {
+        val paymentMethods = BlazePaymentMethods(
+            savedPaymentMethods = listOf(
+                BlazePaymentMethod(
+                    id = "payment-method-id",
+                    name = "Visa **** 4689",
+                    info = BlazePaymentMethod.PaymentMethodInfo.CreditCardInfo(
+                        lastDigits = "4689",
+                        expMonth = 12,
+                        expYear = 2025,
+                        type = "Visa",
+                        nickname = "",
+                        cardHolderName = "John Doe"
+                    )
+                ),
+                BlazePaymentMethod(
+                    id = "payment-method-id-2",
+                    name = "MasterCard **** 1234",
+                    info = BlazePaymentMethod.PaymentMethodInfo.CreditCardInfo(
+                        lastDigits = "1234",
+                        expMonth = 12,
+                        expYear = 2025,
+                        type = "MasterCard",
+                        nickname = "",
+                        cardHolderName = "John Doe"
+                    )
+                )
+            ),
+            addPaymentMethodUrls = BlazePaymentMethodUrls(
+                formUrl = "https://example.com/blaze-pm-add",
+                successUrl = "https://example.com/blaze-pm-success",
+                idUrlParameter = "pmid"
+            )
+        )
+
+        whenever(creationRestClient.fetchPaymentMethods(any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(paymentMethods)
+        )
+
+        val paymentMethodsResult = store.fetchBlazePaymentMethods(siteModel)
+
+        assertThat(paymentMethodsResult.isError).isFalse()
+        assertThat(paymentMethodsResult.model).isEqualTo(paymentMethods)
+    }
+
+    @Test
+    fun `when creating a campaign, then persist it to the DB and return result`() = test {
+        val campaign = BlazeCampaignModel(
+            campaignId = CAMPAIGN_ID,
+            title = TITLE,
+            imageUrl = IMAGE_URL,
+            startTime = BlazeCampaignsUtils.stringToDate(CREATED_AT),
+            durationInDays = DURATION_IN_DAYS,
+            uiStatus = UI_STATUS,
+            impressions = IMPRESSIONS,
+            clicks = CLICKS,
+            targetUrn = TARGET_URN,
+            totalBudget = TOTAL_BUDGET,
+            spentBudget = SPENT_BUDGET,
+            isEndlessCampaign = false
+        )
+
+        whenever(creationRestClient.createCampaign(any(), any())).thenReturn(
+            BlazeCreationRestClient.BlazePayload(campaign)
+        )
+
+        val result = store.createCampaign(siteModel, mock())
+
+        assertThat(result.isError).isFalse()
+        assertThat(result.model).isEqualTo(campaign)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStoreTest.kt
new file mode 100644
index 00000000000..f297dab6811
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStoreTest.kt
@@ -0,0 +1,328 @@
+package org.wordpress.android.fluxc.store.bloggingprompts
+
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsError
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsListResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient.BloggingPromptResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient.BloggingPromptsRespondentAvatar
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsUtils
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao.BloggingPromptEntity
+import org.wordpress.android.fluxc.store.bloggingprompts.BloggingPromptsStore.BloggingPromptsResult
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+const val SITE_LOCAL_ID = 1
+const val ANSWERED_LINK_PREFIX = "https://wordpress.com/tag/dailyprompt-"
+
+private val PROMPTS_RESPONSE: BloggingPromptsListResponse = listOf(
+    BloggingPromptResponse(
+        id = 1,
+        text = "Cast the movie of your life.",
+        date = "2015-01-12",
+        attribution = "",
+        isAnswered = false,
+        respondentsCount = 0,
+        respondentsAvatars = emptyList(),
+        answeredLink = ANSWERED_LINK_PREFIX + 1,
+        answeredLinkText = "View all responses",
+    ),
+
+    BloggingPromptResponse(
+        id = 2,
+        text = "Cast the movie of your life 2.",
+        date = "2015-01-13",
+        attribution = "dayone",
+        isAnswered = true,
+        respondentsCount = 1,
+        respondentsAvatars = listOf(BloggingPromptsRespondentAvatar("http://site/avatar1.jpg")),
+        answeredLink = ANSWERED_LINK_PREFIX + 2,
+        answeredLinkText = "View all responses",
+    ),
+    BloggingPromptResponse(
+        id = 3,
+        text = "Cast the movie of your life 3.",
+        date = "2015-01-14",
+        attribution = "",
+        isAnswered = false,
+        respondentsCount = 3,
+        respondentsAvatars = listOf(
+            BloggingPromptsRespondentAvatar("http://site/avatar1.jpg"),
+            BloggingPromptsRespondentAvatar("http://site/avatar2.jpg"),
+            BloggingPromptsRespondentAvatar("http://site/avatar3.jpg")
+        ),
+        answeredLink = ANSWERED_LINK_PREFIX + 3,
+        answeredLinkText = "View all responses",
+    )
+)
+
+/* MODEL */
+
+private val FIRST_PROMPT_MODEL = BloggingPromptModel(
+    id = 1,
+    text = "Cast the movie of your life.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-12"),
+    isAnswered = false,
+    attribution = "",
+    respondentsCount = 0,
+    respondentsAvatarUrls = emptyList(),
+    answeredLink = ANSWERED_LINK_PREFIX + 1,
+)
+
+private val SECOND_PROMPT_MODEL = BloggingPromptModel(
+    id = 2,
+    text = "Cast the movie of your life 2.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-13"),
+    isAnswered = true,
+    attribution = "dayone",
+    respondentsCount = 1,
+    respondentsAvatarUrls = listOf("http://site/avatar1.jpg"),
+    answeredLink = ANSWERED_LINK_PREFIX + 2,
+)
+
+private val THIRD_PROMPT_MODEL = BloggingPromptModel(
+    id = 3,
+    text = "Cast the movie of your life 3.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-14"),
+    isAnswered = false,
+    attribution = "",
+    respondentsCount = 3,
+    respondentsAvatarUrls = listOf(
+        "http://site/avatar1.jpg",
+        "http://site/avatar2.jpg",
+        "http://site/avatar3.jpg"
+    ),
+    answeredLink = ANSWERED_LINK_PREFIX + 3,
+)
+
+private val PROMPT_MODELS = listOf(FIRST_PROMPT_MODEL, SECOND_PROMPT_MODEL, THIRD_PROMPT_MODEL)
+
+/* ENTITY */
+
+private val FIRST_PROMPT_ENTITY = BloggingPromptEntity(
+    id = 1,
+    siteLocalId = SITE_LOCAL_ID,
+    text = "Cast the movie of your life.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-12"),
+    isAnswered = false,
+    respondentsCount = 0,
+    attribution = "",
+    respondentsAvatars = emptyList(),
+    answeredLink = ANSWERED_LINK_PREFIX + 1,
+)
+
+private val SECOND_PROMPT_ENTITY = BloggingPromptEntity(
+    id = 2,
+    siteLocalId = SITE_LOCAL_ID,
+    text = "Cast the movie of your life 2.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-13"),
+    isAnswered = true,
+    respondentsCount = 1,
+    attribution = "dayone",
+    respondentsAvatars = listOf("http://site/avatar1.jpg"),
+    answeredLink = ANSWERED_LINK_PREFIX + 2,
+)
+
+private val THIRD_PROMPT_ENTITY = BloggingPromptEntity(
+    id = 3,
+    siteLocalId = SITE_LOCAL_ID,
+    text = "Cast the movie of your life 3.",
+    date = BloggingPromptsUtils.stringToDate("2015-01-14"),
+    isAnswered = false,
+    respondentsCount = 3,
+    attribution = "",
+    respondentsAvatars = listOf(
+        "http://site/avatar1.jpg",
+        "http://site/avatar2.jpg",
+        "http://site/avatar3.jpg"
+    ),
+    answeredLink = ANSWERED_LINK_PREFIX + 3,
+)
+
+private val PROMPT_ENTITIES = listOf(FIRST_PROMPT_ENTITY, SECOND_PROMPT_ENTITY, THIRD_PROMPT_ENTITY)
+
+@RunWith(MockitoJUnitRunner::class)
+class BloggingPromptsStoreTest {
+    @Mock private lateinit var siteModel: SiteModel
+    @Mock private lateinit var restClient: BloggingPromptsRestClient
+    @Mock private lateinit var dao: BloggingPromptsDao
+
+    private lateinit var promptsStore: BloggingPromptsStore
+
+    private val numberOfPromptsToFetch = 40
+    private val requestedPromptDate = Date()
+
+    @Before
+    fun setUp() {
+        promptsStore = BloggingPromptsStore(
+            restClient,
+            dao,
+            initCoroutineEngine()
+        )
+        setUpMocks()
+    }
+
+    private fun setUpMocks() {
+        whenever(siteModel.id).thenReturn(SITE_LOCAL_ID)
+    }
+
+    @Test
+    fun `when fetch prompts triggered, then all prompt models are inserted into db`() = test {
+        val payload = BloggingPromptsPayload(PROMPTS_RESPONSE)
+        whenever(
+            restClient.fetchPrompts(
+                siteModel,
+                numberOfPromptsToFetch,
+                requestedPromptDate
+            )
+        ).thenReturn(payload)
+
+        promptsStore.fetchPrompts(siteModel, numberOfPromptsToFetch, requestedPromptDate)
+
+        verify(dao).insertForSite(siteModel.id, PROMPT_MODELS)
+    }
+
+    @Test
+    fun `given cards response, when fetch cards gets triggered, then all prompt models are returned in the result`() =
+        test {
+            val payload = BloggingPromptsPayload(PROMPTS_RESPONSE)
+            whenever(
+                restClient.fetchPrompts(
+                    siteModel,
+                    numberOfPromptsToFetch,
+                    requestedPromptDate
+                )
+            ).thenReturn(
+                payload
+            )
+
+            val result = promptsStore.fetchPrompts(
+                siteModel,
+                numberOfPromptsToFetch,
+                requestedPromptDate
+            )
+
+            assertThat(result.model).isEqualTo(PROMPT_MODELS)
+            assertThat(result.error).isNull()
+        }
+
+    @Test
+    fun `given prompts response with exception, when fetch prompts gets triggered, then prompts error is returned`() =
+        test {
+            val payload = BloggingPromptsPayload(PROMPTS_RESPONSE)
+            whenever(
+                restClient.fetchPrompts(
+                    siteModel,
+                    numberOfPromptsToFetch,
+                    requestedPromptDate
+                )
+            ).thenReturn(
+                payload
+            )
+            whenever(
+                dao.insertForSite(
+                    siteModel.id,
+                    PROMPT_MODELS
+                )
+            ).thenThrow(IllegalStateException("Error"))
+
+            val result = promptsStore.fetchPrompts(
+                siteModel,
+                numberOfPromptsToFetch,
+                requestedPromptDate
+            )
+
+            assertThat(result.model).isNull()
+            assertEquals(BloggingPromptsErrorType.GENERIC_ERROR, result.error.type)
+            assertNull(result.error.message)
+        }
+
+    @Test
+    fun `when get prompts is triggered, then a flow of prompt models is returned`() = test {
+        whenever(dao.getAllPrompts(SITE_LOCAL_ID)).thenReturn(flowOf(PROMPT_ENTITIES))
+
+        val result = promptsStore.getPrompts(siteModel).first()
+
+        assertThat(result).isEqualTo(BloggingPromptsResult(PROMPT_MODELS))
+    }
+
+    @Test
+    fun `when get getPromptByDate is triggered, then a flow with a prompt model is returned`() =
+        test {
+            whenever(
+                dao.getPromptForDate(
+                    SITE_LOCAL_ID,
+                    BloggingPromptsUtils.stringToDate("2015-01-13")
+                )
+            ).thenReturn(flowOf(listOf(SECOND_PROMPT_ENTITY)))
+
+            val result = promptsStore.getPromptForDate(
+                siteModel,
+                BloggingPromptsUtils.stringToDate("2015-01-13")
+            ).first()
+
+            assertThat(result).isEqualTo(BloggingPromptsResult(SECOND_PROMPT_MODEL))
+        }
+
+    @Test
+    fun `when get getPromptById is triggered, then a flow with a prompt model is returned`() =
+        test {
+            whenever(dao.getPrompt(SITE_LOCAL_ID, SECOND_PROMPT_MODEL.id)).thenReturn(
+                flowOf(
+                    listOf(THIRD_PROMPT_ENTITY)
+                )
+            )
+
+            val result = promptsStore.getPromptById(
+                siteModel,
+                SECOND_PROMPT_MODEL.id
+            ).first()
+
+            assertThat(result).isEqualTo(BloggingPromptsResult(THIRD_PROMPT_MODEL))
+        }
+
+    @Test
+    fun `given prompts error, when fetch prompts gets triggered, then prompts error is returned`() =
+        test {
+            val errorType = BloggingPromptsErrorType.API_ERROR
+            val payload = BloggingPromptsPayload<BloggingPromptsListResponse>(
+                BloggingPromptsError(
+                    errorType
+                )
+            )
+            whenever(
+                restClient.fetchPrompts(
+                    siteModel,
+                    numberOfPromptsToFetch,
+                    requestedPromptDate
+                )
+            ).thenReturn(payload)
+
+            val result = promptsStore.fetchPrompts(
+                siteModel,
+                numberOfPromptsToFetch,
+                requestedPromptDate
+            )
+
+            assertThat(result.model).isNull()
+            assertEquals(errorType, result.error.type)
+            assertNull(result.error.message)
+        }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/dashboard/CardsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/dashboard/CardsStoreTest.kt
new file mode 100644
index 00000000000..7e15e7b5c93
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/dashboard/CardsStoreTest.kt
@@ -0,0 +1,784 @@
+package org.wordpress.android.fluxc.store.dashboard
+
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.single
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.ActivityCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.CardOrder
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.DynamicCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.DynamicCardRowModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PagesCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PagesCardModel.PageCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel.PostCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.TodaysStatsCardModel
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivitiesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.CardsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.FetchCardsPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PageResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.PostsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.TodaysStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsUtils
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao.CardEntity
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsPayload
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsResult
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardErrorType
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+/* SITE */
+
+const val SITE_LOCAL_ID = 1
+
+/* TODAY'S STATS */
+
+const val TODAYS_STATS_VIEWS = 100
+const val TODAYS_STATS_VISITORS = 30
+const val TODAYS_STATS_LIKES = 50
+const val TODAYS_STATS_COMMENTS = 10
+
+/* POST */
+
+const val POST_ID = 1
+const val POST_TITLE = "title"
+const val POST_CONTENT = "content"
+const val POST_FEATURED_IMAGE = "featuredImage"
+const val POST_DATE = "2021-12-27 11:33:55"
+
+/* PAGES */
+const val PAGE_ID = 1
+const val PAGE_TITLE = "title"
+const val PAGE_CONTENT = "content"
+const val PAGE_MODIFIED_ON = "2023-03-02 10:26:53"
+const val PAGE_STATUS = "publish"
+const val PAGE_DATE = "2023-03-02 10:30:53"
+
+/* DYNAMIC CARDS */
+const val DYNAMIC_CARD_ID = "year_in_review_2023"
+const val DYNAMIC_CARD_TITLE = "News"
+const val DYNAMIC_CARD_FEATURED_IMAGE = "https://path/to/image"
+const val DYNAMIC_CARD_URL = "https://wordpress.com"
+const val DYNAMIC_CARD_ACTION = "Call to action"
+const val DYNAMIC_CARD_ORDER = "top"
+const val DYNAMIC_CARD_ROW_ICON = "https://path/to/image"
+const val DYNAMIC_CARD_ROW_TITLE = "Row title"
+const val DYNAMIC_CARD_ROW_DESCRIPTION = "Row description"
+
+/* ACTIVITY */
+const val ACTIVITY_ID = "activity123"
+const val ACTIVITY_SUMMARY = "activity"
+const val ACTIVITY_NAME = "name"
+const val ACTIVITY_TYPE = "create a blog"
+const val ACTIVITY_IS_REWINDABLE = false
+const val ACTIVITY_REWIND_ID = "10.0"
+const val ACTIVITY_GRID_ICON = "gridicon.jpg"
+const val ACTIVITY_STATUS = "OK"
+const val ACTIVITY_ACTOR_TYPE = "author"
+const val ACTIVITY_ACTOR_NAME = "John Smith"
+const val ACTIVITY_ACTOR_EXTERNAL_USER_ID = 10L
+const val ACTIVITY_ACTOR_WPCOM_USER_ID = 15L
+const val ACTIVITY_ACTOR_ROLE = "admin"
+const val ACTIVITY_ACTOR_ICON_URL = "dog.jpg"
+const val ACTIVITY_PUBLISHED_DATE = "2021-12-27 11:33:55"
+const val ACTIVITY_CONTENT = "content"
+
+private const val BUILD_NUMBER_PARAM = "build_number_param"
+private const val DEVICE_ID_PARAM = "device_id_param"
+private const val IDENTIFIER_PARAM = "identifier_param"
+private const val MARKETING_VERSION_PARAM = "marketing_version_param"
+private const val PLATFORM_PARAM = "platform_param"
+private const val ANDROID_VERSION_PARAM = "14.0"
+
+/* CARD TYPES */
+
+private val CARD_TYPES = listOf(CardModel.Type.TODAYS_STATS,
+    CardModel.Type.POSTS,
+    CardModel.Type.PAGES,
+    CardModel.Type.ACTIVITY,
+    CardModel.Type.DYNAMIC,
+)
+
+/* RESPONSE */
+
+private val TODAYS_STATS_RESPONSE = TodaysStatsResponse(
+        views = TODAYS_STATS_VIEWS,
+        visitors = TODAYS_STATS_VISITORS,
+        likes = TODAYS_STATS_LIKES,
+        comments = TODAYS_STATS_COMMENTS
+)
+
+private val POST_RESPONSE = PostResponse(
+        id = POST_ID,
+        title = POST_TITLE,
+        content = POST_CONTENT,
+        featuredImage = POST_FEATURED_IMAGE,
+        date = POST_DATE
+)
+
+private val POSTS_RESPONSE = PostsResponse(
+        hasPublished = false,
+        draft = listOf(POST_RESPONSE),
+        scheduled = listOf(POST_RESPONSE)
+)
+
+private val PAGE_RESPONSE = PageResponse(
+    id = PAGE_ID,
+    title = PAGE_TITLE,
+    content = PAGE_CONTENT,
+    modified = PAGE_MODIFIED_ON,
+    status = PAGE_STATUS,
+    date = PAGE_DATE
+)
+
+private val PAGES_RESPONSE = listOf(PAGE_RESPONSE)
+
+private val DYNAMIC_CARD_ROW_RESPONSE = CardsRestClient.DynamicCardRowResponse(
+    icon = DYNAMIC_CARD_ROW_ICON,
+    title = DYNAMIC_CARD_ROW_TITLE,
+    description = DYNAMIC_CARD_ROW_DESCRIPTION
+)
+
+private val DYNAMIC_CARD_ROWS_RESPONSE = listOf(DYNAMIC_CARD_ROW_RESPONSE)
+
+private val DYNAMIC_CARD_RESPONSE = CardsRestClient.DynamicCardResponse(
+    id = DYNAMIC_CARD_ID,
+    title = DYNAMIC_CARD_TITLE,
+    featuredImage = DYNAMIC_CARD_FEATURED_IMAGE,
+    url = DYNAMIC_CARD_URL,
+    action = DYNAMIC_CARD_ACTION,
+    order = DYNAMIC_CARD_ORDER,
+    rows = DYNAMIC_CARD_ROWS_RESPONSE,
+)
+
+private val DYNAMIC_CARDS_RESPONSE = listOf(DYNAMIC_CARD_RESPONSE)
+
+private val ACTIVITY_RESPONSE_ICON = ActivitiesResponse.Icon("jpg", ACTIVITY_ACTOR_ICON_URL, 100, 100)
+private val ACTIVITY_RESPONSE_ACTOR = ActivitiesResponse.Actor(
+    ACTIVITY_ACTOR_TYPE,
+    ACTIVITY_ACTOR_NAME,
+    ACTIVITY_ACTOR_EXTERNAL_USER_ID,
+    ACTIVITY_ACTOR_WPCOM_USER_ID,
+    ACTIVITY_RESPONSE_ICON,
+    ACTIVITY_ACTOR_ROLE
+)
+private val ACTIVITY_RESPONSE_GENERATOR = ActivitiesResponse.Generator(10.3f, 123)
+private val ACTIVITY_RESPONSE_PAGE = ActivitiesResponse.ActivityResponse(
+    summary = ACTIVITY_SUMMARY,
+    content = FormattableContent(text = ACTIVITY_CONTENT),
+    name = ACTIVITY_NAME,
+    actor = ACTIVITY_RESPONSE_ACTOR,
+    type = ACTIVITY_TYPE,
+    published = CardsUtils.fromDate(ACTIVITY_PUBLISHED_DATE),
+    generator = ACTIVITY_RESPONSE_GENERATOR,
+    is_rewindable = ACTIVITY_IS_REWINDABLE,
+    rewind_id = ACTIVITY_REWIND_ID,
+    gridicon = ACTIVITY_GRID_ICON,
+    status = ACTIVITY_STATUS,
+    activity_id = ACTIVITY_ID
+)
+
+private val ACTIVITY_RESPONSE_ACTIVITIES_PAGE = ActivitiesResponse.Page(orderedItems = listOf(ACTIVITY_RESPONSE_PAGE))
+private val ACTIVITY_RESPONSE = ActivitiesResponse(
+    totalItems = 1,
+    summary = "response",
+    current = ACTIVITY_RESPONSE_ACTIVITIES_PAGE
+)
+
+private val CARDS_RESPONSE = CardsResponse(
+        todaysStats = TODAYS_STATS_RESPONSE,
+        posts = POSTS_RESPONSE,
+        pages = PAGES_RESPONSE,
+        activity = ACTIVITY_RESPONSE,
+        dynamic = DYNAMIC_CARDS_RESPONSE,
+)
+
+/* MODEL */
+private val TODAYS_STATS_MODEL = TodaysStatsCardModel(
+        views = TODAYS_STATS_VIEWS,
+        visitors = TODAYS_STATS_VISITORS,
+        likes = TODAYS_STATS_LIKES,
+        comments = TODAYS_STATS_COMMENTS
+)
+
+private val TODAYS_STATS_WITH_ERROR_MODEL = TodaysStatsCardModel(
+        error = TodaysStatsCardError(TodaysStatsCardErrorType.JETPACK_DISCONNECTED)
+)
+
+private val POST_MODEL = PostCardModel(
+        id = POST_ID,
+        title = POST_TITLE,
+        content = POST_CONTENT,
+        featuredImage = POST_FEATURED_IMAGE,
+        date = CardsUtils.fromDate(POST_DATE)
+)
+
+private val POSTS_MODEL = PostsCardModel(
+        hasPublished = false,
+        draft = listOf(POST_MODEL),
+        scheduled = listOf(POST_MODEL)
+)
+
+private val POSTS_WITH_ERROR_MODEL = PostsCardModel(
+        error = PostCardError(PostCardErrorType.UNAUTHORIZED)
+)
+
+private val PAGE_MODEL = PageCardModel(
+        id = PAGE_ID,
+        title = PAGE_TITLE,
+        content = PAGE_CONTENT,
+        lastModifiedOrScheduledOn = CardsUtils.fromDate(PAGE_MODIFIED_ON),
+        status = PAGE_STATUS,
+        date = CardsUtils.fromDate(PAGE_DATE)
+)
+
+private val PAGES_MODEL = PagesCardModel(
+        pages = listOf(PAGE_MODEL)
+)
+
+private val DYNAMIC_CARD_ROW_MODEL = DynamicCardRowModel(
+    icon = DYNAMIC_CARD_ROW_ICON,
+    title = DYNAMIC_CARD_ROW_TITLE,
+    description = DYNAMIC_CARD_ROW_DESCRIPTION
+)
+
+private val DYNAMIC_CARD_MODEL = DynamicCardModel(
+    id = DYNAMIC_CARD_ID,
+    title = DYNAMIC_CARD_TITLE,
+    featuredImage = DYNAMIC_CARD_FEATURED_IMAGE,
+    url = DYNAMIC_CARD_URL,
+    action = DYNAMIC_CARD_ACTION,
+    order = CardOrder.fromString(DYNAMIC_CARD_ORDER),
+    rows = listOf(DYNAMIC_CARD_ROW_MODEL)
+)
+
+private val DYNAMIC_CARDS_MODEL = DynamicCardsModel(
+    dynamicCards = listOf(DYNAMIC_CARD_MODEL)
+)
+
+private val ACTIVITY_LOG_MODEL = ActivityLogModel(
+    summary = ACTIVITY_SUMMARY,
+    content = FormattableContent(text = ACTIVITY_CONTENT),
+    name = ACTIVITY_NAME,
+    actor = ActivityLogModel.ActivityActor(
+        displayName = ACTIVITY_ACTOR_NAME,
+        type = ACTIVITY_ACTOR_TYPE,
+        wpcomUserID = ACTIVITY_ACTOR_WPCOM_USER_ID,
+        avatarURL = ACTIVITY_ACTOR_ICON_URL,
+        role = ACTIVITY_ACTOR_ROLE,
+    ),
+    type = ACTIVITY_TYPE,
+    published = CardsUtils.fromDate(ACTIVITY_PUBLISHED_DATE),
+    rewindable = ACTIVITY_IS_REWINDABLE,
+    rewindID = ACTIVITY_REWIND_ID,
+    gridicon = ACTIVITY_GRID_ICON,
+    status = ACTIVITY_STATUS,
+    activityID = ACTIVITY_ID
+)
+
+private val ACTIVITY_CARD_MODEL = ActivityCardModel(
+    activities = listOf(ACTIVITY_LOG_MODEL)
+)
+
+private val ACTIVITY_CARD_WITH_ERROR_MODEL = ActivityCardModel(
+    error = ActivityCardError(ActivityCardErrorType.UNAUTHORIZED)
+)
+
+private val CARDS_MODEL = listOf(
+        TODAYS_STATS_MODEL,
+        POSTS_MODEL,
+        PAGES_MODEL,
+        ACTIVITY_CARD_MODEL,
+        DYNAMIC_CARDS_MODEL,
+)
+
+/* ENTITY */
+private val TODAYS_STATS_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.TODAYS_STATS.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(TODAYS_STATS_MODEL)
+)
+
+private val TODAY_STATS_WITH_ERROR_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.TODAYS_STATS.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(TODAYS_STATS_WITH_ERROR_MODEL)
+)
+
+private val POSTS_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.POSTS.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(POSTS_MODEL)
+)
+
+private val POSTS_WITH_ERROR_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.POSTS.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(POSTS_WITH_ERROR_MODEL)
+)
+
+private val PAGES_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.PAGES.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(PAGES_MODEL)
+)
+
+private val DYNAMIC_CARDS_ENTITY = CardEntity(
+    siteLocalId = SITE_LOCAL_ID,
+    type = CardModel.Type.DYNAMIC.name,
+    date = CardsUtils.getInsertDate(),
+    json = CardsUtils.GSON.toJson(DYNAMIC_CARDS_MODEL)
+)
+
+private val ACTIVITY_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.ACTIVITY.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(ACTIVITY_CARD_MODEL)
+)
+
+private val ACTIVITY_WITH_ERROR_ENTITY = CardEntity(
+        siteLocalId = SITE_LOCAL_ID,
+        type = CardModel.Type.ACTIVITY.name,
+        date = CardsUtils.getInsertDate(),
+        json = CardsUtils.GSON.toJson(ACTIVITY_CARD_WITH_ERROR_MODEL)
+)
+
+private val CARDS_ENTITY = listOf(
+        TODAYS_STATS_ENTITY,
+        POSTS_ENTITY,
+        PAGES_ENTITY,
+        ACTIVITY_ENTITY,
+        DYNAMIC_CARDS_ENTITY,
+)
+
+@RunWith(MockitoJUnitRunner::class)
+class CardsStoreTest {
+    @Mock private lateinit var siteModel: SiteModel
+    @Mock private lateinit var restClient: CardsRestClient
+    @Mock private lateinit var dao: CardsDao
+    @Mock private lateinit var cardsRespone: CardsResponse
+
+    private lateinit var defaultFetchCardsPayload: FetchCardsPayload
+    private lateinit var cardsStore: CardsStore
+
+    @Before
+    fun setUp() {
+        cardsStore = CardsStore(
+                restClient,
+                dao,
+                initCoroutineEngine()
+        )
+        setUpMocks()
+        defaultFetchCardsPayload = FetchCardsPayload(
+            siteModel,
+            CARD_TYPES,
+            BUILD_NUMBER_PARAM,
+            DEVICE_ID_PARAM,
+            IDENTIFIER_PARAM,
+            MARKETING_VERSION_PARAM,
+            PLATFORM_PARAM,
+            ANDROID_VERSION_PARAM,
+        )
+    }
+
+    private fun setUpMocks() {
+        whenever(siteModel.id).thenReturn(SITE_LOCAL_ID)
+    }
+
+    @Test
+    fun `given all card types, when fetch cards triggered, then all cards model is inserted into db`() = test {
+        val payload = CardsPayload(CARDS_RESPONSE)
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        verify(dao).insertWithDate(siteModel.id, CARDS_MODEL)
+    }
+
+    @Test
+    fun `given todays stats type, when fetch cards triggered, then today's stats card model inserted into db`() = test {
+        val payload = CardsPayload(CardsResponse(todaysStats = TODAYS_STATS_RESPONSE))
+        whenever(
+            restClient.fetchCards(
+                FetchCardsPayload(
+                    siteModel,
+                    listOf(CardModel.Type.TODAYS_STATS),
+                    BUILD_NUMBER_PARAM,
+                    DEVICE_ID_PARAM,
+                    IDENTIFIER_PARAM,
+                    MARKETING_VERSION_PARAM,
+                    PLATFORM_PARAM,
+                    ANDROID_VERSION_PARAM,
+                )
+            )
+        ).thenReturn(payload)
+
+        cardsStore.fetchCards(
+            FetchCardsPayload(
+                siteModel,
+                listOf(CardModel.Type.TODAYS_STATS),
+                BUILD_NUMBER_PARAM,
+                DEVICE_ID_PARAM,
+                IDENTIFIER_PARAM,
+                MARKETING_VERSION_PARAM,
+                PLATFORM_PARAM,
+                ANDROID_VERSION_PARAM,
+            )
+        )
+
+        verify(dao).insertWithDate(siteModel.id, listOf(TODAYS_STATS_MODEL))
+    }
+
+    @Test
+    fun `given posts type, when fetch cards triggered, then post card model inserted into db`() = test {
+        val payload = CardsPayload(CardsResponse(posts = POSTS_RESPONSE))
+        whenever(
+            restClient.fetchCards(
+                FetchCardsPayload(
+                    siteModel,
+                    listOf(CardModel.Type.POSTS),
+                    BUILD_NUMBER_PARAM,
+                    DEVICE_ID_PARAM,
+                    IDENTIFIER_PARAM,
+                    MARKETING_VERSION_PARAM,
+                    PLATFORM_PARAM,
+                    ANDROID_VERSION_PARAM,
+                )
+            )
+        ).thenReturn(payload)
+
+        cardsStore.fetchCards(
+            FetchCardsPayload(
+                siteModel,
+                listOf(CardModel.Type.POSTS),
+                BUILD_NUMBER_PARAM,
+                DEVICE_ID_PARAM,
+                IDENTIFIER_PARAM,
+                MARKETING_VERSION_PARAM,
+                PLATFORM_PARAM,
+                ANDROID_VERSION_PARAM,
+            )
+        )
+
+        verify(dao).insertWithDate(siteModel.id, listOf(POSTS_MODEL))
+    }
+
+    @Test
+    fun `given pages type, when fetch cards triggered, then pages card model inserted into db`() = test {
+        val payload = CardsPayload(CardsResponse(pages = PAGES_RESPONSE))
+        whenever(
+            restClient.fetchCards(
+                FetchCardsPayload(
+                    siteModel,
+                    listOf(CardModel.Type.PAGES),
+                    BUILD_NUMBER_PARAM,
+                    DEVICE_ID_PARAM,
+                    IDENTIFIER_PARAM,
+                    MARKETING_VERSION_PARAM,
+                    PLATFORM_PARAM,
+                    ANDROID_VERSION_PARAM,
+                )
+            )
+        ).thenReturn(payload)
+
+        cardsStore.fetchCards(
+            FetchCardsPayload(
+                siteModel,
+                listOf(CardModel.Type.PAGES),
+                BUILD_NUMBER_PARAM,
+                DEVICE_ID_PARAM,
+                IDENTIFIER_PARAM,
+                MARKETING_VERSION_PARAM,
+                PLATFORM_PARAM,
+                ANDROID_VERSION_PARAM,
+            )
+        )
+
+        verify(dao).insertWithDate(siteModel.id, listOf(PAGES_MODEL))
+    }
+
+    @Test
+    fun `given dynamic cards type, when fetch cards triggered, then dynamic cards model inserted into db`() = test {
+        val payload = CardsPayload(CardsResponse(dynamic = DYNAMIC_CARDS_RESPONSE))
+        whenever(
+            restClient.fetchCards(
+                FetchCardsPayload(
+                    siteModel,
+                    listOf(CardModel.Type.DYNAMIC),
+                    BUILD_NUMBER_PARAM,
+                    DEVICE_ID_PARAM,
+                    IDENTIFIER_PARAM,
+                    MARKETING_VERSION_PARAM,
+                    PLATFORM_PARAM,
+                    ANDROID_VERSION_PARAM,
+                )
+            )
+        ).thenReturn(payload)
+
+        cardsStore.fetchCards(
+            FetchCardsPayload(
+                siteModel,
+                listOf(CardModel.Type.DYNAMIC),
+                BUILD_NUMBER_PARAM,
+                DEVICE_ID_PARAM,
+                IDENTIFIER_PARAM,
+                MARKETING_VERSION_PARAM,
+                PLATFORM_PARAM,
+                ANDROID_VERSION_PARAM,
+            )
+        )
+
+        verify(dao).insertWithDate(siteModel.id, listOf(DYNAMIC_CARDS_MODEL))
+    }
+
+    @Test
+    fun `given activity type, when fetch cards triggered, then activity card model inserted into db`() = test {
+        val payload = CardsPayload(CardsResponse(activity = ACTIVITY_RESPONSE))
+        whenever(
+            restClient.fetchCards(
+                FetchCardsPayload(
+                    siteModel,
+                    listOf(CardModel.Type.ACTIVITY),
+                    BUILD_NUMBER_PARAM,
+                    DEVICE_ID_PARAM,
+                    IDENTIFIER_PARAM,
+                    MARKETING_VERSION_PARAM,
+                    PLATFORM_PARAM,
+                    ANDROID_VERSION_PARAM,
+                )
+            )
+        ).thenReturn(payload)
+
+        cardsStore.fetchCards(
+            FetchCardsPayload(
+                siteModel,
+                listOf(CardModel.Type.ACTIVITY),
+                BUILD_NUMBER_PARAM,
+                DEVICE_ID_PARAM,
+                IDENTIFIER_PARAM,
+                MARKETING_VERSION_PARAM,
+                PLATFORM_PARAM,
+                ANDROID_VERSION_PARAM,
+            )
+        )
+
+        verify(dao).insertWithDate(siteModel.id, listOf(ACTIVITY_CARD_MODEL))
+    }
+
+    @Test
+    fun `given cards response, when fetch cards gets triggered, then empty cards model is returned`() = test {
+        val payload = CardsPayload(CARDS_RESPONSE)
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        val result = cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        assertThat(result.model).isNull()
+        assertThat(result.error).isNull()
+    }
+
+    @Test
+    fun `given card response with exception, when fetch cards gets triggered, then cards error is returned`() = test {
+        val payload = CardsPayload(CARDS_RESPONSE)
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+        whenever(dao.insertWithDate(siteModel.id, CARDS_MODEL)).thenThrow(IllegalStateException("Error"))
+
+        val result = cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        assertThat(result.model).isNull()
+        assertEquals(CardsErrorType.GENERIC_ERROR, result.error.type)
+        assertNull(result.error.message)
+    }
+
+    @Test
+    fun `given cards error, when fetch cards gets triggered, then cards error is returned`() = test {
+        val errorType = CardsErrorType.API_ERROR
+        val payload = CardsPayload<CardsResponse>(CardsError(errorType))
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        val result = cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        assertThat(result.model).isNull()
+        assertEquals(errorType, result.error.type)
+        assertNull(result.error.message)
+    }
+
+    @Test
+    fun `given authorization required, when fetch cards gets triggered, then db is cleared of cards model`() = test {
+        val errorType = CardsErrorType.AUTHORIZATION_REQUIRED
+        val payload = CardsPayload<CardsResponse>(CardsError(errorType))
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        verify(dao).clear()
+    }
+
+    @Test
+    fun `given authorization required, when fetch cards gets triggered, then empty cards model is returned`() = test {
+        val errorType = CardsErrorType.AUTHORIZATION_REQUIRED
+        val payload = CardsPayload<CardsResponse>(CardsError(errorType))
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        val result = cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        assertThat(result.model).isNull()
+        assertThat(result.error).isNull()
+    }
+
+    @Test
+    fun `given empty cards payload, when fetch cards gets triggered, then cards error is returned`() = test {
+        val payload = CardsPayload<CardsResponse>()
+        whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(payload)
+
+        val result = cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        assertThat(result.model).isNull()
+        assertEquals(CardsErrorType.INVALID_RESPONSE, result.error.type)
+        assertNull(result.error.message)
+    }
+
+    @Test
+    fun `when get cards gets triggered, then a flow of cards model is returned`() = test {
+        whenever(dao.get(SITE_LOCAL_ID)).thenReturn(flowOf(CARDS_ENTITY))
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result).isEqualTo(CardsResult(CARDS_MODEL))
+    }
+
+    /* TODAYS STATS CARD WITH ERROR */
+
+    @Test
+    fun `given todays stats card with error, when fetch cards triggered, then card with error inserted into db`() =
+            test {
+                whenever(restClient.fetchCards(defaultFetchCardsPayload)).thenReturn(
+                    CardsPayload(
+                        cardsRespone
+                    )
+                )
+                whenever(cardsRespone.toCards()).thenReturn(listOf(TODAYS_STATS_WITH_ERROR_MODEL))
+
+                cardsStore.fetchCards(defaultFetchCardsPayload)
+
+                verify(dao).insertWithDate(siteModel.id, listOf(TODAYS_STATS_WITH_ERROR_MODEL))
+            }
+
+    @Test
+    fun `given today's stats jetpack disconn error, when get cards triggered, then error exists in the card`() = test {
+        whenever(dao.get(SITE_LOCAL_ID))
+                .thenReturn(
+                        flowOf(listOf(getTodaysStatsErrorCardEntity(TodaysStatsCardErrorType.JETPACK_DISCONNECTED)))
+                )
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result.findTodaysStatsCardError()?.type).isEqualTo(TodaysStatsCardErrorType.JETPACK_DISCONNECTED)
+    }
+
+    @Test
+    fun `given today's stats jetpack disabled error, when get cards triggered, then error exists in the card`() = test {
+        whenever(dao.get(SITE_LOCAL_ID))
+                .thenReturn(flowOf(listOf(getTodaysStatsErrorCardEntity(TodaysStatsCardErrorType.JETPACK_DISABLED))))
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result.findTodaysStatsCardError()?.type).isEqualTo(TodaysStatsCardErrorType.JETPACK_DISABLED)
+    }
+
+    @Test
+    fun `given today's stats jetpack unauth error, when get cards triggered, then error exists in the card`() = test {
+        whenever(dao.get(SITE_LOCAL_ID))
+                .thenReturn(flowOf(listOf(getTodaysStatsErrorCardEntity(TodaysStatsCardErrorType.UNAUTHORIZED))))
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result.findTodaysStatsCardError()?.type).isEqualTo(TodaysStatsCardErrorType.UNAUTHORIZED)
+    }
+
+    /* POSTS CARD WITH ERROR */
+    @Test
+    fun `given posts card with error, when fetch cards triggered, then card with error inserted into db`() = test {
+        whenever(
+            restClient.fetchCards(defaultFetchCardsPayload)
+        ).thenReturn(CardsPayload(cardsRespone))
+        whenever(cardsRespone.toCards()).thenReturn(listOf(POSTS_WITH_ERROR_MODEL))
+
+        cardsStore.fetchCards(defaultFetchCardsPayload)
+
+        verify(dao).insertWithDate(siteModel.id, listOf(POSTS_WITH_ERROR_MODEL))
+    }
+
+    @Test
+    fun `given posts card unauth error, when get cards triggered, then error exists in the card`() = test {
+        whenever(dao.get(SITE_LOCAL_ID)).thenReturn(flowOf(listOf(POSTS_WITH_ERROR_ENTITY)))
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result.findPostsCardError()?.type).isEqualTo(PostCardErrorType.UNAUTHORIZED)
+    }
+
+    /* ACTIVITY CARD WITH ERROR */
+    @Test
+    fun `given activity unauth error, when get cards triggered, then error exists in the card`() = test {
+        whenever(dao.get(SITE_LOCAL_ID))
+            .thenReturn(flowOf(listOf(getActivityErrorCardEntity())))
+
+        val result = cardsStore.getCards(siteModel).single()
+
+        assertThat(result.findActivityCardError()?.type).isEqualTo(ActivityCardErrorType.UNAUTHORIZED)
+    }
+
+    private fun CardsResult<List<CardModel>>.findTodaysStatsCardError(): TodaysStatsCardError? =
+            model?.filterIsInstance(TodaysStatsCardModel::class.java)?.firstOrNull()?.error
+
+    private fun CardsResult<List<CardModel>>.findPostsCardError(): PostCardError? =
+            model?.filterIsInstance(PostsCardModel::class.java)?.firstOrNull()?.error
+
+    private fun CardsResult<List<CardModel>>.findActivityCardError(): ActivityCardError? =
+        model?.filterIsInstance(ActivityCardModel::class.java)?.firstOrNull()?.error
+
+    private fun getTodaysStatsErrorCardEntity(type: TodaysStatsCardErrorType) =
+        TODAY_STATS_WITH_ERROR_ENTITY.copy(
+            json = CardsUtils.GSON.toJson(TodaysStatsCardModel(error = TodaysStatsCardError(type)))
+        )
+
+    private fun getActivityErrorCardEntity() =
+        ACTIVITY_WITH_ERROR_ENTITY.copy(
+            json = CardsUtils.GSON.toJson(
+                ActivityCardModel(
+                    error = ActivityCardError(
+                        ActivityCardErrorType.UNAUTHORIZED
+                    )
+                )
+            )
+        )
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStoreTest.kt
new file mode 100644
index 00000000000..2f485dc80f3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStoreTest.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsError
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsFetchedPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsRestClient.FeatureFlagsPayload
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao
+import org.wordpress.android.fluxc.store.mobile.FeatureFlagsStore.FeatureFlagsResult
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@RunWith(MockitoJUnitRunner::class)
+class FeatureFlagsStoreTest {
+    @Mock private lateinit var restClient: FeatureFlagsRestClient
+    @Mock private lateinit var featureFlagConfigDao: FeatureFlagConfigDao
+    private lateinit var store: FeatureFlagsStore
+
+    private val successResponse = mapOf("flag-1" to true, "flag-2" to false)
+    private val errorResponse = FeatureFlagsError( type = GENERIC_ERROR)
+    private val errorResult = FeatureFlagsError( type = GENERIC_ERROR)
+
+
+    @Before
+    fun setUp() {
+        store = FeatureFlagsStore(restClient, featureFlagConfigDao, initCoroutineEngine())
+    }
+
+    @Test
+    fun `given success, when fetch f-flags is triggered, then result is returned`() = test {
+        whenever(restClient.fetchFeatureFlags(any())).thenReturn(
+            FeatureFlagsFetchedPayload(successResponse)
+        )
+
+        val response = store.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        verify(featureFlagConfigDao).insert(successResponse)
+        assertNotNull(response.featureFlags)
+        assertEquals(FeatureFlagsResult(successResponse), response)
+    }
+
+    @Test
+    fun `given error, when f-flags is triggered, then error result is returned`() = test {
+        whenever(restClient.fetchFeatureFlags(any())).thenReturn(
+            FeatureFlagsFetchedPayload(errorResponse)
+        )
+
+        val response = store.fetchFeatureFlags(
+            FeatureFlagsPayload(
+                buildNumber = BUILD_NUMBER_PARAM,
+                deviceId = DEVICE_ID_PARAM,
+                identifier = IDENTIFIER_PARAM,
+                marketingVersion = MARKETING_VERSION_PARAM,
+                platform = PLATFORM_PARAM,
+                osVersion = OS_VERSION_PARAM,
+            )
+        )
+
+        verifyNoInteractions(featureFlagConfigDao)
+        assertNull(response.featureFlags)
+        assertEquals(FeatureFlagsResult(errorResult), response)
+    }
+
+    companion object {
+        private const val BUILD_NUMBER_PARAM = "build_number_param"
+        private const val DEVICE_ID_PARAM = "device_id_param"
+        private const val IDENTIFIER_PARAM = "identifier_param"
+        private const val MARKETING_VERSION_PARAM = "marketing_version_param"
+        private const val PLATFORM_PARAM = "platform_param"
+        private const val OS_VERSION_PARAM = "os_version_param"
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStoreTest.kt
new file mode 100644
index 00000000000..061b15fdd65
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStoreTest.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.JetpackMigrationRestClient
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload.Success
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload.Error
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class JetpackMigrationStoreTest {
+    @Mock private lateinit var restClient: JetpackMigrationRestClient
+    private lateinit var store: JetpackMigrationStore
+
+    private val successResponse = Success
+    private val errorResponse = Error(BaseNetworkError(SERVER_ERROR))
+
+    @Before
+    fun setUp() {
+        store = JetpackMigrationStore(restClient, initCoroutineEngine())
+    }
+
+    @Test
+    fun `given success, a success result is returned`() = test {
+        whenever(restClient.migrationComplete(any())).thenReturn(Success)
+        val response = store.migrationComplete()
+        assertNotNull(response)
+        assertEquals(successResponse, response)
+    }
+
+    @Test
+    fun `when an error occurs, the error is returned`() = test {
+        whenever(restClient.migrationComplete(any())).thenReturn(errorResponse)
+        val response = store.migrationComplete()
+        assertNotNull(response)
+        assertEquals(errorResponse, response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStoreTest.kt
new file mode 100644
index 00000000000..a653ce57c76
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStoreTest.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigError
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigFetchedPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigRestClient
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao
+import org.wordpress.android.fluxc.store.mobile.RemoteConfigStore.RemoteConfigResult
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@RunWith(MockitoJUnitRunner::class)
+class RemoteConfigStoreTest {
+    @Mock private lateinit var restClient: RemoteConfigRestClient
+    @Mock private lateinit var remoteConfigDao: RemoteConfigDao
+    private lateinit var store: RemoteConfigStore
+
+    private val successResponse = mapOf("jp-deadline" to "2022-10-10")
+    private val errorResponse = RemoteConfigError( type = GENERIC_ERROR)
+    private val errorResult = RemoteConfigError( type = GENERIC_ERROR)
+
+
+    @Before
+    fun setUp() {
+        store = RemoteConfigStore(restClient, remoteConfigDao, initCoroutineEngine())
+    }
+
+    @Test
+    fun `given success, when fetch remote-config is triggered, then result is returned`() = test {
+        whenever(restClient.fetchRemoteConfig()).thenReturn(
+            RemoteConfigFetchedPayload(successResponse)
+        )
+
+        val response = store.fetchRemoteConfig()
+
+        verify(remoteConfigDao).insert(successResponse)
+        assertNotNull(response.remoteConfig)
+        assertEquals(RemoteConfigResult(successResponse), response)
+    }
+
+    @Test
+    fun `given error, when fetch remote-config is triggered, then error result is returned`() = test {
+        whenever(restClient.fetchRemoteConfig()).thenReturn(
+            RemoteConfigFetchedPayload(errorResponse)
+        )
+
+        val response = store.fetchRemoteConfig()
+
+        verifyNoInteractions(remoteConfigDao)
+        assertNull(response.remoteConfig)
+        assertEquals(RemoteConfigResult(errorResult), response)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStoreTest.kt
new file mode 100644
index 00000000000..d7d1da3d35c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStoreTest.kt
@@ -0,0 +1,119 @@
+package org.wordpress.android.fluxc.store.qrcodeauth
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthError
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthAuthenticateResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthValidateResponse
+import org.wordpress.android.fluxc.store.qrcodeauth.QRCodeAuthStore.QRCodeAuthAuthenticateResult
+import org.wordpress.android.fluxc.store.qrcodeauth.QRCodeAuthStore.QRCodeAuthResult
+import org.wordpress.android.fluxc.store.qrcodeauth.QRCodeAuthStore.QRCodeAuthValidateResult
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@RunWith(MockitoJUnitRunner::class)
+class QRCodeAuthStoreTest {
+    @Mock private lateinit var qrcodeAuthRestClient: QRCodeAuthRestClient
+    private lateinit var qrcodeAuthStore: QRCodeAuthStore
+
+    @Before
+    fun setUp() {
+        qrcodeAuthStore = QRCodeAuthStore(qrcodeAuthRestClient, initCoroutineEngine())
+    }
+
+    private val validateResponseSuccess = QRCodeAuthValidateResponse(
+        browser = BROWSER,
+        location = LOCATION,
+        success = SUCCESS
+    )
+
+    private val validateResultSuccess = QRCodeAuthValidateResult(
+        browser = BROWSER,
+        location = LOCATION,
+        success = SUCCESS
+    )
+
+    private val authenticateResponseSuccess = QRCodeAuthAuthenticateResponse(
+        authenticated = AUTHENTICATED
+    )
+
+    private val authenticateResultSuccess = QRCodeAuthAuthenticateResult(
+        authenticated = AUTHENTICATED
+    )
+
+    private val responseError = QRCodeAuthError(
+        type = GENERIC_ERROR
+    )
+
+    private val resultError = QRCodeAuthError(
+        type = GENERIC_ERROR
+    )
+
+    @Test
+    fun `given success, when validate is triggered, then validate result is returned`() = test {
+        whenever(qrcodeAuthRestClient.validate(any(), any())).thenReturn(
+            QRCodeAuthPayload(validateResponseSuccess)
+        )
+
+        val response = qrcodeAuthStore.validate(DATA_PARAM, TOKEN_PARAM)
+
+        assertNotNull(response.model)
+        assertEquals(QRCodeAuthResult(validateResultSuccess), response)
+    }
+
+    @Test
+    fun `given error, when validate is triggered, then error result is returned`() = test {
+        whenever(qrcodeAuthRestClient.validate(any(), any())).thenReturn(
+            QRCodeAuthPayload(responseError)
+        )
+
+        val response = qrcodeAuthStore.validate(DATA_PARAM, TOKEN_PARAM)
+
+        assertNull(response.model)
+        assertEquals(QRCodeAuthResult(resultError), response)
+    }
+
+    @Test
+    fun `given success, when authenticate is triggered, then authenticate result is returned`() = test {
+        whenever(qrcodeAuthRestClient.authenticate(any(), any())).thenReturn(
+            QRCodeAuthPayload(authenticateResponseSuccess)
+        )
+
+        val response = qrcodeAuthStore.authenticate(DATA_PARAM, TOKEN_PARAM)
+
+        assertNotNull(response.model)
+        assertEquals(QRCodeAuthResult(authenticateResultSuccess), response)
+    }
+
+    @Test
+    fun `given error, when authenticate is triggered, then error result is returned`() = test {
+        whenever(qrcodeAuthRestClient.authenticate(any(), any())).thenReturn(
+            QRCodeAuthPayload(responseError)
+        )
+
+        val response = qrcodeAuthStore.authenticate(DATA_PARAM, TOKEN_PARAM)
+
+        assertNull(response.model)
+        assertEquals(QRCodeAuthResult(resultError), response)
+    }
+
+    companion object {
+        private const val TOKEN_PARAM = "token_param"
+        private const val DATA_PARAM = "data_param"
+        private const val BROWSER = "Chrome"
+        private const val LOCATION = "Secaucus, New Jersey"
+        private const val SUCCESS = true
+        private const val AUTHENTICATED = true
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsFixtures.kt
new file mode 100644
index 00000000000..526d77a3ebe
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsFixtures.kt
@@ -0,0 +1,172 @@
+package org.wordpress.android.fluxc.store.stats
+
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse.StatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient.CommentsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowData
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowData.FollowParams
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse.FollowerResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse.Discussion
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse.YearInsightsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse.Streak
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse.Streaks
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse.Service
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient.SummaryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse.TagsGroup
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse.TagsGroup.TagResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import java.util.Date
+
+val DATE = Date(10)
+const val VISITORS = 10
+const val VIEWS = 15
+const val POSTS = 20
+const val VIEWS_BEST_DAY = "Monday"
+const val VIEWS_BEST_DAY_TOTAL = 25
+val ALL_TIME_RESPONSE = AllTimeResponse(
+        DATE, StatsResponse(
+        VISITORS,
+        VIEWS,
+        POSTS,
+        VIEWS_BEST_DAY,
+        VIEWS_BEST_DAY_TOTAL
+)
+)
+
+const val HIGHEST_DAY_OF_WEEK = 10
+const val HIGHEST_HOUR = 15
+const val HIGHEST_DAY_PERCENT = 2.0
+const val HIGHEST_HOUR_PERCENT = 5.0
+val YEAR_INSIGHT = YearInsightsResponse(5.0, 2.0, 1.0, 50.5, 100, 200, 100, 150, 15000, "2019")
+val MOST_POPULAR_RESPONSE = MostPopularResponse(
+        HIGHEST_DAY_OF_WEEK,
+        HIGHEST_HOUR,
+        HIGHEST_DAY_PERCENT,
+        HIGHEST_HOUR_PERCENT,
+        listOf(YEAR_INSIGHT)
+)
+
+const val POSTS_FOUND = 15
+const val ID: Long = 2
+const val TITLE = "title"
+const val URL = "URL"
+const val LIKE_COUNT = 5
+const val COMMENT_COUNT = 10
+const val FEATURED_IMAGE = ""
+val LATEST_POST = PostResponse(
+        ID,
+        TITLE,
+        DATE,
+        URL,
+        LIKE_COUNT, Discussion(COMMENT_COUNT), FEATURED_IMAGE
+)
+
+val FIELDS = listOf("period", "views")
+const val FIRST_DAY = "2018-10-01"
+const val FIRST_DAY_VIEWS = 10
+const val SECOND_DAY = "2018-10-02"
+const val SECOND_DAY_VIEWS = 11
+val DATA = listOf(listOf(FIRST_DAY, FIRST_DAY_VIEWS.toString()), listOf(
+        SECOND_DAY, SECOND_DAY_VIEWS.toString()))
+
+val POST_STATS_RESPONSE = PostStatsResponse(0, 0, 0,
+        VIEWS, null,
+        DATA,
+        FIELDS, listOf(), mapOf(), mapOf())
+
+const val REBLOG_COUNT = 13
+const val POST_COUNT = 17
+val VISITS_FIELDS = listOf("period", "views", "visitors", "likes", "reblogs", "comments", "posts")
+const val VISITS_DATE = "2018-11-02"
+val VISITS_DATA = listOf(
+        VISITS_DATE,
+        "$VIEWS",
+        "$VISITORS",
+        "$LIKE_COUNT",
+        "$REBLOG_COUNT",
+        "$COMMENT_COUNT",
+        "$POST_COUNT"
+)
+val VISITS_RESPONSE = VisitResponse(
+        FIRST_DAY, "day",
+        VISITS_FIELDS, listOf(VISITS_DATA)
+)
+const val USER_LABEL = "John Smith"
+const val AVATAR = "avatar.jpg"
+val PARAMS = FollowParams("follow", "following", "FollowingHover", true, "55", "75", "Source", "Blog.com")
+val FOLLOWER_RESPONSE = FollowerResponse(
+        USER_LABEL,
+        AVATAR,
+        URL,
+        DATE,
+        FollowData("type", PARAMS)
+)
+val FOLLOWER_RESPONSE_2 = FollowerResponse(
+        "Two",
+        AVATAR,
+        URL,
+        DATE,
+        FollowData("type", PARAMS)
+)
+val FOLLOWERS_RESPONSE = FollowersResponse(0, 10, 100, 70, 30, listOf(FOLLOWER_RESPONSE))
+val VIEW_ALL_FOLLOWERS_RESPONSE = listOf(
+        FollowersResponse(0, 10, 100, 70, 30, listOf(FOLLOWER_RESPONSE)),
+        FollowersResponse(0, 10, 100, 70, 30, listOf(FOLLOWER_RESPONSE_2)))
+
+val AUTHOR = CommentsResponse.Author(
+        USER_LABEL,
+        URL,
+        AVATAR,
+        COMMENT_COUNT
+)
+val POST = CommentsResponse.Post(
+        TITLE,
+        URL,
+        ID,
+        COMMENT_COUNT
+)
+val TOP_COMMENTS_RESPONSE = CommentsResponse(
+        FIRST_DAY,
+        COMMENT_COUNT,
+        COMMENT_COUNT,
+        SECOND_DAY,
+        listOf(AUTHOR),
+        listOf(POST)
+)
+val SUMMARY_RESPONSE = SummaryResponse(LIKE_COUNT, COMMENT_COUNT, 100)
+val SERVICE_RESPONSE = Service("facebook", 100)
+val PUBLICIZE_RESPONSE = PublicizeResponse(listOf(SERVICE_RESPONSE))
+
+const val FIRST_TAG_NAME = "Tag 1"
+const val SECOND_TAG_NAME = "Tag 2"
+const val TAG_TYPE = "tag"
+val FIRST_TAG = TagResponse(
+        FIRST_TAG_NAME,
+        TAG_TYPE,
+        URL
+)
+val SECOND_TAG = TagResponse(
+        SECOND_TAG_NAME,
+        TAG_TYPE,
+        URL
+)
+val TAGS_RESPONSE = TagsResponse(
+        FIRST_DAY,
+        listOf(
+                TagsGroup(10, listOf(FIRST_TAG)), TagsGroup(5, listOf(
+                FIRST_TAG,
+                SECOND_TAG
+        ))))
+val POSTING_ACTIVITY_RESPONSE = PostingActivityResponse(
+        Streaks(
+                Streak("2018-01-01", "2018-02-01", 20),
+                Streak("2018-02-01", "2018-04-01", 100)
+        ), mapOf(100L to 1, 200L to 1)
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsStoreTest.kt
new file mode 100644
index 00000000000..3116092437d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/InsightsStoreTest.kt
@@ -0,0 +1,570 @@
+package org.wordpress.android.fluxc.store.stats
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.CommentsModel
+import org.wordpress.android.fluxc.model.stats.FollowersModel
+import org.wordpress.android.fluxc.model.stats.InsightsAllTimeModel
+import org.wordpress.android.fluxc.model.stats.InsightsLatestPostModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.PagedMode
+import org.wordpress.android.fluxc.model.stats.PublicizeModel
+import org.wordpress.android.fluxc.model.stats.TagsModel
+import org.wordpress.android.fluxc.model.stats.VisitsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient.CommentsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.EMAIL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.WP_COM
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse.Discussion
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.AllTimeSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.CommentsInsightsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.DetailedPostStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.EmailFollowersSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.FollowersSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.LatestPostDetailSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.PublicizeSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.TagsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.TodayInsightsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.WpComFollowersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.insights.AllTimeInsightsStore
+import org.wordpress.android.fluxc.store.stats.insights.CommentsStore
+import org.wordpress.android.fluxc.store.stats.insights.FollowersStore
+import org.wordpress.android.fluxc.store.stats.insights.LatestPostInsightsStore
+import org.wordpress.android.fluxc.store.stats.insights.PublicizeStore
+import org.wordpress.android.fluxc.store.stats.insights.TagsStore
+import org.wordpress.android.fluxc.store.stats.insights.TodayInsightsStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val PAGE_SIZE = 8
+private const val PAGE = 1
+private val LOAD_MODE_INITIAL = PagedMode(PAGE_SIZE, false)
+private val CACHE_MODE_TOP = LimitMode.Top(PAGE_SIZE)
+
+@RunWith(MockitoJUnitRunner::class)
+class InsightsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var allTimeInsightsRestClient: AllTimeInsightsRestClient
+    @Mock lateinit var commentsRestClient: CommentsRestClient
+    @Mock lateinit var followersRestClient: FollowersRestClient
+    @Mock lateinit var latestPostInsightsRestClient: LatestPostInsightsRestClient
+    @Mock lateinit var publicizeRestClient: PublicizeRestClient
+    @Mock lateinit var tagsRestClient: TagsRestClient
+    @Mock lateinit var todayInsightsRestClient: TodayInsightsRestClient
+    @Mock lateinit var allTimeSqlUtils: AllTimeSqlUtils
+    @Mock lateinit var commentInsightsSqlUtils: CommentsInsightsSqlUtils
+    @Mock
+    lateinit var followersSqlUtils: FollowersSqlUtils
+    @Mock lateinit var wpComFollowersSqlUtils: WpComFollowersSqlUtils
+    @Mock lateinit var emailFollowersSqlUtils: EmailFollowersSqlUtils
+    @Mock lateinit var latestPostDetailSqlUtils: LatestPostDetailSqlUtils
+    @Mock lateinit var detailedPostStatsSqlUtils: DetailedPostStatsSqlUtils
+    @Mock lateinit var publicizeSqlUtils: PublicizeSqlUtils
+    @Mock lateinit var tagsSqlUtils: TagsSqlUtils
+    @Mock lateinit var todaySqlUtils: TodayInsightsSqlUtils
+    @Mock lateinit var mapper: InsightsMapper
+    private lateinit var allTimeStore: AllTimeInsightsStore
+    private lateinit var commentsStore: CommentsStore
+    private lateinit var followersStore: FollowersStore
+    private lateinit var latestPostStore: LatestPostInsightsStore
+    private lateinit var publicizeStore: PublicizeStore
+    private lateinit var tagsStore: TagsStore
+    private lateinit var todayStore: TodayInsightsStore
+    @Before
+    fun setUp() {
+        allTimeStore = AllTimeInsightsStore(
+                allTimeInsightsRestClient,
+                allTimeSqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+        commentsStore = CommentsStore(
+                commentsRestClient,
+                commentInsightsSqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+        followersStore = FollowersStore(
+            followersRestClient,
+            followersSqlUtils,
+            wpComFollowersSqlUtils,
+            emailFollowersSqlUtils,
+            mapper,
+            initCoroutineEngine()
+        )
+        latestPostStore = LatestPostInsightsStore(
+                latestPostInsightsRestClient,
+                latestPostDetailSqlUtils,
+                detailedPostStatsSqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+        publicizeStore = PublicizeStore(
+                publicizeRestClient,
+                publicizeSqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+        tagsStore = TagsStore(
+                tagsRestClient,
+                tagsSqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+        todayStore = TodayInsightsStore(
+                todayInsightsRestClient,
+                todaySqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns all time insights per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                ALL_TIME_RESPONSE
+        )
+        val forced = true
+        whenever(allTimeInsightsRestClient.fetchAllTimeInsights(site, forced)).thenReturn(fetchInsightsPayload)
+        val model = mock<InsightsAllTimeModel>()
+        whenever(mapper.map(ALL_TIME_RESPONSE, site)).thenReturn(model)
+
+        val responseModel = allTimeStore.fetchAllTimeInsights(site, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(allTimeSqlUtils).insert(site, ALL_TIME_RESPONSE)
+    }
+
+    @Test
+    fun `returns error when all time insights call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<AllTimeResponse>(StatsError(type, message))
+        val forced = true
+        whenever(allTimeInsightsRestClient.fetchAllTimeInsights(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = allTimeStore.fetchAllTimeInsights(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns all time insights from db`() {
+        whenever(allTimeSqlUtils.select(site)).thenReturn(ALL_TIME_RESPONSE)
+        val model = mock<InsightsAllTimeModel>()
+        whenever(mapper.map(ALL_TIME_RESPONSE, site)).thenReturn(model)
+
+        val result = allTimeStore.getAllTimeInsights(site)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns latest post insights per site`() = test {
+        val postsResponse = PostsResponse(
+                POSTS_FOUND, listOf(LATEST_POST)
+        )
+        val fetchInsightsPayload = FetchStatsPayload(
+                postsResponse
+        )
+        val forced = true
+        whenever(latestPostInsightsRestClient.fetchLatestPostForInsights(site, forced)).thenReturn(fetchInsightsPayload)
+        val viewsResponse = POST_STATS_RESPONSE
+        whenever(latestPostInsightsRestClient.fetchPostStats(site, ID, forced)).thenReturn(
+                FetchStatsPayload(
+                        viewsResponse
+                )
+        )
+        val model = mock<InsightsLatestPostModel>()
+        whenever(mapper.map(
+                LATEST_POST,
+                POST_STATS_RESPONSE, site)).thenReturn(model)
+
+        val responseModel = latestPostStore.fetchLatestPostInsights(site, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(latestPostDetailSqlUtils).insert(site, LATEST_POST)
+        verify(detailedPostStatsSqlUtils).insert(site, viewsResponse, postId = LATEST_POST.id)
+    }
+
+    @Test
+    fun `returns latest post insights from db`() {
+        whenever(latestPostDetailSqlUtils.select(site)).thenReturn(LATEST_POST)
+        whenever(detailedPostStatsSqlUtils.select(site, LATEST_POST.id)).thenReturn(POST_STATS_RESPONSE)
+        val model = mock<InsightsLatestPostModel>()
+        whenever(mapper.map(
+                LATEST_POST,
+                POST_STATS_RESPONSE, site)).thenReturn(model)
+
+        val result = latestPostStore.getLatestPostInsights(site)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when latest post insights call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PostsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(latestPostInsightsRestClient.fetchLatestPostForInsights(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = latestPostStore.fetchLatestPostInsights(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns error when latest post views insights call fail`() = test {
+        val postsFound = 15
+        val id: Long = 2
+        val title = "title"
+        val date = Date(10)
+        val url = "url"
+        val likeCount = 5
+        val commentCount = 10
+        val featuredImage = ""
+        val latestPost = PostResponse(
+            id, title, date, url, likeCount, Discussion(commentCount), featuredImage
+        )
+        val fetchInsightsPayload = FetchStatsPayload(
+                PostsResponse(
+                        postsFound, listOf(latestPost)
+                )
+        )
+        val forced = true
+        whenever(latestPostInsightsRestClient.fetchLatestPostForInsights(site, forced)).thenReturn(fetchInsightsPayload)
+
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PostStatsResponse>(StatsError(type, message))
+        whenever(latestPostInsightsRestClient.fetchPostStats(site, id, forced)).thenReturn(errorPayload)
+
+        val responseModel = latestPostStore.fetchLatestPostInsights(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns today stats per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                VISITS_RESPONSE
+        )
+        val forced = true
+        whenever(todayInsightsRestClient.fetchTimePeriodStats(site, DAYS, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<VisitsModel>()
+        whenever(mapper.map(VISITS_RESPONSE)).thenReturn(model)
+
+        val responseModel = todayStore.fetchTodayInsights(site, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(todaySqlUtils).insert(site, VISITS_RESPONSE)
+    }
+
+    @Test
+    fun `returns today stats from db`() {
+        whenever(todaySqlUtils.select(site)).thenReturn(VISITS_RESPONSE)
+        val model = mock<VisitsModel>()
+        whenever(mapper.map(VISITS_RESPONSE)).thenReturn(model)
+
+        val result = todayStore.getTodayInsights(site)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when today stats call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<VisitResponse>(StatsError(type, message))
+        val forced = true
+        whenever(todayInsightsRestClient.fetchTimePeriodStats(site, DAYS, forced)).thenReturn(errorPayload)
+
+        val responseModel = todayStore.fetchTodayInsights(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns WPCOM followers per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                FOLLOWERS_RESPONSE
+        )
+        val forced = true
+        whenever(followersRestClient.fetchFollowers(site, WP_COM, PAGE, PAGE_SIZE, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = FollowersModel(0, emptyList(), false)
+        whenever(wpComFollowersSqlUtils.selectAll(site)).thenReturn(listOf(FOLLOWERS_RESPONSE))
+        whenever(mapper.mapAndMergeFollowersModels(listOf(FOLLOWERS_RESPONSE), WP_COM, LimitMode.All))
+                .thenReturn(model)
+        val responseModel = followersStore.fetchWpComFollowers(site, LOAD_MODE_INITIAL, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(wpComFollowersSqlUtils).insert(
+                site,
+                FOLLOWERS_RESPONSE,
+                requestedItems = PAGE_SIZE,
+                replaceExistingData = true
+        )
+    }
+
+    @Test
+    fun `returns email followers per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                FOLLOWERS_RESPONSE
+        )
+        val forced = true
+        whenever(followersRestClient.fetchFollowers(site, EMAIL, PAGE, PAGE_SIZE, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = FollowersModel(0, emptyList(), false)
+        whenever(emailFollowersSqlUtils.selectAll(site)).thenReturn(listOf(FOLLOWERS_RESPONSE))
+        whenever(mapper.mapAndMergeFollowersModels(listOf(FOLLOWERS_RESPONSE), EMAIL, LimitMode.All))
+                .thenReturn(model)
+        val responseModel = followersStore.fetchEmailFollowers(site, LOAD_MODE_INITIAL, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(emailFollowersSqlUtils).insert(
+                site,
+                FOLLOWERS_RESPONSE,
+                requestedItems = PAGE_SIZE,
+                replaceExistingData = true
+        )
+    }
+
+    @Test
+    fun `returns WPCOM followers from db`() {
+        val model = mock<FollowersModel>()
+        whenever(wpComFollowersSqlUtils.selectAll(site)).thenReturn(listOf(FOLLOWERS_RESPONSE))
+        whenever(mapper.mapAndMergeFollowersModels(listOf(FOLLOWERS_RESPONSE), WP_COM, LimitMode.Top(PAGE_SIZE)))
+                .thenReturn(model)
+
+        val result = followersStore.getWpComFollowers(site, CACHE_MODE_TOP)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns email followers from db`() {
+        val model = mock<FollowersModel>()
+        whenever(emailFollowersSqlUtils.selectAll(site)).thenReturn(listOf(FOLLOWERS_RESPONSE))
+        whenever(mapper.mapAndMergeFollowersModels(listOf(FOLLOWERS_RESPONSE), EMAIL, LimitMode.Top(PAGE_SIZE)))
+                .thenReturn(model)
+
+        val result = followersStore.getEmailFollowers(site, CACHE_MODE_TOP)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when WPCOM followers call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<FollowersResponse>(StatsError(type, message))
+        val forced = true
+        whenever(followersRestClient.fetchFollowers(site, WP_COM, PAGE, PAGE_SIZE, forced)).thenReturn(errorPayload)
+
+        val responseModel = followersStore.fetchWpComFollowers(site, LOAD_MODE_INITIAL, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns error when email followers call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<FollowersResponse>(StatsError(type, message))
+        val forced = true
+        whenever(followersRestClient.fetchFollowers(site, EMAIL, PAGE, PAGE_SIZE, forced)).thenReturn(errorPayload)
+
+        val responseModel = followersStore.fetchEmailFollowers(site, LOAD_MODE_INITIAL, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns top comments per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                TOP_COMMENTS_RESPONSE
+        )
+        val forced = true
+        whenever(commentsRestClient.fetchTopComments(site, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<CommentsModel>()
+        whenever(mapper.map(TOP_COMMENTS_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val responseModel = commentsStore.fetchComments(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(commentInsightsSqlUtils).insert(site, TOP_COMMENTS_RESPONSE, requestedItems = PAGE_SIZE)
+    }
+
+    @Test
+    fun `returns top comments from db`() {
+        whenever(commentInsightsSqlUtils.select(site)).thenReturn(TOP_COMMENTS_RESPONSE)
+        val model = mock<CommentsModel>()
+        whenever(mapper.map(TOP_COMMENTS_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val result = commentsStore.getComments(site, LimitMode.Top(PAGE_SIZE))
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when top comments call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<CommentsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(commentsRestClient.fetchTopComments(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = commentsStore.fetchComments(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns tags and categories per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                TAGS_RESPONSE
+        )
+        val forced = true
+        whenever(tagsRestClient.fetchTags(site, PAGE_SIZE + 1, forced = forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<TagsModel>()
+        whenever(mapper.map(TAGS_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val responseModel = tagsStore.fetchTags(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(tagsSqlUtils).insert(site, TAGS_RESPONSE, requestedItems = PAGE_SIZE)
+    }
+
+    @Test
+    fun `returns tags and categories from db`() {
+        whenever(tagsSqlUtils.select(site)).thenReturn(TAGS_RESPONSE)
+        val model = mock<TagsModel>()
+        whenever(mapper.map(TAGS_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val result = tagsStore.getTags(site, LimitMode.Top(PAGE_SIZE))
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when tags and categories call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<TagsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(tagsRestClient.fetchTags(site, PAGE_SIZE + 1, forced = forced)).thenReturn(errorPayload)
+
+        val responseModel = tagsStore.fetchTags(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns publicize data per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                PUBLICIZE_RESPONSE
+        )
+        val forced = true
+        whenever(publicizeRestClient.fetchPublicizeData(site, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<PublicizeModel>()
+        whenever(mapper.map(PUBLICIZE_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val responseModel = publicizeStore.fetchPublicizeData(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(publicizeSqlUtils).insert(site, PUBLICIZE_RESPONSE)
+    }
+
+    @Test
+    fun `returns publicize data from db`() {
+        whenever(publicizeSqlUtils.select(site)).thenReturn(PUBLICIZE_RESPONSE)
+        val model = mock<PublicizeModel>()
+        whenever(mapper.map(PUBLICIZE_RESPONSE, LimitMode.Top(PAGE_SIZE))).thenReturn(model)
+
+        val result = publicizeStore.getPublicizeData(site, LimitMode.Top(PAGE_SIZE))
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns error when publicize data call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PublicizeResponse>(StatsError(type, message))
+        val forced = true
+        whenever(publicizeRestClient.fetchPublicizeData(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = publicizeStore.fetchPublicizeData(site, LimitMode.Top(PAGE_SIZE), forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/PostDetailStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/PostDetailStoreTest.kt
new file mode 100644
index 00000000000..ea65b423df7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/PostDetailStoreTest.kt
@@ -0,0 +1,87 @@
+package org.wordpress.android.fluxc.store.stats
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.PostDetailStatsMapper
+import org.wordpress.android.fluxc.model.stats.PostDetailStatsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.DetailedPostStatsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class PostDetailStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: LatestPostInsightsRestClient
+    @Mock lateinit var sqlUtils: DetailedPostStatsSqlUtils
+    @Mock lateinit var mapper: PostDetailStatsMapper
+    private lateinit var store: PostDetailStore
+    private val postId: Long = 1L
+
+    @Before
+    fun setUp() {
+        store = PostDetailStore(
+                restClient,
+                sqlUtils,
+                initCoroutineEngine(),
+                mapper
+        )
+    }
+
+    @Test
+    fun `returns post detail stats per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                POST_STATS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchPostStats(site, postId, forced)).thenReturn(fetchInsightsPayload)
+        val model = mock<PostDetailStatsModel>()
+        whenever(mapper.map(POST_STATS_RESPONSE)).thenReturn(model)
+
+        val responseModel = store.fetchPostDetail(site, postId, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, POST_STATS_RESPONSE, postId = postId)
+    }
+
+    @Test
+    fun `returns error when post detail stats call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PostStatsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchPostStats(site, postId, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchPostDetail(site, postId, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns post detail from DB`() = test {
+        whenever(sqlUtils.select(site, postId)).thenReturn(POST_STATS_RESPONSE)
+        val model = mock<PostDetailStatsModel>()
+        whenever(mapper.map(POST_STATS_RESPONSE)).thenReturn(model)
+
+        val dbModel = store.getPostDetail(site, postId)
+
+        assertThat(dbModel).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStoreTest.kt
new file mode 100644
index 00000000000..b1ff68f02d5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStoreTest.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.InsightsMostPopularModel
+import org.wordpress.android.fluxc.model.stats.YearsInsightsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.MostPopularSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.MOST_POPULAR_RESPONSE
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class MostPopularInsightsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: MostPopularRestClient
+    @Mock lateinit var sqlUtils: MostPopularSqlUtils
+    @Mock lateinit var mapper: InsightsMapper
+    private lateinit var store: MostPopularInsightsStore
+    @Before
+    fun setUp() {
+        store = MostPopularInsightsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns most popular insights per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                MOST_POPULAR_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchMostPopularInsights(site, forced)).thenReturn(fetchInsightsPayload)
+        val model = mock<InsightsMostPopularModel>()
+        whenever(mapper.map(MOST_POPULAR_RESPONSE, site)).thenReturn(model)
+
+        val responseModel = store.fetchMostPopularInsights(site, forced)
+
+        Assertions.assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, MOST_POPULAR_RESPONSE)
+    }
+
+    @Test
+    fun `returns error when most popular insights call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<MostPopularResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchMostPopularInsights(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchMostPopularInsights(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns most popular insights from db`() {
+        whenever(sqlUtils.select(site)).thenReturn(MOST_POPULAR_RESPONSE)
+        val model = mock<InsightsMostPopularModel>()
+        whenever(mapper.map(MOST_POPULAR_RESPONSE, site)).thenReturn(model)
+
+        val result = store.getMostPopularInsights(site)
+
+        Assertions.assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns years insights per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                MOST_POPULAR_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchMostPopularInsights(site, forced)).thenReturn(fetchInsightsPayload)
+        val model = mock<YearsInsightsModel>()
+        whenever(mapper.map(MOST_POPULAR_RESPONSE)).thenReturn(model)
+
+        val responseModel = store.fetchYearsInsights(site, forced)
+
+        Assertions.assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, MOST_POPULAR_RESPONSE)
+    }
+
+    @Test
+    fun `returns years insights from db`() {
+        whenever(sqlUtils.select(site)).thenReturn(MOST_POPULAR_RESPONSE)
+        val model = mock<YearsInsightsModel>()
+        whenever(mapper.map(MOST_POPULAR_RESPONSE)).thenReturn(model)
+
+        val result = store.getYearsInsights(site)
+
+        Assertions.assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStoreTest.kt
new file mode 100644
index 00000000000..9c7da59441d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStoreTest.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.PostingActivitySqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.POSTING_ACTIVITY_RESPONSE
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class PostingActivityStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: PostingActivityRestClient
+    @Mock lateinit var sqlUtils: PostingActivitySqlUtils
+    @Mock lateinit var mapper: InsightsMapper
+    private lateinit var store: PostingActivityStore
+    private val startDate = Day(2018, 1, 1)
+    private val endDate = Day(2019, 1, 1)
+    @Before
+    fun setUp() {
+        store = PostingActivityStore(
+                restClient,
+                sqlUtils,
+                initCoroutineEngine(),
+                mapper
+        )
+    }
+
+    @Test
+    fun `fetches posting activity per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                POSTING_ACTIVITY_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchPostingActivity(site, startDate, endDate, forced)).thenReturn(fetchInsightsPayload)
+        val model = mock<PostingActivityModel>()
+        whenever(mapper.map(POSTING_ACTIVITY_RESPONSE, startDate, endDate)).thenReturn(model)
+
+        val responseModel = store.fetchPostingActivity(site, startDate, endDate, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, POSTING_ACTIVITY_RESPONSE)
+    }
+
+    @Test
+    fun `fetches error when posting activity call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PostingActivityResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchPostingActivity(site, startDate, endDate, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchPostingActivity(site, startDate, endDate, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `loads posting activity per site from DB`() = test {
+        whenever(sqlUtils.select(site)).thenReturn(POSTING_ACTIVITY_RESPONSE)
+        val model = mock<PostingActivityModel>()
+        whenever(mapper.map(POSTING_ACTIVITY_RESPONSE, startDate, endDate)).thenReturn(model)
+
+        val dbModel = store.getPostingActivity(site, startDate, endDate)
+
+        assertThat(dbModel).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStoreTest.kt
new file mode 100644
index 00000000000..4b20e37bde8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStoreTest.kt
@@ -0,0 +1,80 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.SummaryModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient.SummaryResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.SummarySqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.stats.SUMMARY_RESPONSE
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(MockitoJUnitRunner::class)
+class SummaryStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: SummaryRestClient
+    @Mock lateinit var sqlUtils: SummarySqlUtils
+    @Mock lateinit var mapper: InsightsMapper
+    private lateinit var store: SummaryStore
+
+    @Before
+    fun setUp() {
+        store = SummaryStore(restClient, sqlUtils, mapper, initCoroutineEngine())
+    }
+
+    @Test
+    fun `returns summary per site`() = test {
+        val fetchSummaryPayload = FetchStatsPayload(SUMMARY_RESPONSE)
+        val forced = true
+        whenever(restClient.fetchSummary(site, forced)).thenReturn(fetchSummaryPayload)
+        val model = mock<SummaryModel>()
+        whenever(mapper.map(SUMMARY_RESPONSE)).thenReturn(model)
+
+        val responseModel = store.fetchSummary(site, forced)
+
+        Assertions.assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, SUMMARY_RESPONSE)
+    }
+
+    @Test
+    fun `returns error when summary call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<SummaryResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchSummary(site, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchSummary(site, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns summary from db`() {
+        whenever(sqlUtils.select(site)).thenReturn(SUMMARY_RESPONSE)
+        val model = mock<SummaryModel>()
+        whenever(mapper.map(SUMMARY_RESPONSE)).thenReturn(model)
+
+        val result = store.getSummary(site)
+
+        Assertions.assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersFixtures.kt
new file mode 100644
index 00000000000..2aa7db5228f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersFixtures.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.store.stats.subscribers
+
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersModel
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersModel.PeriodData
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient.SubscribersResponse
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+
+val SUBSCRIBERS_RESPONSE = SubscribersResponse(
+    "2024-04-22",
+    "day",
+    listOf("period", "subscribers"),
+    listOf(listOf("2024-04-21", "10"))
+)
+val SUBSCRIBERS_MODEL = SubscribersModel("2018-04-22", listOf(PeriodData("2024-04-22", 10)))
+val INVALID_DATA_ERROR = StatsError(INVALID_RESPONSE, "Subscribers: Required data 'period' or 'dates' missing")
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStoreTest.kt
new file mode 100644
index 00000000000..b868409aef2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStoreTest.kt
@@ -0,0 +1,152 @@
+package org.wordpress.android.fluxc.store.stats.subscribers
+
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersMapper
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient.SubscribersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SubscribersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val QUANTITY = 8
+private val LIMIT_MODE = LimitMode.Top(QUANTITY)
+private const val FORMATTED_DATE = "2024-04-22"
+
+@RunWith(MockitoJUnitRunner::class)
+class SubscribersStoreTest {
+    @Mock
+    lateinit var site: SiteModel
+
+    @Mock
+    lateinit var restClient: SubscribersRestClient
+
+    @Mock
+    lateinit var sqlUtils: SubscribersSqlUtils
+
+    @Mock
+    lateinit var statsUtils: StatsUtils
+
+    @Mock
+    lateinit var currentTimeProvider: CurrentTimeProvider
+
+    @Mock
+    lateinit var mapper: SubscribersMapper
+
+    @Mock
+    lateinit var appLogWrapper: AppLogWrapper
+    private lateinit var store: SubscribersStore
+
+    @Before
+    fun setUp() {
+        store = SubscribersStore(
+            restClient,
+            sqlUtils,
+            mapper,
+            statsUtils,
+            currentTimeProvider,
+            initCoroutineEngine(),
+            appLogWrapper
+        )
+        val currentDate = Date(0)
+        whenever(currentTimeProvider.currentDate()).thenReturn(currentDate)
+        val timeZone = "GMT"
+        whenever(site.timezone).thenReturn(timeZone)
+        whenever(statsUtils.getFormattedDate(eq(currentDate), any())).thenReturn(FORMATTED_DATE)
+    }
+
+    @Test
+    fun `returns data per site`() = test {
+        val fetchSubscribersPayload = FetchStatsPayload(SUBSCRIBERS_RESPONSE)
+        val forced = true
+        whenever(restClient.fetchSubscribers(site, DAYS, QUANTITY, FORMATTED_DATE, forced))
+            .thenReturn(fetchSubscribersPayload)
+        whenever(mapper.map(SUBSCRIBERS_RESPONSE, LIMIT_MODE)).thenReturn(SUBSCRIBERS_MODEL)
+
+        val responseModel = store.fetchSubscribers(site, DAYS, LIMIT_MODE, forced)
+
+        Assertions.assertThat(responseModel.model).isEqualTo(SUBSCRIBERS_MODEL)
+        verify(sqlUtils).insert(site, SUBSCRIBERS_RESPONSE, DAYS, FORMATTED_DATE, QUANTITY)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, FORMATTED_DATE, QUANTITY)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, FORMATTED_DATE)).thenReturn(SUBSCRIBERS_RESPONSE)
+        val model = mock<SubscribersModel>()
+        whenever(mapper.map(SUBSCRIBERS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchSubscribers(site, DAYS, LIMIT_MODE, forced)
+
+        Assertions.assertThat(responseModel.model).isEqualTo(model)
+        Assertions.assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<String>(), isNull())
+    }
+
+    @Test
+    fun `returns error when invalid data`() = test {
+        val forced = true
+        val fetchInsightsPayload = FetchStatsPayload(SUBSCRIBERS_RESPONSE)
+        whenever(restClient.fetchSubscribers(site, DAYS, QUANTITY, FORMATTED_DATE, forced))
+            .thenReturn(fetchInsightsPayload)
+        val emptyModel = SubscribersModel("", emptyList())
+        whenever(mapper.map(SUBSCRIBERS_RESPONSE, LIMIT_MODE)).thenReturn(emptyModel)
+
+        val responseModel = store.fetchSubscribers(site, DAYS, LIMIT_MODE, forced)
+
+        Assertions.assertThat(responseModel.error.type).isEqualTo(INVALID_DATA_ERROR.type)
+        Assertions.assertThat(responseModel.error.message).isEqualTo(INVALID_DATA_ERROR.message)
+    }
+
+    @Test
+    fun `returns error when data call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<SubscribersResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchSubscribers(site, DAYS, QUANTITY, FORMATTED_DATE, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchSubscribers(site, DAYS, LIMIT_MODE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns data from db`() {
+        whenever(sqlUtils.select(site, DAYS, FORMATTED_DATE)).thenReturn(SUBSCRIBERS_RESPONSE)
+        val model = mock<SubscribersModel>()
+        whenever(mapper.map(SUBSCRIBERS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getSubscribers(site, DAYS, LIMIT_MODE)
+
+        Assertions.assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStoreTest.kt
new file mode 100644
index 00000000000..dc771379ee8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStoreTest.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.AuthorsModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.AuthorsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class AuthorsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: AuthorsRestClient
+    @Mock lateinit var sqlUtils: AuthorsSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: AuthorsStore
+    @Before
+    fun setUp() {
+        store = AuthorsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns data per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                AUTHORS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchAuthors(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<AuthorsModel>()
+        whenever(mapper.map(AUTHORS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val responseModel = store.fetchAuthors(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isFalse()
+        verify(sqlUtils).insert(site, AUTHORS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(AUTHORS_RESPONSE)
+        val model = mock<AuthorsModel>()
+        whenever(mapper.map(AUTHORS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchAuthors(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when data call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<AuthorsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchAuthors(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchAuthors(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns data from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(AUTHORS_RESPONSE)
+        val model = mock<AuthorsModel>()
+        whenever(mapper.map(AUTHORS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getAuthors(site, DAYS, LIMIT_MODE, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ClicksStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ClicksStoreTest.kt
new file mode 100644
index 00000000000..e54d2a6dce7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ClicksStoreTest.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.ClicksModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ClicksSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val DATE = Date(0)
+private val limitMode = LimitMode.Top(ITEMS_TO_LOAD)
+
+@RunWith(MockitoJUnitRunner::class)
+class ClicksStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: ClicksRestClient
+    @Mock lateinit var sqlUtils: ClicksSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: ClicksStore
+    @Before
+    fun setUp() {
+        store = ClicksStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns clicks per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                CLICKS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchClicks(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<ClicksModel>()
+        whenever(mapper.map(CLICKS_RESPONSE, limitMode)).thenReturn(model)
+
+        val responseModel = store.fetchClicks(site, DAYS, limitMode, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, CLICKS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(CLICKS_RESPONSE)
+        val model = mock<ClicksModel>()
+        whenever(mapper.map(CLICKS_RESPONSE, limitMode)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchClicks(site, DAYS, limitMode, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when clicks call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<ClicksResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchClicks(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchClicks(site, DAYS, limitMode, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns clicks from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(CLICKS_RESPONSE)
+        val model = mock<ClicksModel>()
+        whenever(mapper.map(CLICKS_RESPONSE, limitMode)).thenReturn(model)
+
+        val result = store.getClicks(site, DAYS, limitMode, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStoreTest.kt
new file mode 100644
index 00000000000..d10f004d13a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStoreTest.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.CountryViewsModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.CountryViewsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class CountryViewsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: CountryViewsRestClient
+    @Mock lateinit var sqlUtils: CountryViewsSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: CountryViewsStore
+    @Before
+    fun setUp() {
+        store = CountryViewsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns country views per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                COUNTRY_VIEWS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchCountryViews(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced))
+                .thenReturn(fetchInsightsPayload)
+        val model = mock<CountryViewsModel>()
+        whenever(mapper.map(COUNTRY_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val responseModel = store.fetchCountryViews(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, COUNTRY_VIEWS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(COUNTRY_VIEWS_RESPONSE)
+        val model = mock<CountryViewsModel>()
+        whenever(mapper.map(COUNTRY_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchCountryViews(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when country views call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<CountryViewsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchCountryViews(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchCountryViews(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns country views from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(COUNTRY_VIEWS_RESPONSE)
+        val model = mock<CountryViewsModel>()
+        whenever(mapper.map(COUNTRY_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getCountryViews(site, DAYS, LIMIT_MODE, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStoreTest.kt
new file mode 100644
index 00000000000..befec8f027c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStoreTest.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.FileDownloadsModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.FileDownloadsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class FileDownloadsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: FileDownloadsRestClient
+    @Mock lateinit var sqlUtils: FileDownloadsSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: FileDownloadsStore
+    @Before
+    fun setUp() {
+        store = FileDownloadsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns file downloads per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                FILE_DOWNLOADS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchFileDownloads(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced))
+                .thenReturn(fetchInsightsPayload)
+        val model = mock<FileDownloadsModel>()
+        whenever(mapper.map(FILE_DOWNLOADS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val responseModel = store.fetchFileDownloads(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, FILE_DOWNLOADS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(FILE_DOWNLOADS_RESPONSE)
+        val model = mock<FileDownloadsModel>()
+        whenever(mapper.map(FILE_DOWNLOADS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchFileDownloads(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when file downloads call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<FileDownloadsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchFileDownloads(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchFileDownloads(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns file downloads from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(FILE_DOWNLOADS_RESPONSE)
+        val model = mock<FileDownloadsModel>()
+        whenever(mapper.map(FILE_DOWNLOADS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getFileDownloads(site, DAYS, LIMIT_MODE, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStoreTest.kt
new file mode 100644
index 00000000000..9bbea3f0fe8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStoreTest.kt
@@ -0,0 +1,113 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.PostsAndPagesSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class PostAndPageViewsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: PostAndPageViewsRestClient
+    @Mock lateinit var sqlUtils: PostsAndPagesSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: PostAndPageViewsStore
+    @Before
+    fun setUp() {
+        store = PostAndPageViewsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns post and page views per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                POST_AND_PAGE_VIEWS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchPostAndPageViews(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<PostAndPageViewsModel>()
+        whenever(mapper.map(POST_AND_PAGE_VIEWS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val responseModel = store.fetchPostAndPageViews(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, POST_AND_PAGE_VIEWS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(POST_AND_PAGE_VIEWS_RESPONSE)
+        val model = mock<PostAndPageViewsModel>()
+        whenever(mapper.map(POST_AND_PAGE_VIEWS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchPostAndPageViews(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when post and page day views call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<PostAndPageViewsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchPostAndPageViews(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                errorPayload
+        )
+
+        val responseModel = store.fetchPostAndPageViews(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns post and page day views from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(POST_AND_PAGE_VIEWS_RESPONSE)
+        val model = mock<PostAndPageViewsModel>()
+        whenever(mapper.map(POST_AND_PAGE_VIEWS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val result = store.getPostAndPageViews(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt
new file mode 100644
index 00000000000..b88352aec68
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStoreTest.kt
@@ -0,0 +1,241 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.ReferrersModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReportReferrerAsSpamResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ReferrersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.ReportReferrerAsSpamPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+
+private const val ITEMS_TO_LOAD = 8
+private val DATE = Date(0)
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+
+@RunWith(MockitoJUnitRunner::class)
+class ReferrersStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: ReferrersRestClient
+    @Mock lateinit var sqlUtils: ReferrersSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: ReferrersStore
+    private val domain: String = "example.referral.com"
+    @Before
+    fun setUp() {
+        store = ReferrersStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns referrers per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                REFERRERS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchReferrers(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<ReferrersModel>()
+        whenever(mapper.map(REFERRERS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val responseModel = store.fetchReferrers(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, REFERRERS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(REFERRERS_RESPONSE)
+        val model = mock<ReferrersModel>()
+        whenever(mapper.map(REFERRERS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchReferrers(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when referrers call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<ReferrersResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchReferrers(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchReferrers(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE, forced)
+
+        assertThat(responseModel.error).isNotNull
+        val error = responseModel.error!!
+        assertThat(error.type).isEqualTo(type)
+        assertThat(error.message).isEqualTo(message)
+    }
+
+    @Test
+    fun `returns referrers from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(REFERRERS_RESPONSE)
+        val model = mock<ReferrersModel>()
+        whenever(mapper.map(REFERRERS_RESPONSE, LimitMode.Top(ITEMS_TO_LOAD))).thenReturn(model)
+
+        val result = store.getReferrers(site, DAYS, LimitMode.Top(ITEMS_TO_LOAD), DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+
+    @Test
+    fun `returns successful when report referrer as spam`() = test {
+        val date = Date()
+        val restResponse = ReportReferrerAsSpamPayload(ReportReferrerAsSpamResponse(true))
+        whenever(restClient.reportReferrerAsSpam(site, domain)).thenReturn(restResponse)
+        whenever(sqlUtils.select(site, YEARS, date)).thenReturn(REFERRERS_RESPONSE)
+
+        val result = store.reportReferrerAsSpam(
+                site,
+                domain,
+                YEARS,
+                LIMIT_MODE,
+                date
+        )
+
+        assertThat(result.model?.success).isEqualTo(true)
+    }
+
+    @Test
+    fun `report referrer as spam doesnt mark spam when cache fails`() = test {
+        val date = Date()
+        val restResponse = ReportReferrerAsSpamPayload(ReportReferrerAsSpamResponse(true))
+        whenever(restClient.reportReferrerAsSpam(site, domain)).thenReturn(restResponse)
+        whenever(sqlUtils.select(site, YEARS, date)).thenReturn(null)
+
+        val result = store.reportReferrerAsSpam(
+                site,
+                domain,
+                YEARS,
+                LIMIT_MODE,
+                date
+        )
+
+        assertThat(result.model?.success).isEqualTo(true)
+    }
+
+    @Test
+    fun `returns error when report referrer as spam causes network error`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = ReportReferrerAsSpamPayload<ReportReferrerAsSpamResponse>(StatsError(type, message))
+        whenever(restClient.reportReferrerAsSpam(site, domain)).thenReturn(errorPayload)
+
+        val result = store.reportReferrerAsSpam(
+                site,
+                domain,
+                YEARS,
+                LIMIT_MODE,
+                Date()
+        )
+
+        assertThat(result.error).isNotNull
+        val error = result.error!!
+        assertThat(error.type).isEqualTo(type)
+        assertThat(error.message).isEqualTo(message)
+    }
+
+    @Test
+    fun `returns successful when unreport referrer as spam`() = test {
+        val restResponse = ReportReferrerAsSpamPayload(ReportReferrerAsSpamResponse(true))
+        whenever(restClient.unreportReferrerAsSpam(site, domain)).thenReturn(restResponse)
+
+        val result = store.unreportReferrerAsSpam(
+                site,
+                domain,
+                YEARS,
+                LIMIT_MODE,
+                Date()
+        )
+
+        assertThat(result.model?.success).isTrue
+    }
+
+    @Test
+    fun `returns error when unreport referrer as spam causes network error`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = ReportReferrerAsSpamPayload<ReportReferrerAsSpamResponse>(StatsError(type, message))
+        whenever(restClient.unreportReferrerAsSpam(site, domain)).thenReturn(errorPayload)
+
+        val result = store.unreportReferrerAsSpam(
+                site,
+                domain,
+                YEARS,
+                LIMIT_MODE,
+                Date()
+        )
+
+        assertThat(result.error).isNotNull
+        val error = result.error!!
+        assertThat(error.type).isEqualTo(type)
+        assertThat(error.message).isEqualTo(message)
+    }
+
+    @Test
+    fun `set spam to true`() = test {
+        val groupResult = store.setSelectForSpam(REFERRERS_RESPONSE, "url_group_2.com", true)
+
+        // Asserting group 1 is set with spam as false and group 2 is set with spam as true
+        assertThat(groupResult.referrerGroups[0].markedAsSpam).isFalse()
+        assertThat(groupResult.referrerGroups[1].markedAsSpam).isTrue()
+
+        val referrerResult = store.setSelectForSpam(REFERRERS_RESPONSE, "john.com", true)
+        assertThat(referrerResult.referrerGroups[0].referrers!![0].markedAsSpam).isTrue()
+
+        val childResult = store.setSelectForSpam(REFERRERS_RESPONSE, "child.com", true)
+        assertThat(childResult.referrerGroups[0].referrers!![0].markedAsSpam).isTrue()
+    }
+
+    @Test
+    fun `set spam to false`() = test {
+        val groupResultWithSpam = store.setSelectForSpam(REFERRERS_RESPONSE, "url_group_2.com", true)
+        val groupResult = store.setSelectForSpam(groupResultWithSpam, "url_group_2.com", false)
+
+        // Asserting group 1 and group 2 is set with spam to false
+        assertThat(groupResult.referrerGroups[0].markedAsSpam).isFalse()
+        assertThat(groupResult.referrerGroups[1].markedAsSpam).isFalse()
+
+        val referrerResultWitSpam = store.setSelectForSpam(REFERRERS_RESPONSE, "john.com", true)
+        val referrerResult = store.setSelectForSpam(referrerResultWitSpam, "john.com", false)
+        assertThat(referrerResult.referrerGroups[0].referrers!![0].markedAsSpam).isFalse()
+
+        val childResultWithSpam = store.setSelectForSpam(REFERRERS_RESPONSE, "child.com", true)
+        val childResult = store.setSelectForSpam(childResultWithSpam, "child.com", false)
+        assertThat(childResult.referrerGroups[0].referrers!![0].markedAsSpam).isFalse()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStoreTest.kt
new file mode 100644
index 00000000000..932750e1871
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStoreTest.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.SearchTermsModel
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SearchTermsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class SearchTermsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: SearchTermsRestClient
+    @Mock lateinit var sqlUtils: SearchTermsSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: SearchTermsStore
+    @Before
+    fun setUp() {
+        store = SearchTermsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns search terms per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                SEARCH_TERMS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchSearchTerms(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<SearchTermsModel>()
+        whenever(mapper.map(SEARCH_TERMS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val responseModel = store.fetchSearchTerms(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, SEARCH_TERMS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(SEARCH_TERMS_RESPONSE)
+        val model = mock<SearchTermsModel>()
+        whenever(mapper.map(SEARCH_TERMS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchSearchTerms(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when search terms call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<SearchTermsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchSearchTerms(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchSearchTerms(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns search terms from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(SEARCH_TERMS_RESPONSE)
+        val model = mock<SearchTermsModel>()
+        whenever(mapper.map(SEARCH_TERMS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getSearchTerms(site, DAYS, LIMIT_MODE, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/TimeStatsFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/TimeStatsFixtures.kt
new file mode 100644
index 00000000000..866aba084a3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/TimeStatsFixtures.kt
@@ -0,0 +1,143 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel
+import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel.PeriodData
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse.Author
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse.Post
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse.ClickGroup
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse.CountryInfo
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse.CountryView
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse.Day
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse.File
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse.ViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse.ViewsResponse.PostViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse.Child
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse.Referrer
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse.ReferrerGroup
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse.SearchTerm
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse.Play
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.stats.DATE
+import org.wordpress.android.fluxc.store.stats.POST_COUNT
+
+const val DAY_GRANULARITY = "day"
+const val TYPE = "post"
+const val TOTAL_VIEWS = 100
+const val POST_ID = 1L
+const val POST_TITLE = "ABCD"
+const val POST_URL = "url.com"
+const val POST_VIEWS = 10
+
+val DAY_POST_VIEW_RESPONSE = PostViewsResponse(
+        POST_ID,
+        POST_TITLE,
+        TYPE,
+        POST_URL,
+        POST_VIEWS
+)
+val DAY_POST_VIEW_RESPONSE_LIST = List(POST_COUNT) { DAY_POST_VIEW_RESPONSE }
+val DAY_VIEW_RESPONSE_MAP = mapOf(
+        DATE.toString() to ViewsResponse(
+                DAY_POST_VIEW_RESPONSE_LIST,
+                TOTAL_VIEWS
+        )
+)
+val POST_AND_PAGE_VIEWS_RESPONSE = PostAndPageViewsResponse(
+        DATE,
+        DAY_VIEW_RESPONSE_MAP,
+        DAY_GRANULARITY
+)
+
+const val GROUP_ID_1 = "group ID 1"
+const val GROUP_ID_2 = "group ID 2"
+val REFERRER = Referrer(
+        GROUP_ID_1,
+        "John Smith",
+        "john.jpg",
+        "john.com",
+        30,
+        listOf(Child("child.com")),
+        false
+)
+val GROUP_WITH_REFERRALS = ReferrerGroup(
+        GROUP_ID_1,
+        "Group 1",
+        "icon_group_1.jpg",
+        "url_group_1.com",
+        50,
+        referrers = listOf(REFERRER),
+        markedAsSpam = false
+)
+val GROUP_WITH_EMPTY_REFERRALS = ReferrerGroup(
+        GROUP_ID_2,
+        "Group 2",
+        "icon_group_2.jpg",
+        "url_group_2.com",
+        50,
+        null,
+        markedAsSpam = false
+)
+val REFERRERS_RESPONSE = ReferrersResponse(
+        null,
+        10,
+        20,
+        listOf(GROUP_WITH_REFERRALS, GROUP_WITH_EMPTY_REFERRALS)
+)
+val CLICK_GROUP = ClickGroup(GROUP_ID_1, "Click name", "click.jpg", "click.com", 20, null)
+val CLICKS_RESPONSE = ClicksResponse(null, mapOf("2018-10-10" to ClicksResponse.Groups(10, 15, listOf(CLICK_GROUP))))
+val VISITS_AND_VIEWS_RESPONSE = VisitsAndViewsResponse(
+        "2018-10-10",
+        listOf("period", "views", "likes", "comments", "visitors"),
+        listOf(listOf("2018-10-09", "10", "15", "20", "25")),
+        "day"
+)
+val INVALID_DATA_ERROR = StatsError(INVALID_RESPONSE, "Overview: Required data 'period' or 'dates' missing")
+val VISITS_AND_VIEWS_MODEL = VisitsAndViewsModel(
+        "2018-10-10",
+        listOf<PeriodData>(PeriodData("2018-10-10", 10, 10, 10, 10, 10, 10))
+)
+const val COUNTRY_CODE = "CZ"
+val COUNTRY_VIEWS_RESPONSE = CountryViewsResponse(
+        mapOf(COUNTRY_CODE to CountryInfo("flag.jpg", "flatFlag.jpg", "123", "Czech Republic")), days = mapOf(
+        "2018-10-10" to Day(
+                10, 20, listOf(
+                CountryView(COUNTRY_CODE, 150)
+        )
+        )
+)
+)
+val AUTHOR = Author(
+        "John", 5, "avatar.jpg", null, listOf(
+        Post("15", "Post 1", 100, "post.com")
+)
+)
+val AUTHORS_GROUP = AuthorsResponse.Groups(10, listOf(AUTHOR))
+val AUTHORS_RESPONSE = AuthorsResponse("day", mapOf("2018-10-10" to AUTHORS_GROUP))
+val SEARCH_TERMS_RESPONSE = SearchTermsResponse("day", mapOf("2018-10-10" to SearchTermsResponse.Day(10, 15, 20, listOf(
+        SearchTerm("search term", 20)
+))))
+val PLAY = Play("post1", "Post 1", "post1.com", 50)
+val VIDEO_PLAYS_RESPONSE = VideoPlaysResponse(
+        "day",
+        mapOf("2018-10-10" to VideoPlaysResponse.Days(10, 15, listOf(PLAY)))
+)
+val FILE_DOWNLOAD = File("file.txt", 153)
+val FILE_DOWNLOADS_RESPONSE = FileDownloadsResponse(
+        "day", null, mapOf(
+        "2019-10-10" to FileDownloadsResponse.Group(
+                0, 0, listOf(
+                FILE_DOWNLOAD
+        )
+        )
+)
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStoreTest.kt
new file mode 100644
index 00000000000..93da24f1a74
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStoreTest.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.model.stats.time.VideoPlaysModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VideoPlaysSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private val DATE = Date(0)
+
+@RunWith(MockitoJUnitRunner::class)
+class VideoPlaysStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: VideoPlaysRestClient
+    @Mock lateinit var sqlUtils: VideoPlaysSqlUtils
+    @Mock lateinit var mapper: TimeStatsMapper
+    private lateinit var store: VideoPlaysStore
+    @Before
+    fun setUp() {
+        store = VideoPlaysStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun `returns video plays per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                VIDEO_PLAYS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchVideoPlays(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val model = mock<VideoPlaysModel>()
+        whenever(mapper.map(VIDEO_PLAYS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val responseModel = store.fetchVideoPlays(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        verify(sqlUtils).insert(site, VIDEO_PLAYS_RESPONSE, DAYS, DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(VIDEO_PLAYS_RESPONSE)
+        val model = mock<VideoPlaysModel>()
+        whenever(mapper.map(VIDEO_PLAYS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchVideoPlays(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<Date>(), isNull())
+    }
+
+    @Test
+    fun `returns error when video plays call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<VideoPlaysResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchVideoPlays(site, DAYS, DATE, ITEMS_TO_LOAD + 1, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchVideoPlays(site, DAYS, LIMIT_MODE, DATE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns video plays from db`() {
+        whenever(sqlUtils.select(site, DAYS, DATE)).thenReturn(VIDEO_PLAYS_RESPONSE)
+        val model = mock<VideoPlaysModel>()
+        whenever(mapper.map(VIDEO_PLAYS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getVideoPlays(site, DAYS, LIMIT_MODE, DATE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStoreTest.kt
new file mode 100644
index 00000000000..0df5bc55b43
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStoreTest.kt
@@ -0,0 +1,149 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VisitsAndViewsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.API_ERROR
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private const val ITEMS_TO_LOAD = 8
+private val LIMIT_MODE = LimitMode.Top(ITEMS_TO_LOAD)
+private const val FORMATTED_DATE = "2019-10-10"
+
+@RunWith(MockitoJUnitRunner::class)
+class VisitsAndViewsStoreTest {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var restClient: VisitAndViewsRestClient
+    @Mock lateinit var sqlUtils: VisitsAndViewsSqlUtils
+    @Mock lateinit var statsUtils: StatsUtils
+    @Mock lateinit var currentTimeProvider: CurrentTimeProvider
+    @Mock lateinit var mapper: TimeStatsMapper
+    @Mock lateinit var appLogWrapper: AppLogWrapper
+    private lateinit var store: VisitsAndViewsStore
+    @Before
+    fun setUp() {
+        store = VisitsAndViewsStore(
+                restClient,
+                sqlUtils,
+                mapper,
+                statsUtils,
+                currentTimeProvider,
+                initCoroutineEngine(),
+                appLogWrapper
+        )
+        val currentDate = Date(0)
+        whenever(currentTimeProvider.currentDate()).thenReturn(currentDate)
+        val timeZone = "GMT"
+        whenever(site.timezone).thenReturn(timeZone)
+        whenever(
+                statsUtils.getFormattedDate(
+                        eq(currentDate),
+                        any()
+                )
+        ).thenReturn(FORMATTED_DATE)
+    }
+
+    @Test
+    fun `returns data per site`() = test {
+        val fetchInsightsPayload = FetchStatsPayload(
+                VISITS_AND_VIEWS_RESPONSE
+        )
+        val forced = true
+        whenever(restClient.fetchVisits(site, DAYS, FORMATTED_DATE, ITEMS_TO_LOAD, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        whenever(mapper.map(VISITS_AND_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(VISITS_AND_VIEWS_MODEL)
+
+        val responseModel = store.fetchVisits(site, DAYS, LIMIT_MODE, forced)
+
+        assertThat(responseModel.model).isEqualTo(VISITS_AND_VIEWS_MODEL)
+        verify(sqlUtils).insert(site, VISITS_AND_VIEWS_RESPONSE, DAYS, FORMATTED_DATE, ITEMS_TO_LOAD)
+    }
+
+    @Test
+    fun `returns cached data per site`() = test {
+        whenever(sqlUtils.hasFreshRequest(site, DAYS, FORMATTED_DATE, ITEMS_TO_LOAD)).thenReturn(true)
+        whenever(sqlUtils.select(site, DAYS, FORMATTED_DATE)).thenReturn(VISITS_AND_VIEWS_RESPONSE)
+        val model = mock<VisitsAndViewsModel>()
+        whenever(mapper.map(VISITS_AND_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val forced = false
+        val responseModel = store.fetchVisits(site, DAYS, LIMIT_MODE, forced)
+
+        assertThat(responseModel.model).isEqualTo(model)
+        assertThat(responseModel.cached).isTrue()
+        verify(sqlUtils, never()).insert(any(), any(), any(), any<String>(), isNull())
+    }
+
+    @Test
+    fun `returns error when invalid data`() = test {
+        val forced = true
+        val fetchInsightsPayload = FetchStatsPayload(
+                VISITS_AND_VIEWS_RESPONSE
+        )
+        whenever(restClient.fetchVisits(site, DAYS, FORMATTED_DATE, ITEMS_TO_LOAD, forced)).thenReturn(
+                fetchInsightsPayload
+        )
+        val emptyModel = VisitsAndViewsModel("", emptyList())
+        whenever(mapper.map(VISITS_AND_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(emptyModel)
+
+        val responseModel = store.fetchVisits(site, DAYS, LIMIT_MODE, forced)
+
+        assertThat(responseModel.error.type).isEqualTo(INVALID_DATA_ERROR.type)
+        assertThat(responseModel.error.message).isEqualTo(INVALID_DATA_ERROR.message)
+    }
+
+    @Test
+    fun `returns error when data call fail`() = test {
+        val type = API_ERROR
+        val message = "message"
+        val errorPayload = FetchStatsPayload<VisitsAndViewsResponse>(StatsError(type, message))
+        val forced = true
+        whenever(restClient.fetchVisits(site, DAYS, FORMATTED_DATE, ITEMS_TO_LOAD, forced)).thenReturn(errorPayload)
+
+        val responseModel = store.fetchVisits(site, DAYS, LIMIT_MODE, forced)
+
+        assertNotNull(responseModel.error)
+        val error = responseModel.error!!
+        assertEquals(type, error.type)
+        assertEquals(message, error.message)
+    }
+
+    @Test
+    fun `returns data from db`() {
+        whenever(sqlUtils.select(site, DAYS, FORMATTED_DATE)).thenReturn(VISITS_AND_VIEWS_RESPONSE)
+        val model = mock<VisitsAndViewsModel>()
+        whenever(mapper.map(VISITS_AND_VIEWS_RESPONSE, LIMIT_MODE)).thenReturn(model)
+
+        val result = store.getVisits(site, DAYS, LIMIT_MODE)
+
+        assertThat(result).isEqualTo(model)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyStoreUnitTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyStoreUnitTest.java
new file mode 100644
index 00000000000..4eb3fb63d1c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyStoreUnitTest.java
@@ -0,0 +1,309 @@
+package org.wordpress.android.fluxc.taxonomy;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.taxonomy.TaxonomyRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.taxonomy.TaxonomyXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.TaxonomySqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.store.TaxonomyStore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.wordpress.android.fluxc.store.TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY;
+import static org.wordpress.android.fluxc.store.TaxonomyStore.DEFAULT_TAXONOMY_TAG;
+
+@RunWith(RobolectricTestRunner.class)
+public class TaxonomyStoreUnitTest {
+    private final TaxonomyStore mTaxonomyStore = new TaxonomyStore(
+            new Dispatcher(),
+            Mockito.mock(TaxonomyRestClient.class),
+            Mockito.mock(TaxonomyXMLRPCClient.class)
+    );
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.getApplication().getApplicationContext();
+
+        WellSqlConfig config = new SingleStoreWellSqlConfigForTests(appContext, TermModel.class);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testSimpleInsertionAndRetrieval() {
+        TermModel termModel = new TermModel(TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY);
+        TaxonomySqlUtils.insertOrUpdateTerm(termModel);
+
+        assertEquals(1, TaxonomyTestUtils.getTermsCount());
+        assertEquals(termModel, TaxonomyTestUtils.getTerms().get(0));
+    }
+
+    @Test
+    public void testCategoryInsertionAndRetrieval() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel category = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category);
+
+        assertEquals(1, TaxonomyTestUtils.getTermsCount());
+        assertEquals(category, TaxonomyTestUtils.getTerms().get(0));
+
+        assertEquals(1, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_CATEGORY).size());
+        assertEquals(1, mTaxonomyStore.getCategoriesForSite(site).size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_TAG).size());
+        assertEquals(0, mTaxonomyStore.getTagsForSite(site).size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, "author").size());
+        assertEquals(0, mTaxonomyStore.getTermsForSite(site, "author").size());
+    }
+
+    @Test
+    public void testTagInsertionAndRetrieval() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel tag = TaxonomyTestUtils.generateSampleTag();
+        TaxonomySqlUtils.insertOrUpdateTerm(tag);
+
+        assertEquals(1, TaxonomyTestUtils.getTermsCount());
+        assertEquals(tag, TaxonomyTestUtils.getTerms().get(0));
+
+        assertEquals(1, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_TAG).size());
+        assertEquals(1, mTaxonomyStore.getTagsForSite(site).size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_CATEGORY).size());
+        assertEquals(0, mTaxonomyStore.getCategoriesForSite(site).size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, "author").size());
+        assertEquals(0, mTaxonomyStore.getTermsForSite(site, "author").size());
+    }
+
+    @Test
+    public void testCustomTaxonomyTermInsertionAndRetrieval() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel author = TaxonomyTestUtils.generateSampleAuthor();
+        TaxonomySqlUtils.insertOrUpdateTerm(author);
+
+        assertEquals(1, TaxonomyTestUtils.getTermsCount());
+        assertEquals(author, TaxonomyTestUtils.getTerms().get(0));
+
+        assertEquals(1, TaxonomySqlUtils.getTermsForSite(site, "author").size());
+        assertEquals(1, mTaxonomyStore.getTermsForSite(site, "author").size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_CATEGORY).size());
+        assertEquals(0, mTaxonomyStore.getCategoriesForSite(site).size());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_TAG).size());
+        assertEquals(0, mTaxonomyStore.getTagsForSite(site).size());
+    }
+
+    @Test
+    public void testGetTermByRemoteId() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel category = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category);
+
+        assertEquals(category, mTaxonomyStore.getCategoryByRemoteId(site, category.getRemoteTermId()));
+
+        // An identical category on a different site should be ignored in the match
+        TermModel otherSiteIdenticalCategory = TaxonomyTestUtils.generateSampleCategory();
+        otherSiteIdenticalCategory.setLocalSiteId(7);
+        TaxonomySqlUtils.insertOrUpdateTerm(otherSiteIdenticalCategory);
+
+        assertEquals(category, mTaxonomyStore.getCategoryByRemoteId(site, category.getRemoteTermId()));
+    }
+
+    @Test
+    public void testGetTermByName() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel category = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category);
+
+        assertEquals(category, mTaxonomyStore.getCategoryByName(site, category.getName()));
+    }
+
+    @Test
+    public void testRemoveTag() {
+        TermModel tag = TaxonomyTestUtils.generateSampleTag();
+        TaxonomySqlUtils.insertOrUpdateTerm(tag);
+        assertEquals(1, TaxonomyTestUtils.getTermsCount());
+
+        TaxonomySqlUtils.removeTerm(tag);
+        assertEquals(0, TaxonomyTestUtils.getTermsCount());
+    }
+
+    @Test
+    public void testClearTaxonomy() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel category = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category);
+
+        TermModel category2 = TaxonomyTestUtils.generateSampleCategory();
+        category2.setRemoteTermId(6);
+        category2.setName("Something");
+        TaxonomySqlUtils.insertOrUpdateTerm(category2);
+
+        TermModel tag = TaxonomyTestUtils.generateSampleTag();
+        TaxonomySqlUtils.insertOrUpdateTerm(tag);
+
+        TermModel author = TaxonomyTestUtils.generateSampleAuthor();
+        TaxonomySqlUtils.insertOrUpdateTerm(author);
+
+        assertEquals(4, TaxonomyTestUtils.getTermsCount());
+        assertEquals(2, mTaxonomyStore.getCategoriesForSite(site).size());
+
+        int deletedTermModels = TaxonomySqlUtils.clearTaxonomyForSite(site, DEFAULT_TAXONOMY_CATEGORY);
+        assertEquals(2, deletedTermModels);
+
+        assertEquals(0, mTaxonomyStore.getCategoriesForSite(site).size());
+        assertEquals(2, TaxonomyTestUtils.getTermsCount());
+    }
+
+    @Test
+    public void testGetCategoriesFromPost() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel category = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category);
+
+        TermModel category2 = TaxonomyTestUtils.generateSampleCategory();
+        category2.setRemoteTermId(6);
+        category2.setName("Something");
+        TaxonomySqlUtils.insertOrUpdateTerm(category2);
+
+        List<Long> idList = new ArrayList<>();
+        idList.add(category.getRemoteTermId());
+        idList.add(category2.getRemoteTermId());
+
+        assertEquals(2, TaxonomySqlUtils.getTermsFromRemoteIdList(idList, site, DEFAULT_TAXONOMY_CATEGORY).size());
+
+        // Unsynced category ID should be ignored in the final list
+        TermModel unsyncedCategory = TaxonomyTestUtils.generateSampleCategory();
+        unsyncedCategory.setRemoteTermId(66);
+        unsyncedCategory.setName("More");
+        idList.add(unsyncedCategory.getRemoteTermId());
+
+        assertEquals(2, TaxonomySqlUtils.getTermsFromRemoteIdList(idList, site, DEFAULT_TAXONOMY_CATEGORY).size());
+
+        // Empty list should return empty category list
+        idList.clear();
+
+        assertEquals(0, TaxonomySqlUtils.getTermsFromRemoteIdList(idList, site, DEFAULT_TAXONOMY_CATEGORY).size());
+
+        // List with only unsynced categories should return empty category list
+        idList.add(unsyncedCategory.getRemoteTermId());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsFromRemoteIdList(idList, site, DEFAULT_TAXONOMY_CATEGORY).size());
+
+        // An identical category on a different site should be ignored in the match
+        TermModel otherSiteIdenticalCategory = TaxonomyTestUtils.generateSampleCategory();
+        otherSiteIdenticalCategory.setLocalSiteId(7);
+        TaxonomySqlUtils.insertOrUpdateTerm(otherSiteIdenticalCategory);
+
+        idList.clear();
+        idList.add(category.getRemoteTermId());
+        idList.add(category2.getRemoteTermId());
+
+        assertEquals(2, TaxonomySqlUtils.getTermsFromRemoteIdList(idList, site, DEFAULT_TAXONOMY_CATEGORY).size());
+    }
+
+    @Test
+    public void testGetTagsFromPost() {
+        SiteModel site = new SiteModel();
+        site.setId(6);
+
+        TermModel tag = TaxonomyTestUtils.generateSampleTag();
+        TaxonomySqlUtils.insertOrUpdateTerm(tag);
+
+        TermModel tag2 = TaxonomyTestUtils.generateSampleTag();
+        tag2.setRemoteTermId(6);
+        tag2.setName("Something");
+        TaxonomySqlUtils.insertOrUpdateTerm(tag2);
+
+        List<String> nameList = new ArrayList<>();
+        nameList.add(tag.getName());
+        nameList.add(tag2.getName());
+
+        assertEquals(2, TaxonomySqlUtils.getTermsFromRemoteNameList(nameList, site, DEFAULT_TAXONOMY_TAG).size());
+
+        // Unsynced tag ID should be ignored in the final list
+        TermModel unsyncedTag = TaxonomyTestUtils.generateSampleTag();
+        unsyncedTag.setRemoteTermId(66);
+        unsyncedTag.setName("More");
+        nameList.add(unsyncedTag.getName());
+
+        assertEquals(2, TaxonomySqlUtils.getTermsFromRemoteNameList(nameList, site, DEFAULT_TAXONOMY_TAG).size());
+
+        // Empty list should return empty tag list
+        nameList.clear();
+
+        assertEquals(0, TaxonomySqlUtils.getTermsFromRemoteNameList(nameList, site, DEFAULT_TAXONOMY_TAG).size());
+
+        // List with only unsynced tags should return empty tag list
+        nameList.add(unsyncedTag.getName());
+
+        assertEquals(0, TaxonomySqlUtils.getTermsFromRemoteNameList(nameList, site, DEFAULT_TAXONOMY_TAG).size());
+    }
+
+    @Test
+    public void testRemoveAllTaxonomy() {
+        SiteModel site1 = new SiteModel();
+        site1.setId(6);
+
+        SiteModel site2 = new SiteModel();
+        site2.setId(7);
+
+        TermModel category1 = TaxonomyTestUtils.generateSampleCategory();
+        TaxonomySqlUtils.insertOrUpdateTerm(category1);
+
+        TermModel category2 = TaxonomyTestUtils.generateSampleCategory();
+        category2.setLocalSiteId(7);
+        TaxonomySqlUtils.insertOrUpdateTerm(category2);
+
+        TermModel tag1 = TaxonomyTestUtils.generateSampleTag();
+        TaxonomySqlUtils.insertOrUpdateTerm(tag1);
+
+        TermModel tag2 = TaxonomyTestUtils.generateSampleTag();
+        tag2.setLocalSiteId(7);
+        TaxonomySqlUtils.insertOrUpdateTerm(tag2);
+
+        TermModel author1 = TaxonomyTestUtils.generateSampleAuthor();
+        TaxonomySqlUtils.insertOrUpdateTerm(author1);
+
+        TermModel author2 = TaxonomyTestUtils.generateSampleAuthor();
+        author2.setLocalSiteId(7);
+        TaxonomySqlUtils.insertOrUpdateTerm(author2);
+
+        assertEquals(6, TaxonomyTestUtils.getTermsCount());
+
+        TaxonomySqlUtils.deleteAllTerms();
+
+        assertEquals(0, TaxonomyTestUtils.getTermsCount());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyTestUtils.java
new file mode 100644
index 00000000000..cf4c54b16d4
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TaxonomyTestUtils.java
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.taxonomy;
+
+import androidx.annotation.NonNull;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.store.TaxonomyStore;
+
+import java.util.List;
+
+class TaxonomyTestUtils {
+    @NonNull
+    private static TermModel generateSampleTerm(@NonNull String taxonomy) {
+        return new TermModel(
+                0,
+                6,
+                5,
+                taxonomy,
+                "Travel",
+                "travel",
+                "Post about travelling",
+                0,
+                0
+        );
+    }
+
+    @NonNull
+    public static TermModel generateSampleCategory() {
+        return generateSampleTerm(TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY);
+    }
+
+    @NonNull
+    public static TermModel generateSampleTag() {
+        return generateSampleTerm(TaxonomyStore.DEFAULT_TAXONOMY_TAG);
+    }
+
+    @NonNull
+    public static TermModel generateSampleAuthor() {
+        return generateSampleTerm("author");
+    }
+
+    @NonNull
+    static List<TermModel> getTerms() {
+        return WellSql.select(TermModel.class).getAsModel();
+    }
+
+    static int getTermsCount() {
+        return getTerms().size();
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TermModelTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TermModelTest.java
new file mode 100644
index 00000000000..2a0e81d53f0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/taxonomy/TermModelTest.java
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.taxonomy;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.TermModel;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TermModelTest {
+    @Test
+    public void testEquals() {
+        TermModel testCategory1 = TaxonomyTestUtils.generateSampleCategory();
+        TermModel testCategory2 = TaxonomyTestUtils.generateSampleCategory();
+
+        testCategory2.setRemoteTermId(testCategory1.getRemoteTermId() + 1);
+        assertFalse(testCategory1.equals(testCategory2));
+        testCategory2.setRemoteTermId(testCategory1.getRemoteTermId());
+        assertTrue(testCategory1.equals(testCategory2));
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/theme/ThemeStoreUnitTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/theme/ThemeStoreUnitTest.java
new file mode 100644
index 00000000000..5cbef7bc27a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/theme/ThemeStoreUnitTest.java
@@ -0,0 +1,186 @@
+package org.wordpress.android.fluxc.theme;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.TestSiteSqlUtils;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.ThemeModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.ThemeRestClient;
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils;
+import org.wordpress.android.fluxc.persistence.ThemeSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.site.SiteUtils;
+import org.wordpress.android.fluxc.store.ThemeStore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricTestRunner.class)
+public class ThemeStoreUnitTest {
+    private final ThemeStore mThemeStore = new ThemeStore(new Dispatcher(), Mockito.mock(ThemeRestClient.class));
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.getApplication().getApplicationContext();
+        WellSqlConfig config = new WellSqlConfig(appContext);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testActiveTheme() throws SiteSqlUtils.DuplicateSiteException {
+        final SiteModel site = SiteUtils.generateWPComSite();
+        TestSiteSqlUtils.INSTANCE.getSiteSqlUtils().insertOrUpdateSite(site);
+        assertNull(mThemeStore.getActiveThemeForSite(site));
+
+        final ThemeModel firstTheme = generateTestTheme(site.getId(), "first-active", "First Active");
+        final ThemeModel secondTheme = generateTestTheme(site.getId(), "second-active", "Second Active");
+        firstTheme.setActive(true);
+        secondTheme.setActive(true);
+
+        // set first theme active and verify
+        mThemeStore.setActiveThemeForSite(site, firstTheme);
+        List<ThemeModel> activeThemes = ThemeSqlUtils.getActiveThemeForSite(site);
+        assertNotNull(activeThemes);
+        assertEquals(1, activeThemes.size());
+        ThemeModel firstActiveTheme = activeThemes.get(0);
+        assertEquals(firstTheme.getThemeId(), firstActiveTheme.getThemeId());
+        assertEquals(firstTheme.getName(), firstActiveTheme.getName());
+
+        // set second theme active and verify
+        mThemeStore.setActiveThemeForSite(site, secondTheme);
+        activeThemes = ThemeSqlUtils.getActiveThemeForSite(site);
+        assertNotNull(activeThemes);
+        assertEquals(1, activeThemes.size());
+        ThemeModel secondActiveTheme = activeThemes.get(0);
+        assertEquals(secondTheme.getThemeId(), secondActiveTheme.getThemeId());
+        assertEquals(secondTheme.getName(), secondActiveTheme.getName());
+    }
+
+    @Test
+    public void testInsertOrUpdateTheme() throws SiteSqlUtils.DuplicateSiteException {
+        final SiteModel site = SiteUtils.generateJetpackSiteOverRestOnly();
+        TestSiteSqlUtils.INSTANCE.getSiteSqlUtils().insertOrUpdateSite(site);
+
+        final String testThemeId = "fluxc-ftw";
+        final String testThemeName = "FluxC FTW";
+        final String testUpdatedName = testThemeName + " v2";
+        final ThemeModel insertTheme = generateTestTheme(site.getId(), testThemeId, testThemeName);
+
+        // verify theme doesn't already exist
+        assertNull(mThemeStore.getInstalledThemeByThemeId(site, testThemeId));
+
+        // insert new theme and verify it exists
+        ThemeSqlUtils.insertOrUpdateSiteTheme(site, insertTheme);
+        ThemeModel insertedTheme = mThemeStore.getInstalledThemeByThemeId(site, testThemeId);
+        assertNotNull(insertedTheme);
+        assertEquals(testThemeName, insertedTheme.getName());
+
+        // update the theme and verify the updated attributes
+        insertedTheme.setName(testUpdatedName);
+        ThemeSqlUtils.insertOrUpdateSiteTheme(site, insertedTheme);
+        insertedTheme = mThemeStore.getInstalledThemeByThemeId(site, testThemeId);
+        assertNotNull(insertedTheme);
+        assertEquals(testUpdatedName, insertedTheme.getName());
+    }
+
+    @Test
+    public void testInsertOrReplaceWpThemes() {
+        final List<ThemeModel> firstTestThemes = generateThemesTestList(20);
+        final List<ThemeModel> secondTestThemes = generateThemesTestList(30);
+        final List<ThemeModel> thirdTestThemes = generateThemesTestList(10);
+
+        // first add 20 themes and make sure the count is correct
+        ThemeSqlUtils.insertOrReplaceWpComThemes(firstTestThemes);
+        assertEquals(20, mThemeStore.getWpComThemes().size());
+
+        // next add a larger list of themes (with 20 being duplicates) and make sure the count is correct
+        ThemeSqlUtils.insertOrReplaceWpComThemes(secondTestThemes);
+        assertEquals(30, mThemeStore.getWpComThemes().size());
+
+        // lastly add a smaller list of themes (all duplicates) and make sure count is correct
+        ThemeSqlUtils.insertOrReplaceWpComThemes(thirdTestThemes);
+        assertEquals(10, mThemeStore.getWpComThemes().size());
+    }
+
+    @Test
+    public void testInsertOrReplaceInstalledThemes() throws SiteSqlUtils.DuplicateSiteException {
+        final SiteModel site = SiteUtils.generateJetpackSiteOverRestOnly();
+        TestSiteSqlUtils.INSTANCE.getSiteSqlUtils().insertOrUpdateSite(site);
+
+        final List<ThemeModel> firstTestThemes = generateThemesTestList(5);
+        final List<ThemeModel> secondTestThemes = generateThemesTestList(10);
+        final List<ThemeModel> thirdTestThemes = generateThemesTestList(1);
+
+        // first add 5 installed themes
+        ThemeSqlUtils.insertOrReplaceInstalledThemes(site, firstTestThemes);
+        assertEquals(firstTestThemes.size(), mThemeStore.getThemesForSite(site).size());
+
+        // then replace them all with a new list of 10
+        ThemeSqlUtils.insertOrReplaceInstalledThemes(site, secondTestThemes);
+        assertEquals(secondTestThemes.size(), mThemeStore.getThemesForSite(site).size());
+
+        // then replace them all with a single theme
+        ThemeSqlUtils.insertOrReplaceInstalledThemes(site, thirdTestThemes);
+        assertEquals(thirdTestThemes.size(), mThemeStore.getThemesForSite(site).size());
+    }
+
+    @Test
+    public void testRemoveThemesWithNoSite() {
+        final List<ThemeModel> testThemes = generateThemesTestList(20);
+
+        // insert and verify count
+        assertEquals(0, mThemeStore.getWpComThemes().size());
+        ThemeSqlUtils.insertOrReplaceWpComThemes(testThemes);
+        assertEquals(testThemes.size(), mThemeStore.getWpComThemes().size());
+
+        // remove and verify count
+        ThemeSqlUtils.removeWpComThemes();
+        assertEquals(0, mThemeStore.getWpComThemes().size());
+    }
+
+    @Test
+    public void testRemoveInstalledSiteThemes() throws SiteSqlUtils.DuplicateSiteException {
+        final SiteModel site = SiteUtils.generateJetpackSiteOverRestOnly();
+        TestSiteSqlUtils.INSTANCE.getSiteSqlUtils().insertOrUpdateSite(site);
+
+        final List<ThemeModel> testThemes = generateThemesTestList(5);
+
+        // add site themes and verify count
+        ThemeSqlUtils.insertOrReplaceInstalledThemes(site, testThemes);
+        assertEquals(testThemes.size(), mThemeStore.getThemesForSite(site).size());
+
+        // remove and verify count
+        ThemeSqlUtils.removeSiteThemes(site);
+        assertEquals(0, mThemeStore.getThemesForSite(site).size());
+    }
+
+    private ThemeModel generateTestTheme(int siteId, String themeId, String themeName) {
+        @SuppressWarnings("deprecation") ThemeModel theme = new ThemeModel();
+        theme.setLocalSiteId(siteId);
+        theme.setThemeId(themeId);
+        theme.setName(themeName);
+        return theme;
+    }
+
+    private List<ThemeModel> generateThemesTestList(int num) {
+        List<ThemeModel> testThemes = new ArrayList<>();
+        for (int i = 0; i < num; ++i) {
+            testThemes.add(generateTestTheme(0, "themeid" + i, "themename" + i));
+        }
+        return testThemes;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/CoroutineEngineUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/CoroutineEngineUtils.kt
new file mode 100644
index 00000000000..cb04ef0bb09
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/CoroutineEngineUtils.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.tools
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.runBlocking
+import org.mockito.Mockito.lenient
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+
+fun initCoroutineEngine() = runBlocking {
+    val coroutineEngine = mock<CoroutineEngine>()
+    lenient().doAnswer {
+        return@doAnswer runBlocking {
+            it.getArgument<(suspend CoroutineScope.() -> Any)>(3).invoke(this)
+        }
+    }.whenever(coroutineEngine).withDefaultContext(
+            any(),
+            any(),
+            any(),
+            any<(suspend CoroutineScope.() -> Any)>()
+    )
+    lenient().doAnswer {
+        it.getArgument<(() -> Any)>(3).invoke()
+    }.whenever(coroutineEngine).run(
+            any(),
+            any(),
+            any(),
+            any<(() -> Any)>()
+    )
+    lenient().doAnswer {
+        runBlocking {
+            it.getArgument<(suspend CoroutineScope.() -> Any)>(3).invoke(this)
+        }
+        return@doAnswer mock<Job>()
+    }.whenever(coroutineEngine).launch(
+            any(),
+            any(),
+            any(),
+            any<(suspend CoroutineScope.() -> Any)>()
+    )
+    lenient().doAnswer {
+        return@doAnswer runBlocking {
+            flow { it.getArgument<(suspend FlowCollector<Any>.() -> Unit)>(3).invoke(this) }
+        }
+    }.whenever(coroutineEngine).flowWithDefaultContext(
+            any(),
+            any(),
+            any(),
+            any<(suspend FlowCollector<Any>.() -> Unit)>()
+    )
+    coroutineEngine
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/FormattableContentMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/FormattableContentMapperTest.kt
new file mode 100644
index 00000000000..ed013fde265
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/tools/FormattableContentMapperTest.kt
@@ -0,0 +1,147 @@
+package org.wordpress.android.fluxc.tools
+
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.module.ReleaseNetworkModule
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@RunWith(MockitoJUnitRunner::class)
+class FormattableContentMapperTest {
+    private lateinit var formattableContentMapper: FormattableContentMapper
+    private val url = "https://www.wordpress.com"
+
+    @Before
+    fun setUp() {
+        val gson = ReleaseNetworkModule().provideGson()
+        formattableContentMapper = FormattableContentMapper(gson)
+    }
+
+    @Test
+    fun mapsNotificationSubjectToRichFormattableContent() {
+        val notificationSubjectResponse = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/subject-response.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(notificationSubjectResponse)
+        assertEquals("You've received 20 likes on My Site", formattableContent.text)
+        assertEquals(2, formattableContent.ranges!!.size)
+        with(formattableContent.ranges!![0]) {
+            assertEquals(FormattableRangeType.B, this.rangeType())
+            assertEquals(listOf(16, 18), this.indices)
+        }
+        with(formattableContent.ranges!![1]) {
+            assertEquals(FormattableRangeType.SITE, this.rangeType())
+            assertEquals(123, this.id)
+            assertEquals("http://mysite.wordpress.com", this.url)
+            assertEquals(listOf(28, 35), this.indices)
+        }
+    }
+
+    @Test
+    fun mapsNotificationBodyToRichFormattableContent() {
+        val notificationBodyResponse = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/body-response.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(notificationBodyResponse)
+        assertEquals("This site was created by Author", formattableContent.text)
+        assertTrue(formattableContent.meta!!.isMobileButton == true)
+        assertEquals(2, formattableContent.ranges!!.size)
+        with(formattableContent.ranges!![0]) {
+            assertEquals(FormattableRangeType.USER, this.rangeType())
+            assertEquals(123, this.siteId)
+            assertEquals(111, this.id)
+            assertEquals(url, this.url)
+            assertEquals(listOf(0, 9), this.indices)
+        }
+    }
+
+    @Test
+    fun mapsScanTypeToScanFormattableRangeType() {
+        val notificationBodyResponse = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/body-response.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(notificationBodyResponse)
+        assertEquals(FormattableRangeType.SCAN, formattableContent.ranges!![1].rangeType())
+    }
+
+    @Test
+    fun mapsActivityLogContentToSimpleFormattableContent() {
+        val activityLogBodyResponse = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "activitylog/body-response.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(activityLogBodyResponse)
+        assertEquals("Comment text", formattableContent.text)
+        assertEquals(2, formattableContent.ranges!!.size)
+        with(formattableContent.ranges!![0]) {
+            assertEquals(FormattableRangeType.POST, this.rangeType())
+            assertEquals(123, this.siteId)
+            assertEquals(111, this.id)
+            assertEquals(url, this.url)
+            assertEquals("post", this.section)
+            assertEquals("edit", this.intent)
+            assertEquals("single", this.context)
+            assertEquals(listOf(27, 39), this.indices)
+        }
+    }
+
+    @Test
+    fun createsUnknownStringFromNull() {
+        val unknownType = FormattableRangeType.fromString(null)
+
+        assertEquals(FormattableRangeType.UNKNOWN, unknownType)
+    }
+
+    @Test
+    fun createsUnknownStringFromEmptyText() {
+        val unknownType = FormattableRangeType.fromString("")
+
+        assertEquals(FormattableRangeType.UNKNOWN, unknownType)
+    }
+
+    @Test
+    fun mapsJsonArrayToFormattableContentList() {
+        val jsonContentArray = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/formattable-content-array.json")
+        val formattableList = formattableContentMapper.mapToFormattableContentList(jsonContentArray)
+        assertEquals(3, formattableList.size)
+        assertEquals("Jennifer Shultz", formattableList[0].text)
+        assertEquals("I bought this for my daughter and it fits beautifully!", formattableList[1].text)
+        assertEquals("Review for Ninja Hoodie", formattableList[2].text)
+    }
+
+    @Test
+    fun mapsFormattableContentListToJsonString() {
+        val jsonContentArray = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/formattable-content-array.json")
+        val formattableList = formattableContentMapper.mapToFormattableContentList(jsonContentArray)
+        val formattableJson = formattableContentMapper.mapFormattableContentListToJson(formattableList)
+        assertEquals(jsonContentArray, formattableJson)
+    }
+
+    @Test
+    fun mapsRewindDownloadReadyTypeToRewindDownloadReadyFormattableRangeType() {
+        val response = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/rewind-download-ready.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(response)
+        assertEquals(FormattableRangeType.REWIND_DOWNLOAD_READY, formattableContent.ranges!![0].rangeType())
+    }
+
+    @Test
+    fun `getting ID from FormattableRange returns correct value depending on value type `() {
+        val notificationCommentBodyResponse = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "notifications/comment-response.json")
+        val formattableContent = formattableContentMapper.mapToFormattableContent(notificationCommentBodyResponse)
+        assertEquals(4, formattableContent.ranges!!.size)
+        // ID is missing
+        with(formattableContent.ranges!![0]) {
+            assertEquals(null, this.id)
+        }
+        // ID is numerical
+        with(formattableContent.ranges!![1]) {
+            assertEquals(16, this.id)
+        }
+        // ID is non-numerical
+        with(formattableContent.ranges!![2]) {
+            assertEquals(null, this.id)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/MediaUploadModelTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/MediaUploadModelTest.java
new file mode 100644
index 00000000000..d7d2064ca54
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/MediaUploadModelTest.java
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.upload;
+
+import android.text.TextUtils;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class MediaUploadModelTest {
+    @Test
+    public void testEquals() {
+        MediaUploadModel mediaUploadModel1 = new MediaUploadModel(1);
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(1);
+
+        mediaUploadModel1.setUploadState(MediaUploadModel.FAILED);
+        assertFalse(mediaUploadModel1.equals(mediaUploadModel2));
+
+        mediaUploadModel2.setUploadState(MediaUploadModel.FAILED);
+
+        MediaError mediaError = new MediaError(MediaErrorType.EXCEEDS_MEMORY_LIMIT, "Too large!");
+        mediaUploadModel1.setMediaError(mediaError);
+        assertFalse(mediaUploadModel1.equals(mediaUploadModel2));
+
+        mediaUploadModel2.setErrorType(mediaError.type.toString());
+        mediaUploadModel2.setErrorMessage(mediaError.message);
+
+        assertTrue(mediaUploadModel1.equals(mediaUploadModel2));
+    }
+
+    @Test
+    public void testMediaError() {
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(1);
+
+        assertNull(mediaUploadModel.getMediaError());
+        assertTrue(TextUtils.isEmpty(mediaUploadModel.getErrorType()));
+        assertTrue(TextUtils.isEmpty(mediaUploadModel.getErrorMessage()));
+
+        mediaUploadModel.setMediaError(new MediaError(MediaErrorType.EXCEEDS_MEMORY_LIMIT, "Too large!"));
+        assertNotNull(mediaUploadModel.getMediaError());
+        assertEquals(MediaErrorType.EXCEEDS_MEMORY_LIMIT, MediaErrorType.fromString(mediaUploadModel.getErrorType()));
+        assertEquals("Too large!", mediaUploadModel.getErrorMessage());
+    }
+
+    @Test
+    public void testNotEqualsOnErrorSubType() {
+        MediaUploadModel mediaUploadModel1 = new MediaUploadModel(1);
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(1);
+
+        MediaError mediaError1 = new MediaError(
+                MediaErrorType.MALFORMED_MEDIA_ARG,
+                "File type not supported!",
+                new MalformedMediaArgSubType(MalformedMediaArgSubType.Type.UNSUPPORTED_MIME_TYPE)
+        );
+
+        MediaError mediaError2 = new MediaError(
+                MediaErrorType.MALFORMED_MEDIA_ARG,
+                "File type not supported!",
+                new MalformedMediaArgSubType(Type.DIRECTORY_PATH_SUPPLIED_FILE_NEEDED)
+        );
+
+        mediaUploadModel1.setMediaError(mediaError1);
+        mediaUploadModel2.setMediaError(mediaError2);
+
+        assertFalse(mediaUploadModel2.equals(mediaUploadModel1));
+    }
+    public void testEqualsOnErrorSubType() {
+        MediaUploadModel mediaUploadModel1 = new MediaUploadModel(1);
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(1);
+
+        MediaError mediaError1 = new MediaError(
+                MediaErrorType.MALFORMED_MEDIA_ARG,
+                "File type not supported!",
+                new MalformedMediaArgSubType(MalformedMediaArgSubType.Type.UNSUPPORTED_MIME_TYPE)
+        );
+        MediaError mediaError2 = new MediaError(
+                MediaErrorType.MALFORMED_MEDIA_ARG,
+                "File type not supported!",
+                new MalformedMediaArgSubType(MalformedMediaArgSubType.Type.UNSUPPORTED_MIME_TYPE)
+        );
+
+        mediaUploadModel1.setMediaError(mediaError1);
+        mediaUploadModel2.setMediaError(mediaError2);
+
+        assertFalse(mediaUploadModel2.equals(mediaUploadModel1));
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/PostUploadModelTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/PostUploadModelTest.java
new file mode 100644
index 00000000000..8293ccb4812
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/PostUploadModelTest.java
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.upload;
+
+import android.text.TextUtils;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class PostUploadModelTest {
+    @Test
+    public void testEquals() {
+        PostUploadModel postUploadModel1 = new PostUploadModel(1);
+        PostUploadModel postUploadModel2 = new PostUploadModel(1);
+
+        Set<Integer> idSet = new HashSet<>();
+        idSet.add(6);
+        idSet.add(5);
+        postUploadModel1.setAssociatedMediaIdSet(idSet);
+        assertFalse(postUploadModel1.equals(postUploadModel2));
+
+        postUploadModel2.setAssociatedMediaIdSet(idSet);
+
+        PostError postError = new PostError(PostErrorType.UNKNOWN_POST, "Unknown post");
+        postUploadModel1.setPostError(postError);
+
+        assertFalse(postUploadModel1.equals(postUploadModel2));
+
+        postUploadModel2.setErrorType(postError.type.toString());
+        postUploadModel2.setErrorMessage(postError.message);
+
+        assertTrue(postUploadModel1.equals(postUploadModel2));
+    }
+
+    @Test
+    public void testAssociatedMediaIds() {
+        PostUploadModel postUploadModel = new PostUploadModel(1);
+        Set<Integer> idSet = new HashSet<>();
+        idSet.add(6);
+        idSet.add(5);
+        postUploadModel.setAssociatedMediaIdSet(idSet);
+        assertEquals("5,6", postUploadModel.getAssociatedMediaIds());
+        assertTrue(idSet.containsAll(postUploadModel.getAssociatedMediaIdSet()));
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().containsAll(idSet));
+    }
+
+    @Test
+    public void testPostError() {
+        PostUploadModel postUploadModel = new PostUploadModel(1);
+
+        assertNull(postUploadModel.getPostError());
+        assertTrue(TextUtils.isEmpty(postUploadModel.getErrorType()));
+        assertTrue(TextUtils.isEmpty(postUploadModel.getErrorMessage()));
+
+        postUploadModel.setPostError(new PostError(PostErrorType.UNKNOWN_POST, "Unknown post"));
+        assertNotNull(postUploadModel.getPostError());
+        assertEquals(PostErrorType.UNKNOWN_POST, PostErrorType.fromString(postUploadModel.getErrorType()));
+        assertEquals("Unknown post", postUploadModel.getErrorMessage());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadSqlUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadSqlUtilsTest.java
new file mode 100644
index 00000000000..e4b751e1dac
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadSqlUtilsTest.java
@@ -0,0 +1,352 @@
+package org.wordpress.android.fluxc.upload;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.persistence.PostSqlUtils;
+import org.wordpress.android.fluxc.persistence.UploadSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.post.PostTestUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNotSame;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+@RunWith(RobolectricTestRunner.class)
+public class UploadSqlUtilsTest {
+    private Random mRandom = new Random(System.currentTimeMillis());
+    private PostSqlUtils mPostSqlUtils = new PostSqlUtils();
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new WellSqlConfig(appContext);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    // Attempts to insert null then verifies there is no media
+    @Test
+    public void testInsertNullMedia() {
+        assertEquals(0, UploadSqlUtils.insertOrUpdateMedia(null));
+        assertEquals(0, WellSql.select(MediaUploadModel.class).getAsCursor().getCount());
+    }
+
+    @Test
+    public void testInsertMedia() {
+        long testId = Math.abs(mRandom.nextLong());
+        MediaModel testMedia = UploadTestUtils.getTestMedia(testId);
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia));
+        List<MediaModel> media = MediaSqlUtils.getSiteMediaWithId(UploadTestUtils.getTestSite(), testId);
+        assertEquals(1, media.size());
+        assertNotNull(media.get(0));
+
+        // Store a MediaUploadModel corresponding to this MediaModel
+        testMedia = media.get(0);
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(testMedia.getId());
+        mediaUploadModel.setProgress(0.65F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+
+        mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(testMedia.getId());
+        assertNotNull(mediaUploadModel);
+        assertEquals(testMedia.getId(), mediaUploadModel.getId());
+        assertEquals(MediaUploadModel.UPLOADING, mediaUploadModel.getUploadState());
+
+        // Update the stored MediaUploadModel, marking it as completed
+        mediaUploadModel.setUploadState(MediaUploadModel.COMPLETED);
+        mediaUploadModel.setProgress(1F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+
+        mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(testMedia.getId());
+        assertNotNull(mediaUploadModel);
+        assertEquals(testMedia.getId(), mediaUploadModel.getId());
+        assertEquals(MediaUploadModel.COMPLETED, mediaUploadModel.getUploadState());
+
+        // Deleting the MediaModel should cause the corresponding MediaUploadModel to be deleted also
+        MediaSqlUtils.deleteMedia(testMedia);
+
+        media = MediaSqlUtils.getSiteMediaWithId(UploadTestUtils.getTestSite(), testId);
+        assertTrue(media.isEmpty());
+
+        mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(testMedia.getId());
+        assertNull(mediaUploadModel);
+    }
+
+    @Test
+    public void testUpdateMediaProgress() {
+        long testId = Math.abs(mRandom.nextLong());
+        MediaModel testMedia = UploadTestUtils.getTestMedia(testId);
+        MediaSqlUtils.insertOrUpdateMedia(testMedia);
+        testMedia = MediaSqlUtils.getSiteMediaWithId(UploadTestUtils.getTestSite(), testId).get(0);
+
+        // Store a MediaUploadModel corresponding to this MediaModel
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(testMedia.getId());
+        mediaUploadModel.setProgress(0.65F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+
+        mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(testMedia.getId());
+        assertNotNull(mediaUploadModel);
+        assertEquals(0.65F, mediaUploadModel.getProgress());
+
+        // Update the progress for the MediaUploadModel
+        mediaUploadModel.setProgress(0.87F);
+        assertEquals(1, UploadSqlUtils.updateMediaProgressOnly(mediaUploadModel));
+
+        mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(testMedia.getId());
+        assertNotNull(mediaUploadModel);
+        assertEquals(testMedia.getId(), mediaUploadModel.getId());
+        assertEquals(0.87F, mediaUploadModel.getProgress());
+
+        // Attempting to update the progress for a MediaUploadModel that doesn't exist in the db should fail
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(mRandom.nextInt());
+        mediaUploadModel2.setProgress(0.45F);
+        assertEquals(0, UploadSqlUtils.updateMediaProgressOnly(mediaUploadModel2));
+        assertNull(UploadSqlUtils.getMediaUploadModelForLocalId(mediaUploadModel2.getId()));
+    }
+
+    @Test
+    public void testDeleteMediaUploadModel() {
+        MediaModel testMedia1 = UploadTestUtils.getTestMedia(65);
+        MediaModel testMedia2 = UploadTestUtils.getTestMedia(35);
+
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia1));
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia2));
+        List<MediaModel> mediaModels = MediaSqlUtils.getAllSiteMedia(UploadTestUtils.getTestSite());
+        assertEquals(2, mediaModels.size());
+
+        // Store MediaUploadModels corresponding to the MediaModels
+        testMedia1 = mediaModels.get(0);
+        MediaUploadModel mediaUploadModel1 = new MediaUploadModel(testMedia1.getId());
+        mediaUploadModel1.setProgress(0.65F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel1);
+
+        testMedia2 = mediaModels.get(1);
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(testMedia2.getId());
+        mediaUploadModel2.setProgress(0.35F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel2);
+
+        // Delete one of the MediaUploadModels
+        assertEquals(1, UploadSqlUtils.deleteMediaUploadModelWithLocalId(testMedia2.getId()));
+
+        List<MediaUploadModel> mediaUploadModels = WellSql.select(MediaUploadModel.class).getAsModel();
+        assertEquals(1, mediaUploadModels.size());
+        assertEquals(testMedia1.getId(), mediaUploadModels.get(0).getId());
+
+        // Delete the other MediaUploadModel
+        Set<Integer> mediaIdSet = new HashSet<>();
+        mediaIdSet.add(testMedia1.getId());
+        assertEquals(1, UploadSqlUtils.deleteMediaUploadModelsWithLocalIds(mediaIdSet));
+
+        mediaUploadModels = WellSql.select(MediaUploadModel.class).getAsModel();
+        assertEquals(0, mediaUploadModels.size());
+
+        // The corresponding MediaModels should be untouched
+        mediaModels = MediaSqlUtils.getAllSiteMedia(UploadTestUtils.getTestSite());
+        assertEquals(2, mediaModels.size());
+    }
+
+    // Attempts to insert null then verifies there is no post
+    @Test
+    public void testInsertNullPost() {
+        assertEquals(0, UploadSqlUtils.insertOrUpdatePost(null));
+        assertEquals(0, WellSql.select(PostUploadModel.class).getAsCursor().getCount());
+    }
+
+    @Test
+    public void testInsertPost() {
+        PostModel testPost = UploadTestUtils.getTestPost();
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(testPost));
+        List<PostModel> postList = PostTestUtils.getPosts();
+        assertEquals(1, postList.size());
+        assertNotNull(postList.get(0));
+
+        // Store a PostUploadModel corresponding to this PostModel
+        testPost = postList.get(0);
+        PostUploadModel postUploadModel = new PostUploadModel(testPost.getId());
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+
+        postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(testPost.getId());
+        assertNotNull(postUploadModel);
+        assertEquals(testPost.getId(), postUploadModel.getId());
+        assertEquals(PostUploadModel.PENDING, postUploadModel.getUploadState());
+
+        // Deleting the PostModel should cause the corresponding PostUploadModel to be deleted also
+        mPostSqlUtils.deletePost(testPost);
+
+        postList = PostTestUtils.getPosts();
+        assertTrue(postList.isEmpty());
+
+        postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(testPost.getId());
+        assertNull(postUploadModel);
+    }
+
+    @Test
+    public void testGetPostModelsByState() {
+        PostModel testPost1 = UploadTestUtils.getTestPost();
+        testPost1.setIsLocalDraft(true);
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(testPost1));
+        PostModel testPost2 = UploadTestUtils.getTestPost();
+        testPost2.setIsLocalDraft(true);
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(testPost2));
+        List<PostModel> postList = PostTestUtils.getPosts();
+        assertEquals(2, postList.size());
+
+        // Store PostUploadModels corresponding to the PostModels
+        testPost1 = postList.get(0);
+        PostUploadModel postUploadModel1 = new PostUploadModel(testPost1.getId());
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel1);
+        testPost2 = postList.get(1);
+        PostUploadModel postUploadModel2 = new PostUploadModel(testPost2.getId());
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel2);
+
+        // Both PostUploadModels should be PENDING
+        List<PostUploadModel> pendingPostUploadModels =
+                UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.PENDING);
+        assertEquals(2, pendingPostUploadModels.size());
+        assertEquals(0, UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.FAILED).size());
+        assertEquals(0, UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.CANCELLED).size());
+        assertEquals(2, UploadSqlUtils.getAllPostUploadModels().size());
+
+        // Fetch the corresponding PostModels
+        List<PostModel> pendingPostModels = UploadSqlUtils.getPostModelsForPostUploadModels(pendingPostUploadModels);
+        assertEquals(2, pendingPostModels.size());
+        assertNotSame(pendingPostModels.get(0), pendingPostModels.get(1));
+
+        // Set one PostUploadModel to CANCELLED
+        postUploadModel1.setUploadState(PostUploadModel.CANCELLED);
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel1);
+
+        pendingPostUploadModels = UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.PENDING);
+        List<PostUploadModel> cancelledPostUploadModels =
+                UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.CANCELLED);
+
+        assertEquals(1, pendingPostUploadModels.size());
+        assertEquals(1, cancelledPostUploadModels.size());
+        assertEquals(0, UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.FAILED).size());
+        assertEquals(2, UploadSqlUtils.getAllPostUploadModels().size());
+
+        // Fetch the corresponding PostModels
+        pendingPostModels = UploadSqlUtils.getPostModelsForPostUploadModels(pendingPostUploadModels);
+        assertEquals(1, pendingPostModels.size());
+        assertEquals(postUploadModel2.getId(), pendingPostModels.get(0).getId());
+    }
+
+    @Test
+    public void testDeletePostUploadModel() {
+        PostModel testPost1 = UploadTestUtils.getTestPost();
+        testPost1.setIsLocalDraft(true);
+        PostModel testPost2 = UploadTestUtils.getTestPost();
+        testPost2.setIsLocalDraft(true);
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(testPost1));
+        assertEquals(1, mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(testPost2));
+        List<PostModel> postModels = PostTestUtils.getPosts();
+        assertEquals(2, postModels.size());
+
+        // Store PostUploadModels corresponding to the PostModels
+        testPost1 = postModels.get(0);
+        PostUploadModel postUploadModel1 = new PostUploadModel(testPost1.getId());
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel1);
+
+        testPost2 = postModels.get(1);
+        PostUploadModel postUploadModel2 = new PostUploadModel(testPost2.getId());
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel2);
+
+        // Delete one of the PostUploadModels
+        assertEquals(1, UploadSqlUtils.deletePostUploadModelWithLocalId(testPost2.getId()));
+
+        List<PostUploadModel> postUploadModels = WellSql.select(PostUploadModel.class).getAsModel();
+        assertEquals(1, postUploadModels.size());
+        assertEquals(testPost1.getId(), postUploadModels.get(0).getId());
+
+        // Delete the other PostUploadModel
+        Set<Integer> postIdSet = new HashSet<>();
+        postIdSet.add(testPost1.getId());
+        assertEquals(1, UploadSqlUtils.deletePostUploadModelsWithLocalIds(postIdSet));
+
+        postUploadModels = WellSql.select(PostUploadModel.class).getAsModel();
+        assertEquals(0, postUploadModels.size());
+
+        // The corresponding PostModels should be untouched
+        postModels = PostTestUtils.getPosts();
+        assertEquals(2, postModels.size());
+    }
+
+    @Test
+    public void testGetMediaUploadModelsForPost() {
+        // Check case where there are no matching MediaUploadModels for the post
+        assertEquals(0, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+
+        // Set up a MediaModel with a local post ID
+        long testId = Math.abs(mRandom.nextLong());
+        MediaModel testMedia = UploadTestUtils.getTestMedia(testId);
+        testMedia.setLocalPostId(98);
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia));
+
+        // Store a MediaUploadModel corresponding to the MediaModel
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(testMedia.getId());
+        mediaUploadModel.setProgress(0.65F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+
+        // Test retrieving MediaUploadModels by post id
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+
+        // Set up a second MediaModel with a different post ID
+        long testId2 = Math.abs(mRandom.nextLong());
+        MediaModel testMedia2 = UploadTestUtils.getTestMedia(testId2);
+        testMedia2.setLocalPostId(97);
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia2));
+
+        // Results for the first post ID should be unchanged
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+        // Expect empty result since we haven't created a MediaUploadModel for this yet
+        assertEquals(0, UploadSqlUtils.getMediaUploadModelsForPostId(97).size());
+
+        // Store a MediaUploadModel corresponding to the second MediaModel
+        MediaUploadModel mediaUploadModel2 = new MediaUploadModel(testMedia2.getId());
+        mediaUploadModel2.setProgress(0.66F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel2);
+
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(97).size());
+
+        // Set up a third MediaModel, with the same post ID as the second
+        long testId3 = Math.abs(mRandom.nextLong());
+        MediaModel testMedia3 = UploadTestUtils.getTestMedia(testId3);
+        testMedia3.setLocalPostId(97);
+        assertEquals(1, MediaSqlUtils.insertOrUpdateMedia(testMedia3));
+
+        // Store a MediaUploadModel corresponding to the third MediaModel
+        MediaUploadModel mediaUploadModel3 = new MediaUploadModel(testMedia3.getId());
+        mediaUploadModel3.setProgress(0.67F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel3);
+
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+        assertEquals(2, UploadSqlUtils.getMediaUploadModelsForPostId(97).size());
+
+        // Delete two MediaModels and verify the results
+        MediaSqlUtils.deleteMedia(testMedia);
+        MediaSqlUtils.deleteMedia(testMedia2);
+
+        assertEquals(0, UploadSqlUtils.getMediaUploadModelsForPostId(98).size());
+        assertEquals(1, UploadSqlUtils.getMediaUploadModelsForPostId(97).size());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadStoreUnitTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadStoreUnitTest.java
new file mode 100644
index 00000000000..73ff3122bf1
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadStoreUnitTest.java
@@ -0,0 +1,239 @@
+package org.wordpress.android.fluxc.upload;
+
+import android.content.Context;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.post.PostXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.persistence.PostSqlUtils;
+import org.wordpress.android.fluxc.persistence.UploadSqlUtils;
+import org.wordpress.android.fluxc.persistence.WellSqlConfig;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.PostStore;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType;
+import org.wordpress.android.fluxc.store.UploadStore;
+import org.wordpress.android.fluxc.store.UploadStore.UploadError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricTestRunner.class)
+public class UploadStoreUnitTest {
+    private Dispatcher mDispatcher = new Dispatcher();
+    private UploadStore mUploadStore = new UploadStore(mDispatcher);
+    private PostSqlUtils mPostSqlUtils = new PostSqlUtils();
+    private PostStore mPostStore = new PostStore(mDispatcher, Mockito.mock(PostRestClient.class),
+            Mockito.mock(PostXMLRPCClient.class), mPostSqlUtils);
+
+    @Before
+    public void setUp() {
+        Context appContext = RuntimeEnvironment.application.getApplicationContext();
+
+        WellSqlConfig config = new WellSqlConfig(appContext);
+        WellSql.init(config);
+        config.reset();
+    }
+
+    @Test
+    public void testMediaUploadProgress() {
+        // Create a MediaModel and add it to both the MediaModelTable and the MediaUploadTable
+        // (simulating an upload action)
+        MediaModel testMedia = UploadTestUtils.getLocalTestMedia();
+        testMedia.setId(5);
+        MediaSqlUtils.insertMediaForResult(testMedia);
+
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(testMedia.getId());
+        mediaUploadModel.setProgress(0.65F);
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+
+        // Check that the stored MediaUploadModel has the right state
+        mediaUploadModel = UploadTestUtils.getMediaUploadModelForMediaModel(testMedia);
+        assertNotNull(mediaUploadModel);
+        assertEquals(testMedia.getId(), mediaUploadModel.getId());
+        assertEquals(MediaUploadModel.UPLOADING, mediaUploadModel.getUploadState());
+        assertEquals(0.65F, mUploadStore.getUploadProgressForMedia(testMedia), 0.1F);
+    }
+
+    @Test
+    public void testPostModelRegistration() {
+        // Create a PostModel and add it to the PostStore
+        PostModel postModel = UploadTestUtils.getTestPost();
+        postModel.setId(55);
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel);
+        postModel = mPostStore.getPostByLocalPostId(postModel.getId());
+        assertNotNull(postModel);
+
+        // Register the PostModel with the UploadStore, creating a PostUploadModel with some associated media
+        List<MediaModel> associatedMedia = new ArrayList<>();
+        MediaModel media1 = UploadTestUtils.getLocalTestMedia();
+        media1.setId(5);
+        MediaModel media2 = UploadTestUtils.getLocalTestMedia();
+        media2.setId(6);
+        associatedMedia.add(media1);
+        associatedMedia.add(media2);
+        mUploadStore.registerPostModel(postModel, associatedMedia);
+
+        // Confirm that the PostUploadModel has been created and has the expected status
+        PostUploadModel postUploadModel = UploadTestUtils.getPostUploadModelForPostModel(postModel);
+        assertNotNull(postUploadModel);
+        assertEquals(2, postUploadModel.getAssociatedMediaIdSet().size());
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().contains(5));
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().contains(6));
+        assertEquals(PostUploadModel.PENDING, postUploadModel.getUploadState());
+        assertTrue(mUploadStore.isPendingPost(postModel));
+
+        // Register the same post again with media changes
+        MediaModel media3 = UploadTestUtils.getLocalTestMedia();
+        media3.setId(8);
+        // Remove one media and add a new one
+        associatedMedia.clear();
+        associatedMedia.add(media1);
+        associatedMedia.add(media3);
+        mUploadStore.registerPostModel(postModel, associatedMedia);
+
+        // Expect the updated model to have both the original media and the new one
+        postUploadModel = UploadTestUtils.getPostUploadModelForPostModel(postModel);
+        assertNotNull(postUploadModel);
+        assertEquals(3, postUploadModel.getAssociatedMediaIdSet().size());
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().contains(5));
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().contains(6));
+        assertTrue(postUploadModel.getAssociatedMediaIdSet().contains(8));
+        assertEquals(PostUploadModel.PENDING, postUploadModel.getUploadState());
+        assertTrue(mUploadStore.isPendingPost(postModel));
+    }
+
+    @Test
+    public void testGetUploadErrorForPost() {
+        // Create a PostModel and add it to the PostStore
+        PostModel postModel = UploadTestUtils.getTestPost();
+        postModel.setId(55);
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel);
+        postModel = mPostStore.getPostByLocalPostId(postModel.getId());
+        assertNotNull(postModel);
+
+        // Create some MediaModels and add them to both the MediaModelTable and the MediaUploadTable
+        // (simulating an upload action)
+        MediaModel media1 = UploadTestUtils.getLocalTestMedia();
+        media1.setId(5);
+        MediaSqlUtils.insertMediaForResult(media1);
+        UploadSqlUtils.insertOrUpdateMedia(new MediaUploadModel(media1.getId()));
+        MediaModel media2 = UploadTestUtils.getLocalTestMedia();
+        media2.setId(6);
+        MediaSqlUtils.insertMediaForResult(media2);
+        UploadSqlUtils.insertOrUpdateMedia(new MediaUploadModel(media2.getId()));
+
+        // Register the PostModel with the UploadStore, creating a PostUploadModel with some associated media
+        List<MediaModel> associatedMedia = new ArrayList<>();
+        associatedMedia.add(media1);
+        associatedMedia.add(media2);
+        mUploadStore.registerPostModel(postModel, associatedMedia);
+
+        // Confirm that the PostUploadModel has been created and has a null error state
+        PostUploadModel postUploadModel = UploadTestUtils.getPostUploadModelForPostModel(postModel);
+        assertNotNull(postUploadModel);
+        assertNull(mUploadStore.getUploadErrorForPost(postModel));
+
+        // Add an error to this PostUploadModel
+        postUploadModel.setPostError(new PostError(PostErrorType.UNKNOWN_POST, "Unknown!"));
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+
+        // Confirm that the store represents the post error correctly
+        UploadError uploadError = mUploadStore.getUploadErrorForPost(postModel);
+        assertNotNull(uploadError);
+        assertNull(uploadError.mediaError);
+        assertNotNull(uploadError.postError);
+        assertEquals(PostErrorType.UNKNOWN_POST, uploadError.postError.type);
+
+        // Null out the post error again
+        postUploadModel.setPostError(null);
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+        assertNull(mUploadStore.getUploadErrorForPost(postModel));
+
+        // Confirm that the MediaUploadModel's default state is error-free
+        MediaUploadModel mediaUploadModel1 = UploadTestUtils.getMediaUploadModelForMediaModel(media1);
+        assertNull(mediaUploadModel1.getMediaError());
+
+        // Add an error to the first MediaUploadModel
+        mediaUploadModel1.setMediaError(new MediaError(MediaErrorType.EXCEEDS_MEMORY_LIMIT, "Too large!"));
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel1);
+
+        // Confirm that the store now returns a media error for the post, since it has an associated media item
+        // with an error
+        uploadError = mUploadStore.getUploadErrorForPost(postModel);
+        assertNotNull(uploadError);
+        assertNull(uploadError.postError);
+        assertNotNull(uploadError.mediaError);
+        assertEquals(MediaErrorType.EXCEEDS_MEMORY_LIMIT, uploadError.mediaError.type);
+
+        // Create another PostModel and add it to the PostStore - this time, without registering it with the UploadStore
+        PostModel unregisteredPostModel = UploadTestUtils.getTestPost();
+        unregisteredPostModel.setId(55);
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(unregisteredPostModel);
+
+        // Create a MediaModel attached to the above post
+        MediaModel mediaLinkedToPost = UploadTestUtils.getLocalTestMedia();
+        mediaLinkedToPost.setId(7);
+        mediaLinkedToPost.setLocalPostId(unregisteredPostModel.getId());
+        MediaSqlUtils.insertMediaForResult(mediaLinkedToPost);
+        UploadSqlUtils.insertOrUpdateMedia(new MediaUploadModel(mediaLinkedToPost.getId()));
+        MediaUploadModel linkedMediaUploadModel = UploadTestUtils.getMediaUploadModelForMediaModel(mediaLinkedToPost);
+
+        // Add an error to the MediaUploadModel
+        linkedMediaUploadModel.setMediaError(new MediaError(MediaErrorType.EXCEEDS_MEMORY_LIMIT, "Too large!"));
+        UploadSqlUtils.insertOrUpdateMedia(linkedMediaUploadModel);
+
+        // Confirm that the store returns a media error for the post (even though there's no associated PostUploadModel)
+        uploadError = mUploadStore.getUploadErrorForPost(unregisteredPostModel);
+        assertNotNull(uploadError);
+        assertNull(uploadError.postError);
+        assertNotNull(uploadError.mediaError);
+        assertEquals(MediaErrorType.EXCEEDS_MEMORY_LIMIT, uploadError.mediaError.type);
+    }
+
+    @Test
+    public void testNumberOfAutoUploadsAttemptsCounter() {
+        // Create a PostModel and add it to the PostStore
+        PostModel postModel = UploadTestUtils.getTestPost();
+        postModel.setId(55);
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel);
+        postModel = mPostStore.getPostByLocalPostId(postModel.getId());
+        assertNotNull(postModel);
+
+        // Register the PostModel with the UploadStore
+        mUploadStore.registerPostModel(postModel, new ArrayList<MediaModel>());
+
+        assertEquals(0, UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId())
+                                      .getNumberOfAutoUploadAttempts());
+
+        mUploadStore.onAction(UploadActionBuilder.newIncrementNumberOfAutoUploadAttemptsAction(postModel));
+
+        assertEquals(1, UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId())
+                                      .getNumberOfAutoUploadAttempts());
+
+        mUploadStore.onAction(UploadActionBuilder.newIncrementNumberOfAutoUploadAttemptsAction(postModel));
+
+        assertEquals(2, UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId())
+                                      .getNumberOfAutoUploadAttempts());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadTestUtils.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadTestUtils.java
new file mode 100644
index 00000000000..82b34ded104
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/upload/UploadTestUtils.java
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc.upload;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.persistence.UploadSqlUtils;
+
+class UploadTestUtils {
+    private static final int TEST_LOCAL_SITE_ID = 42;
+
+    static MediaModel getTestMedia(long mediaId) {
+        return new MediaModel(
+                TEST_LOCAL_SITE_ID,
+                mediaId
+        );
+    }
+
+    static MediaModel getLocalTestMedia() {
+        return new MediaModel(
+                TEST_LOCAL_SITE_ID,
+                0
+        );
+    }
+
+    static PostModel getTestPost() {
+        PostModel post = new PostModel();
+        post.setLocalSiteId(TEST_LOCAL_SITE_ID);
+        return post;
+    }
+
+    static SiteModel getTestSite() {
+        SiteModel siteModel = new SiteModel();
+        siteModel.setId(TEST_LOCAL_SITE_ID);
+        return siteModel;
+    }
+
+    static MediaUploadModel getMediaUploadModelForMediaModel(MediaModel mediaModel) {
+        return UploadSqlUtils.getMediaUploadModelForLocalId(mediaModel.getId());
+    }
+
+    static PostUploadModel getPostUploadModelForPostModel(PostModel postModel) {
+        return UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/BloggingPromptUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/BloggingPromptUtilsTest.kt
new file mode 100644
index 00000000000..0943a51fa42
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/BloggingPromptUtilsTest.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.utils
+
+import org.junit.Assert
+import org.junit.Test
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsUtils
+
+class BloggingPromptUtilsTest {
+    @Test
+    fun testBloggingPromptDateStringToDateObject() {
+        val date = "2022-05-01"
+
+        // A string date converted to Date and back should be unaltered
+        val result = BloggingPromptsUtils.stringToDate(date)
+        Assert.assertEquals(date, BloggingPromptsUtils.dateToString(result))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/CurrentTimeProviderTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/CurrentTimeProviderTest.kt
new file mode 100644
index 00000000000..7f117df0a13
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/CurrentTimeProviderTest.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.utils
+
+import kotlinx.coroutines.delay
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.fluxc.test
+
+class CurrentTimeProviderTest {
+    private val currentTimeProvider = CurrentTimeProvider()
+
+    @Test
+    fun `always returns current date`() = test {
+        val firstDate = currentTimeProvider.currentDate()
+        delay(1)
+        val secondDate = currentTimeProvider.currentDate()
+
+        assertThat(firstDate).isNotEqualTo(secondDate)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/DateTimeUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/DateTimeUtilsTest.java
new file mode 100644
index 00000000000..10038e83f2e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/DateTimeUtilsTest.java
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.junit.Test;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
+
+public class DateTimeUtilsTest {
+    @Test
+    public void test8601DateStringToDateObject() {
+        String iso8601date = "1955-11-05T06:15:00-0800";
+        String iso8601dateUTC = "1955-11-05T14:15:00+00:00";
+
+        // A UTC ISO 8601 date converted to Date and back should be unaltered
+        Date result = DateTimeUtils.dateUTCFromIso8601(iso8601dateUTC);
+        assertEquals(iso8601dateUTC, DateTimeUtils.iso8601UTCFromDate(result));
+
+        // An ISO 8601 date with timezone offset converted to Date and back should be in UTC format
+        result = DateTimeUtils.dateUTCFromIso8601(iso8601date);
+        assertEquals(iso8601dateUTC, DateTimeUtils.iso8601UTCFromDate(result));
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtilsTest.kt
new file mode 100644
index 00000000000..f24e5e11c2d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtilsTest.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.utils
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.mockito.Mockito.mock
+import org.mockito.kotlin.whenever
+import java.io.File
+
+class JetpackAITranscriptionUtilsTest {
+    private val jetpackAITranscriptionUtils = JetpackAITranscriptionUtils()
+
+    @Test
+    fun `file is not eligible if it does not exist`() {
+        val mockFile = mock(File::class.java)
+        whenever(mockFile.exists()).thenReturn(false)
+
+        val result = jetpackAITranscriptionUtils.isFileEligibleForTranscription(mockFile, 1000L)
+
+        assertFalse(result)
+    }
+
+    @Test
+    fun `file is not eligible if it is not readable`() {
+        val mockFile = mock(File::class.java)
+        whenever(mockFile.exists()).thenReturn(true)
+        whenever(mockFile.canRead()).thenReturn(false)
+
+        val result = jetpackAITranscriptionUtils.isFileEligibleForTranscription(mockFile, 1000L)
+
+        assertFalse(result)
+    }
+
+    @Test
+    fun `file is not eligible if it exceeds size limit`() {
+        val mockFile = mock(File::class.java)
+        whenever(mockFile.exists()).thenReturn(true)
+        whenever(mockFile.canRead()).thenReturn(true)
+        whenever(mockFile.length()).thenReturn(2000L)
+
+        val result = jetpackAITranscriptionUtils.isFileEligibleForTranscription(mockFile, 1000L)
+
+        assertFalse(result)
+    }
+
+    @Test
+    fun `file is eligible if it exists, is readable, and meets size limit`() {
+        val mockFile = mock(File::class.java)
+        whenever(mockFile.exists()).thenReturn(true)
+        whenever(mockFile.canRead()).thenReturn(true)
+        whenever(mockFile.length()).thenReturn(500L)
+
+        val result = jetpackAITranscriptionUtils.isFileEligibleForTranscription(mockFile, 1000L)
+
+        assertTrue(result)
+    }
+
+    @Test
+    fun `file is eligible if it exists, is readable, and equals size limit`() {
+        val mockFile = mock(File::class.java)
+        whenever(mockFile.exists()).thenReturn(true)
+        whenever(mockFile.canRead()).thenReturn(true)
+        whenever(mockFile.length()).thenReturn(1000L)
+
+        val result = jetpackAITranscriptionUtils.isFileEligibleForTranscription(mockFile, 1000L)
+
+        assertTrue(result)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectExtensionsTests.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectExtensionsTests.kt
new file mode 100644
index 00000000000..f0b5c2a9324
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/JsonObjectExtensionsTests.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc.utils
+
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import org.junit.Test
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.network.utils.getJsonObject
+import org.wordpress.android.fluxc.network.utils.getString
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+private const val SAMPLE_JSON =
+"""
+{
+    "string": "Some string",
+    "escaped_string": "\\ \" '",
+    "number": 37,
+    "nullstring": null,
+    "object": {
+        "name": "Object name"
+    }
+}
+"""
+
+class JsonObjectExtensionsTests {
+    private val jsonObject by lazy {
+        JsonParser().parse(SAMPLE_JSON).asJsonObject
+    }
+
+    @Test
+    fun testNullGetters() {
+        val nullJsonObject: JsonObject? = null
+        assertNull(nullJsonObject.getString(""))
+        assertNull(nullJsonObject.getJsonObject(""))
+        assertEquals(0, nullJsonObject.getInt(""))
+        assertEquals(3, nullJsonObject.getInt("", 3))
+    }
+
+    @Test
+    fun testGetString() {
+        assertEquals("Some string", jsonObject.getString("string"))
+        assertEquals("\\ \" '", jsonObject.getString("escaped_string", true))
+        assertNull(jsonObject.getString("doesn't exist"))
+        assertNull(jsonObject.getString("nullstring"))
+    }
+
+    @Test
+    fun testGetInt() {
+        assertEquals(37, jsonObject.getInt("number"))
+        assertEquals(0, jsonObject.getInt("doesn't exist"))
+        assertEquals(99, jsonObject.getInt("doesn't exist", 99))
+    }
+
+    @Test
+    fun testGetObject() {
+        val obj = jsonObject.getJsonObject("object")
+        assertNotNull(obj)
+        assertEquals("Object name", obj.getString("name"))
+        assertNull(obj.getJsonObject("doesn't exist"))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MediaUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MediaUtilsTest.java
new file mode 100644
index 00000000000..a905b95eb5b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MediaUtilsTest.java
@@ -0,0 +1,212 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MediaUtilsTest {
+    private final String[] mSupportedImageSubtypes = {
+            "jpeg", "png", "gif"
+    };
+    private final String[] mSupportedVideoSubtypes = {
+            "mp4", "quicktime", "x-ms-wmv", "avi", "mpeg", "mp2p", "ogg", "3gpp", "3gpp2"
+    };
+    private final String[] mSupportedAudioSubtypes = {
+            "mpeg", "mp4", "ogg", "x-wav"
+    };
+    private final String[] mSupportedApplicationSubtypes = {
+            "pdf", "msword", "vnd.openxmlformats-officedocument.wordprocessingml.document", "mspowerpoint",
+            "vnd.openxmlformats-officedocument.presentationml.presentation", "vnd.oasis.opendocument.text",
+            "vnd.ms-excel", "vnd.openxmlformats-officedocument.spreadsheetml.sheet", "keynote", "zip"
+    };
+    private final String[] mSupportedImageExtensions = {
+            "jpg", "jpeg", "png", "gif"
+    };
+    private final String[] mSupportedVideoExtensions = {
+            "mp4", "m4v", "mov", "wmv", "avi", "mpg", "ogv", "3gp", "3g2"
+    };
+    private final String[] mSupportedAudioExtensions = {
+            "mp3", "m4a", "ogg", "wav"
+    };
+    private final String[] mSupportedApplicationExtensions = {
+            "pdf", "doc", "ppt", "odt", "pptx", "docx", "xls", "xlsx", "key", "zip"
+    };
+
+    @Test
+    public void testImageMimeTypeRecognition() {
+        final String[] validImageMimeTypes = {
+                "image/jpg", "image/*", "image/png", "image/mp4"
+        };
+        final String[] invalidImageMimeTypes = {
+                "imagejpg", "video/jpg", "", null, "/", "image/jpg/png", "jpg", "jpg/image"
+        };
+
+        for (String validImageMimeType : validImageMimeTypes) {
+            assertThat(MediaUtils.isImageMimeType(validImageMimeType)).isTrue();
+        }
+        for (String invalidImageMimeType : invalidImageMimeTypes) {
+            assertThat(MediaUtils.isImageMimeType(invalidImageMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testVideoMimeTypeRecognition() {
+        final String[] validVideoMimeTypes = {
+                "video/mp4", "video/*", "video/mkv", "video/png"
+        };
+        final String[] invalidVideoMimeTypes = {
+                "videomp4", "image/mp4", "", null, "/", "video/mp4/mkv", "mp4", "mp4/video"
+        };
+
+        for (String validVideoMimeType : validVideoMimeTypes) {
+            assertThat(MediaUtils.isVideoMimeType(validVideoMimeType)).isTrue();
+        }
+        for (String invalidVideoMimeType : invalidVideoMimeTypes) {
+            assertThat(MediaUtils.isVideoMimeType(invalidVideoMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testAudioMimeTypeRecognition() {
+        final String[] validAudioMimeTypes = {
+                "audio/mp3", "audio/*", "audio/wav", "audio/png"
+        };
+        final String[] invalidAudioMimeTypes = {
+                "audiomp3", "video/mp3", "", null, "/", "audio/mp4/mkv", "mp3", "mp4/audio"
+        };
+
+        for (String validAudioMimeType : validAudioMimeTypes) {
+            assertThat(MediaUtils.isAudioMimeType(validAudioMimeType)).isTrue();
+        }
+        for (String invalidAudioMimeType : invalidAudioMimeTypes) {
+            assertThat(MediaUtils.isAudioMimeType(invalidAudioMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testApplicationMimeTypeRecognition() {
+        final String[] validApplicationMimeTypes = {
+                "application/pdf", "application/*", "application/ppsx", "application/png"
+        };
+        final String[] invalidApplicationMimeTypes = {
+                "applicationpdf", "audio/pdf", "", null, "/", "application/pdf/doc", "pdf", "pdf/application"
+        };
+
+        for (String validApplicationMimeType : validApplicationMimeTypes) {
+            assertThat(MediaUtils.isApplicationMimeType(validApplicationMimeType)).isTrue();
+        }
+        for (String invalidApplicationMimeType : invalidApplicationMimeTypes) {
+            assertThat(MediaUtils.isApplicationMimeType(invalidApplicationMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testSupportedImageRecognition() {
+        final String[] unsupportedImageTypes = {"bmp", "tif", "tiff", "ppm", "pgm", "svg"};
+        for (String supportedImageType : mSupportedImageSubtypes) {
+            String supportedImageMimeType = "image/" + supportedImageType;
+            assertThat(MediaUtils.isSupportedImageMimeType(supportedImageMimeType)).isTrue();
+        }
+        for (String unsupportedImageType : mSupportedVideoSubtypes) {
+            String unsupportedImageMimeType = "image/" + unsupportedImageType;
+            assertThat(MediaUtils.isSupportedImageMimeType(unsupportedImageMimeType)).isFalse();
+        }
+        for (String unsupportedImageType : unsupportedImageTypes) {
+            String unsupportedImageMimeType = "image/" + unsupportedImageType;
+            assertThat(MediaUtils.isSupportedImageMimeType(unsupportedImageMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testSupportedVideoRecognition() {
+        final String[] unsupportedVideoTypes = {"flv", "vob", "yuv", "m2v"};
+        for (String supportedVideoType : mSupportedVideoSubtypes) {
+            String supportedVideoMimeType = "video/" + supportedVideoType;
+            assertThat(MediaUtils.isSupportedVideoMimeType(supportedVideoMimeType)).isTrue();
+        }
+        for (String unsupportedVideoType : mSupportedApplicationSubtypes) {
+            String unsupportedVideoMimeType = "video/" + unsupportedVideoType;
+            assertThat(MediaUtils.isSupportedVideoMimeType(unsupportedVideoMimeType)).isFalse();
+        }
+        for (String unsupportedVideoType : unsupportedVideoTypes) {
+            String unsupportedVideoMimeType = "video/" + unsupportedVideoType;
+            assertThat(MediaUtils.isSupportedVideoMimeType(unsupportedVideoMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testSupportedAudioRecognition() {
+        final String[] unsupportedAudioTypes = {"m4p", "raw", "tta", "wma", "dss", "webm"};
+        for (String supportedAudioType : mSupportedAudioSubtypes) {
+            String supportedAudioMimeType = "audio/" + supportedAudioType;
+            assertThat(MediaUtils.isSupportedAudioMimeType(supportedAudioMimeType)).isTrue();
+        }
+        for (String unsupportedAudioType : mSupportedApplicationSubtypes) {
+            String unsupportedAudioMimeType = "audio/" + unsupportedAudioType;
+            assertThat(MediaUtils.isSupportedAudioMimeType(unsupportedAudioMimeType)).isFalse();
+        }
+        for (String unsupportedAudioType : unsupportedAudioTypes) {
+            String unsupportedAudioMimeType = "audio/" + unsupportedAudioType;
+            assertThat(MediaUtils.isSupportedAudioMimeType(unsupportedAudioMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testSupportedApplicationRecognition() {
+        final String[] unsupportedApplicationTypes = {"com", "bin", "exe", "jar", "xif", "xsl"};
+        for (String supportedApplicationType : mSupportedApplicationSubtypes) {
+            String supportedApplicationMimeType = "application/" + supportedApplicationType;
+            assertThat(MediaUtils.isSupportedApplicationMimeType(supportedApplicationMimeType))
+                    .withFailMessage("MimeType not supported: " + supportedApplicationMimeType).isTrue();
+        }
+        for (String unsupportedApplicationType : mSupportedImageSubtypes) {
+            String unsupportedApplicationMimeType = "application/" + unsupportedApplicationType;
+            assertThat(MediaUtils.isSupportedApplicationMimeType(unsupportedApplicationMimeType)).isFalse();
+        }
+        for (String unsupportedApplicationType : unsupportedApplicationTypes) {
+            String unsupportedApplicationMimeType = "application/" + unsupportedApplicationType;
+            assertThat(MediaUtils.isSupportedApplicationMimeType(unsupportedApplicationMimeType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testGetMimeTypeFromExtension() {
+        for (String supportedImageExtension : mSupportedImageExtensions) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedImageExtension);
+            assertThat(mimeType).isNotNull();
+        }
+        for (String supportedVideoExtension : mSupportedVideoExtensions) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedVideoExtension);
+            assertThat(mimeType).isNotNull();
+        }
+        for (String supportedAudioExtension : mSupportedAudioExtensions) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedAudioExtension);
+            assertThat(mimeType).isNotNull();
+        }
+        for (String supportedApplicationExtension : mSupportedApplicationExtensions) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedApplicationExtension);
+            assertThat(mimeType).isNotNull();
+        }
+
+        final String[] unsupportedImageTypes = {"bmp", "tif", "tiff", "ppm", "pgm", "svg"};
+        for (String supportedImageExtension : unsupportedImageTypes) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedImageExtension);
+            assertThat(mimeType).isNull();
+        }
+        final String[] unsupportedVideoTypes = {"flv", "vob", "yuv", "m2v"};
+        for (String supportedVideoExtension : unsupportedVideoTypes) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedVideoExtension);
+            assertThat(mimeType).isNull();
+        }
+        final String[] unsupportedAudioTypes = {"m4p", "raw", "tta", "wma", "dss"};
+        for (String supportedAudioExtension : unsupportedAudioTypes) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedAudioExtension);
+            assertThat(mimeType).isNull();
+        }
+        final String[] unsupportedApplicationTypes = {"com", "bin", "exe", "jar", "xif", "xsl"};
+        for (String supportedApplicationExtension : unsupportedApplicationTypes) {
+            String mimeType = MediaUtils.getMimeTypeForExtension(supportedApplicationExtension);
+            assertThat(mimeType).isNull();
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MimeTypesTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MimeTypesTest.kt
new file mode 100644
index 00000000000..498cdaddec9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/MimeTypesTest.kt
@@ -0,0 +1,215 @@
+package org.wordpress.android.fluxc.utils
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.SELF_HOSTED
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.WP_COM_FREE
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.WP_COM_PAID
+
+@RunWith(MockitoJUnitRunner::class)
+class MimeTypesTest {
+    private val mimeTypes = MimeTypes()
+
+    @Test
+    fun `returns all mime types as strings`() {
+        val allTypes = mimeTypes.getAllTypes()
+
+        assertThat(allTypes).isEqualTo(allMimeTypes)
+    }
+
+    @Test
+    fun `returns all WP_COM_PAID mime types as strings`() {
+        val allTypes = mimeTypes.getAllTypes(WP_COM_PAID)
+
+        assertThat(allTypes).isEqualTo(allMimeTypes)
+    }
+
+    @Test
+    fun `returns all SELF_HOSTED mime types as strings`() {
+        val allTypes = mimeTypes.getAllTypes(SELF_HOSTED)
+
+        assertThat(allTypes).isEqualTo(allMimeTypes)
+    }
+
+    @Test
+    fun `returns all WP_COM_FREE mime types as strings`() {
+        val allTypes = mimeTypes.getAllTypes(WP_COM_FREE)
+
+        assertThat(allTypes).isEqualTo(
+                arrayOf(
+                        "video/mp4",
+                        "video/quicktime",
+                        "video/x-ms-wmv",
+                        "video/avi",
+                        "video/mpeg",
+                        "video/mp2p",
+                        "video/ogg",
+                        "video/3gpp",
+                        "video/3gpp2",
+                        "image/jpeg",
+                        "image/png",
+                        "image/gif",
+                        "image/webp",
+                        "image/heic",
+                        "image/heif",
+                        "application/pdf",
+                        "application/msword",
+                        "application/doc",
+                        "application/ms-doc",
+                        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                        "application/powerpoint",
+                        "application/mspowerpoint",
+                        "application/x-mspowerpoint",
+                        "application/vnd.ms-powerpoint",
+                        "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+                        "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+                        "application/vnd.oasis.opendocument.text",
+                        "application/excel",
+                        "application/x-excel",
+                        "application/vnd.ms-excel",
+                        "application/x-msexcel",
+                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                )
+        )
+    }
+
+    @Test
+    fun `returns image and video only mime types as strings`() {
+        val allTypes = mimeTypes.getVideoAndImageTypesOnly()
+
+        assertThat(allTypes).isEqualTo(
+                arrayOf(
+                        "video/mp4",
+                        "video/quicktime",
+                        "video/x-ms-wmv",
+                        "video/avi",
+                        "video/mpeg",
+                        "video/mp2p",
+                        "video/ogg",
+                        "video/3gpp",
+                        "video/3gpp2",
+                        "image/jpeg",
+                        "image/png",
+                        "image/gif",
+                        "image/webp",
+                        "image/heic",
+                        "image/heif"
+                )
+        )
+    }
+
+    @Test
+    fun `returns image only mime types as strings`() {
+        val allTypes = mimeTypes.getImageTypesOnly()
+
+        assertThat(allTypes).isEqualTo(
+                arrayOf(
+                        "image/jpeg",
+                        "image/png",
+                        "image/gif",
+                        "image/webp",
+                        "image/heic",
+                        "image/heif"
+                )
+        )
+    }
+
+    @Test
+    fun `returns video only mime types as strings`() {
+        val allTypes = mimeTypes.getVideoTypesOnly()
+
+        assertThat(allTypes).isEqualTo(
+                arrayOf(
+                        "video/mp4",
+                        "video/quicktime",
+                        "video/x-ms-wmv",
+                        "video/avi",
+                        "video/mpeg",
+                        "video/mp2p",
+                        "video/ogg",
+                        "video/3gpp",
+                        "video/3gpp2"
+                )
+        )
+    }
+
+    @Test
+    fun `returns audio only mime types as strings`() {
+        val allTypes = mimeTypes.getAudioTypesOnly()
+
+        assertThat(allTypes).isEqualTo(allAudioMimeTypes)
+    }
+
+    @Test
+    fun `returns WP_COM_FREE audio only mime types as strings`() {
+        val allTypes = mimeTypes.getAudioTypesOnly(WP_COM_FREE)
+
+        assertThat(allTypes).isEqualTo(emptyArray<MimeType>())
+    }
+
+    @Test
+    fun `returns WP_COM_PAID audio only mime types as strings`() {
+        val allTypes = mimeTypes.getAudioTypesOnly(WP_COM_PAID)
+
+        assertThat(allTypes).isEqualTo(allAudioMimeTypes)
+    }
+
+    @Test
+    fun `returns SELF_HOSTED audio only mime types as strings`() {
+        val allTypes = mimeTypes.getAudioTypesOnly(SELF_HOSTED)
+
+        assertThat(allTypes).isEqualTo(allAudioMimeTypes)
+    }
+
+    private val allAudioMimeTypes = arrayOf(
+            "audio/mpeg",
+            "audio/mp4",
+            "audio/ogg",
+            "application/ogg",
+            "audio/x-wav"
+    )
+
+    private val allMimeTypes = arrayOf(
+            "audio/mpeg",
+            "audio/mp4",
+            "audio/ogg",
+            "application/ogg",
+            "audio/x-wav",
+            "video/mp4",
+            "video/quicktime",
+            "video/x-ms-wmv",
+            "video/avi",
+            "video/mpeg",
+            "video/mp2p",
+            "video/ogg",
+            "video/3gpp",
+            "video/3gpp2",
+            "image/jpeg",
+            "image/png",
+            "image/gif",
+            "image/webp",
+            "image/heic",
+            "image/heif",
+            "application/pdf",
+            "application/msword",
+            "application/doc",
+            "application/ms-doc",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            "application/powerpoint",
+            "application/mspowerpoint",
+            "application/x-mspowerpoint",
+            "application/vnd.ms-powerpoint",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+            "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+            "application/vnd.oasis.opendocument.text",
+            "application/excel",
+            "application/x-excel",
+            "application/vnd.ms-excel",
+            "application/x-msexcel",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            "application/keynote",
+            "application/zip"
+    )
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/ObjectsUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/ObjectsUtilsTest.kt
new file mode 100644
index 00000000000..91eeeeca5e8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/ObjectsUtilsTest.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.utils
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+internal class ObjectsUtilsTest {
+    @Test
+    fun `equals returns true for same references`() {
+        val first = Any()
+        val second = first
+        assertTrue(ObjectsUtils.equals(first, second))
+    }
+
+    @Test
+    fun `equals return true if both arguments are null`() {
+        val first = null
+        val second = null
+        assertTrue(ObjectsUtils.equals(first, second))
+    }
+
+    @Test
+    fun `equals returns false for different references`() {
+        val first = Any()
+        val second = Any()
+        assertFalse(ObjectsUtils.equals(first, second))
+    }
+
+    @Test
+    fun `equals returns false when only first argument is null`() {
+        val first = Any()
+        val second = null
+        assertFalse(ObjectsUtils.equals(first, second))
+    }
+
+    @Test
+    fun `equals returns false when only second argument is null`() {
+        val first = null
+        val second = Any()
+        assertFalse(ObjectsUtils.equals(first, second))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/PlanOffersSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/PlanOffersSqlUtilsTest.kt
new file mode 100644
index 00000000000..a9a26f1880b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/PlanOffersSqlUtilsTest.kt
@@ -0,0 +1,49 @@
+package org.wordpress.android.fluxc.utils
+
+import androidx.room.Room
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.model.plans.PlanOffersMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PLAN_OFFER_MODELS
+import org.wordpress.android.fluxc.persistence.PlanOffersDao
+import org.wordpress.android.fluxc.persistence.PlanOffersSqlUtils
+import org.wordpress.android.fluxc.persistence.WPAndroidDatabase
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(RobolectricTestRunner::class)
+class PlanOffersSqlUtilsTest {
+    private lateinit var planOffersDao: PlanOffersDao
+    private lateinit var planOffersMapper: PlanOffersMapper
+
+    private lateinit var planOffersSqlUtils: PlanOffersSqlUtils
+    private lateinit var database: WPAndroidDatabase
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+
+        database = Room.inMemoryDatabaseBuilder(
+                appContext,
+                WPAndroidDatabase::class.java
+        ).allowMainThreadQueries().build()
+
+        planOffersDao = database.planOffersDao()
+        planOffersMapper = PlanOffersMapper()
+
+        planOffersSqlUtils = PlanOffersSqlUtils(planOffersDao, planOffersMapper)
+    }
+
+    @Test
+    fun testStoringAndRetrievingPlanOffers() {
+        planOffersSqlUtils.storePlanOffers(PLAN_OFFER_MODELS)
+
+        val cachedPlanOffers = planOffersSqlUtils.getPlanOffers()
+
+        assertNotNull(cachedPlanOffers)
+        assertEquals(PLAN_OFFER_MODELS, cachedPlanOffers)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/QuickStartSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/QuickStartSqlUtilsTest.kt
new file mode 100644
index 00000000000..f2bc93eb8e5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/QuickStartSqlUtilsTest.kt
@@ -0,0 +1,103 @@
+package org.wordpress.android.fluxc.utils
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.QuickStartStatusModel
+import org.wordpress.android.fluxc.model.QuickStartTaskModel
+import org.wordpress.android.fluxc.persistence.QuickStartSqlUtils
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@RunWith(RobolectricTestRunner::class)
+class QuickStartSqlUtilsTest {
+    private val testLocalSiteId: Long = 72
+    private lateinit var quickStartSqlUtils: QuickStartSqlUtils
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(QuickStartTaskModel::class.java, QuickStartStatusModel::class.java), ""
+        )
+        WellSql.init(config)
+        config.reset()
+
+        quickStartSqlUtils = QuickStartSqlUtils()
+    }
+
+    @Test
+    fun testDoneCount() {
+        assertEquals(0, quickStartSqlUtils.getDoneCount(testLocalSiteId))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.FOLLOW_SITE, true)
+        assertEquals(1, quickStartSqlUtils.getDoneCount(testLocalSiteId))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.FOLLOW_SITE, false)
+        assertEquals(0, quickStartSqlUtils.getDoneCount(testLocalSiteId))
+    }
+
+    @Test
+    fun testDoneCountByType() {
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, CUSTOMIZE))
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, GROW))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.CREATE_SITE, true)
+        assertEquals(1, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, CUSTOMIZE))
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, GROW))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.CREATE_SITE, false)
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, CUSTOMIZE))
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, GROW))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.PUBLISH_POST, true)
+        assertEquals(1, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, GROW))
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, CUSTOMIZE))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.PUBLISH_POST, false)
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, GROW))
+        assertEquals(0, quickStartSqlUtils.getDoneCountByType(testLocalSiteId, CUSTOMIZE))
+    }
+
+    @Test
+    fun testTaskDoneStatus() {
+        assertFalse(quickStartSqlUtils.hasDoneTask(testLocalSiteId, QuickStartNewSiteTask.UNKNOWN))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.UNKNOWN, true)
+        assertTrue(quickStartSqlUtils.hasDoneTask(testLocalSiteId, QuickStartNewSiteTask.UNKNOWN))
+
+        quickStartSqlUtils.setDoneTask(testLocalSiteId, QuickStartNewSiteTask.UNKNOWN, false)
+        assertFalse(quickStartSqlUtils.hasDoneTask(testLocalSiteId, QuickStartNewSiteTask.UNKNOWN))
+    }
+
+    @Test
+    fun testQuickStartCompletedStatus() {
+        assertFalse(quickStartSqlUtils.getQuickStartCompleted(testLocalSiteId))
+
+        quickStartSqlUtils.setQuickStartCompleted(testLocalSiteId, true)
+        assertTrue(quickStartSqlUtils.getQuickStartCompleted(testLocalSiteId))
+
+        quickStartSqlUtils.setQuickStartCompleted(testLocalSiteId, false)
+        assertFalse(quickStartSqlUtils.getQuickStartCompleted(testLocalSiteId))
+    }
+
+    @Test
+    fun testQuickStartNotificationReceivedStatus() {
+        assertFalse(quickStartSqlUtils.getQuickStartNotificationReceived(testLocalSiteId))
+
+        quickStartSqlUtils.setQuickStartNotificationReceived(testLocalSiteId, true)
+        assertTrue(quickStartSqlUtils.getQuickStartNotificationReceived(testLocalSiteId))
+
+        quickStartSqlUtils.setQuickStartNotificationReceived(testLocalSiteId, false)
+        assertFalse(quickStartSqlUtils.getQuickStartNotificationReceived(testLocalSiteId))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/RequestQueryParametersTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/RequestQueryParametersTest.java
new file mode 100644
index 00000000000..b864134762c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/RequestQueryParametersTest.java
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricTestRunner.class)
+public class RequestQueryParametersTest {
+    @Test
+    public void testBaseRequestAddQueryParameters() {
+        String baseUrl = "https://public-api.wordpress.com/rest/v1.1/sites/56/posts/";
+
+        WPComGsonRequest<Object> wpComGsonRequest = WPComGsonRequest.buildGetRequest(baseUrl, null, null, null, null);
+
+        wpComGsonRequest.addQueryParameter("type", "post");
+        assertEquals(baseUrl + "?type=post", wpComGsonRequest.getUrl());
+
+        Map<String, String> params = new HashMap<>();
+        params.put("offset", "20");
+        params.put("favorite_pet", "pony");
+        wpComGsonRequest.addQueryParameters(params);
+        assertEquals(baseUrl + "?type=post&offset=20&favorite_pet=pony", wpComGsonRequest.getUrl());
+
+        // No change to URL if params are null or empty
+        wpComGsonRequest.addQueryParameters(null);
+        assertEquals(baseUrl + "?type=post&offset=20&favorite_pet=pony", wpComGsonRequest.getUrl());
+
+        wpComGsonRequest.addQueryParameters(new HashMap<String, String>());
+        assertEquals(baseUrl + "?type=post&offset=20&favorite_pet=pony", wpComGsonRequest.getUrl());
+    }
+
+    @Test
+    public void testWPComGsonRequestConstructorGet() {
+        String baseUrl = "https://public-api.wordpress.com/rest/v1.1/sites/56/posts/";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("offset", "20");
+        params.put("favorite_pet", "pony");
+
+        WPComGsonRequest wpComGsonRequest = WPComGsonRequest.buildGetRequest(baseUrl, params, null, null, null);
+        assertEquals(baseUrl + "?offset=20&favorite_pet=pony", wpComGsonRequest.getUrl());
+    }
+
+    @Test
+    public void testWPComGsonRequestConstructorPost() {
+        String baseUrl = "https://public-api.wordpress.com/rest/v1.1/sites/56/posts/";
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("offset", "20");
+        body.put("favorite_pet", "pony");
+
+        WPComGsonRequest wpComGsonRequest = WPComGsonRequest.buildPostRequest(baseUrl, body, null, null, null);
+        // No change if the request != GET
+        assertEquals(baseUrl, wpComGsonRequest.getUrl());
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/SiteUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/SiteUtilsTest.kt
new file mode 100644
index 00000000000..7d2dac95f71
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/SiteUtilsTest.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.utils
+
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.util.DateTimeUtils
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+
+class SiteUtilsTest {
+    companion object {
+        const val UTC8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX"
+        private const val DATE_FORMAT_DAY = "yyyy-MM-dd"
+        private const val DATE_FORMAT_WEEK = "yyyy-'W'ww"
+        private const val DATE_FORMAT_MONTH = "yyyy-MM"
+        private const val DATE_FORMAT_YEAR = "yyyy"
+    }
+
+    @Test
+    fun testGetCurrentDateTimeUtcSite() {
+        val siteModel = SiteModel()
+        with(siteModel) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            val currentTimeUtc = DateTimeUtils.iso8601UTCFromDate(Date())
+            assertEquals(currentTimeUtc, formattedDate.replace("Z", "+00:00"))
+        }
+
+        siteModel.timezone = ""
+        with(siteModel) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            val currentTimeUtc = DateTimeUtils.iso8601UTCFromDate(Date())
+            assertEquals(currentTimeUtc, formattedDate.replace("Z", "+00:00"))
+        }
+
+        siteModel.timezone = "0"
+        with(siteModel) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            val currentTimeUtc = DateTimeUtils.iso8601UTCFromDate(Date())
+            assertEquals(currentTimeUtc, formattedDate.replace("Z", "+00:00"))
+        }
+    }
+
+    @Test
+    fun testGetCurrentDateTimeForNonUtcSite() {
+        val hourFormat = SimpleDateFormat("HH", Locale.ROOT)
+
+        val estSite = SiteModel().apply { timezone = "-4" }
+        with(estSite) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            assertEquals("-04:00", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.nowUTC())
+            assertNotEquals(currentHour, SiteUtils.getCurrentDateTimeForSite(this, hourFormat))
+        }
+
+        val acstSite = SiteModel().apply { timezone = "9.5" }
+        with(acstSite) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            assertEquals("+09:30", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.nowUTC())
+            assertNotEquals(currentHour, SiteUtils.getCurrentDateTimeForSite(this, hourFormat))
+        }
+
+        val nptSite = SiteModel().apply { timezone = "5.75" }
+        with(nptSite) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            assertEquals("+05:45", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.nowUTC())
+            assertNotEquals(currentHour, SiteUtils.getCurrentDateTimeForSite(this, hourFormat))
+        }
+
+        val imaginaryQuarterTimeZoneSite = SiteModel().apply { timezone = "-2.25" }
+        with(imaginaryQuarterTimeZoneSite) {
+            val formattedDate = SiteUtils.getCurrentDateTimeForSite(this, UTC8601_FORMAT)
+            assertEquals("-02:15", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.nowUTC())
+            assertNotEquals(currentHour, SiteUtils.getCurrentDateTimeForSite(this, hourFormat))
+        }
+    }
+
+    @Test
+    fun testGetFormattedDateForUtcSite() {
+        val siteModel = SiteModel()
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, "")
+            val currentTimeUtc = DateTimeUtils.iso8601UTCFromDate(Date())
+            assertEquals(currentTimeUtc, formattedDate.replace("Z", "+00:00"))
+        }
+
+        siteModel.timezone = ""
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, null)
+            val currentTimeUtc = DateTimeUtils.iso8601UTCFromDate(Date())
+            assertEquals(currentTimeUtc, formattedDate.replace("Z", "+00:00"))
+        }
+
+        siteModel.timezone = "0"
+        val dateString = "2019-01-31"
+        val date = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT).parse(dateString)
+
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, DATE_FORMAT_DAY, dateString)
+            val currentTimeUtc = DateUtils.formatDate(DATE_FORMAT_DAY, date)
+            assertEquals(currentTimeUtc, formattedDate)
+        }
+
+        siteModel.timezone = ""
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, DATE_FORMAT_WEEK, dateString)
+            val currentTimeUtc = DateUtils.formatDate(DATE_FORMAT_WEEK, date)
+            assertEquals(currentTimeUtc, formattedDate)
+        }
+
+        siteModel.timezone = "0"
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, DATE_FORMAT_MONTH, dateString)
+            val currentTimeUtc = DateUtils.formatDate(DATE_FORMAT_MONTH, date)
+            assertEquals(currentTimeUtc, formattedDate)
+        }
+
+        siteModel.timezone = ""
+        with(siteModel) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, DATE_FORMAT_YEAR, dateString)
+            val currentTimeUtc = DateUtils.formatDate(DATE_FORMAT_YEAR, date)
+            assertEquals(currentTimeUtc, formattedDate)
+        }
+    }
+
+    @Test
+    fun testGetFormattedDateForNonUtcSite() {
+        val hourFormat = SimpleDateFormat("HH", Locale.ROOT)
+        val dateString = "2019-01-31"
+        val date = DateUtils.getDateFromString(dateString)
+
+        val estSite = SiteModel().apply { timezone = "-4" }
+        with(estSite) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, dateString)
+            assertEquals("-04:00", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.localDateToUTC(date))
+            assertNotEquals(currentHour, SiteUtils.getDateTimeForSite(this, hourFormat, date))
+        }
+
+        val acstSite = SiteModel().apply { timezone = "9.5" }
+        with(acstSite) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, dateString)
+            assertEquals("+09:30", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.localDateToUTC(date))
+            assertNotEquals(currentHour, SiteUtils.getDateTimeForSite(this, hourFormat, date))
+        }
+
+        val nptSite = SiteModel().apply { timezone = "5.75" }
+        with(nptSite) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, dateString)
+            assertEquals("+05:45", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.localDateToUTC(date))
+            assertNotEquals(currentHour, SiteUtils.getDateTimeForSite(this, hourFormat, date))
+        }
+
+        val imaginaryQuarterTimeZoneSite = SiteModel().apply { timezone = "-2.25" }
+        with(imaginaryQuarterTimeZoneSite) {
+            val formattedDate = DateUtils.getDateTimeForSite(this, UTC8601_FORMAT, dateString)
+            assertEquals("-02:15", formattedDate.takeLast(6))
+
+            val currentHour = hourFormat.format(DateTimeUtils.localDateToUTC(date))
+            assertNotEquals(currentHour, SiteUtils.getDateTimeForSite(this, hourFormat, date))
+        }
+    }
+
+    @Test
+    fun `returns correct timezone`() {
+        val timeZone = SiteUtils.getNormalizedTimezone("+10")
+
+        Assertions.assertThat(timeZone.displayName).isEqualTo("GMT+10:00")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WPComRestClientUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WPComRestClientUtilsTest.kt
new file mode 100644
index 00000000000..f70e6f2d3eb
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WPComRestClientUtilsTest.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+
+@RunWith(RobolectricTestRunner::class)
+class WPComRestClientUtilsTest  {
+    companion object {
+        private const val LOCALE_PARAM = "locale"
+        private const val UNDERSCORE_LOCALE_PARAM = "_locale"
+    }
+
+    private val appContext = RuntimeEnvironment.application.applicationContext
+
+    @Test
+    fun `getLocaleParamName should return _locale for v2 url`() {
+        val url = "https://public-api.wordpress.com/wpcom/v2/something"
+        val result = WPComRestClientUtils.getLocaleParamName(url)
+        assertEquals(UNDERSCORE_LOCALE_PARAM, result)
+    }
+
+    @Test
+    fun `getLocaleParamName should return _locale for v3 url`() {
+        val url = "https://public-api.wordpress.com/wpcom/v3/something"
+        val result = WPComRestClientUtils.getLocaleParamName(url)
+        assertEquals(UNDERSCORE_LOCALE_PARAM, result)
+    }
+
+    @Test
+    fun `getLocaleParamName should return locale for other urls`() {
+        val url = "https://public-api.wordpress.com/rest/v1/"
+        val result = WPComRestClientUtils.getLocaleParamName(url)
+        assertEquals(LOCALE_PARAM, result)
+    }
+
+    @Test
+    fun `getHttpUrlWithLocale should add correct locale parameter for v2 url`() {
+        val url = "https://public-api.wordpress.com/wpcom/v2/something"
+        val result = WPComRestClientUtils.getHttpUrlWithLocale(appContext, url)
+
+        assertNotNull(result)
+        assertNotNull(result?.queryParameter(UNDERSCORE_LOCALE_PARAM))
+    }
+
+    @Test
+    fun `getHttpUrlWithLocale should add correct locale parameter for v3 url`() {
+        val url = "https://public-api.wordpress.com/wpcom/v3/something"
+        val result = WPComRestClientUtils.getHttpUrlWithLocale(appContext, url)
+
+        assertNotNull(result)
+        assertNotNull(result?.queryParameter(UNDERSCORE_LOCALE_PARAM))
+    }
+
+    @Test
+    fun `getHttpUrlWithLocale should add correct locale parameter for other urls`() {
+        val url = "https://public-api.wordpress.com/rest/v1/"
+        val result = WPComRestClientUtils.getHttpUrlWithLocale(appContext, url)
+
+        assertNotNull(result)
+        assertNotNull(result?.queryParameter(LOCALE_PARAM))
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtilsTest.kt
new file mode 100644
index 00000000000..fa1b567b213
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtilsTest.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.utils
+
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class WhatsNewAppVersionUtilsTest {
+    @Test
+    fun `versionNameToInt converts major dot minor dot patch into major minor int`() {
+        val inputVersion = "14.1.2"
+        val expectedOutputVersion = 141
+
+        val result = WhatsNewAppVersionUtils.versionNameToInt(inputVersion)
+
+        assertEquals(expectedOutputVersion, result)
+    }
+
+    @Test
+    fun `versionNameToInt returns -1 from malformed version name`() {
+        val inputVersion = "alpha-222"
+        val expectedOutputVersion = -1
+
+        val result = WhatsNewAppVersionUtils.versionNameToInt(inputVersion)
+
+        assertEquals(expectedOutputVersion, result)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLRPCUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLRPCUtilsTest.java
new file mode 100644
index 00000000000..f45dd1cdd93
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLRPCUtilsTest.java
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.junit.Test;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCUtils;
+
+import java.sql.Time;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+public class XMLRPCUtilsTest {
+    @Test
+    public void testDefaultValueString() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), "test"), equalTo("test"));
+    }
+
+    @Test
+    public void testGetValueString() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("ponies"), "nope"), equalTo("ponies"));
+    }
+
+    @Test
+    public void testDefaultValueBool() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), true), equalTo(true));
+    }
+
+    @Test
+    public void testGetValueBool() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("0"), true), equalTo(false));
+    }
+
+    @Test
+    public void testGetValueBool2() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("false"), true), equalTo(false));
+    }
+
+    @Test
+    public void testDefaultValueLong() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), 42L), equalTo(42L));
+    }
+
+    @Test
+    public void testGetValueLong() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("42"), 0L), equalTo(42L));
+    }
+
+    @Test
+    public void testGetValueLong2() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("nope"), 42L), equalTo(42L));
+    }
+
+    @Test
+    public void testDefaultValueInt() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), 42), equalTo(42));
+    }
+
+    @Test
+    public void testGetValueInt() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("42"), 0), equalTo(42));
+    }
+
+    @Test
+    public void testDefaultValueFloat() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), 42.42f), equalTo(42.42f));
+    }
+
+    @Test
+    public void testGetValueFloat() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("42.42"), 0f), equalTo(42.42f));
+    }
+
+    @Test
+    public void testDefaultValueDouble() {
+        assertThat(XMLRPCUtils.safeGetMapValue(new HashMap<>(), 42.42), equalTo(42.42));
+    }
+
+    @Test
+    public void testGetValueDouble() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("42.42"), 0.0), equalTo(42.42));
+    }
+
+    @Test
+    public void testGetValueDouble2() {
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("false"), 42.42), equalTo(42.42));
+    }
+
+    @Test
+    public void testGetValueDate() {
+        Date theDate = new Date();
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue(theDate), new Date(4244)), equalTo(theDate));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testGetValueInvalidType() {
+        // Something bad should happen if we try this - Random isn't a possible type the XML-RPC deserializer would
+        // parse into, so it's guaranteed to always return the default value, without us ever knowing that we're
+        // asking safeGetMapValue() for an impossible type
+        Random thing = new Random();
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue("text"), thing), equalTo(thing));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testGetValueInvalidTypeSubclass() {
+        // If we pass a Date subclass as the default value, we might expect it to work as a match for a Date entry
+        // But it doesn't - we'll always receive the default value
+        // Something bad should happen if we try this too - we should be warned that we're giving safeGetMapValue()
+        // an impossible type
+        Date theDate = new Date();
+        assertThat(XMLRPCUtils.safeGetMapValue(getTestMapForValue(theDate), new Time(4244)), equalTo(theDate));
+    }
+
+    private static Map<String, String> getTestMapForValue(String value) {
+        Map<String, String> map = new HashMap<>();
+        map.put("key", "test-key");
+        map.put("id", "42");
+        map.put("value", value);
+        return map;
+    }
+
+    private static Map<String, Object> getTestMapForValue(Object value) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("key", "test-key");
+        map.put("id", "42");
+        map.put("value", value);
+        return map;
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLSerializerUtilsTest.java b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLSerializerUtilsTest.java
new file mode 100644
index 00000000000..ed50e44b2ee
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/utils/XMLSerializerUtilsTest.java
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCSerializer;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLSerializerUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@RunWith(RobolectricTestRunner.class)
+public class XMLSerializerUtilsTest {
+    @Test
+    public void testXmlRpcResponseScrubWithJunk() {
+        final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><nothing></nothing>";
+        final String junk = "this is junk text 12345,./;'pp<<><><;;";
+        final String result = scrub(junk + xml, xml.length());
+        Assert.assertEquals(xml, result);
+    }
+
+    @Test
+    public void testXmlRpcResponseScrubWithPhpWarning() {
+        final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><nothing></nothing>";
+        final String junk1 = "Warning: virtual() [function.virtual2]: Unable to include '/cgi-bin/script/l' - request"
+                             + " execution failed in /home/mysite/public_html/index.php on line 2\n";
+        final String junk2 = "Warning: virtual() [function.virtual2]: Unable to include '/cgi-bin/script/l' - request"
+                             + " execution failed in /home/mysite/public_html/index.php on line 3\n";
+        final String result = scrub(junk1 + junk2 + xml, xml.length());
+        Assert.assertEquals(xml, result);
+    }
+
+    @Test
+    public void testXmlRpcResponseScrubWithoutJunk() {
+        final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><nothing></nothing>";
+        final String result = scrub(xml, xml.length());
+        Assert.assertEquals(xml, result);
+    }
+
+    private String scrub(String input, int xmlLength) {
+        try {
+            final InputStream is = new ByteArrayInputStream(input.getBytes("UTF-8"));
+            final InputStream resultStream = XMLSerializerUtils.scrubXmlResponse(is);
+            byte[] bb = new byte[xmlLength];
+            int val;
+            for (int i = 0; i < bb.length && ((val = resultStream.read()) != -1); ++i) {
+                bb[i] = (byte) val;
+            }
+
+            is.close();
+            resultStream.close();
+
+            return new String(bb, "UTF-8");
+        } catch (IOException e) {
+        }
+        return null;
+    }
+
+    @Test
+    public void testXMLRPCSerializer_makeValidInputString_emoji() throws IOException {
+        // Not a XML 1.0 valid character
+        String inputString = "\uD83D";
+        String serializeThis = XMLRPCSerializer.makeValidInputString(inputString);
+        // If the input wasn't modified, it will fail during the XMLRPC serialization step
+        Assert.assertNotEquals(inputString, serializeThis);
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WCSettingsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WCSettingsSqlUtilsTest.kt
new file mode 100644
index 00000000000..5651885d90d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WCSettingsSqlUtilsTest.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.fluxc.wc
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition
+import org.wordpress.android.fluxc.persistence.WCSettingsSqlUtils
+import org.wordpress.android.fluxc.persistence.WCSettingsSqlUtils.WCSettingsBuilder
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCSettingsSqlUtilsTest {
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                WCSettingsBuilder::class.java,
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun testInsertOrUpdateSettings() {
+        val settingsModel = WCSettingsModel(
+                localSiteId = 5,
+                currencyCode = "CAD",
+                currencyPosition = CurrencyPosition.LEFT,
+                currencyThousandSeparator = ",",
+                currencyDecimalSeparator = ".",
+                currencyDecimalNumber = 2,
+                couponsEnabled = true
+        )
+
+        // Test inserting settings
+        WCSettingsSqlUtils.insertOrUpdateSettings(settingsModel)
+
+        val returnedSettings = WellSql.select(WCSettingsBuilder::class.java).asModel.first().build()
+        assertEquals(settingsModel, returnedSettings)
+
+        // Test updating settings
+        val updatedSettingsModel = WCSettingsModel(
+                localSiteId = 5,
+                currencyCode = "EUR",
+                currencyPosition = CurrencyPosition.RIGHT_SPACE,
+                currencyThousandSeparator = ".",
+                currencyDecimalSeparator = ",",
+                currencyDecimalNumber = 2,
+                couponsEnabled = true
+        )
+        WCSettingsSqlUtils.insertOrUpdateSettings(updatedSettingsModel)
+
+        val returnedUpdatedSettings = WellSql.select(WCSettingsBuilder::class.java).asModel.first().build()
+        assertEquals(updatedSettingsModel, returnedUpdatedSettings)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WooCommerceStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WooCommerceStoreTest.kt
new file mode 100644
index 00000000000..186249d2d74
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/WooCommerceStoreTest.kt
@@ -0,0 +1,528 @@
+package org.wordpress.android.fluxc.wc
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import com.yarolegovich.wellsql.WellSql
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductSettingsModel
+import org.wordpress.android.fluxc.model.WCSSRModel
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.model.settings.WCSettingsMapper
+import org.wordpress.android.fluxc.model.taxes.TaxBasedOnSettingEntity
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.discovery.RootWPAPIRestResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooCommerceRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCApiVersionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCSystemPluginResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WCSystemPluginResponse.SystemPluginModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WooSystemRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WooSystemRestClient.WPSiteSettingsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.toDomainModel
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.WCSettingsSqlUtils.WCSettingsBuilder
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.persistence.dao.TaxBasedOnDao
+import org.wordpress.android.fluxc.site.SiteUtils
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged
+import org.wordpress.android.fluxc.store.WooCommerceStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.wc.settings.WCSettingsTestUtils
+import java.io.IOException
+import kotlin.test.assertEquals
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WooCommerceStoreTest {
+    private companion object {
+        const val TEST_SITE_REMOTE_ID = 1337L
+        const val SUPPORTED_API_VERSION = "wc/v3"
+    }
+
+    private val appContext = ApplicationProvider.getApplicationContext<Application>()
+    private val restClient = mock<WooSystemRestClient>()
+    private val siteStore = mock<SiteStore>()
+    private val wcrestClient = mock<WooCommerceRestClient>()
+    private val accountStore = mock<AccountStore>()
+    private val settingsMapper = WCSettingsMapper()
+    private val dispatcher: Dispatcher = mock()
+
+    private lateinit var db: WCAndroidDatabase
+    private lateinit var taxBasedOnDao: TaxBasedOnDao
+
+    private val wooCommerceStore by lazy {
+        WooCommerceStore(
+            appContext = appContext,
+            dispatcher = dispatcher,
+            coroutineEngine = initCoroutineEngine(),
+            siteStore = siteStore,
+            systemRestClient = restClient,
+            wcCoreRestClient = wcrestClient,
+            siteSqlUtils = TestSiteSqlUtils.siteSqlUtils,
+            settingsMapper = settingsMapper,
+            accountStore = accountStore,
+            taxBasedOnDao = taxBasedOnDao,
+        )
+    }
+    private val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+    private val site = SiteModel().apply {
+        id = 1
+        siteId = TEST_SITE_REMOTE_ID
+    }
+
+    private val response = WCSystemPluginResponse(
+        listOf(
+            SystemPluginModel(
+                plugin = "woocommerce-services/woocommerce-services",
+                name = "WooCommerce Shipping &amp; Tax",
+                version = "1.0",
+                url = "url"
+            ),
+            SystemPluginModel(
+                plugin = "other-plugin/other-plugin",
+                name = "Other Plugin",
+                version = "2.0",
+                url = "url"
+            )
+        ),
+        listOf(
+            SystemPluginModel(plugin = "inactive", name = "Inactive", version = "1.0", url = "url")
+        )
+    )
+
+    private val siteSettingsResponse = WCSettingsTestUtils.getSiteSettingsResponse()
+    private val siteProductSettingsResponse = WCSettingsTestUtils.getSiteProductSettingsResponse()
+    private val taxBasedOnSettingsResponse = WCSettingsTestUtils.getTaxBasedOnSettingsResponse()
+
+    @Before
+    fun setUp() {
+        val config = SingleStoreWellSqlConfigForTests(
+            appContext,
+            listOf(
+                SitePluginModel::class.java,
+                SiteModel::class.java,
+                WCProductSettingsModel::class.java,
+                WCSettingsBuilder::class.java,
+            ),
+            WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+        db = Room.inMemoryDatabaseBuilder(appContext, WCAndroidDatabase::class.java).build()
+        taxBasedOnDao = db.taxBasedOnSettingDao
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        db.close()
+    }
+
+    @Test
+    fun testGetWooCommerceSites() {
+        val nonWooSite = SiteModel().apply { siteId = 42 }
+        WellSql.insert(nonWooSite).execute()
+
+        assertEquals(0, wooCommerceStore.getWooCommerceSites().size)
+
+        val wooJetpackSite = SiteModel().apply {
+            siteId = 43
+            hasWooCommerce = true
+            setIsWPCom(false)
+        }
+        WellSql.insert(wooJetpackSite).execute()
+
+        assertEquals(1, wooCommerceStore.getWooCommerceSites().size)
+
+        val wooAtomicSite = SiteModel().apply {
+            siteId = 44
+            hasWooCommerce = true
+            setIsWPCom(true)
+        }
+        WellSql.insert(wooAtomicSite).execute()
+
+        assertEquals(2, wooCommerceStore.getWooCommerceSites().size)
+    }
+
+    @Test
+    fun `when fetching plugin fails, then error returned`() = test {
+        val result = getPlugin(isError = true)
+
+        assertThat(result.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `when fetching plugin succeeds, then success returned`() = test {
+        val result = getPlugin(isError = false)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.model).isNotNull
+    }
+
+    @Test
+    fun `when fetching plugin succeeds, then plugins inserted into db`() = test {
+        getPlugin(isError = false)
+        val expectedModel = response.plugins.mapIndexed { index, model ->
+            model.toDomainModel(site.id).apply { id = index + 1 }
+        }
+
+        val result = wooCommerceStore.getSitePlugins(site)
+
+        assertThat(result)
+            .hasSameSizeAs(expectedModel)
+            .allMatch { model ->
+                expectedModel.any { model.id == it.id && model.name == it.name && model.isActive == it.isActive }
+            }
+    }
+
+    @Test
+    fun `when fetching ssr fails, then error returned`() = test {
+        val result = fetchSSR(isError = true)
+
+        assertThat(result.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `when fetching ssr succeeds, then success returned`() = test {
+        val result = fetchSSR(isError = false)
+
+        assertThat(result.isError).isFalse
+        assertThat(result.model).isNotNull
+    }
+
+    @Test
+    fun `when fetch site settings succeeds, then success returned`() = test {
+        val result: WooResult<WCSettingsModel> = fetchSiteSettings()
+
+        assertThat(result.isError).isFalse
+        assertThat(result.model).isNotNull
+        assertThat(result.model).isEqualTo(
+            settingsMapper.mapSiteSettings(siteSettingsResponse!!, site)
+        )
+    }
+
+    @Test
+    fun `when fetch site settings fails, then error returned`() {
+        runBlocking {
+            val result: WooResult<WCSettingsModel> = fetchSiteSettings(isError = true)
+            assertThat(result.error).isEqualTo(error)
+            assertThat(result.model).isNull()
+        }
+    }
+
+    @Test
+    fun `when fetch site product settings succeeds, then success returned`() {
+        runBlocking {
+            val expectedModel = settingsMapper.mapProductSettings(siteProductSettingsResponse!!, site)
+
+            val result: WooResult<WCProductSettingsModel> = fetchSiteProductSettings()
+
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+            assertThat(result.model?.localSiteId).isEqualTo(expectedModel.localSiteId)
+            assertThat(result.model?.weightUnit).isEqualTo(expectedModel.weightUnit)
+            assertThat(result.model?.dimensionUnit).isEqualTo(expectedModel.dimensionUnit)
+        }
+    }
+
+    @Test
+    fun `when fetch site product settings fails, then error returned`() {
+        runBlocking {
+            val result: WooResult<WCProductSettingsModel> = fetchSiteProductSettings(isError = true)
+            assertThat(result.error).isEqualTo(error)
+            assertThat(result.model).isNull()
+        }
+    }
+
+    @Test
+    fun `when fetch tax based on settings fails, the error returned`() {
+        runBlocking {
+            val result = fetchTaxBasedOnSettings(isError = true)
+            assertThat(result.error).isEqualTo(error)
+        }
+    }
+
+    @Test
+    fun `when fetch tax based on settings succeeds, the success returned`() {
+        runBlocking {
+            val expectedModel = settingsMapper.mapTaxBasedOnSettings(taxBasedOnSettingsResponse!!, site.localId())
+            val result = fetchTaxBasedOnSettings()
+            assertThat(result.isError).isFalse
+            with (result.model) {
+                assertThat(this).isNotNull
+                assertThat(this?.localSiteId).isEqualTo(expectedModel.localSiteId)
+                assertThat(this?.selectedOption).isEqualTo(expectedModel.selectedOption)
+            }
+        }
+    }
+
+    @Test
+    fun `when fetch tax based on settings succeeds, the setting is saved in db`() {
+        runBlocking {
+            val expectedModel = settingsMapper.mapTaxBasedOnSettings(taxBasedOnSettingsResponse!!, site.localId())
+            val result = fetchTaxBasedOnSettings()
+            assertThat(result.isError).isFalse
+            taxBasedOnDao.getTaxBasedOnSetting(site.localId()).let {
+                assertThat(it).isNotNull
+                assertThat(it?.localSiteId).isEqualTo(expectedModel.localSiteId)
+                assertThat(it?.selectedOption).isEqualTo(expectedModel.selectedOption)
+            }
+        }
+    }
+
+    @Test
+    fun `when fetching supported api version succeeds, then success returned`() {
+        runBlocking {
+            val result: WooResult<WCApiVersionResponse> = fetchSupportedWooApiVersion(
+                response = WCSettingsTestUtils.getSupportedApiVersionResponse()
+            )
+
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+            assertThat(result.model?.apiVersion).isEqualTo(SUPPORTED_API_VERSION)
+            assertThat(result.model?.siteModel).isEqualTo(site)
+        }
+    }
+
+    @Test
+    fun `when fetching unsupported api version succeeds, then blank api version returned`() {
+        runBlocking {
+            val result: WooResult<WCApiVersionResponse> = fetchSupportedWooApiVersion(
+                response = RootWPAPIRestResponse()
+            )
+
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+            assertThat(result.model?.apiVersion).isBlank
+        }
+    }
+
+    @Test
+    fun `when fetching supported api version fails, then error returned`() {
+        runBlocking {
+            val result: WooResult<WCApiVersionResponse> = fetchSupportedWooApiVersion(
+                isError = true,
+                response = WCSettingsTestUtils.getUnsupportedApiVersionResponse()
+            )
+            assertThat(result.error).isEqualTo(error)
+        }
+    }
+
+    @Test
+    fun `when the user is signed in using WPCom, then fetch sites using WPCom API`() {
+        runBlocking {
+            whenever(accountStore.hasAccessToken()).thenReturn(true)
+            whenever(siteStore.fetchSites(any())).thenReturn(OnSiteChanged(1, updatedSites = listOf(site)))
+
+            wooCommerceStore.fetchWooCommerceSites()
+
+            verify(siteStore).fetchSites(any())
+        }
+    }
+
+    @Test
+    fun `when the user is not signed in using WPCom, then don't fetch sites using WPCom API`() {
+        runBlocking {
+            whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+            wooCommerceStore.fetchWooCommerceSites()
+
+            verify(siteStore, never()).fetchSites(any())
+        }
+    }
+
+    @Test
+    fun `when fetching a jetpack cp site, then fetch metadata from the remote site manually`() {
+        runBlocking {
+            val site = SiteUtils.generateJetpackCPSite()
+            whenever(accountStore.hasAccessToken()).thenReturn(true)
+            whenever(siteStore.fetchSites(any())).thenReturn(OnSiteChanged(1, updatedSites = listOf(site)))
+            whenever(siteStore.sites).thenReturn(listOf(site))
+            whenever(restClient.fetchSiteSettings(site)).thenReturn(
+                WooPayload(
+                    WPSiteSettingsResponse(title = "new title")
+                )
+            )
+            whenever(restClient.checkIfWooCommerceIsAvailable(site)).thenReturn(WooPayload(true))
+
+            val sites = wooCommerceStore.fetchWooCommerceSites().model!!
+
+            verify(restClient).fetchSiteSettings(site)
+            verify(restClient).checkIfWooCommerceIsAvailable(site)
+            assertThat(sites.first().hasWooCommerce).isTrue
+            assertThat(sites.first().name).isEqualTo("new title")
+        }
+    }
+
+    @Test
+    fun `given 3 woo and 3 updated sites, when fetching a jetpack cp site, emit event with 6 rows affected`() {
+        runBlocking {
+            val sites = (0..4).map { SiteUtils.generateSelfHostedNonJPSite() }
+            whenever(siteStore.sites).thenReturn(sites)
+
+            whenever(accountStore.hasAccessToken()).thenReturn(true)
+            val updatedSites = (0..4).map {
+                SiteUtils.generateJetpackCPSite()
+            }
+            whenever(siteStore.fetchSites(any())).thenReturn(
+                OnSiteChanged(3, updatedSites = updatedSites)
+            )
+            sites.forEach {
+                whenever(restClient.fetchSiteSettings(it)).thenReturn(
+                    WooPayload(WPSiteSettingsResponse(title = "new title"))
+                )
+            }
+            whenever(restClient.checkIfWooCommerceIsAvailable(sites[0])).thenReturn(WooPayload(true))
+            whenever(restClient.checkIfWooCommerceIsAvailable(sites[1])).thenReturn(WooPayload(true))
+            whenever(restClient.checkIfWooCommerceIsAvailable(sites[2])).thenReturn(WooPayload(true))
+            whenever(restClient.checkIfWooCommerceIsAvailable(sites[3])).thenReturn(WooPayload(null))
+            whenever(restClient.checkIfWooCommerceIsAvailable(sites[4])).thenReturn(WooPayload(null))
+
+            wooCommerceStore.fetchWooCommerceSites()
+
+            val eventCaptor = argumentCaptor<OnSiteChanged>()
+            verify(dispatcher).emitChange(eventCaptor.capture())
+            assertThat(eventCaptor.firstValue.rowsAffected).isEqualTo(6)
+        }
+    }
+
+    @Test
+    fun `when fetching a non-Jetpack self-hosted site, then detect WooCommerce installation manually`() {
+        runBlocking {
+            val site = SiteUtils.generateSelfHostedNonJPSite()
+            whenever(accountStore.hasAccessToken()).thenReturn(false)
+            whenever(siteStore.fetchSite(any())).thenReturn(OnSiteChanged(1, updatedSites = listOf(site)))
+            whenever(siteStore.sites).thenReturn(listOf(site))
+            whenever(siteStore.getSiteByLocalId(any())).thenReturn(site)
+            whenever(restClient.checkIfWooCommerceIsAvailable(site)).thenReturn(WooPayload(true))
+
+            wooCommerceStore.fetchWooCommerceSite(site)
+
+            verify(siteStore).fetchSite(site)
+            verify(restClient).checkIfWooCommerceIsAvailable(site)
+        }
+    }
+
+    @Test
+    fun `when fetching a Jetpack site using site credentials, then detect WooCommerce installation manually`() {
+        runBlocking {
+            val site = SiteUtils.generateJetpackSiteOverXMLRPC()
+            whenever(accountStore.hasAccessToken()).thenReturn(false)
+            whenever(siteStore.fetchSite(any())).thenReturn(OnSiteChanged(1, updatedSites = listOf(site)))
+            whenever(siteStore.sites).thenReturn(listOf(site))
+            whenever(siteStore.getSiteByLocalId(any())).thenReturn(site)
+            whenever(restClient.checkIfWooCommerceIsAvailable(site)).thenReturn(WooPayload(true))
+
+            wooCommerceStore.fetchWooCommerceSite(site)
+
+            verify(siteStore).fetchSite(site)
+            verify(restClient).checkIfWooCommerceIsAvailable(site)
+        }
+    }
+
+    @Test
+    fun `when enabling coupons succeeds, then true is returned`() {
+        runBlocking {
+            whenever(wcrestClient.enableCoupons(site)).thenReturn(WooPayload(true))
+            val result = wooCommerceStore.enableCoupons(site)
+            assertThat(result).isTrue
+        }
+    }
+
+    @Test
+    fun `when enabling coupons fails, then false is returned`() {
+        runBlocking {
+            whenever(wcrestClient.enableCoupons(site)).thenReturn(WooPayload(false))
+            val result = wooCommerceStore.enableCoupons(site)
+            assertThat(result).isFalse
+        }
+    }
+
+    private suspend fun getPlugin(isError: Boolean = false): WooResult<List<SitePluginModel>> {
+        val payload = WooPayload(response)
+        if (isError) {
+            whenever(restClient.fetchInstalledPlugins(any())).thenReturn(WooPayload(error))
+        } else {
+            whenever(restClient.fetchInstalledPlugins(any())).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchSitePlugins(site)
+    }
+
+    private suspend fun fetchSSR(isError: Boolean = false): WooResult<WCSSRModel> {
+        val payload = WooPayload(WCSettingsTestUtils.getSSRResponse())
+        if (isError) {
+            whenever(restClient.fetchSSR(any())).thenReturn(WooPayload(error))
+        } else {
+            whenever(restClient.fetchSSR(any())).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchSSR(site)
+    }
+
+    private suspend fun fetchSupportedWooApiVersion(
+        isError: Boolean = false,
+        response: RootWPAPIRestResponse
+    ): WooResult<WCApiVersionResponse> {
+        val payload = WooPayload(response)
+        if (isError) {
+            whenever(wcrestClient.fetchSupportedWooApiVersion(any(), any())).thenReturn(WooPayload(error))
+        } else {
+            whenever(wcrestClient.fetchSupportedWooApiVersion(any(), any())).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchSupportedApiVersion(site)
+    }
+
+    private suspend fun fetchSiteSettings(isError: Boolean = false): WooResult<WCSettingsModel> {
+        val payload = WooPayload(siteSettingsResponse)
+        if (isError) {
+            whenever(wcrestClient.fetchSiteSettingsGeneral(site)).thenReturn(WooPayload(error))
+        } else {
+            whenever(wcrestClient.fetchSiteSettingsGeneral(site)).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchSiteGeneralSettings(site)
+    }
+
+    private suspend fun fetchSiteProductSettings(isError: Boolean = false): WooResult<WCProductSettingsModel> {
+        val payload = WooPayload(siteProductSettingsResponse)
+        if (isError) {
+            whenever(wcrestClient.fetchSiteSettingsProducts(site)).thenReturn(WooPayload(error))
+        } else {
+            whenever(wcrestClient.fetchSiteSettingsProducts(site)).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchSiteProductSettings(site)
+    }
+
+    private suspend fun fetchTaxBasedOnSettings(isError: Boolean = false) : WooResult<TaxBasedOnSettingEntity> {
+        val payload = WooPayload(taxBasedOnSettingsResponse)
+        if (isError) {
+            whenever(wcrestClient.fetchSiteSettingsTaxBasedOn(site)).thenReturn(WooPayload(error))
+        } else {
+            whenever(wcrestClient.fetchSiteSettingsTaxBasedOn(site)).thenReturn(payload)
+        }
+        return wooCommerceStore.fetchTaxBasedOnSettings(site)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeMapperTest.kt
new file mode 100644
index 00000000000..a7ee4a3e13a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeMapperTest.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.wc.attributes
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeMapper
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributeCreateResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributesFullListResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.stubSite
+import kotlin.test.fail
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCGlobalAttributeMapperTest {
+    private lateinit var mapperUnderTest: WCGlobalAttributeMapper
+
+    @Before
+    fun setUp() {
+        mapperUnderTest = WCGlobalAttributeMapper()
+    }
+
+    @Test
+    fun `mapToAttributeModel should never allow null values`() = test {
+        attributeCreateResponse
+                ?.let {
+                    mapperUnderTest.responseToAttributeModel(it, stubSite)
+                }?.let { result ->
+                    assertThat(result).isNotNull
+                    assertThat(result.remoteId).isNotNull
+                    assertThat(result.name).isNotNull
+                    assertThat(result.slug).isNotNull
+                    assertThat(result.type).isNotNull
+                    assertThat(result.orderBy).isNotNull
+                    assertThat(result.hasArchives).isNotNull
+                } ?: fail("Result shouldn't be null")
+    }
+
+    @Test
+    fun `mapToAttributeModelList should parse list correctly`() = test {
+        mapperUnderTest.responseToAttributeModelList(attributesFullListResponse!!, stubSite)
+                .let { result ->
+                    assertThat(result).isNotNull
+                    assertThat(result.size).isEqualTo(2)
+                }
+    }
+
+    @Test
+    fun `mapToAttributeModel should parse correctly`() = test {
+        mapperUnderTest.responseToAttributeModel(attributeCreateResponse!!, stubSite)
+                ?.let { result ->
+                    assertThat(result).isNotNull
+                    assertThat(result.remoteId).isEqualTo(1)
+                    assertThat(result.name).isEqualTo("Color")
+                    assertThat(result.slug).isEqualTo("pa_color")
+                    assertThat(result.type).isEqualTo("select")
+                    assertThat(result.orderBy).isEqualTo("menu_order")
+                    assertThat(result.hasArchives).isEqualTo(true)
+                } ?: fail("Result shouldn't be null")
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeStoreTest.kt
new file mode 100644
index 00000000000..515341b7ec3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCGlobalAttributeStoreTest.kt
@@ -0,0 +1,218 @@
+package org.wordpress.android.fluxc.wc.attributes
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeMapper
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeModel
+import org.wordpress.android.fluxc.model.attribute.terms.WCAttributeTermModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.ProductAttributeRestClient
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCGlobalAttributeStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributeCreateResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributeDeleteResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributeUpdateResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.attributesFullListResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.parsedAttributesList
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.parsedCreateAttributeResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.parsedDeleteAttributeResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.parsedUpdateAttributeResponse
+import org.wordpress.android.fluxc.wc.attributes.WCProductAttributesTestFixtures.stubSite
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCGlobalAttributeStoreTest {
+    private lateinit var storeUnderTest: WCGlobalAttributeStore
+    private lateinit var restClient: ProductAttributeRestClient
+    private lateinit var mapper: WCGlobalAttributeMapper
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        SiteModel::class.java,
+                        WCGlobalAttributeModel::class.java,
+                        WCAttributeTermModel::class.java
+                ),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+        initMocks()
+        createStoreUnderTest()
+    }
+
+    @Test
+    fun `fetch attributes with empty result should return WooError`() = test {
+        whenever(restClient.fetchProductFullAttributesList(stubSite))
+                .thenReturn(WooPayload(emptyArray()))
+        val result = storeUnderTest.fetchStoreAttributes(stubSite)
+        assertThat(result.model).isNull()
+        assertThat(result.error).isNotNull
+    }
+
+    @Test
+    fun `fetch attributes should call mapper once`() = test {
+        mapper = spy()
+        createStoreUnderTest()
+        whenever(restClient.fetchProductFullAttributesList(stubSite))
+                .thenReturn(WooPayload(attributesFullListResponse))
+
+        storeUnderTest.fetchStoreAttributes(stubSite)
+        verify(mapper).responseToAttributeModelList(attributesFullListResponse!!, stubSite)
+    }
+
+    @Test
+    fun `fetch attributes should return WooResult correctly`() = test {
+        whenever(restClient.fetchProductFullAttributesList(stubSite))
+                .thenReturn(WooPayload(attributesFullListResponse))
+
+        whenever(mapper.responseToAttributeModelList(attributesFullListResponse!!, stubSite))
+                .thenReturn(parsedAttributesList)
+
+        storeUnderTest.fetchStoreAttributes(stubSite).let { result ->
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(parsedAttributesList)
+            assertThat(result.error).isNull()
+        }
+    }
+
+    @Test
+    fun `create Attribute should return WooResult with parsed entity`() = test {
+        val expectedResult = WCGlobalAttributeModel(
+                1,
+                321,
+                "Color",
+                "pa_color",
+                "select",
+                "menu_order",
+                true
+        )
+
+        whenever(restClient.postNewAttribute(stubSite, with(expectedResult) {
+            mapOf(
+                    "name" to name,
+                    "slug" to slug,
+                    "type" to type,
+                    "order_by" to orderBy,
+                    "has_archives" to hasArchives.toString()
+            )
+        })).thenReturn(WooPayload(attributeCreateResponse))
+
+        whenever(mapper.responseToAttributeModel(attributeCreateResponse!!, stubSite))
+                .thenReturn(parsedCreateAttributeResponse)
+
+        storeUnderTest.createAttribute(
+                site = stubSite,
+                name = expectedResult.name,
+                slug = expectedResult.slug,
+                type = expectedResult.type,
+                orderBy = expectedResult.orderBy,
+                hasArchives = expectedResult.hasArchives
+        ).let { result ->
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(expectedResult)
+            assertThat(result.error).isNull()
+        }
+    }
+
+    @Test
+    fun `delete Attribute should return WooResult with parsed entity`() = test {
+        val expectedResult = WCGlobalAttributeModel(
+                17,
+                321,
+                "Size",
+                "pa_size",
+                "select",
+                "name",
+                true
+        )
+
+        whenever(restClient.deleteExistingAttribute(stubSite, 17))
+                .thenReturn(WooPayload(attributeDeleteResponse))
+
+        whenever(mapper.responseToAttributeModel(attributeDeleteResponse!!, stubSite))
+                .thenReturn(parsedDeleteAttributeResponse)
+
+        storeUnderTest.deleteAttribute(
+                site = stubSite,
+                attributeID = 17
+        ).let { result ->
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(expectedResult)
+            assertThat(result.error).isNull()
+        }
+    }
+
+    @Test
+    fun `update Attribute should return WooResult with parsed entity`() = test {
+        val expectedResult = WCGlobalAttributeModel(
+                99,
+                321,
+                "test_name",
+                "pa_test",
+                "test_type",
+                "test",
+                false
+        )
+
+        whenever(
+                restClient.updateExistingAttribute(stubSite, 99,
+                        with(expectedResult) {
+                            mapOf(
+                                    "id" to "99",
+                                    "name" to name,
+                                    "slug" to slug,
+                                    "type" to type,
+                                    "order_by" to orderBy,
+                                    "has_archives" to hasArchives.toString()
+                            )
+                        })
+        ).thenReturn(WooPayload(attributeUpdateResponse))
+
+        whenever(mapper.responseToAttributeModel(attributeUpdateResponse!!, stubSite))
+                .thenReturn(parsedUpdateAttributeResponse)
+
+        storeUnderTest.updateAttribute(
+                site = stubSite,
+                attributeID = 99,
+                name = expectedResult.name,
+                slug = expectedResult.slug,
+                type = expectedResult.type,
+                orderBy = expectedResult.orderBy,
+                hasArchives = expectedResult.hasArchives
+        ).let { result ->
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(expectedResult)
+            assertThat(result.error).isNull()
+        }
+    }
+
+    private fun initMocks() {
+        restClient = mock()
+        mapper = mock()
+    }
+
+    private fun createStoreUnderTest() =
+            WCGlobalAttributeStore(
+                    restClient,
+                    mapper,
+                    initCoroutineEngine()
+            ).apply { storeUnderTest = this }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCProductAttributesTestFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCProductAttributesTestFixtures.kt
new file mode 100644
index 00000000000..5c590943316
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/attributes/WCProductAttributesTestFixtures.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.wc.attributes
+
+import org.wordpress.android.fluxc.JsonLoaderUtils.jsonFileAs
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.attribute.WCGlobalAttributeModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.AttributeApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.attributes.terms.AttributeTermApiResponse
+
+object WCProductAttributesTestFixtures {
+    val stubSite = SiteModel().apply { id = 321 }
+
+    val attributeDeleteResponse by lazy {
+        "wc/product-attribute-delete.json"
+                .jsonFileAs(AttributeApiResponse::class.java)
+    }
+
+    val attributeCreateResponse by lazy {
+        "wc/product-attribute-create.json"
+                .jsonFileAs(AttributeApiResponse::class.java)
+    }
+
+    val attributeUpdateResponse by lazy {
+        "wc/product-attribute-update.json"
+                .jsonFileAs(AttributeApiResponse::class.java)
+    }
+
+    val attributesFullListResponse by lazy {
+        "wc/product-attributes-all.json"
+                .jsonFileAs(Array<AttributeApiResponse>::class.java)
+    }
+
+    val attributeTermsFullListResponse by lazy {
+        "wc/attribute-terms-full-list.json"
+                .jsonFileAs(Array<AttributeTermApiResponse>::class.java)
+    }
+
+    val parsedAttributesList by lazy {
+        listOf(
+                WCGlobalAttributeModel(
+                        1,
+                        321,
+                        "Color",
+                        "pa_color",
+                        "select",
+                        "menu_order",
+                        true
+                ),
+                WCGlobalAttributeModel(
+                        2,
+                        321,
+                        "Size",
+                        "pa_size",
+                        "select",
+                        "menu_order",
+                        false
+                )
+        )
+    }
+
+    val parsedCreateAttributeResponse by lazy {
+        WCGlobalAttributeModel(
+                1,
+                321,
+                "Color",
+                "pa_color",
+                "select",
+                "menu_order",
+                true
+        )
+    }
+
+    val parsedDeleteAttributeResponse by lazy {
+        WCGlobalAttributeModel(
+                17,
+                321,
+                "Size",
+                "pa_size",
+                "select",
+                "name",
+                true
+        )
+    }
+
+    val parsedUpdateAttributeResponse by lazy {
+        WCGlobalAttributeModel(
+                99,
+                321,
+                "test_name",
+                "pa_test",
+                "test_type",
+                "test",
+                false
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/CountryTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/CountryTestUtils.kt
new file mode 100644
index 00000000000..21fe049e389
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/CountryTestUtils.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.wc.data
+
+import org.wordpress.android.fluxc.model.data.WCLocationModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.data.WCDataRestClient.CountryApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.data.WCDataRestClient.CountryApiResponse.State
+
+object CountryTestUtils {
+    private fun generateSampleCountry(
+        code: String = "",
+        name: String = "",
+        parentCode: String = ""
+    ): WCLocationModel {
+        return WCLocationModel().apply {
+            this.code = code
+            this.name = name
+            this.parentCode = parentCode
+        }
+    }
+
+    fun generateCountries(): List<WCLocationModel> {
+        return listOf(
+            generateSampleCountry("CA", "Canada"),
+            generateSampleCountry("ON", "Ontario", parentCode = "CA"),
+            generateSampleCountry("BC", "British Columbia", parentCode = "CA"),
+            generateSampleCountry("CZ", "Czech Republic")
+        )
+    }
+
+    fun generateCountryApiResponse(): List<CountryApiResponse> {
+        return listOf(
+            CountryApiResponse("CA", "Canada", listOf(
+                    State("ON", "Ontario"),
+                    State("BC", "British Columbia")
+                )
+            ),
+            CountryApiResponse("CZ", "Czech Republic", emptyList())
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/WCDataStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/WCDataStoreTest.kt
new file mode 100644
index 00000000000..0331e54097b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/data/WCDataStoreTest.kt
@@ -0,0 +1,123 @@
+package org.wordpress.android.fluxc.wc.data
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.data.WCCountryMapper
+import org.wordpress.android.fluxc.model.data.WCLocationModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.data.WCDataRestClient
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCDataStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCDataStoreTest {
+    private val restClient = mock<WCDataRestClient>()
+    private val site = SiteModel().apply { id = 321 }
+    private val mapper = WCCountryMapper()
+    private lateinit var store: WCDataStore
+
+    private val sampleData = CountryTestUtils.generateCountries().sortedBy { it.code }
+    private val sampleResponse = CountryTestUtils.generateCountryApiResponse()
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(SiteModel::class.java, WCLocationModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCDataStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper
+        )
+
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun `fetch countries`() = test {
+        val result = fetchCountries()
+
+        assertThat(result.model?.size).isEqualTo(sampleData.size)
+        val first = mapper.map(sampleResponse.first()).first()
+        assertThat(result.model?.first()?.name).isEqualTo(first.name)
+        assertThat(result.model?.first()?.code).isEqualTo(first.code)
+        assertThat(result.model?.first()?.parentCode).isEqualTo(first.parentCode)
+    }
+
+    @Test
+    fun `get countries`() = test {
+        fetchCountries()
+
+        val sampleCountries = sampleData.filter { it.parentCode == "" }
+        val countries = store.getCountries().sortedBy { it.code }
+
+        assertThat(countries.size).isEqualTo(sampleCountries.size)
+
+        countries.forEachIndexed { i, country ->
+            assertThat(country.code).isEqualTo(sampleCountries[i].code)
+            assertThat(country.name).isEqualTo(sampleCountries[i].name)
+            assertThat(country.parentCode).isEqualTo(sampleCountries[i].parentCode)
+        }
+    }
+
+    @Test
+    fun `get non-empty states`() = test {
+        fetchCountries()
+
+        val sampleStates = sampleData.filter { it.parentCode == "CA" }.sortedBy { it.code }
+        val states = store.getStates("CA").sortedBy { it.code }
+
+        assertThat(states.size).isEqualTo(sampleStates.size)
+
+        states.forEachIndexed { i, state ->
+            assertThat(state.code).isEqualTo(sampleStates[i].code)
+            assertThat(state.name).isEqualTo(sampleStates[i].name)
+            assertThat(state.parentCode).isEqualTo(sampleStates[i].parentCode)
+        }
+    }
+
+    @Test
+    fun `get empty states`() = test {
+        fetchCountries()
+
+        val states = store.getStates("CZ")
+
+        assertThat(states).isEqualTo(emptyList<WCLocationModel>())
+    }
+
+    @Test
+    fun `when empty country code is passed, then empty list is returned when getting states`() = test {
+        fetchCountries()
+
+        val states = store.getStates("")
+
+        assertThat(states).isEqualTo(emptyList<WCLocationModel>())
+    }
+
+    private suspend fun fetchCountries(): WooResult<List<WCLocationModel>> {
+        val payload = WooPayload(sampleResponse.toTypedArray())
+        whenever(restClient.fetchCountries(site)).thenReturn(payload)
+        return store.fetchCountriesAndStates(site)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/GatewayFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/GatewayFixtures.kt
new file mode 100644
index 00000000000..0b11f67c916
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/GatewayFixtures.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.wc.gateways
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient.GatewayResponse
+
+val GATEWAYS_RESPONSE = listOf(
+        GatewayResponse(
+            "cod",
+            "Cash on Delivery",
+            "Pay cash",
+            "",
+            false,
+                "COD: Method title",
+                "COD: Method description",
+            listOf("products")
+        ),
+        GatewayResponse(
+                "stripe",
+                "Credit card",
+                "Pay with CC",
+                "1",
+                true,
+                "Stripe: Method title",
+                "Stripe: Method description",
+                listOf("products", "refunds")
+        )
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewaySqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewaySqlUtilsTest.kt
new file mode 100644
index 00000000000..2fd8b0d9068
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewaySqlUtilsTest.kt
@@ -0,0 +1,74 @@
+package org.wordpress.android.fluxc.wc.gateways
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.WCGatewaySqlUtils
+import org.wordpress.android.fluxc.persistence.WCGatewaySqlUtils.GatewaysTable
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCGatewaySqlUtilsTest {
+    private val site = SiteModel().apply { id = 2 }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(GatewaysTable::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `test gateway insert`() {
+        WCGatewaySqlUtils.insertOrUpdate(site, GATEWAYS_RESPONSE)
+        val gateways = WCGatewaySqlUtils.selectAllGateways(site)
+        assertEquals(2, gateways.size)
+        assertEquals(GATEWAYS_RESPONSE, gateways)
+    }
+
+    @Test
+    fun `test gateway update`() {
+        val response = GATEWAYS_RESPONSE.first()
+        WCGatewaySqlUtils.insertOrUpdate(site, response)
+        val gateway = WCGatewaySqlUtils.selectGateway(site, response.gatewayId)!!
+        assertEquals(response, gateway)
+
+        val newTitle = "New title"
+        WCGatewaySqlUtils.insertOrUpdate(site, response.copy(title = newTitle))
+        val updatedGateway = WCGatewaySqlUtils.selectGateway(site, response.gatewayId)!!
+        assertEquals(newTitle, updatedGateway.title)
+    }
+
+    @Test
+    fun `test select`() {
+        WCGatewaySqlUtils.insertOrUpdate(site, GATEWAYS_RESPONSE)
+
+        val gateway = WCGatewaySqlUtils.selectGateway(site, "stripe")
+        assertEquals(GATEWAYS_RESPONSE[1], gateway)
+    }
+
+    @Test
+    fun `test select empty result`() {
+        val newSite = SiteModel().apply { id = 3 }
+        WCGatewaySqlUtils.insertOrUpdate(newSite, GATEWAYS_RESPONSE)
+        val gateways = WCGatewaySqlUtils.selectAllGateways(site)
+        assertTrue(gateways.isEmpty())
+
+        val gateway = WCGatewaySqlUtils.selectGateway(site, GATEWAYS_RESPONSE.first().gatewayId)
+        assertNull(gateway)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewayStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewayStoreTest.kt
new file mode 100644
index 00000000000..edeaee24972
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/gateways/WCGatewayStoreTest.kt
@@ -0,0 +1,115 @@
+package org.wordpress.android.fluxc.wc.gateways
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.gateways.GatewayMapper
+import org.wordpress.android.fluxc.model.gateways.WCGatewayModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_ID
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.gateways.GatewayRestClient
+import org.wordpress.android.fluxc.persistence.WCGatewaySqlUtils.GatewaysTable
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCGatewayStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCGatewayStoreTest {
+    private val restClient = mock<GatewayRestClient>()
+    private val site = SiteModel().apply { id = 321 }
+    private val errorSite = SiteModel().apply { id = 123 }
+    private val mapper = GatewayMapper()
+    private lateinit var store: WCGatewayStore
+
+    private val gatewayId = GATEWAYS_RESPONSE.first().gatewayId
+    private val error = WooError(INVALID_ID, NOT_FOUND, "Invalid gateway ID")
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(GatewaysTable::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCGatewayStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper
+        )
+    }
+
+    @Test
+    fun `fetch all gateways`() = test {
+        val result = fetchAllTestGateways()
+
+        assertThat(result.model?.size).isEqualTo(GATEWAYS_RESPONSE.size)
+        assertThat(result.model?.first()).isEqualTo(mapper.map(GATEWAYS_RESPONSE.first()))
+
+        whenever(restClient.fetchAllGateways(errorSite)).thenReturn(WooPayload(error))
+        val invalidRequestResult = store.fetchAllGateways(errorSite)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get all gateways`() = test {
+        fetchAllTestGateways()
+
+        val gateways = store.getAllGateways(site)
+
+        assertThat(gateways.size).isEqualTo(2)
+        assertThat(gateways.first()).isEqualTo(mapper.map(GATEWAYS_RESPONSE.first()))
+
+        val invalidRequestResult = store.getAllGateways(errorSite)
+        assertThat(invalidRequestResult.size).isEqualTo(0)
+    }
+
+    @Test
+    fun `fetch specific gateway`() = test {
+        val gateway = fetchSpecificTestGateway()
+
+        assertThat(gateway.model).isEqualTo(mapper.map(GATEWAYS_RESPONSE.first()))
+
+        whenever(restClient.fetchGateway(errorSite, gatewayId)).thenReturn(WooPayload(error))
+    }
+
+    @Test
+    fun `get specific gateway`() = test {
+        fetchSpecificTestGateway()
+        val gateway = store.getGateway(site, gatewayId)
+
+        assertThat(gateway).isEqualTo(mapper.map(GATEWAYS_RESPONSE.first()))
+        val invalidRequestResult = store.getGateway(errorSite, gatewayId)
+        assertThat(invalidRequestResult).isNull()
+    }
+
+    private suspend fun fetchSpecificTestGateway(): WooResult<WCGatewayModel> {
+        val fetchGatewaysPayload = WooPayload(GATEWAYS_RESPONSE.first())
+        whenever(restClient.fetchGateway(site, gatewayId)).thenReturn(fetchGatewaysPayload)
+        return store.fetchGateway(site, gatewayId)
+    }
+
+    private suspend fun fetchAllTestGateways(): WooResult<List<WCGatewayModel>> {
+        val fetchGatewaysPayload = WooPayload(GATEWAYS_RESPONSE.toTypedArray())
+        whenever(restClient.fetchAllGateways(site)).thenReturn(fetchGatewaysPayload)
+        return store.fetchAllGateways(site)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/LeaderboardsRestClientTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/LeaderboardsRestClientTest.kt
new file mode 100644
index 00000000000..67f93b0818f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/LeaderboardsRestClientTest.kt
@@ -0,0 +1,120 @@
+package org.wordpress.android.fluxc.wc.leaderboards
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsRestClient
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateSampleLeaderboardsApiResponse
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.stubSite
+
+class LeaderboardsRestClientTest {
+    private lateinit var restClientUnderTest: LeaderboardsRestClient
+    private lateinit var wpApiSuccessResponse: WPAPIResponse.Success<Array<LeaderboardsApiResponse>>
+    private lateinit var wpApiErrorResponse: WPAPIResponse.Error<Array<LeaderboardsApiResponse>>
+
+    private val wooNetwork: WooNetwork = mock()
+
+    @Before
+    fun setUp() {
+        wpApiSuccessResponse = mock()
+        wpApiErrorResponse = mock()
+        restClientUnderTest = LeaderboardsRestClient(wooNetwork)
+    }
+
+    @Test
+    fun `fetch leaderboards should call correct request with correct parameters and return expected response`() = test {
+        val expectedResult = generateSampleLeaderboardsApiResponse()
+        configureSuccessRequest(expectedResult!!)
+        val response = restClientUnderTest.fetchLeaderboards(
+            site = stubSite,
+            startDate = "10-10-2022",
+            endDate = "22-10-2022",
+            quantity = 5,
+            forceRefresh = false,
+            interval = "day"
+        )
+
+        verify(wooNetwork).executeGetGsonRequest(
+            site = stubSite,
+            path = WOOCOMMERCE.leaderboards.pathV4Analytics,
+            params = mapOf(
+                "before" to "22-10-2022",
+                "after" to "10-10-2022",
+                "per_page" to "5",
+                "interval" to "day",
+                "force_cache_refresh" to "false",
+            ),
+            clazz = Array<LeaderboardsApiResponse>::class.java
+        )
+        assertThat(response).isNotNull
+        assertThat(response.result).isNotNull
+        assertThat(response.error).isNull()
+        assertThat(response.result).isEqualTo(expectedResult)
+    }
+
+    @Test
+    fun `fetch leaderboards should correctly return failure as WooError`() = test {
+        configureErrorRequest()
+        val response = restClientUnderTest.fetchLeaderboards(
+            site = stubSite,
+            startDate = "10-10-2022",
+            endDate = "22-10-2022",
+            forceRefresh = false,
+            quantity = 5,
+            interval = "day"
+        )
+
+        assertThat(response).isNotNull
+        assertThat(response.result).isNull()
+        assertThat(response.error).isNotNull
+        assertThat(response.error).isExactlyInstanceOf(WooError::class.java)
+    }
+
+    private suspend fun configureSuccessRequest(expectedResult: Array<LeaderboardsApiResponse>) {
+        whenever(wpApiSuccessResponse.data).thenReturn(expectedResult)
+        whenever(
+            wooNetwork.executeGetGsonRequest(
+                site = stubSite,
+                path = WOOCOMMERCE.leaderboards.pathV4Analytics,
+                params = mapOf(
+                    "after" to "10-10-2022",
+                    "before" to "22-10-2022",
+                    "per_page" to "5",
+                    "interval" to "day",
+                    "force_cache_refresh" to "false",
+                ),
+                clazz = Array<LeaderboardsApiResponse>::class.java
+            )
+        ).thenReturn(wpApiSuccessResponse)
+    }
+
+    private suspend fun configureErrorRequest() {
+        whenever(wpApiErrorResponse.error).thenReturn(WPAPINetworkError(BaseNetworkError(NETWORK_ERROR)))
+        whenever(
+            wooNetwork.executeGetGsonRequest(
+                site = stubSite,
+                path = WOOCOMMERCE.leaderboards.pathV4Analytics,
+                params = mapOf(
+                    "after" to "10-10-2022",
+                    "before" to "22-10-2022",
+                    "per_page" to "5",
+                    "interval" to "day",
+                    "force_cache_refresh" to "false",
+                ),
+                clazz = Array<LeaderboardsApiResponse>::class.java
+            )
+        ).thenReturn(wpApiErrorResponse)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsStoreTest.kt
new file mode 100644
index 00000000000..2acc45c0d20
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsStoreTest.kt
@@ -0,0 +1,371 @@
+package org.wordpress.android.fluxc.wc.leaderboards
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.leaderboards.WCProductLeaderboardsMapper
+import org.wordpress.android.fluxc.model.leaderboards.WCTopPerformerProductModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.PRODUCTS
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsProductApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsRestClient
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.persistence.dao.TopPerformerProductsDao
+import org.wordpress.android.fluxc.persistence.entity.TopPerformerProductEntity
+import org.wordpress.android.fluxc.store.WCLeaderboardsStore
+import org.wordpress.android.fluxc.store.WCProductStore
+import org.wordpress.android.fluxc.store.WooCommerceStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateSampleLeaderboardsApiResponse
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateSampleTopPerformerApiResponse
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.stubSite
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCLeaderboardsStoreTest {
+    private val leaderboardsRestClient: LeaderboardsRestClient = mock()
+    private val reportsRestClient: ReportsRestClient = mock()
+    private val productStore: WCProductStore = mock()
+    private var mapper: WCProductLeaderboardsMapper = spy { WCProductLeaderboardsMapper() }
+    private val topPerformersDao: TopPerformerProductsDao = mock()
+    private val wooCommerceStore: WooCommerceStore = mock()
+
+    private lateinit var storeUnderTest: WCLeaderboardsStore
+
+    fun setup(prepareMocks: () -> Unit = {}) {
+        prepareMocks()
+        createStoreUnderTest()
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+            appContext,
+            listOf(
+                SiteModel::class.java,
+                WCTopPerformerProductModel::class.java,
+                WCProductModel::class.java
+            ),
+            WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `fetch top performer products legacy with empty result should return WooError`() = test {
+        givenFetchLeaderBoardsReturns(emptyArray())
+        setup()
+
+        val result = storeUnderTest.fetchTopPerformerProductsLegacy(
+            site = stubSite,
+            startDate = START_DATE,
+            endDate = END_DATE
+        )
+
+        assertThat(result.model).isNull()
+        assertThat(result.error).isNotNull
+    }
+
+    @Test
+    fun `fetch top performer products legacy should filter leaderboards by PRODUCTS type`() = test {
+        setup { mapper = spy() }
+        val response = generateSampleLeaderboardsApiResponse()
+        givenFetchLeaderBoardsReturns(response)
+
+        storeUnderTest.fetchTopPerformerProductsLegacy(
+            site = stubSite,
+            startDate = START_DATE,
+            endDate = END_DATE
+        )
+
+        verify(mapper).mapTopPerformerProductsEntity(
+            response?.firstOrNull { it.type == PRODUCTS }!!,
+            stubSite,
+            productStore,
+            DATE_PERIOD
+        )
+    }
+
+    @Test
+    fun `fetch top performer products legacy should call mapper once`() = test {
+        setup()
+        val response = generateSampleLeaderboardsApiResponse()
+        givenFetchLeaderBoardsReturns(response)
+
+        storeUnderTest.fetchTopPerformerProductsLegacy(
+            site = stubSite,
+            startDate = START_DATE,
+            endDate = END_DATE
+        )
+
+        verify(mapper, times(1)).mapTopPerformerProductsEntity(
+            any<LeaderboardsApiResponse>(),
+            any(),
+            any(),
+            any()
+        )
+    }
+
+    @Test
+    fun `fetch top performer products legacy should return mapped top performer entities correctly`() =
+        test {
+            setup()
+            val response = generateSampleLeaderboardsApiResponse()
+            givenFetchLeaderBoardsReturns(response)
+            givenTopPerformersMapperReturns(
+                givenResponse = response?.firstOrNull { it.type == PRODUCTS }!!,
+                returnedTopPerformersList = TOP_PERFORMER_ENTITY_LIST
+            )
+
+            val result = storeUnderTest.fetchTopPerformerProductsLegacy(
+                site = stubSite,
+                startDate = START_DATE,
+                endDate = END_DATE
+            )
+
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(TOP_PERFORMER_ENTITY_LIST)
+            assertThat(result.error).isNull()
+        }
+
+    @Test
+    fun `fetch top performer products should return mapped top performer entities correctly`() =
+        test {
+            setup()
+            val response = generateSampleTopPerformerApiResponse()
+            givenFetchTopPerformerReturns(response)
+
+            val topPerformers = storeUnderTest.fetchTopPerformerProducts(
+                site = stubSite,
+                startDate = START_DATE,
+                endDate = END_DATE
+            )
+            val result = setMillisSinceLastUpdated(topPerformers, DEFAULT_MILLIS_SINCE_LAST_UPDATE)
+
+            assertThat(result.model).isNotNull
+            assertThat(result.model).isEqualTo(TOP_PERFORMER_ENTITY_REPORTS_LIST)
+            assertThat(result.error).isNull()
+        }
+
+    @Test
+    fun `fetching top performer products should update database with new data`() =
+        test {
+            setup()
+            val response = generateSampleTopPerformerApiResponse()
+            givenFetchTopPerformerReturns(response)
+
+            storeUnderTest.fetchTopPerformerProducts(
+                site = stubSite,
+                startDate = START_DATE,
+                endDate = END_DATE
+            )
+
+            verify(topPerformersDao).updateTopPerformerProductsFor(
+                eq(stubSite.localId()),
+                eq(DATE_PERIOD),
+                any()
+            )
+        }
+
+    @Test
+    fun `fetching top performer products legacy should update database with new data`() =
+        test {
+            setup()
+            val response = generateSampleLeaderboardsApiResponse()
+            givenFetchLeaderBoardsReturns(response)
+            givenTopPerformersMapperReturns(
+                givenResponse = response?.firstOrNull { it.type == PRODUCTS }!!,
+                returnedTopPerformersList = TOP_PERFORMER_ENTITY_LIST
+            )
+
+            storeUnderTest.fetchTopPerformerProductsLegacy(
+                site = stubSite,
+                startDate = START_DATE,
+                endDate = END_DATE
+            )
+
+            verify(topPerformersDao, times(1))
+                .updateTopPerformerProductsFor(
+                    stubSite.localId(),
+                    DATE_PERIOD,
+                    TOP_PERFORMER_ENTITY_LIST
+                )
+        }
+
+    @Test
+    fun `invalidating top performer products should update database`() =
+        test {
+            setup()
+            givenCachedTopPerformers()
+
+            storeUnderTest.invalidateTopPerformers(stubSite)
+
+            verify(topPerformersDao, times(1))
+                .getTopPerformerProductsForSite(stubSite.localId())
+            verify(topPerformersDao, times(1))
+                .updateTopPerformerProductsForSite(
+                    stubSite.localId(),
+                    INVALIDATED_TOP_PERFORMER_ENTITY_LIST
+                )
+        }
+
+    private suspend fun givenCachedTopPerformers() {
+        whenever(
+            topPerformersDao.getTopPerformerProductsForSite(stubSite.localId())
+        ).thenReturn(TOP_PERFORMER_ENTITY_LIST)
+    }
+
+    private suspend fun givenFetchLeaderBoardsReturns(response: Array<LeaderboardsApiResponse>?) {
+        whenever(
+            leaderboardsRestClient.fetchLeaderboards(
+                site = any(),
+                startDate = any(),
+                endDate = any(),
+                quantity = anyOrNull(),
+                forceRefresh = any(),
+                interval = any(),
+                addProductsPath = any(),
+            )
+        ).thenReturn(WooPayload(response))
+    }
+
+    private suspend fun givenFetchTopPerformerReturns(response: Array<ReportsProductApiResponse>?) {
+        whenever(
+            reportsRestClient.fetchTopPerformerProducts(
+                site = any(),
+                startDate = any(),
+                endDate = any(),
+                quantity = any()
+            )
+        ).thenReturn(WooPayload(response))
+    }
+
+    private fun createStoreUnderTest() {
+        storeUnderTest = WCLeaderboardsStore(
+            leaderboardsRestClient,
+            productStore,
+            mapper,
+            initCoroutineEngine(),
+            topPerformersDao,
+            reportsRestClient,
+            wooCommerceStore
+        )
+    }
+
+    private suspend fun givenTopPerformersMapperReturns(
+        givenResponse: LeaderboardsApiResponse,
+        returnedTopPerformersList: List<TopPerformerProductEntity>,
+        siteModel: SiteModel = stubSite
+    ) {
+        whenever(
+            mapper.mapTopPerformerProductsEntity(
+                givenResponse,
+                siteModel,
+                productStore,
+                DATE_PERIOD
+            )
+        ).thenReturn(returnedTopPerformersList)
+    }
+
+    private fun setMillisSinceLastUpdated(
+        result: WooResult<List<TopPerformerProductEntity>>,
+        millis: Long
+    ): WooResult<List<TopPerformerProductEntity>> {
+        val updatedList = result.model?.map { entity ->
+            entity.copy(millisSinceLastUpdated = millis)
+        }
+        return WooResult(updatedList)
+    }
+
+    companion object {
+        const val DEFAULT_MILLIS_SINCE_LAST_UPDATE = 100L
+        const val START_DATE = "2024-01-01"
+        const val END_DATE = "2024-01-31"
+        const val DATE_PERIOD = "$START_DATE-$END_DATE"
+        val TOP_PERFORMER_ENTITY_LIST =
+            listOf(
+                TopPerformerProductEntity(
+                    localSiteId = LocalId(1),
+                    datePeriod = DATE_PERIOD,
+                    productId = RemoteId(123),
+                    name = "product",
+                    imageUrl = null,
+                    quantity = 5,
+                    currency = "USD",
+                    total = 10.5,
+                    millisSinceLastUpdated = 100
+                )
+            )
+        val INVALIDATED_TOP_PERFORMER_ENTITY_LIST =
+            listOf(
+                TopPerformerProductEntity(
+                    localSiteId = LocalId(1),
+                    datePeriod = DATE_PERIOD,
+                    productId = RemoteId(123),
+                    name = "product",
+                    imageUrl = null,
+                    quantity = 5,
+                    currency = "USD",
+                    total = 10.5,
+                    millisSinceLastUpdated = 0
+                )
+            )
+
+        @Suppress("MaxLineLength")
+        val TOP_PERFORMER_ENTITY_REPORTS_LIST =
+            listOf(
+                TopPerformerProductEntity(
+                    localSiteId = LocalId(321),
+                    datePeriod = DATE_PERIOD,
+                    productId = RemoteId(14),
+                    name = "Polo",
+                    imageUrl = "https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-600x599.jpg",
+                    quantity = 25,
+                    currency = "",
+                    total = 506.0000000000001,
+                    millisSinceLastUpdated = DEFAULT_MILLIS_SINCE_LAST_UPDATE
+                ),
+                TopPerformerProductEntity(
+                    localSiteId = LocalId(321),
+                    datePeriod = DATE_PERIOD,
+                    productId = RemoteId(22),
+                    name = "Sunglasses Subscription",
+                    imageUrl = "https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-600x600.jpg",
+                    quantity = 25,
+                    currency = "",
+                    total = 1374.0,
+                    millisSinceLastUpdated = DEFAULT_MILLIS_SINCE_LAST_UPDATE
+                ),
+                TopPerformerProductEntity(
+                    localSiteId = LocalId(321),
+                    datePeriod = DATE_PERIOD,
+                    productId = RemoteId(15),
+                    name = "Beanie",
+                    imageUrl = "https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-600x600.jpg",
+                    quantity = 21,
+                    currency = "",
+                    total = 385.0,
+                    millisSinceLastUpdated = DEFAULT_MILLIS_SINCE_LAST_UPDATE
+                )
+            )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt
new file mode 100644
index 00000000000..9fb84f2dc7e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCLeaderboardsTestFixtures.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.wc.leaderboards
+
+import com.google.gson.Gson
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.mock
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductDtoMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.reports.ReportsProductApiResponse
+
+object WCLeaderboardsTestFixtures {
+    val stubSite = SiteModel().apply {
+        id = 321
+        origin = SiteModel.ORIGIN_XMLRPC
+    }
+    private val productDtoMapper = ProductDtoMapper(
+        stripProductMetaData = mock {
+            on { invoke(any()) } doAnswer {
+                @Suppress("UNCHECKED_CAST")
+                it.arguments[0] as List<WCMetaData>
+            }
+        }
+    )
+
+    fun generateSampleProductList() = listOf(
+        "wc/top-performer-product-1.json",
+        "wc/top-performer-product-2.json",
+        "wc/top-performer-product-3.json"
+    )
+        .mapNotNull { fileName ->
+            UnitTestUtils.getStringFromResourceFile(this.javaClass, fileName)
+                ?.let { Gson().fromJson(it, ProductApiResponse::class.java) }
+        }.map {
+            productDtoMapper.mapToModel(LocalOrRemoteId.LocalId(0), it).product
+        }
+
+    fun generateSampleLeaderboardsApiResponse() =
+        UnitTestUtils
+            .getStringFromResourceFile(this.javaClass, "wc/leaderboards-response-example.json")
+            ?.run { Gson().fromJson(this, Array<LeaderboardsApiResponse>::class.java) }
+
+    fun generateSampleTopPerformerApiResponse() =
+        UnitTestUtils
+            .getStringFromResourceFile(this.javaClass, "wc/reports-product-response-example.json")
+            ?.run { Gson().fromJson(this, Array<ReportsProductApiResponse>::class.java) }
+
+    val generateStubbedProductIdList = listOf(14L, 22L, 15L)
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCProductLeaderboardsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCProductLeaderboardsMapperTest.kt
new file mode 100644
index 00000000000..27ed7303009
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/leaderboards/WCProductLeaderboardsMapperTest.kt
@@ -0,0 +1,124 @@
+package org.wordpress.android.fluxc.wc.leaderboards
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.leaderboards.WCProductLeaderboardsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.leaderboards.LeaderboardsApiResponse.Type.PRODUCTS
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCProductStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateSampleLeaderboardsApiResponse
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateSampleProductList
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.generateStubbedProductIdList
+import org.wordpress.android.fluxc.wc.leaderboards.WCLeaderboardsTestFixtures.stubSite
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCProductLeaderboardsMapperTest {
+    companion object {
+        const val DATE_PERIOD = "2024-01-01-2024-01-31"
+    }
+
+    private lateinit var mapperUnderTest: WCProductLeaderboardsMapper
+    private lateinit var productStore: WCProductStore
+
+    private val expectedProducts = generateSampleProductList()
+    private val productApiResponse = generateSampleLeaderboardsApiResponse()
+            ?.firstOrNull { it.type == PRODUCTS }
+
+    @Before
+    fun setUp() {
+        SingleStoreWellSqlConfigForTests(
+                RuntimeEnvironment.application.applicationContext,
+                listOf(SiteModel::class.java, WCProductModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        ).let {
+            WellSql.init(it)
+            it.reset()
+        }
+
+        mapperUnderTest = WCProductLeaderboardsMapper()
+        productStore = mock()
+    }
+
+    @Test
+    fun `map should request and parse all products from id`() = test {
+        configureProductStoreMock()
+        val result = mapperUnderTest.mapTopPerformerProductsEntity(
+                productApiResponse!!,
+                stubSite,
+                productStore,
+                DATE_PERIOD
+        )
+        assertThat(result).isNotNull
+        assertThat(result.size).isEqualTo(3)
+    }
+
+    @Test
+    fun `map should request and parse all products from id removing failing ones`() = test {
+        configureProductStoreMock()
+        configureExactFailingProductStoreMock(15)
+        val result = mapperUnderTest.mapTopPerformerProductsEntity(
+                productApiResponse!!,
+                stubSite,
+                productStore,
+                DATE_PERIOD
+        )
+        assertThat(result).isNotNull
+        assertThat(result.size).isEqualTo(2)
+    }
+
+    @Test
+    fun `map should remove any failing product response from the result`() = test {
+        configureFailingProductStoreMock()
+        val result = mapperUnderTest.mapTopPerformerProductsEntity(
+                productApiResponse!!,
+                stubSite,
+                productStore,
+                DATE_PERIOD
+        )
+        assertThat(result).isNotNull
+        assertThat(result).isEmpty()
+    }
+
+    private suspend fun configureProductStoreMock() {
+        generateStubbedProductIdList
+                .let {
+                    whenever(productStore.fetchProductListSynced(stubSite, it))
+                            .thenReturn(expectedProducts)
+                }
+    }
+
+    private suspend fun configureFailingProductStoreMock() {
+        generateStubbedProductIdList
+                .let {
+                    whenever(productStore.fetchProductListSynced(stubSite, it))
+                            .thenReturn(null)
+                }
+    }
+
+    private suspend fun configureExactFailingProductStoreMock(productId: Long) {
+        expectedProducts
+                .filter { it.remoteProductId != productId }
+                .let {
+                    whenever(
+                            productStore
+                                    .fetchProductListSynced(
+                                            stubSite,
+                                            generateStubbedProductIdList
+                                    )
+                    ).thenReturn(it)
+                }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderEntityTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderEntityTest.kt
new file mode 100644
index 00000000000..16019ed5ef5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderEntityTest.kt
@@ -0,0 +1,146 @@
+package org.wordpress.android.fluxc.wc.order
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.junit.Test
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.order.ShippingLine
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class OrderEntityTest {
+    private val gson = Gson()
+
+    @Test
+    fun testGetShippingAddress() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+                shippingAddress1 = "Some place"
+        )
+
+        assertEquals("Some place", model.getShippingAddress().address1)
+        assertEquals("something else", model.copy(shippingAddress1 = "something else").getShippingAddress().address1)
+    }
+
+    @Test
+    fun testGetShippingVSBillingAddress() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+                billingAddress1 = "Some place",
+                billingCountry = "Canada",
+                shippingAddress1 = "A different place",
+                shippingCountry = "Canada"
+        )
+
+        assertTrue(model.hasSeparateShippingDetails())
+        assertEquals("Some place", model.getBillingAddress().address1)
+        assertEquals("A different place", model.getShippingAddress().address1)
+        assertEquals("something else", model.copy(billingAddress1 = "something else").getBillingAddress().address1)
+    }
+
+    @Test
+    fun testGetLineItems() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+                lineItems = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/lineitems.json")
+        )
+        val renderedLineItems = model.getLineItemList()
+        assertEquals(3, renderedLineItems.size)
+
+        with(renderedLineItems[0]) {
+            assertEquals("A test", name)
+            assertEquals(15, productId)
+            assertNull(variationId)
+            assertEquals("10.00", total)
+            assertNull(sku)
+            assertNull(parentName)
+        }
+
+        with(renderedLineItems[1]) {
+            assertEquals("A second test", name)
+            assertEquals(65, productId)
+            assertEquals(3, variationId)
+            assertEquals("20.00", total)
+            assertEquals("blabla", sku)
+            assertNull(parentName)
+        }
+
+        with(renderedLineItems[2]) {
+            assertEquals("V-Neck T-Shirt - Blue, Medium", name)
+            assertEquals("V-Neck T-Shirt", parentName)
+            assertEquals(12, productId)
+            assertEquals(8947, variationId)
+        }
+    }
+
+    @Test
+    fun testGetLineItemAttributes() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+                lineItems = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/lineitems.json")
+        )
+        val renderedLineItems = model.getLineItemList()
+        assertEquals(3, renderedLineItems.size)
+
+        with(renderedLineItems[0]) {
+            val attributes = getAttributeList()
+            assertEquals(2, attributes.size)
+
+            assertEquals("color", attributes[0].key)
+            assertEquals("Red", attributes[0].value)
+
+            assertEquals("size", attributes[1].key)
+            assertEquals("Medium", attributes[1].value)
+        }
+
+        with(renderedLineItems[1]) {
+            val attributes = getAttributeList()
+            assertEquals(1, attributes.size)
+
+            assertEquals("size", attributes[0].key)
+            assertEquals("medium", attributes[0].value)
+        }
+    }
+
+    @Test
+    fun testGetSubtotal() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+                lineItems = "[{\"subtotal\": \"12.26\"},{\"subtotal\": \"15.39\"}]"
+        )
+
+        assertEquals(27.65, model.getOrderSubtotal())
+        assertEquals(0.0, model.copy(lineItems = "[{\"total\": \"12.26\"},{\"total\": \"15.39\"}]").getOrderSubtotal())
+    }
+
+    @Test
+    fun testGetShippingLines() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+            shippingLines = UnitTestUtils.getStringFromResourceFile(
+                    this.javaClass, "wc/order-shipping-lines.json"
+            )
+        )
+
+        val listShippingLineType = object : TypeToken<List<ShippingLine>>() {}.type
+        val shippingLinesList: List<ShippingLine> = gson.fromJson(model.shippingLines, listShippingLineType)
+
+        assertEquals(2, shippingLinesList.count())
+    }
+
+    @Test
+    fun testGetShippingLinesAttributes() {
+        val model = OrderTestUtils.generateSampleOrder(61).copy(
+            shippingLines = UnitTestUtils.getStringFromResourceFile(
+                    this.javaClass, "wc/order-shipping-lines.json"
+            )
+        )
+
+        val listShippingLineType = object : TypeToken<List<ShippingLine>>() {}.type
+        val shippingLinesList: List<ShippingLine> = gson.fromJson(model.shippingLines, listShippingLineType)
+
+        assertEquals(2, shippingLinesList[0].id)
+        assertEquals(3, shippingLinesList[1].id)
+
+        assertEquals("10.00", shippingLinesList[0].total)
+        assertEquals("20.00", shippingLinesList[1].total)
+
+        assertEquals("Flat Rate Shipping", shippingLinesList[0].methodTitle)
+        assertEquals("Local Pickup Shipping", shippingLinesList[1].methodTitle)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderSqlUtilsTest.kt
new file mode 100644
index 00000000000..a33fc320e69
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderSqlUtilsTest.kt
@@ -0,0 +1,369 @@
+@file:Suppress("DEPRECATION_ERROR")
+package org.wordpress.android.fluxc.wc.order
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class OrderSqlUtilsTest {
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        WCOrderStatusModel::class.java,
+                        WCOrderShipmentTrackingModel::class.java,
+                        WCOrderShipmentProviderModel::class.java,
+                        WCOrderSummaryModel::class.java,
+                        SiteModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun testInsertOrUpdateOrderStatusOptions() {
+        val siteModel = SiteModel().apply { id = 1 }
+        val optionsJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order_status_options.json")
+        val orderStatusOptions = OrderTestUtils.getOrderStatusOptionsFromJson(optionsJson, siteModel.id)
+        assertEquals(8, orderStatusOptions.size)
+
+        // Save first option to the database, retrieve and verify fields
+        val firstOption = orderStatusOptions[0]
+        var rowsAffected = OrderSqlUtils.insertOrUpdateOrderStatusOption(firstOption)
+        assertEquals(1, rowsAffected)
+        val firstOptionDb = OrderSqlUtils.getOrderStatusOptionsForSite(siteModel).first()
+        assertNotNull(firstOptionDb)
+        assertEquals(firstOptionDb.localSiteId, firstOption.id)
+        assertEquals(firstOptionDb.statusKey, firstOption.statusKey)
+        assertEquals(firstOptionDb.label, firstOption.label)
+        assertEquals(firstOptionDb.statusCount, firstOption.statusCount)
+
+        // Save full list, but only all but the first 2 should be inserted
+        rowsAffected = orderStatusOptions.sumBy { OrderSqlUtils.insertOrUpdateOrderStatusOption(it) }
+        assertEquals(8, rowsAffected)
+
+        // Update a single option
+        val newLabel = "New Label"
+        firstOption.apply { label = newLabel }
+        rowsAffected = OrderSqlUtils.insertOrUpdateOrderStatusOption(firstOption)
+        assertEquals(1, rowsAffected)
+        val newFirstOption = OrderSqlUtils.getOrderStatusOptionsForSite(siteModel).first {
+            it.statusKey == firstOption.statusKey
+        }
+        assertEquals(firstOption.label, newFirstOption.label)
+        assertEquals(firstOption.statusCount, newFirstOption.statusCount)
+
+        // Get order status options from the database
+        val orderStatusOptionsDb = OrderSqlUtils.getOrderStatusOptionsForSite(siteModel)
+        assertEquals(8, orderStatusOptionsDb.size)
+    }
+
+    @Test
+    fun testDeleteOrderStatusOption() {
+        val siteModel = SiteModel().apply { id = 1 }
+        val optionsJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order_status_options.json")
+        val orderStatusOptions = OrderTestUtils.getOrderStatusOptionsFromJson(optionsJson, siteModel.id)
+        assertEquals(8, orderStatusOptions.size)
+
+        // Save the full list to the database
+        var rowsAffected = orderStatusOptions.sumBy { OrderSqlUtils.insertOrUpdateOrderStatusOption(it) }
+        assertEquals(8, rowsAffected)
+
+        // Delete the first option from the database
+        val firstOption = orderStatusOptions[0]
+        rowsAffected = OrderSqlUtils.deleteOrderStatusOption(firstOption)
+        assertEquals(1, rowsAffected)
+
+        // Fetch list and verify first option is not present
+        val allOptions = OrderSqlUtils.getOrderStatusOptionsForSite(siteModel)
+        assertEquals(7, allOptions.size)
+        assertFalse { allOptions.contains(firstOption) }
+    }
+
+    @Test
+    fun testGetOrderStatusOption() {
+        val siteModel = SiteModel().apply { id = 1 }
+        val optionsJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order_status_options.json")
+        val orderStatusOptions = OrderTestUtils.getOrderStatusOptionsFromJson(optionsJson, siteModel.id)
+        assertEquals(8, orderStatusOptions.size)
+
+        // Save the full list to the database
+        val rowsAffected = orderStatusOptions.sumBy { OrderSqlUtils.insertOrUpdateOrderStatusOption(it) }
+        assertEquals(8, rowsAffected)
+
+        // Get the first option from the database by the status key
+        val firstOption = OrderSqlUtils.getOrderStatusOptionForSiteByKey(siteModel, orderStatusOptions[0].statusKey)
+        assertNotNull(firstOption)
+        assertEquals(firstOption.label, orderStatusOptions[0].label)
+        assertEquals(firstOption.statusCount, orderStatusOptions[0].statusCount)
+    }
+
+    @Test
+    fun testGetOrderStatusOptions_Empty() {
+        val siteModel = SiteModel().apply { id = 1 }
+
+        // Attempt to fetch order status options from database.
+        // No options will be available.
+        val options = OrderSqlUtils.getOrderStatusOptionsForSite(siteModel)
+        assertNotNull(options)
+        assertEquals(0, options.size)
+    }
+
+    @Test
+    fun testGetOrderStatusOption_NotExists() {
+        val siteModel = SiteModel().apply { id = 1 }
+
+        // Get the first option from the database by the status key
+        val option = OrderSqlUtils.getOrderStatusOptionForSiteByKey(siteModel, "missing")
+        assertNull(option)
+    }
+
+    @Test
+    fun testGetOrderShipmentTrackingsForOrder() {
+        val siteModel = SiteModel().apply { id = 1 }
+        val orderId = 3L
+        val json = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "wc/order-shipment-trackings-multiple.json")
+        val trackings = OrderTestUtils
+                .getOrderShipmentTrackingsFromJson(json, siteModel.id, orderId)
+                .toMutableList()
+        assertEquals(2, trackings.size)
+
+        // Save full list to the database
+        var rowsAffected = trackings.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+        assertEquals(2, rowsAffected)
+
+        // Attempt to save again (should ignore both existing entries and add new one)
+        trackings.add(OrderTestUtils.generateOrderShipmentTracking(siteModel.id, orderId))
+        rowsAffected = trackings.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+        assertEquals(1, rowsAffected)
+
+        // Get all shipment trackings for a single order
+        val trackingsForOrder = OrderSqlUtils.getShipmentTrackingsForOrder(siteModel, orderId)
+        assertEquals(3, trackingsForOrder.size)
+
+        // get a single shipment tracking by tracking number
+        val shipmentTracking = OrderSqlUtils.getShipmentTrackingByTrackingNumber(
+                siteModel, orderId, trackingsForOrder[0].trackingNumber
+        )
+        assertNotNull(shipmentTracking)
+        assertEquals(trackingsForOrder[0].trackingNumber, shipmentTracking.trackingNumber)
+    }
+
+    @Test
+    fun testDeleteOrderShipmentTrackingsForSite() {
+        val orderId = 3L
+        // Insert shipment trackings into the database
+        val siteModel = SiteModel().apply { id = 1 }
+        val json = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "wc/order-shipment-trackings-multiple.json")
+        val trackings = OrderTestUtils
+                .getOrderShipmentTrackingsFromJson(json, siteModel.id, orderId)
+                .toMutableList()
+        assertEquals(2, trackings.size)
+        var rowsAffected = trackings.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+        assertEquals(2, rowsAffected)
+
+        // Delete all shipment trackings for site
+        rowsAffected = OrderSqlUtils.deleteOrderShipmentTrackingsForSite(siteModel)
+        assertEquals(2, rowsAffected)
+
+        // Verify no shipment trackings in db
+        val trackingsInDb = OrderSqlUtils.getShipmentTrackingsForOrder(siteModel, orderId)
+        assertEquals(0, trackingsInDb.size)
+    }
+
+    @Test
+    fun testDeleteOrderShipmentTrackingsById() {
+        val orderId = 3L
+        // Insert shipment trackings into the database
+        val siteModel = SiteModel().apply { id = 1 }
+        val json = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "wc/order-shipment-trackings-multiple.json")
+        val trackings = OrderTestUtils
+                .getOrderShipmentTrackingsFromJson(json, siteModel.id, orderId)
+                .toMutableList()
+        assertEquals(2, trackings.size)
+        var rowsAffected = trackings.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentTracking(it) }
+        assertEquals(2, rowsAffected)
+
+        // Delete the first shipment tracking
+        var trackingsInDb = OrderSqlUtils.getShipmentTrackingsForOrder(siteModel, orderId)
+        rowsAffected = OrderSqlUtils.deleteOrderShipmentTrackingById(trackingsInDb[0])
+        assertEquals(1, rowsAffected)
+
+        // Verify only a single shipment tracking row in db
+        trackingsInDb = OrderSqlUtils.getShipmentTrackingsForOrder(siteModel, orderId)
+        assertEquals(1, trackingsInDb.size)
+    }
+
+    @Test
+    fun testGetOrderShipmentProvidersForOrder() {
+        val siteModel = SiteModel().apply { id = 1 }
+        val json = UnitTestUtils
+                .getStringFromResourceFile(this.javaClass, "wc/order-shipment-providers.json")
+        val providers = OrderTestUtils
+                .getOrderShipmentProvidersFromJson(json, siteModel.id)
+                .toMutableList()
+        assertEquals(54, providers.size)
+
+        // Save full list to the database
+        var rowsAffected = providers.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentProvider(it) }
+        assertEquals(54, rowsAffected)
+
+        // Attempt to save again (should ignore existing entries and add new one)
+        providers.add(OrderTestUtils.generateOrderShipmentProvider(siteModel.id))
+        rowsAffected = providers.sumBy { OrderSqlUtils.insertOrIgnoreOrderShipmentProvider(it) }
+        assertEquals(1, rowsAffected)
+
+        // Get all shipment providers for a single site
+        val providersForSite = OrderSqlUtils.getOrderShipmentProvidersForSite(siteModel)
+        assertEquals(55, providersForSite.size)
+    }
+
+    @Test
+    fun testInsertOrderSummaries() {
+        // Arrange:
+        // - Create the test site so any foreign key dependency works
+        // - Create a list of WCOrderSummaryModels for testing
+        val site = OrderTestUtils.getAndSaveTestSite()
+        val summaryList = OrderTestUtils.getTestOrderSummaryList(site)
+
+        // Act:
+        // - Insert all records and verify
+        OrderSqlUtils.insertOrUpdateOrderSummaries(summaryList)
+
+        // Assert:
+        // - Verify all records were inserted
+        val summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId })
+        assertEquals(10, summariesDb.size)
+    }
+
+    @Test
+    fun testUpdateOrderSummaries() {
+        // Arrange:
+        // - Create the test site so any foreign key dependency works
+        // - Create a list of WCOrderSummaryModels for testing
+        // - Save first option to the database
+        // - Verify first option inserted
+        val site = OrderTestUtils.getAndSaveTestSite()
+        val summaryList = OrderTestUtils.getTestOrderSummaryList(site)
+        val firstOption = summaryList[0]
+        OrderSqlUtils.insertOrUpdateOrderSummaries(listOf(firstOption))
+        var summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, listOf(firstOption.orderId))
+        assertEquals(1, summariesDb.size)
+        assertEquals(firstOption.dateCreated, summariesDb[0].dateCreated)
+        assertEquals(firstOption.orderId, summariesDb[0].orderId)
+        assertEquals(firstOption.localSiteId, summariesDb[0].localSiteId)
+
+        // Act:
+        // - Update first option and re-save. This should just update the record in the db
+        firstOption.dateCreated = "2019-01-01"
+        OrderSqlUtils.insertOrUpdateOrderSummaries(listOf(firstOption))
+
+        // Assert:
+        // - Verify the modified property was updated
+        summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, listOf(firstOption.orderId))
+        assertEquals(1, summariesDb.size)
+        assertEquals(firstOption.dateCreated, summariesDb[0].dateCreated)
+    }
+
+    @Test
+    fun testDeleteOrderSummariesForSite() {
+        // Arrange:
+        // - Create the test site so any foreign key dependency works
+        // - Create a list of WCOrderSummaryModels for testing
+        // - Save all order summaries to the db
+        // - Verify all orders saved successfully
+        val site = OrderTestUtils.getAndSaveTestSite()
+        val summaryList = OrderTestUtils.getTestOrderSummaryList(site)
+        OrderSqlUtils.insertOrUpdateOrderSummaries(summaryList)
+        var summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId })
+        assertEquals(10, summariesDb.size)
+
+        // Act:
+        // - Delete all summaries
+        OrderSqlUtils.deleteOrderSummariesForSite(site)
+
+        // Assert:
+        // - Verify all order summaries deleted for the active site
+        summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId })
+        assertEquals(0, summariesDb.size)
+    }
+
+    /**
+     * Tests the foreign key relationship between SiteModel and WCOrderSummaryModel.
+     */
+    @Test
+    fun testOrderSummarySiteModelForeignKeyOnDeleteCascade() {
+        // Arrange:
+        // - Create the test site so any foreign key dependency works
+        // - Create a list of WCOrderSummaryModels for testing
+        // - Save all order summaries to the db
+        // - Verify all orders saved successfully
+        val site = OrderTestUtils.getAndSaveTestSite()
+        val summaryList = OrderTestUtils.getTestOrderSummaryList(site)
+        OrderSqlUtils.insertOrUpdateOrderSummaries(summaryList)
+        var summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId })
+        assertEquals(10, summariesDb.size)
+
+        // Act:
+        // - Delete the site, this should delete all the WCOrderSummaryModel records as well
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+
+        // Assert:
+        // - Verify all order summaries for the deleted site have also been deleted
+        summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId })
+        assertEquals(0, summariesDb.size)
+    }
+
+    @Test
+    fun testGetOrderSummariesByRemoteIds() {
+        // Arrange:
+        // - Create a list of 300 WCOrderSummaryModel's
+        val site = OrderTestUtils.getAndSaveTestSite()
+        val summaryList = OrderTestUtils.getTestOrderSummaryExtendedList(site).sortedByDescending { it.id }
+
+        // Act:
+        // - Save 300 order summaries to the db
+        OrderSqlUtils.insertOrUpdateOrderSummaries(summaryList)
+
+        // Assert:
+        // - Query for the 300 order summary records from the database
+        // - Verify all records fetched successfully
+        // - Verify list saved to db matches list fetched from db
+        val summariesDb = OrderSqlUtils
+                .getOrderSummariesForRemoteIds(site, summaryList.map { it.orderId }).sortedBy { it.id }
+        assertEquals(300, summariesDb.size)
+        assertEquals(summaryList, summariesDb)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderTestUtils.kt
new file mode 100644
index 00000000000..d9b39933ba0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/OrderTestUtils.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.wc.order
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.JsonParser
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.persistence.entity.OrderNoteEntity
+import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
+import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderNoteApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderShipmentTrackingApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderStatusApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderSummaryApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.toDataModel
+import org.wordpress.android.fluxc.site.SiteUtils
+import org.wordpress.android.fluxc.utils.DateUtils
+import kotlin.collections.MutableMap.MutableEntry
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+object OrderTestUtils {
+    fun generateSampleOrder(
+        orderId: Long,
+        orderStatus: String = CoreOrderStatus.PROCESSING.value,
+        siteId: Int = 6,
+        modified: String = "1955-11-05T14:15:00Z",
+        paymentMethod: String = "",
+        paymentMethodTitle: String = ""
+    ): OrderEntity {
+        return OrderEntity(
+            orderId = orderId,
+            localSiteId = LocalId(siteId),
+            status = orderStatus,
+            dateModified = modified,
+            dateCreated = "1955-11-05T14:15:00Z",
+            datePaid = "1956-11-05T14:15:00Z",
+            currency = "USD",
+            total = "10.0",
+            paymentMethod = paymentMethod,
+            paymentMethodTitle = paymentMethodTitle,
+        )
+    }
+
+    fun generateSampleOrderSummary(
+        id: Number,
+        remoteId: Number,
+        modified: String = "1955-11-05T14:15:00Z"
+    ): WCOrderSummaryModel {
+        return WCOrderSummaryModel(id.toInt()).apply {
+            orderId = remoteId.toLong()
+            dateModified = modified
+        }
+    }
+
+    fun getOrderNotesFromJsonString(json: String, localSiteId: Int, orderId: Long): List<OrderNoteEntity> {
+        val responseType = object : TypeToken<List<OrderNoteApiResponse>>() {}.type
+        val converted = Gson().fromJson(json, responseType) as? List<OrderNoteApiResponse> ?: emptyList()
+        return converted.map {
+            it.toDataModel(localSiteId = LocalId(localSiteId), orderId = RemoteId(orderId))
+        }
+    }
+
+    fun getOrderStatusOptionsFromJson(json: String, siteId: Int): List<WCOrderStatusModel> {
+        val responseType = object : TypeToken<List<OrderStatusApiResponse>>() {}.type
+        val converted = Gson().fromJson(json, responseType) as? List<OrderStatusApiResponse> ?: emptyList()
+        return converted.map {
+            WCOrderStatusModel().apply {
+                localSiteId = siteId
+                statusKey = it.slug ?: ""
+                label = it.name ?: ""
+                statusCount = it.total
+            }
+        }
+    }
+
+    fun getOrderShipmentTrackingsFromJson(
+        json: String,
+        siteId: Int,
+        orderId: Long
+    ): List<WCOrderShipmentTrackingModel> {
+        val responseType = object : TypeToken<List<OrderShipmentTrackingApiResponse>>() {}.type
+        val converted = Gson().fromJson(json, responseType) as? List<OrderShipmentTrackingApiResponse> ?: emptyList()
+        return converted.map {
+            WCOrderShipmentTrackingModel().apply {
+                localSiteId = siteId
+                this.orderId = orderId
+                remoteTrackingId = it.tracking_id ?: ""
+                trackingNumber = it.tracking_number ?: ""
+                trackingProvider = it.tracking_provider ?: ""
+                trackingLink = it.tracking_link ?: ""
+                dateShipped = it.date_shipped ?: ""
+            }
+        }
+    }
+
+    fun generateOrderShipmentTracking(siteId: Int, orderId: Long): WCOrderShipmentTrackingModel {
+        return WCOrderShipmentTrackingModel().apply {
+            localSiteId = siteId
+            this.orderId = orderId
+            remoteTrackingId = "3290834092801"
+            trackingNumber = "ZZ9939921"
+            trackingProvider = "USPS"
+            trackingLink = ""
+            dateShipped = "2019-01-01"
+        }
+    }
+
+    fun getOrderShipmentProvidersFromJson(json: String, siteId: Int): List<WCOrderShipmentProviderModel> {
+        val providers = mutableListOf<WCOrderShipmentProviderModel>()
+        val jsonElement = JsonParser().parse(json)
+        jsonElement.asJsonObject.entrySet().forEach { countryEntry: MutableEntry<String, JsonElement> ->
+            countryEntry.value.asJsonObject.entrySet().map { carrierEntry ->
+                carrierEntry?.let { carrier ->
+                    val provider = WCOrderShipmentProviderModel().apply {
+                        localSiteId = siteId
+                        this.country = countryEntry.key
+                        this.carrierName = carrier.key
+                        this.carrierLink = carrier.value.asString
+                    }
+                    providers.add(provider)
+                }
+            }
+        }
+        return providers
+    }
+
+    fun generateOrderShipmentProvider(siteId: Int): WCOrderShipmentProviderModel {
+        return WCOrderShipmentProviderModel().apply {
+            localSiteId = siteId
+            country = "Australia"
+            carrierName = "Amanda Test"
+            carrierLink = "http://google.com"
+        }
+    }
+
+    fun getOrderSummariesFromJsonString(json: String, siteId: Int): List<WCOrderSummaryModel> {
+        val responseType = object : TypeToken<List<OrderSummaryApiResponse>>() {}.type
+        val converted = Gson().fromJson(json, responseType) as? List<OrderSummaryApiResponse> ?: emptyList()
+        return converted.map { response ->
+            WCOrderSummaryModel().apply {
+                localSiteId = siteId
+                orderId = response.id ?: 0
+                dateCreated = response.dateCreatedGmt?.let { DateUtils.formatGmtAsUtcDateString(it) } ?: ""
+                dateModified = response.dateModifiedGmt?.let { DateUtils.formatGmtAsUtcDateString(it) } ?: ""
+            }
+        }
+    }
+
+    fun getAndSaveTestSite(): SiteModel {
+        var siteModel = SiteUtils.generateTestSite(556, "", "", false, true).apply {
+            name = "Generic WP site"
+        }
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(siteModel)
+        siteModel = TestSiteSqlUtils.siteSqlUtils.getSitesByNameOrUrlMatching("Generic").firstOrNull()
+        assertNotNull(siteModel)
+
+        return siteModel
+    }
+
+    fun getTestOrderSummaryList(site: SiteModel): List<WCOrderSummaryModel> {
+        val json = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order-summaries.json")
+        val summaryList = getOrderSummariesFromJsonString(json, site.id)
+        assertEquals(10, summaryList.size)
+
+        return summaryList
+    }
+
+    fun getTestOrderSummaryExtendedList(site: SiteModel): List<WCOrderSummaryModel> {
+        val json = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order-summaries-extended.json")
+        val summaryList = getOrderSummariesFromJsonString(json, site.id)
+        assertEquals(300, summaryList.size)
+
+        return summaryList
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderListDescriptorTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderListDescriptorTest.kt
new file mode 100644
index 00000000000..e7bbd30de85
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderListDescriptorTest.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.wc.order
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameters
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.list.ListDescriptorUnitTestCase
+import org.wordpress.android.fluxc.list.post.LIST_DESCRIPTOR_TEST_FIRST_MOCK_SITE_LOCAL_SITE_ID
+import org.wordpress.android.fluxc.list.post.LIST_DESCRIPTOR_TEST_QUERY_1
+import org.wordpress.android.fluxc.list.post.LIST_DESCRIPTOR_TEST_QUERY_2
+import org.wordpress.android.fluxc.list.post.LIST_DESCRIPTOR_TEST_SECOND_MOCK_SITE_LOCAL_SITE_ID
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+
+private typealias WCOrderListDescriptorTestCase = ListDescriptorUnitTestCase<WCOrderListDescriptor>
+
+@RunWith(Parameterized::class)
+internal class WCOrderListDescriptorTest(
+    private val testCase: WCOrderListDescriptorTestCase
+) {
+    companion object {
+        @JvmStatic
+        @Parameters
+        fun testCases(): List<WCOrderListDescriptorTestCase> {
+            val mockSite = mock<SiteModel>()
+            val mockSite2 = mock<SiteModel>()
+            whenever(mockSite.id).thenReturn(LIST_DESCRIPTOR_TEST_FIRST_MOCK_SITE_LOCAL_SITE_ID)
+            whenever(mockSite2.id).thenReturn(LIST_DESCRIPTOR_TEST_SECOND_MOCK_SITE_LOCAL_SITE_ID)
+            return listOf(
+                    // Same site
+                    WCOrderListDescriptorTestCase(
+                            typeIdentifierReason = "Same sites should have same type identifier",
+                            uniqueIdentifierReason = "Same sites should have same unique identifier",
+                            descriptor1 = WCOrderListDescriptor(site = mockSite),
+                            descriptor2 = WCOrderListDescriptor(site = mockSite),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = true
+                    ),
+                    // Different site
+                    WCOrderListDescriptorTestCase(
+                            typeIdentifierReason = "Different sites should have different type identifiers",
+                            uniqueIdentifierReason = "Different sites should have different unique identifiers",
+                            descriptor1 = WCOrderListDescriptor(site = mockSite),
+                            descriptor2 = WCOrderListDescriptor(site = mockSite2),
+                            shouldHaveSameTypeIdentifier = false,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different status filters
+                    WCOrderListDescriptorTestCase(
+                            typeIdentifierReason = "Different status filters should have same type identifiers",
+                            uniqueIdentifierReason = "Different status filters should have different " +
+                                    "unique identifiers",
+                            descriptor1 = WCOrderListDescriptor(
+                                    site = mockSite,
+                                    statusFilter = LIST_DESCRIPTOR_TEST_QUERY_1
+                            ),
+                            descriptor2 = WCOrderListDescriptor(
+                                    site = mockSite,
+                                    statusFilter = LIST_DESCRIPTOR_TEST_QUERY_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    ),
+                    // Different search query
+                    WCOrderListDescriptorTestCase(
+                            typeIdentifierReason = "Different search queries should have same type identifiers",
+                            uniqueIdentifierReason = "Different search queries should have different " +
+                                    "unique identifiers",
+                            descriptor1 = WCOrderListDescriptor(
+                                    site = mockSite,
+                                    searchQuery = LIST_DESCRIPTOR_TEST_QUERY_1
+                            ),
+                            descriptor2 = WCOrderListDescriptor(
+                                    site = mockSite,
+                                    statusFilter = LIST_DESCRIPTOR_TEST_QUERY_2
+                            ),
+                            shouldHaveSameTypeIdentifier = true,
+                            shouldHaveSameUniqueIdentifier = false
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `test type identifier`() {
+        testCase.testTypeIdentifier()
+    }
+
+    @Test
+    fun `test unique identifier`() {
+        testCase.testUniqueIdentifier()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderStoreTest.kt
new file mode 100644
index 00000000000..20e70a02be9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/order/WCOrderStoreTest.kt
@@ -0,0 +1,773 @@
+@file:Suppress("DEPRECATION_ERROR")
+package org.wordpress.android.fluxc.wc.order
+
+import android.app.Application
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import com.yarolegovich.wellsql.WellSql
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
+import okhttp3.internal.toImmutableMap
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.check
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.generated.WCOrderActionBuilder
+import org.wordpress.android.fluxc.generated.WCOrderActionBuilder.newFetchedOrderListAction
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.OrderEntity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCOrderListDescriptor
+import org.wordpress.android.fluxc.model.WCOrderStatusModel
+import org.wordpress.android.fluxc.model.WCOrderSummaryModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.BatchOrderApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus.COMPLETED
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.OrderRestClient
+import org.wordpress.android.fluxc.persistence.OrderSqlUtils
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.persistence.dao.MetaDataDao
+import org.wordpress.android.fluxc.persistence.dao.OrderNotesDao
+import org.wordpress.android.fluxc.persistence.dao.OrdersDaoDecorator
+import org.wordpress.android.fluxc.store.InsertOrder
+import org.wordpress.android.fluxc.store.WCOrderFetcher
+import org.wordpress.android.fluxc.store.WCOrderStore
+import org.wordpress.android.fluxc.store.WCOrderStore.BulkUpdateOrderStatusResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchHasOrdersResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderListResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrderStatusOptionsResponsePayload
+import org.wordpress.android.fluxc.store.WCOrderStore.HasOrdersResult
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderError
+import org.wordpress.android.fluxc.store.WCOrderStore.OrderErrorType
+import org.wordpress.android.fluxc.store.WCOrderStore.RemoteOrderPayload
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.util.Calendar
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+private const val COD_PAYMENT_METHOD_ID = "cod"
+private const val CUSTOM_PAYMENT_METHOD_TITLE = "Pay in Person"
+
+
+@InternalCoroutinesApi
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCOrderStoreTest {
+    private val orderFetcher: WCOrderFetcher = mock()
+    private val orderRestClient: OrderRestClient = mock()
+    lateinit var ordersDaoDecorator: OrdersDaoDecorator
+    lateinit var orderNotesDao: OrderNotesDao
+    lateinit var metaDataDao: MetaDataDao
+    lateinit var orderStore: WCOrderStore
+    private val insertOrder: InsertOrder = mock()
+
+    @Before
+    fun setUp() {
+        val appContext = ApplicationProvider.getApplicationContext<Application>()
+
+        val database = Room.inMemoryDatabaseBuilder(appContext, WCAndroidDatabase::class.java)
+                .allowMainThreadQueries()
+                .build()
+
+        val dispatcher = Dispatcher()
+        ordersDaoDecorator = OrdersDaoDecorator(dispatcher, database.ordersDao)
+        orderNotesDao = database.orderNotesDao
+        metaDataDao = database.metaDataDao
+
+        orderStore = WCOrderStore(
+                dispatcher = dispatcher,
+                wcOrderRestClient = orderRestClient,
+                wcOrderFetcher = orderFetcher,
+                coroutineEngine = initCoroutineEngine(),
+                ordersDaoDecorator = ordersDaoDecorator,
+                orderNotesDao = orderNotesDao,
+                metaDataDao = metaDataDao,
+                insertOrder = insertOrder
+        )
+
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(WCOrderStatusModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun testSimpleInsertionAndRetrieval() {
+        runBlocking {
+            val orderModel = OrderTestUtils.generateSampleOrder(42)
+            ordersDaoDecorator.insertOrUpdateOrder(orderModel)
+            val site = SiteModel().apply { id = orderModel.localSiteId.value }
+
+            val storedOrders = ordersDaoDecorator.getOrdersForSite(site.localId())
+            assertEquals(1, storedOrders.size)
+            assertEquals(42, storedOrders[0].orderId)
+            assertEquals(orderModel, storedOrders[0])
+        }
+    }
+
+    @Test
+    fun testGetOrders() {
+        runBlocking {
+            val processingOrder = OrderTestUtils.generateSampleOrder(3).saveToDb()
+            OrderTestUtils.generateSampleOrder(4, CoreOrderStatus.ON_HOLD.value).saveToDb()
+            val cancelledOrder = OrderTestUtils.generateSampleOrder(5, CoreOrderStatus.CANCELLED.value).saveToDb()
+
+            val site = SiteModel().apply { id = processingOrder.localSiteId.value }
+
+            val orderList = orderStore
+                .getOrdersForSite(site, CoreOrderStatus.PROCESSING.value, CoreOrderStatus.CANCELLED.value)
+
+            assertEquals(2, orderList.size)
+            assertTrue(orderList.contains(processingOrder))
+            assertTrue(orderList.contains(cancelledOrder))
+
+            val fullOrderList = orderStore.getOrdersForSite(site)
+            assertEquals(3, fullOrderList.size)
+        }
+    }
+
+    private suspend fun OrderEntity.saveToDb(): OrderEntity {
+        ordersDaoDecorator.insertOrUpdateOrder(this)
+        return copy()
+    }
+
+    private fun insertOrUpdate(item: OrderEntity) {
+        runBlocking {
+            ordersDaoDecorator.insertOrUpdateOrder(item)
+        }
+    }
+
+    @Test
+    fun testGetOrderByLocalId() {
+        runBlocking {
+            val sampleOrder = OrderTestUtils.generateSampleOrder(3)
+            ordersDaoDecorator.insertOrUpdateOrder(sampleOrder)
+
+            val site = SiteModel().apply { this.id = sampleOrder.localSiteId.value }
+
+            val retrievedOrder = orderStore.getOrderByIdAndSite(sampleOrder.orderId, site)
+            assertEquals(sampleOrder, retrievedOrder)
+
+            // Non-existent ID should return null
+            // assertNull(orderStore.getOrderByIdentifier(OrderIdentifier(WCOrderModel(id = 1955))))
+        }
+    }
+
+    @Test
+    fun testCustomOrderStatus() {
+        runBlocking {
+            val customStatus = "chronologically-incongruous"
+            val customStatusOrder = OrderTestUtils.generateSampleOrder(3, customStatus)
+            ordersDaoDecorator.insertOrUpdateOrder(customStatusOrder)
+
+            val site = SiteModel().apply { id = customStatusOrder.localSiteId.value }
+
+            val orderList = orderStore.getOrdersForSite(site, customStatus)
+            assertEquals(1, orderList.size)
+            assertTrue(orderList.contains(customStatusOrder))
+
+            val orderList2 = orderStore.getOrdersForSite(site, customStatus, CoreOrderStatus.CANCELLED.value)
+            assertEquals(1, orderList2.size)
+            assertTrue(orderList2.contains(customStatusOrder))
+
+            val fullOrderList = orderStore.getOrdersForSite(site)
+            assertEquals(1, fullOrderList.size)
+        }
+    }
+
+    @Test
+    fun testUpdateOrderStatus() = runBlocking {
+        val orderModel = OrderTestUtils.generateSampleOrder(42)
+        ordersDaoDecorator.insertOrUpdateOrder(orderModel)
+        val site = SiteModel().apply { id = orderModel.localSiteId.value }
+        val result = RemoteOrderPayload.Updating(orderModel.copy(status = CoreOrderStatus.REFUNDED.value), site)
+        whenever(orderRestClient
+            .updateOrderStatusAndPaymentMethod(orderModel, site, CoreOrderStatus.REFUNDED.value)
+        ).thenReturn(result)
+
+        orderStore.updateOrderStatus(orderModel.orderId, site, WCOrderStatusModel(CoreOrderStatus.REFUNDED.value))
+            .toList()
+
+        with(orderStore.getOrderByIdAndSite(orderModel.orderId, site)!!) {
+            // The version of the order model in the database should have the updated status
+            assertEquals(CoreOrderStatus.REFUNDED.value, status)
+            // Other fields should not be altered by the update
+            assertEquals(orderModel.currency, currency)
+        }
+    }
+
+    @Test
+    fun testGetOrderStatusOptions() {
+        val site = SiteModel().apply { id = 8 }
+        val optionsJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order_status_options.json")
+        val orderStatusOptions = OrderTestUtils.getOrderStatusOptionsFromJson(optionsJson, site.id)
+        orderStatusOptions.sumBy { OrderSqlUtils.insertOrUpdateOrderStatusOption(it) }
+
+        // verify that the order status options are stored correctly
+        val storedOrderStatusOptions = OrderSqlUtils.getOrderStatusOptionsForSite(site)
+        assertEquals(orderStatusOptions.size, storedOrderStatusOptions.size)
+
+        val firstOrderStatusOption = storedOrderStatusOptions[0]
+        assertEquals(firstOrderStatusOption.label, orderStatusOptions[0].label)
+        assertEquals(firstOrderStatusOption.statusCount, orderStatusOptions[0].statusCount)
+        firstOrderStatusOption.apply { statusCount = 100 }
+
+        // Simulate incoming action with updated order status model list
+        val payload = FetchOrderStatusOptionsResponsePayload(site, storedOrderStatusOptions)
+        orderStore.onAction(WCOrderActionBuilder.newFetchedOrderStatusOptionsAction(payload))
+
+        with(OrderSqlUtils.getOrderStatusOptionsForSite(site)[0]) {
+            // The status count of the first order status model in the database should have updated
+            assertEquals(firstOrderStatusOption.statusCount, statusCount)
+            // Other fields should not be altered by the update
+            assertEquals(firstOrderStatusOption.label, label)
+        }
+    }
+
+    @Test
+    fun testOrderErrorType() {
+        assertEquals(OrderErrorType.INVALID_PARAM, OrderErrorType.fromString("invalid_param"))
+        assertEquals(OrderErrorType.INVALID_PARAM, OrderErrorType.fromString("INVALID_PARAM"))
+        assertEquals(OrderErrorType.GENERIC_ERROR, OrderErrorType.fromString(""))
+    }
+
+    @Test
+    fun testGetOrderNotesForOrder() = runBlocking {
+        val notesJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/order_notes.json")
+        val orderId = 949L
+        val localSiteId = 6
+        val noteModels = OrderTestUtils.getOrderNotesFromJsonString(notesJson, localSiteId, orderId)
+        val orderModel = OrderTestUtils.generateSampleOrder(orderId).copy(localSiteId = LocalId(localSiteId.toInt()))
+        val site = SiteModel().apply { id = localSiteId }
+        assertEquals(6, noteModels.size)
+        orderNotesDao.insertNotes(noteModels[0])
+
+        val retrievedNotes = orderStore.getOrderNotesForOrder(site, orderModel.orderId)
+        assertEquals(1, retrievedNotes.size)
+        assertEquals(noteModels[0], retrievedNotes[0])
+    }
+
+    @Test
+    fun testOrderToIdentifierToOrder() {
+        runBlocking {
+            val site = SiteModel().apply { id = 6 }
+            // Convert an order to identifier and restore it from the database
+            OrderTestUtils.generateSampleOrder(3).saveToDb().let { sampleOrder ->
+                assertEquals(sampleOrder, orderStore.getOrderByIdAndSite(3, site))
+            }
+
+            // Attempt to restore an order that doesn't exist in the database
+            OrderTestUtils.generateSampleOrder(4).let {
+                assertNull(orderStore.getOrderByIdAndSite(4, site))
+            }
+
+            // Restore an order that doesn't have a remote ID
+            OrderTestUtils.generateSampleOrder(0).saveToDb().let { draftOrder ->
+                assertEquals(draftOrder, orderStore.getOrderByIdAndSite(0, site))
+            }
+
+            // Restore an order without a local ID by matching site and remote order IDs
+            OrderTestUtils.generateSampleOrder(3).let { duplicateRemoteOrder ->
+                assertEquals(duplicateRemoteOrder, orderStore.getOrderByIdAndSite(3, site))
+            }
+        }
+    }
+
+    @Test
+    fun testFetchingOnlyOutdatedOrMissingOrders() {
+        runBlocking {
+            val site = SiteModel().apply { id = 8 }
+
+            val upToDate = setupUpToDateOrders(site)
+            upToDate.orders.filterNotNull().forEach(::insertOrUpdate)
+            assertThat(ordersDaoDecorator.getOrdersForSite(site.localId())).hasSize(10)
+
+            val outdated = setupOutdatedOrders(site)
+            outdated.orders.filterNotNull().forEach(::insertOrUpdate)
+            assertThat(ordersDaoDecorator.getOrdersForSite(site.localId())).hasSize(20)
+
+            val missing = setupMissingOrders()
+            assertThat(ordersDaoDecorator.getOrdersForSite(site.localId())).hasSize(20)
+
+            orderStore.onAction(
+                newFetchedOrderListAction(
+                    FetchOrderListResponsePayload(
+                        WCOrderListDescriptor(site = site),
+                        requestStartTime = Calendar.getInstance(),
+                        orderSummaries = upToDate.summaries + outdated.summaries + missing.summaries
+                    )
+                )
+            )
+
+            verify(orderFetcher).fetchOrders(eq(site), check { remoteIdsToFetch ->
+                assertThat(remoteIdsToFetch).containsExactlyInAnyOrderElementsOf(
+                    (outdated.summaries + missing.summaries).map { it.orderId }
+                )
+            })
+        }
+    }
+
+    @Test
+    fun testUpdateOrderStatusRequestUpdatesLocalDatabase() = runBlocking {
+        val orderModel = OrderTestUtils.generateSampleOrder(42, orderStatus = CoreOrderStatus.PROCESSING.value)
+                .saveToDb()
+        val site = SiteModel().apply { id = orderModel.localSiteId.value }
+        val result = RemoteOrderPayload.Updating(orderModel.copy(status = CoreOrderStatus.COMPLETED.value), site)
+        whenever(orderRestClient.updateOrderStatusAndPaymentMethod(orderModel, site, CoreOrderStatus.COMPLETED.value))
+                .thenReturn(result)
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.status)
+                .isEqualTo(CoreOrderStatus.PROCESSING.value)
+
+        orderStore.updateOrderStatus(
+                orderModel.orderId,
+                site,
+                WCOrderStatusModel(CoreOrderStatus.COMPLETED.value)
+        ).toList()
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.status)
+                .isEqualTo(CoreOrderStatus.COMPLETED.value)
+        Unit
+    }
+
+    @Test
+    fun testRevertLocalOrderUpdateIfRemoteUpdateFails() = runBlocking {
+        val orderModel = OrderTestUtils.generateSampleOrder(42, orderStatus = CoreOrderStatus.PROCESSING.value)
+                .saveToDb()
+        val site = SiteModel().apply { id = orderModel.localSiteId.value }
+        val error = OrderError()
+        whenever(
+            orderRestClient.updateOrderStatusAndPaymentMethod(
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                anyOrNull()
+            )
+        ).thenReturn(
+                RemoteOrderPayload.Updating(
+                        error = error,
+                        order = orderModel,
+                        site = site
+                )
+        )
+
+        val response = orderStore.updateOrderStatus(
+                orderModel.orderId,
+                site,
+                WCOrderStatusModel(CoreOrderStatus.COMPLETED.value)
+        ).toList().last()
+
+        // Ensure the error is sent in the response
+        assertThat(response.event.error).isEqualTo(error)
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.status)
+                .isEqualTo(CoreOrderStatus.PROCESSING.value)
+        Unit
+    }
+
+
+    @Test
+    fun testUpdateOrderPaymentMethodRequestUpdatesLocalDatabase() = runBlocking {
+        val orderModel = OrderTestUtils.generateSampleOrder(
+            42,
+            orderStatus = CoreOrderStatus.PROCESSING.value,
+            paymentMethod = "",
+            paymentMethodTitle = "")
+            .saveToDb()
+        val site = SiteModel().apply { id = orderModel.localSiteId.value }
+        whenever(orderRestClient.updateOrderStatusAndPaymentMethod(
+            orderModel,
+            site,
+            CoreOrderStatus.COMPLETED.value,
+            COD_PAYMENT_METHOD_ID,
+            CUSTOM_PAYMENT_METHOD_TITLE
+        )).thenReturn(
+            RemoteOrderPayload.Updating(
+                orderModel.copy(
+                    status = CoreOrderStatus.COMPLETED.value,
+                    paymentMethod = COD_PAYMENT_METHOD_ID,
+                    paymentMethodTitle = CUSTOM_PAYMENT_METHOD_TITLE
+                ),
+                site
+            )
+        )
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethod)
+            .isEqualTo("")
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethodTitle)
+            .isEqualTo("")
+
+        orderStore.updateOrderStatusAndPaymentMethod(
+            orderModel.orderId,
+            site,
+            WCOrderStatusModel(CoreOrderStatus.COMPLETED.value),
+            newPaymentMethodId = COD_PAYMENT_METHOD_ID,
+            newPaymentMethodTitle = CUSTOM_PAYMENT_METHOD_TITLE
+        ).toList()
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethod)
+            .isEqualTo(COD_PAYMENT_METHOD_ID)
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethodTitle)
+            .isEqualTo(CUSTOM_PAYMENT_METHOD_TITLE)
+        Unit
+    }
+
+    @Test
+    fun testRevertLocalPaymentMethodIfRemoteUpdateFails() = runBlocking {
+        val orderModel = OrderTestUtils.generateSampleOrder(
+            42,
+            orderStatus = CoreOrderStatus.PROCESSING.value,
+            paymentMethod = "",
+            paymentMethodTitle = "")
+            .saveToDb()
+        val site = SiteModel().apply { id = orderModel.localSiteId.value }
+        val error = OrderError()
+        whenever(
+            orderRestClient.updateOrderStatusAndPaymentMethod(
+                orderModel,
+                site,
+                CoreOrderStatus.COMPLETED.value,
+                COD_PAYMENT_METHOD_ID,
+                CUSTOM_PAYMENT_METHOD_TITLE
+            )
+        ).thenReturn(
+            RemoteOrderPayload.Updating(
+                error = error,
+                order = orderModel,
+                site = site
+            )
+        )
+
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethod)
+            .isEqualTo("")
+        assertThat(ordersDaoDecorator.getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethodTitle)
+            .isEqualTo("")
+
+        val response = orderStore.updateOrderStatusAndPaymentMethod(
+            orderModel.orderId,
+            site,
+            WCOrderStatusModel(CoreOrderStatus.COMPLETED.value),
+            newPaymentMethodId = COD_PAYMENT_METHOD_ID,
+            newPaymentMethodTitle = CUSTOM_PAYMENT_METHOD_TITLE
+        ).toList().last()
+
+        // Ensure the error is sent in the response
+        assertThat(response.event.error).isEqualTo(error)
+
+        assertThat(
+            ordersDaoDecorator
+                .getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethod
+        ).isEqualTo("")
+        assertThat(
+            ordersDaoDecorator
+                .getOrder(orderModel.orderId, orderModel.localSiteId)?.paymentMethodTitle
+        ).isEqualTo("")
+        Unit
+    }
+
+    @Test
+    fun testObserveOrdersCount() {
+        runBlocking {
+            val siteId = 5
+            val site = SiteModel().apply { id = siteId }
+            // When inserting 3 PROCESSING and 1 COMPLETED orders
+            for (i in 1L..3L) {
+                OrderTestUtils.generateSampleOrder(
+                    siteId = siteId,
+                    orderId = i,
+                    orderStatus = CoreOrderStatus.PROCESSING.value
+                ).saveToDb()
+            }
+
+            OrderTestUtils.generateSampleOrder(
+                siteId = siteId,
+                orderId = 4L,
+                orderStatus = CoreOrderStatus.COMPLETED.value
+            ).saveToDb()
+
+            // Then PROCESSING orders count = 3
+            var count = orderStore.observeOrderCountForSite(
+                site,
+                listOf(CoreOrderStatus.PROCESSING.value)
+            ).first()
+
+            assertThat(count).isEqualTo(3)
+
+            count = orderStore.observeOrderCountForSite(
+                site,
+                listOf(CoreOrderStatus.COMPLETED.value)
+            ).first()
+
+            // Then COMPLETED orders count = 1
+            assertThat(count).isEqualTo(1)
+        }
+    }
+
+    @Test
+    fun testHasOrdersWithoutLocalOrders() {
+        runBlocking {
+            // Given there are NO orders in the local database
+            val orderModel = OrderTestUtils.generateSampleOrder(42)
+            val site = SiteModel().apply { id = orderModel.localSiteId.value }
+            val hasOrdersResponse = FetchHasOrdersResponsePayload(site = site, hasOrders = false)
+            whenever(orderRestClient.fetchHasOrders(any(), anyOrNull()))
+                .thenReturn(hasOrdersResponse)
+
+            // When checking if the store has orders
+            val result = orderStore.hasOrders(site)
+
+            // Then check with the API if the store has orders
+            verify(orderRestClient).fetchHasOrders(site,null)
+            assertThat(result).isInstanceOf(HasOrdersResult.Success::class.java)
+            (result as? HasOrdersResult.Success)?.let { success ->
+                assertThat(success.hasOrders).isEqualTo(hasOrdersResponse.hasOrders)
+            }
+        }
+    }
+
+    @Test
+    fun testHasOrdersWithLocalOrders() {
+        runBlocking {
+            // Given there are orders in the local database
+            val orderModel = OrderTestUtils.generateSampleOrder(42)
+            val site = SiteModel().apply { id = orderModel.localSiteId.value }
+            orderModel.saveToDb()
+
+            // When checking if the store has orders
+            val result = orderStore.hasOrders(site)
+
+            // Then use the database as proof that the store has orders and avoid
+            // fetching data from the API
+            verify(orderRestClient, never()).fetchHasOrders(site,null)
+            assertThat(result).isInstanceOf(HasOrdersResult.Success::class.java)
+            (result as? HasOrdersResult.Success)?.let { success ->
+                assertThat(success.hasOrders).isEqualTo(true)
+            }
+        }
+    }
+
+    @Test
+    fun testFetchOrdersReceipt() {
+        runBlocking {
+            val orderModel = OrderTestUtils.generateSampleOrder(42)
+            val site = SiteModel().apply { id = orderModel.localSiteId.value }
+            val orderId = 42L
+            val expirationDate = "2021-01-05"
+            val expirationDays = 30
+            val forceNew = true
+
+            orderStore.fetchOrdersReceipt(
+                site,
+                orderId,
+                expirationDate,
+                expirationDays,
+                forceNew
+            )
+
+            verify(orderRestClient).fetchOrdersReceipt(
+                site,
+                orderId,
+                expirationDate,
+                expirationDays,
+                forceNew
+            )
+        }
+    }
+
+    @Test
+    fun testSendOrderReceipt() {
+        runBlocking {
+            val orderModel = OrderTestUtils.generateSampleOrder(42)
+            val site = SiteModel().apply { id = orderModel.localSiteId.value }
+            val orderId = 42L
+
+            orderStore.sendOrderReceipt(site, orderId)
+
+            verify(orderRestClient).sendOrderReceipt(site, orderId)
+        }
+    }
+
+    @Test
+    fun `given successful response for all orders when batch updating status then returns successful orders`() {
+        runBlocking {
+            // Given
+            val site = SiteModel().apply { id = 1 }
+            val orderIds = listOf(1L, 2L, 3L)
+            val newStatus = COMPLETED.value
+
+            // Create mocked OrderDto objects for success responses
+            val order1 = mock<OrderDto>().apply {
+                whenever(id).thenReturn(1L)
+                whenever(status).thenReturn(COMPLETED.value)
+            }
+            val order2 = mock<OrderDto>().apply {
+                whenever(id).thenReturn(2L)
+                whenever(status).thenReturn(COMPLETED.value)
+            }
+            val order3 = mock<OrderDto>().apply {
+                whenever(id).thenReturn(3L)
+                whenever(status).thenReturn(COMPLETED.value)
+            }
+
+            val successResponses = listOf(
+                BatchOrderApiResponse.OrderResponse.Success(order1),
+                BatchOrderApiResponse.OrderResponse.Success(order2),
+                BatchOrderApiResponse.OrderResponse.Success(order3)
+            )
+
+            whenever(orderRestClient.batchUpdateOrdersStatus(site, orderIds, newStatus))
+                .thenReturn(BulkUpdateOrderStatusResponsePayload(successResponses))
+
+            // When
+            val result = orderStore.batchUpdateOrdersStatus(
+                site,
+                orderIds,
+                WCOrderStatusModel(COMPLETED.value)
+            )
+
+            // Then
+            assertThat(result.isError).isFalse()
+            result.model?.let { updateResult ->
+                assertEquals(orderIds, updateResult.updatedOrders)
+                assertTrue(updateResult.failedOrders.isEmpty())
+            }
+        }
+    }
+
+    @Test
+    fun `given mixed response when batch updating status then returns successful and failed orders`() {
+        runBlocking {
+            // Given
+            val site = SiteModel().apply { id = 1 }
+            val orderIds = listOf(1L, 2L, 3L)
+            val newStatus = COMPLETED.value
+
+            // Mock successful orders
+            val order1 = mock<OrderDto>().apply {
+                whenever(id).thenReturn(1L)
+                whenever(status).thenReturn(COMPLETED.value)
+            }
+            val order3 = mock<OrderDto>().apply {
+                whenever(id).thenReturn(3L)
+                whenever(status).thenReturn(COMPLETED.value)
+            }
+
+            val mixedResponses = listOf(
+                BatchOrderApiResponse.OrderResponse.Success(order1),
+                BatchOrderApiResponse.OrderResponse.Error(
+                    id = 2L,
+                    error = BatchOrderApiResponse.ErrorResponse(
+                        code = "woocommerce_rest_shop_order_invalid_id",
+                        message = "Invalid ID.",
+                        data = BatchOrderApiResponse.ErrorData(status = 400)
+                    )
+                ),
+                BatchOrderApiResponse.OrderResponse.Success(order3)
+            )
+
+            whenever(orderRestClient.batchUpdateOrdersStatus(site, orderIds, newStatus))
+                .thenReturn(BulkUpdateOrderStatusResponsePayload(mixedResponses))
+
+            // When
+            val result = orderStore.batchUpdateOrdersStatus(
+                site,
+                orderIds,
+                WCOrderStatusModel(COMPLETED.value)
+            )
+
+            // Then
+            assertThat(result.isError).isFalse()
+            result.model?.let { updateResult ->
+                assertEquals(listOf(1L, 3L), updateResult.updatedOrders)
+                assertEquals(1, updateResult.failedOrders.size)
+                with(updateResult.failedOrders[0]) {
+                    assertEquals(2L, id)
+                    assertEquals("woocommerce_rest_shop_order_invalid_id", errorCode)
+                    assertEquals("Invalid ID.", errorMessage)
+                    assertEquals(400, errorStatus)
+                }
+            }
+        }
+    }
+
+    private fun setupMissingOrders(): MutableMap<WCOrderSummaryModel, OrderEntity?> {
+        return mutableMapOf<WCOrderSummaryModel, OrderEntity?>().apply {
+            (21L..30L).forEach { index ->
+                put(
+                        OrderTestUtils.generateSampleOrderSummary(
+                                id = index,
+                                remoteId = index
+                        ),
+                        null
+                )
+            }
+        }
+    }
+
+    private fun setupOutdatedOrders(site: SiteModel) =
+            mutableMapOf<WCOrderSummaryModel, OrderEntity>().apply {
+                val baselineDate = "2021-01-05T12:00:00Z"
+                val oneDayAfterBaselineDate = "2021-01-06T12:00:00Z"
+                (11L..20L).forEach { index ->
+                    put(
+                            OrderTestUtils.generateSampleOrderSummary(
+                                    id = index,
+                                    remoteId = index,
+                                    modified = oneDayAfterBaselineDate
+                            ),
+                            OrderTestUtils.generateSampleOrder(
+                                    siteId = site.id,
+                                    orderId = index,
+                                    modified = baselineDate
+                            )
+                    )
+                }
+            }.toImmutableMap()
+
+    private fun setupUpToDateOrders(site: SiteModel) =
+            mutableMapOf<WCOrderSummaryModel, OrderEntity>().apply {
+                val baselineDate = "2021-01-05T12:00:00Z"
+                (1L..10L).forEach { index ->
+                    put(
+                            OrderTestUtils.generateSampleOrderSummary(
+                                    id = index,
+                                    remoteId = index,
+                                    modified = baselineDate
+                            ),
+                            OrderTestUtils.generateSampleOrder(
+                                    siteId = site.id,
+                                    orderId = index,
+                                    modified = baselineDate
+                            )
+                    )
+                }
+            }.toImmutableMap()
+
+    private val Map<WCOrderSummaryModel, OrderEntity?>.summaries
+        get() = keys.toList()
+
+    private val Map<WCOrderSummaryModel, OrderEntity?>.orders
+        get() = values.toList()
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/pay/WCInPersonPaymentsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/pay/WCInPersonPaymentsStoreTest.kt
new file mode 100644
index 00000000000..fc022d28de1
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/pay/WCInPersonPaymentsStoreTest.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.fluxc.wc.pay
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson.ConnectionTokenApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.payments.inperson.InPersonPaymentsRestClient
+import org.wordpress.android.fluxc.store.WCInPersonPaymentsStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@RunWith(MockitoJUnitRunner::class)
+class WCInPersonPaymentsStoreTest {
+    private val restClient = mock<InPersonPaymentsRestClient>()
+
+    private lateinit var store: WCInPersonPaymentsStore
+
+    @Before
+    fun setUp() {
+        store = WCInPersonPaymentsStore(initCoroutineEngine(), restClient)
+    }
+
+    @Test
+    fun `given server returns valid token, when fetchConnectionToken, then result contains the token`() = test {
+        val token = "valid token"
+        whenever(restClient.fetchConnectionToken(any(), any())).thenReturn(
+                WooPayload(ConnectionTokenApiResponse(token, false))
+        )
+
+        val result = store.fetchConnectionToken(mock(), mock())
+
+        assertThat(result.model?.token).isEqualTo(token)
+    }
+
+    @Test
+    fun `given server response is testMode=true, when fetchConnectionToken, then testMode=true returned`() = test {
+        val isTestMode = true
+        whenever(restClient.fetchConnectionToken(any(), any())).thenReturn(
+                WooPayload(ConnectionTokenApiResponse("", isTestMode))
+        )
+
+        val result = store.fetchConnectionToken(mock(), mock())
+
+        assertThat(result.model?.isTestMode).isEqualTo(isTestMode)
+    }
+
+    @Test
+    fun `given server response is error, when fetchConnectionToken, then WooError returned`() = test {
+        whenever(restClient.fetchConnectionToken(any(), any())).thenReturn(
+                WooPayload(mock())
+        )
+
+        val result = store.fetchConnectionToken(mock(), mock())
+
+        assertThat(result.error).isNotNull
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductReliabilityTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductReliabilityTest.kt
new file mode 100644
index 00000000000..68bffdd7b82
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductReliabilityTest.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.wc.product
+
+import com.google.gson.Gson
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductApiResponse
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ProductReliabilityTest {
+    @Test
+    fun testBooleansWrongFormatted() {
+        val result = UnitTestUtils
+            .getStringFromResourceFile(this.javaClass, "wc/product_reliability_booleans.json")
+            ?.run { Gson().fromJson(this, ProductApiResponse::class.java) }
+
+        assertThat(result).isNotNull
+        assertThat(result?.sold_individually).isTrue
+        assertThat(result?.purchasable).isTrue
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductSqlUtilsTest.kt
new file mode 100644
index 00000000000..1535d753e8c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductSqlUtilsTest.kt
@@ -0,0 +1,942 @@
+package org.wordpress.android.fluxc.wc.product
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductShippingClassModel
+import org.wordpress.android.fluxc.model.WCProductTagModel
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCProductStore.ProductFilterOption
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@Suppress("LargeClass")
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class ProductSqlUtilsTest {
+    val site = SiteModel().apply {
+        email = "test@example.org"
+        name = "Test Site"
+        siteId = 24
+    }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        WCProductModel::class.java,
+                        WCProductReviewModel::class.java,
+                        WCProductCategoryModel::class.java,
+                        WCProductShippingClassModel::class.java,
+                        WCProductTagModel::class.java,
+                        SiteModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+
+        // Insert the site into the db so it's available later for product
+        // reviews
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun testInsertOrUpdateProduct() {
+        val productModel = ProductTestUtils.generateSampleProduct(40)
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        // Test inserting product
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+        val storedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(1, storedProductsCount)
+
+        // Test updating product
+        val storedProduct = ProductSqlUtils.getProductByRemoteId(site, productModel.remoteProductId)
+        storedProduct?.apply {
+            name = "Anitaa Test"
+            virtual = true
+        }
+        storedProduct?.also {
+            ProductSqlUtils.insertOrUpdateProduct(it)
+        }
+
+        val updatedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(1, updatedProductsCount)
+
+        val updatedProduct = ProductSqlUtils.getProductByRemoteId(site, productModel.remoteProductId)
+        assertEquals(storedProduct?.id, updatedProduct?.id)
+        assertEquals(storedProduct?.name, updatedProduct?.name)
+        assertEquals(storedProduct?.virtual, updatedProduct?.virtual)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductWithDecimalQuantity() {
+        val productModel = ProductTestUtils.generateSampleProduct(
+                remoteId = 42,
+                stockQuantity = 4.2
+        )
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        // Test inserting product
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+        val storedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(1, storedProductsCount)
+
+        // Test updating product
+        val storedProduct = ProductSqlUtils.getProductByRemoteId(site, productModel.remoteProductId)
+        storedProduct?.apply {
+            stockQuantity = 4.0
+        }
+        storedProduct?.also {
+            ProductSqlUtils.insertOrUpdateProduct(it)
+        }
+
+        val updatedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(1, updatedProductsCount)
+
+        val updatedProduct = ProductSqlUtils.getProductByRemoteId(site, productModel.remoteProductId)
+        assertEquals(storedProduct?.id, updatedProduct?.id)
+        assertEquals(storedProduct?.name, updatedProduct?.name)
+        assertEquals(storedProduct?.virtual, updatedProduct?.virtual)
+    }
+
+    @Test
+    fun testInsertOrUpdateProducts() {
+        val site = SiteModel().apply { id = 2 }
+        val products = ArrayList<WCProductModel>().apply {
+            this.add(ProductTestUtils.generateSampleProduct(40, siteId = site.id))
+            this.add(ProductTestUtils.generateSampleProduct(41, siteId = site.id))
+            this.add(ProductTestUtils.generateSampleProduct(42, siteId = site.id))
+        }
+
+        // Delete all products for this site, then test inserting the above products
+        ProductSqlUtils.deleteProductsForSite(site)
+        val insertedProductCount = ProductSqlUtils.insertOrUpdateProducts(products)
+        assertEquals(3, insertedProductCount)
+        val storedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(3, storedProductsCount)
+    }
+
+    @Test
+    fun testGetProductsForSite() {
+        // insert products for one site
+        val site1 = SiteModel().apply { id = 2 }
+        val product1 = ProductTestUtils.generateSampleProduct(40, siteId = site1.id)
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+
+        // verify that it is stored
+        val storedProduct = ProductSqlUtils.getProductByRemoteId(site1, product1.remoteProductId)
+        assertEquals(product1.id, storedProduct?.id)
+        assertEquals(product1.name, storedProduct?.name)
+        assertEquals(product1.virtual, storedProduct?.virtual)
+
+        // insert products for another site
+        val site2 = SiteModel().apply { id = 10 }
+        val product2 = ProductTestUtils.generateSampleProduct(43, siteId = site2.id)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+
+        // verify that it is stored
+        val storedProduct2 = ProductSqlUtils.getProductByRemoteId(site2, product2.remoteProductId)
+        assertEquals(product2.id, storedProduct2?.id)
+        assertEquals(product2.name, storedProduct2?.name)
+        assertEquals(product2.virtual, storedProduct2?.virtual)
+
+        // add another product for site 1
+        val product3 = ProductTestUtils.generateSampleProduct(43, siteId = site1.id)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        // verify that the site 2 product size is still the same
+        val storedProductForSite2Count = ProductSqlUtils.getProductCountForSite(site2)
+        assertEquals(1, storedProductForSite2Count)
+
+        // verify that the site 1 product is increases by 1
+        val storedProductForSite1Count = ProductSqlUtils.getProductCountForSite(site1)
+        assertEquals(2, storedProductForSite1Count)
+    }
+
+    @Test
+    fun testGetVirtualProductsForSite() {
+        // insert products for one site
+        val site1 = SiteModel().apply { id = 2 }
+        val products = ArrayList<WCProductModel>().apply {
+            this.add(ProductTestUtils.generateSampleProduct(40, siteId = site1.id, virtual = true))
+            this.add(ProductTestUtils.generateSampleProduct(41, siteId = site1.id, virtual = false))
+            this.add(ProductTestUtils.generateSampleProduct(42, siteId = site1.id, virtual = true))
+        }
+
+        ProductSqlUtils.insertOrUpdateProducts(products)
+
+        // verify that the product list exists locally
+        val remoteProductIds = products.map { it.remoteProductId }.toList()
+        val storedProductCountForSite1 = ProductSqlUtils.getProductCountByRemoteIds(site1, remoteProductIds)
+        assertEquals(remoteProductIds.size, storedProductCountForSite1)
+
+        // verify that only 2 of the products are virtual
+        assertEquals(2, ProductSqlUtils.getVirtualProductCountByRemoteIds(site1, remoteProductIds))
+
+        // insert products for another site
+        val site2 = SiteModel().apply { id = 10 }
+        val products2 = ArrayList<WCProductModel>().apply {
+            this.add(ProductTestUtils.generateSampleProduct(40, siteId = site2.id, virtual = true))
+            this.add(ProductTestUtils.generateSampleProduct(41, siteId = site2.id, virtual = true))
+            this.add(ProductTestUtils.generateSampleProduct(42, siteId = site2.id, virtual = true))
+        }
+        ProductSqlUtils.insertOrUpdateProducts(products2)
+
+        // verify that it is stored
+        val remoteProductIds2 = products2.map { it.remoteProductId }.toList()
+        val storedProductCountForSite2 = ProductSqlUtils.getProductCountByRemoteIds(site2, remoteProductIds2)
+        assertEquals(remoteProductIds2.size, storedProductCountForSite2)
+
+        // verify that all of the products are virtual
+        assertEquals(3, ProductSqlUtils.getVirtualProductCountByRemoteIds(site2, remoteProductIds2))
+
+        // insert products for another site
+        val site3 = SiteModel().apply { id = 11 }
+        val products3 = ArrayList<WCProductModel>().apply {
+            this.add(ProductTestUtils.generateSampleProduct(40, siteId = site3.id))
+            this.add(ProductTestUtils.generateSampleProduct(41, siteId = site3.id))
+            this.add(ProductTestUtils.generateSampleProduct(42, siteId = site3.id))
+        }
+        ProductSqlUtils.insertOrUpdateProducts(products3)
+
+        // verify that it is stored
+        val remoteProductIds3 = products3.map { it.remoteProductId }.toList()
+        val storedProductCountForSite3 = ProductSqlUtils.getProductCountByRemoteIds(site3, remoteProductIds3)
+        assertEquals(remoteProductIds3.size, storedProductCountForSite3)
+
+        // verify that none of the products are virtual
+        assertEquals(0, ProductSqlUtils.getVirtualProductCountByRemoteIds(site3, remoteProductIds3))
+    }
+
+    @Test
+    fun testDeleteProduct() {
+        val remoteProductId = 40L
+        val productModel = ProductTestUtils.generateSampleProduct(remoteProductId)
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        // Test inserting product
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+        val storedProductsCount = ProductSqlUtils.getProductCountForSite(site)
+        assertEquals(1, storedProductsCount)
+
+        // Test deleting product
+        val rowsAffected = ProductSqlUtils.deleteProduct(site, remoteProductId)
+        assertEquals(1, rowsAffected)
+        assertNull(ProductSqlUtils.getProductByRemoteId(site, remoteProductId))
+    }
+
+    @Test
+    fun testInsertOrUpdateProductShippingClass() {
+        val shippingClass = ProductTestUtils.generateProductShippingClassList(site.id)[0]
+        assertNotNull(shippingClass)
+
+        // Test inserting a product shipping class
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClass(shippingClass)
+        assertEquals(1, rowsAffected)
+        var savedShippingClassList = ProductSqlUtils
+                .getProductShippingClassListForSite(site.id)
+        assertEquals(savedShippingClassList.size, 1)
+        assertEquals(savedShippingClassList[0].localSiteId, shippingClass.localSiteId)
+        assertEquals(savedShippingClassList[0].remoteShippingClassId, shippingClass.remoteShippingClassId)
+        assertEquals(savedShippingClassList[0].name, shippingClass.name)
+        assertEquals(savedShippingClassList[0].slug, shippingClass.slug)
+        assertEquals(savedShippingClassList[0].description, shippingClass.description)
+
+        // Test updating the same product shipping class
+        shippingClass.apply {
+            name = "Test shipping class"
+        }
+        rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClass(shippingClass)
+        assertEquals(1, rowsAffected)
+        savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(savedShippingClassList.size, 1)
+        assertEquals(savedShippingClassList[0].localSiteId, shippingClass.localSiteId)
+        assertEquals(savedShippingClassList[0].remoteShippingClassId, shippingClass.remoteShippingClassId)
+        assertEquals(savedShippingClassList[0].name, shippingClass.name)
+        assertEquals(savedShippingClassList[0].slug, shippingClass.slug)
+        assertEquals(savedShippingClassList[0].description, shippingClass.description)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductShippingClassList() {
+        val shippingClassList = ProductTestUtils.generateProductShippingClassList(site.id)
+        assertTrue(shippingClassList.isNotEmpty())
+
+        // Insert product shipping class list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClassList(shippingClassList)
+        assertEquals(shippingClassList.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetProductShippingClassListForSite() {
+        val shippingClassList = ProductTestUtils.generateProductShippingClassList(site.id)
+        assertTrue(shippingClassList.isNotEmpty())
+
+        // Insert product shipping class list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClassList(shippingClassList)
+        assertEquals(shippingClassList.size, rowsAffected)
+
+        // Get shipping class list for site and verify
+        val savedShippingClassListExists = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(shippingClassList.size, savedShippingClassListExists.size)
+
+        // Get shipping class list for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(nonExistingSite.id)
+        assertEquals(0, savedShippingClassList.size)
+    }
+
+    @Test
+    fun testGetProductShippingClassByRemoteShippingId() {
+        val shippingClass = ProductTestUtils.generateSampleProductShippingClass(
+                remoteId = 40, siteId = site.id
+        )
+
+        // Insert product shipping class list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClass(shippingClass)
+        assertEquals(1, rowsAffected)
+
+        // Get shipping class for site and remoteId and verify
+        val savedShippingClassExists = ProductSqlUtils.getProductShippingClassByRemoteId(
+                shippingClass.remoteShippingClassId, site.id
+        )
+        assertEquals(shippingClass.remoteShippingClassId, savedShippingClassExists?.remoteShippingClassId)
+        assertEquals(shippingClass.name, savedShippingClassExists?.name)
+        assertEquals(shippingClass.description, savedShippingClassExists?.description)
+        assertEquals(shippingClass.slug, savedShippingClassExists?.slug)
+        assertEquals(shippingClass.localSiteId, savedShippingClassExists?.localSiteId)
+
+        // Get shipping class for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedShippingClass = ProductSqlUtils.getProductShippingClassByRemoteId(
+                25, nonExistingSite.id
+        )
+        assertNull(savedShippingClass)
+
+        // Get shipping class for a site that does not exist
+        val nonExistingRemoteId = 25L
+        val nonExistentShippingClass = ProductSqlUtils.getProductShippingClassByRemoteId(
+                nonExistingRemoteId, site.id
+        )
+        assertNull(nonExistentShippingClass)
+    }
+
+    @Test
+    fun testDeleteProductShippingListForSite() {
+        val shippingClassList = ProductTestUtils.generateProductShippingClassList(site.id)
+
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClassList(shippingClassList)
+        assertEquals(shippingClassList.size, rowsAffected)
+
+        // Verify products inserted
+        var savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(shippingClassList.size, savedShippingClassList.size)
+
+        // Delete shipping class list for site and verify
+        rowsAffected = ProductSqlUtils.deleteProductShippingClassListForSite(site)
+        assertEquals(shippingClassList.size, rowsAffected)
+        savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(0, savedShippingClassList.size)
+    }
+
+    @Test
+    fun testDeleteSiteDeletesProductShippingClassList() {
+        val shippingClassList = ProductTestUtils.generateProductShippingClassList(site.id)
+        assertTrue(shippingClassList.isNotEmpty())
+
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductShippingClassList(shippingClassList)
+        assertEquals(shippingClassList.size, rowsAffected)
+
+        // Verify products inserted
+        var savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(shippingClassList.size, savedShippingClassList.size)
+
+        // Delete site and verify shipping class list  deleted via foreign key constraint
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+        savedShippingClassList = ProductSqlUtils.getProductShippingClassListForSite(site.id)
+        assertEquals(0, savedShippingClassList.size)
+    }
+
+    @Test
+    fun testGetProductsForSiteAndProductIds() {
+        val productIds = listOf<Long>(40, 41, 2)
+
+        val product1 = ProductTestUtils.generateSampleProduct(40)
+        val product2 = ProductTestUtils.generateSampleProduct(41)
+        val product3 = ProductTestUtils.generateSampleProduct(42)
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+        val products = ProductSqlUtils.getProductsByRemoteIds(site, productIds)
+        assertEquals(2, products.size)
+
+        // insert products with the same productId but for a different site
+        val differentSiteProduct1 = ProductTestUtils.generateSampleProduct(40, siteId = 10)
+        val differentSiteProduct2 = ProductTestUtils.generateSampleProduct(41, siteId = 10)
+        val differentSiteProduct3 = ProductTestUtils.generateSampleProduct(2, siteId = 10)
+
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct1)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct2)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct3)
+
+        // verify that the products for the first site is still 2
+        assertEquals(2, ProductSqlUtils.getProductsByRemoteIds(site, productIds).size)
+
+        // verify that the products for the second site is 3
+        val site2 = SiteModel().apply { id = differentSiteProduct1.localSiteId }
+        val differentSiteProducts = ProductSqlUtils.getProductsByRemoteIds(site2, productIds)
+        assertEquals(3, differentSiteProducts.size)
+    }
+
+    @Test
+    fun testGetProductsWithFilterOptions() {
+        val productFilterOptions = mapOf(
+                ProductFilterOption.STOCK_STATUS to "instock",
+                ProductFilterOption.STATUS to "publish",
+                ProductFilterOption.TYPE to "simple"
+        )
+
+        val product1 = ProductTestUtils.generateSampleProduct(40)
+        val product2 = ProductTestUtils.generateSampleProduct(41)
+        val product3 = ProductTestUtils.generateSampleProduct(42, stockStatus = "onbackorder")
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+        val products = ProductSqlUtils.getProducts(site, productFilterOptions)
+        assertEquals(2, products.size)
+
+        // insert products with the same productId but for a different site
+        val differentSiteProduct1 = ProductTestUtils.generateSampleProduct(40, siteId = 10)
+        val differentSiteProduct2 = ProductTestUtils.generateSampleProduct(
+                41, siteId = 10, type = "grouped"
+        )
+        val differentSiteProduct3 = ProductTestUtils.generateSampleProduct(
+                2, siteId = 10, status = "pending"
+        )
+
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct1)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct2)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct3)
+
+        // verify that the products for the first site is still 2
+        assertEquals(2, ProductSqlUtils.getProducts(site, productFilterOptions).size)
+
+        // verify that the products for the second site is 3
+        val site2 = SiteModel().apply { id = differentSiteProduct1.localSiteId }
+        val differentSiteProducts = ProductSqlUtils.getProducts(site2, productFilterOptions)
+        assertEquals(1, differentSiteProducts.size)
+    }
+
+    @Test
+    fun testGetProductsWithSearchQuery() {
+        val product1 = ProductTestUtils.generateSampleProduct(40, name = "a",
+                description = "1", shortDescription = "+")
+        val product2 = ProductTestUtils.generateSampleProduct(41, name = "b",
+                description = "2", shortDescription = "-")
+        val product3 = ProductTestUtils.generateSampleProduct(42, name = "xyz ab piu",
+                description = "xyz 12 piu", shortDescription = "xyz +- piu", stockStatus = "onbackorder")
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+
+        // Test search in name
+        var products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "a")
+        // Products 1 and 3
+        assertEquals(2, products.size)
+
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "b")
+        // Products 2 and 3
+        assertEquals(2, products.size)
+
+        // Product 3
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "ab")
+        assertEquals(1, products.size)
+
+        // Test search in description
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "1")
+        // Products 1 and 3
+        assertEquals(2, products.size)
+
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "2")
+        // Products 2 and 3
+        assertEquals(2, products.size)
+
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "12")
+        // Product 3
+        assertEquals(1, products.size)
+
+        // Test search in short description
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "+")
+        // Products 1 and 3
+        assertEquals(2, products.size)
+
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "-")
+        // Products 2 and 3
+        assertEquals(2, products.size)
+
+        products = ProductSqlUtils.getProducts(site, emptyMap(), searchQuery = "+-")
+        // Product 3
+        assertEquals(1, products.size)
+
+        // Test search with filter options
+        products = ProductSqlUtils.getProducts(site, mapOf(ProductFilterOption.STOCK_STATUS to "instock"),
+                searchQuery = "a")
+        // Product 1
+        assertEquals(1, products.size)
+    }
+
+    @Test
+    fun testGetProductsForSiteWithExcludedProductIds() {
+        val excludedProductIds = listOf(40L)
+
+        val product1 = ProductTestUtils.generateSampleProduct(40)
+        val product2 = ProductTestUtils.generateSampleProduct(41)
+        val product3 = ProductTestUtils.generateSampleProduct(42)
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+        val products = ProductSqlUtils.getProducts(
+                site, filterOptions = emptyMap(), excludedProductIds = excludedProductIds
+        )
+        assertEquals(2, products.size)
+        assertEquals(41, products.first().remoteProductId)
+        assertEquals(42, products.last().remoteProductId)
+
+        // insert products with the same productId but for a different site
+        val differentSiteProduct1 = ProductTestUtils.generateSampleProduct(40, siteId = 10)
+        val differentSiteProduct2 = ProductTestUtils.generateSampleProduct(
+                41, siteId = 10
+        )
+        val differentSiteProduct3 = ProductTestUtils.generateSampleProduct(
+                42, siteId = 10
+        )
+
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct1)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct2)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct3)
+
+        // verify that the products for the first site is still 2
+        assertEquals(2, ProductSqlUtils.getProducts(
+                site, emptyMap(), excludedProductIds = excludedProductIds
+        ).size)
+
+        // verify that the products for the second site is also 2
+        val site2 = SiteModel().apply { id = differentSiteProduct1.localSiteId }
+        val differentSiteProducts = ProductSqlUtils.getProducts(
+                site2, emptyMap(), excludedProductIds = listOf(40, 41)
+        )
+        assertEquals(1, differentSiteProducts.size)
+        assertEquals(42, differentSiteProducts.first().remoteProductId)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductReview() {
+        val review = getProductReviews(site.id)[0]
+        assertNotNull(review)
+
+        // Test inserting a product review
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductReview(review)
+        assertEquals(1, rowsAffected)
+        var savedReview = ProductSqlUtils.getProductReviewByRemoteId(
+                site.id, review.remoteProductReviewId
+        )
+        assertNotNull(savedReview)
+        assertEquals(review.remoteProductReviewId, savedReview.remoteProductReviewId)
+        assertEquals(review.verified, savedReview.verified)
+        assertEquals(review.rating, savedReview.rating)
+        assertEquals(review.reviewerEmail, savedReview.reviewerEmail)
+        assertEquals(review.review, savedReview.review)
+        assertEquals(review.reviewerName, savedReview.reviewerName)
+        assertEquals(review.remoteProductId, savedReview.remoteProductId)
+        assertEquals(review.dateCreated, savedReview.dateCreated)
+        assertEquals(review.localSiteId, savedReview.localSiteId)
+        assertEquals(review.reviewerAvatarsJson, savedReview.reviewerAvatarsJson)
+
+        // Test updating the same product review
+        review.apply {
+            verified = !verified
+        }
+        rowsAffected = ProductSqlUtils.insertOrUpdateProductReview(review)
+        assertEquals(1, rowsAffected)
+        savedReview = ProductSqlUtils.getProductReviewByRemoteId(
+                site.id, review.remoteProductReviewId
+        )
+        assertNotNull(savedReview)
+        assertEquals(review.verified, savedReview.verified)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductReviews() {
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+
+        // Insert all product reviews
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetProductReviewsForSite() {
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+
+        // Insert all product reviews
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+
+        // Get all product reviews for site and verify
+        val savedReviewsExists = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(reviews.size, savedReviewsExists.size)
+
+        // Get all product reviews for a site that does not exist
+        val savedReviews = ProductSqlUtils.getProductReviewsForSite(SiteModel().apply { id = 400 })
+        assertEquals(0, savedReviews.size)
+    }
+
+    @Test
+    fun testGetProductReviewsForProduct() {
+        val productId = 18L // should be 3 products in the test products json config
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+
+        // Get all reviews for existing product
+        val savedReviewsForProductExisting = ProductSqlUtils
+                .getProductReviewsForProductAndSiteId(site.id, productId)
+        assertEquals(3, savedReviewsForProductExisting.size)
+
+        // Get all reviews for non-existing product
+        val savedReviewsForProduct = ProductSqlUtils
+                .getProductReviewsForProductAndSiteId(site.id, 400)
+        assertEquals(0, savedReviewsForProduct.size)
+    }
+
+    @Test
+    fun testDeleteAllProductReviewsForSite() {
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+
+        // Verify products inserted
+        var savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(reviews.size, savedReviews.size)
+
+        // Delete all reviews for site and verify
+        rowsAffected = ProductSqlUtils.deleteAllProductReviewsForSite(site)
+        assertEquals(reviews.size, rowsAffected)
+        savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(0, savedReviews.size)
+    }
+
+    @Test
+    fun testDeleteSiteDeletesAllProductReviews() {
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+
+        // Verify products inserted
+        var savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(reviews.size, savedReviews.size)
+
+        // Delete site and verify reviews deleted via foreign key constraint
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+        savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(0, savedReviews.size)
+    }
+
+    @Test
+    fun testDeleteAllProductReviews() {
+        val reviews = getProductReviews(site.id)
+        assertTrue(reviews.isNotEmpty())
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductReviews(reviews)
+        assertEquals(reviews.size, rowsAffected)
+
+        // Verify products inserted
+        var savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(reviews.size, savedReviews.size)
+
+        // Delete all reviews and verify
+        rowsAffected = ProductSqlUtils.deleteAllProductReviews()
+        assertEquals(reviews.size, rowsAffected)
+        savedReviews = ProductSqlUtils.getProductReviewsForSite(site)
+        assertEquals(0, savedReviews.size)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductCategory() {
+        val category = ProductTestUtils.getProductCategories(site.id)[0]
+        assertNotNull(category)
+
+        // Test inserting a product category
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductCategory(category)
+        assertEquals(1, rowsAffected)
+        var savedCategory = ProductSqlUtils.getProductCategoryByRemoteId(
+                site.id, category.remoteCategoryId
+        )
+        assertNotNull(savedCategory)
+        assertEquals(category.remoteCategoryId, savedCategory.remoteCategoryId)
+        assertEquals(category.name, savedCategory.name)
+        assertEquals(category.slug, savedCategory.slug)
+        assertEquals(category.parent, savedCategory.parent)
+        assertEquals(category.localSiteId, savedCategory.localSiteId)
+
+        // Test updating the same product category
+        category.apply {
+            name = "foo"
+        }
+        rowsAffected = ProductSqlUtils.insertOrUpdateProductCategory(category)
+        assertEquals(1, rowsAffected)
+        savedCategory = ProductSqlUtils.getProductCategoryByRemoteId(
+                site.id, category.remoteCategoryId
+        )
+        assertNotNull(savedCategory)
+        assertEquals(category.name, savedCategory.name)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductCategories() {
+        val productCategories = ProductTestUtils.getProductCategories(site.id)
+        assertTrue(productCategories.isNotEmpty())
+
+        // Insert all product categories
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductCategories(productCategories)
+        assertEquals(productCategories.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetProductCategoriesForSite() {
+        val categories = ProductTestUtils.getProductCategories(site.id)
+        assertTrue(categories.isNotEmpty())
+
+        // Insert all product categories
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductCategories(categories)
+        assertEquals(categories.size, rowsAffected)
+
+        // Get all product categories for site and verify
+        val savedCategoriesExist = ProductSqlUtils.getProductCategoriesForSite(site)
+        assertEquals(categories.size, savedCategoriesExist.size)
+
+        // Get all product categories for a site that do not exist
+        val savedCategories = ProductSqlUtils.getProductCategoriesForSite(SiteModel().apply { id = 400 })
+        assertEquals(0, savedCategories.size)
+    }
+
+    @Test
+    fun testDeleteAllProductCategories() {
+        val categories = ProductTestUtils.getProductCategories(site.id)
+        assertTrue(categories.isNotEmpty())
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductCategories(categories)
+        assertEquals(categories.size, rowsAffected)
+
+        // Verify categories inserted
+        var savedCategories = ProductSqlUtils.getProductCategoriesForSite(site)
+        assertEquals(categories.size, savedCategories.size)
+
+        // Delete all categories and verify
+        rowsAffected = ProductSqlUtils.deleteAllProductCategories()
+        assertEquals(categories.size, rowsAffected)
+        savedCategories = ProductSqlUtils.getProductCategoriesForSite(site)
+        assertEquals(0, savedCategories.size)
+    }
+
+    @Test
+    fun testDeleteProductCategoriesForSite() {
+        val categories = ProductTestUtils.getProductCategories(site.id)
+
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductCategories(categories)
+        assertEquals(categories.size, rowsAffected)
+
+        // Verify categories inserted
+        var savedCategories = ProductSqlUtils.getProductCategoriesForSite(site)
+        assertEquals(categories.size, savedCategories.size)
+
+        // Delete categories for site and verify
+        rowsAffected = ProductSqlUtils.deleteAllProductCategoriesForSite(site)
+        assertEquals(categories.size, rowsAffected)
+        savedCategories = ProductSqlUtils.getProductCategoriesForSite(site)
+        assertEquals(0, savedCategories.size)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductTag() {
+        val tagModel = ProductTestUtils.generateProductTags(site.id)[0]
+        assertNotNull(tagModel)
+
+        // Test inserting a product tag
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductTag(tagModel)
+        assertEquals(1, rowsAffected)
+
+        var savedTagList = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(savedTagList.size, 1)
+        assertEquals(savedTagList[0].localSiteId, tagModel.localSiteId)
+        assertEquals(savedTagList[0].remoteTagId, tagModel.remoteTagId)
+        assertEquals(savedTagList[0].name, tagModel.name)
+        assertEquals(savedTagList[0].slug, tagModel.slug)
+        assertEquals(savedTagList[0].description, tagModel.description)
+
+        // Test updating the same product tag
+        tagModel.apply { name = "Tag update" }
+        rowsAffected = ProductSqlUtils.insertOrUpdateProductTag(tagModel)
+        assertEquals(1, rowsAffected)
+
+        savedTagList = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(savedTagList.size, 1)
+        assertEquals(savedTagList[0].localSiteId, tagModel.localSiteId)
+        assertEquals(savedTagList[0].remoteTagId, tagModel.remoteTagId)
+        assertEquals(savedTagList[0].name, tagModel.name)
+        assertEquals(savedTagList[0].slug, tagModel.slug)
+        assertEquals(savedTagList[0].description, tagModel.description)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductTagList() {
+        val tagList = ProductTestUtils.generateProductTags(site.id)
+        assertTrue(tagList.isNotEmpty())
+
+        // Insert product tag list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tagList)
+        assertEquals(tagList.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetProductTagsForSite() {
+        val tagList = ProductTestUtils.generateProductTags(site.id)
+        assertTrue(tagList.isNotEmpty())
+
+        // Insert product tag list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tagList)
+        assertEquals(tagList.size, rowsAffected)
+
+        // Get tag list for site and verify
+        val savedTagListExists = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(tagList.size, savedTagListExists.size)
+
+        // Get tag list for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedTagList = ProductSqlUtils.getProductTagsForSite(nonExistingSite.id)
+        assertEquals(0, savedTagList.size)
+    }
+
+    @Test
+    fun testGetProductTagByName() {
+        val tagList = ProductTestUtils.generateProductTags(site.id)
+        assertTrue(tagList.isNotEmpty())
+
+        // Insert product tag list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tagList)
+        assertEquals(tagList.size, rowsAffected)
+
+        // Get tag by name and verify
+        val savedTagExists = ProductSqlUtils.getProductTagByName(site.id, tagList[0].name)
+        assertEquals(tagList[0].name, savedTagExists?.name)
+        assertEquals(tagList[0].remoteTagId, savedTagExists?.remoteTagId)
+        assertEquals(tagList[0].slug, savedTagExists?.slug)
+        assertEquals(tagList[0].description, savedTagExists?.description)
+
+        // Get tag for a name that does not exist
+        val nonExistingTagName = "test"
+        val savedTag = ProductSqlUtils.getProductTagByName(site.id, nonExistingTagName)
+        assertNull(savedTag)
+    }
+
+    @Test
+    fun testGetProductTagsByNames() {
+        val tagList = ProductTestUtils.generateProductTags(site.id)
+        assertTrue(tagList.isNotEmpty())
+
+        // Insert product tag list
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tagList)
+        assertEquals(tagList.size, rowsAffected)
+
+        // Get tags by list of name and verify
+        val tagNames = tagList.map { it.name }.toList()
+        val savedTagListExists = ProductSqlUtils.getProductTagsByNames(site.id, tagNames)
+        assertEquals(tagList.size, savedTagListExists.size)
+        assertEquals(tagList[0].name, savedTagListExists[0].name)
+        assertEquals(tagList[1].name, savedTagListExists[1].name)
+        assertEquals(tagList[2].name, savedTagListExists[2].name)
+
+        // Get tags for a name that does not exist
+        val monExistingTagList = ProductSqlUtils.getProductTagsByNames(
+                site.id, listOf("test", "test1", "test2")
+        )
+        assertEquals(0, monExistingTagList.size)
+
+        val savedTagList = ProductSqlUtils.getProductTagsByNames(
+                site.id, listOf(tagNames[0], tagNames[1], "test")
+        )
+        assertEquals(2, savedTagList.size)
+    }
+
+    @Test
+    fun testDeleteProductTagsForSite() {
+        val tags = ProductTestUtils.generateProductTags(site.id)
+
+        var rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tags)
+        assertEquals(tags.size, rowsAffected)
+
+        // Verify product tags inserted
+        var savedTags = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(tags.size, savedTags.size)
+
+        // Delete tags for site and verify
+        rowsAffected = ProductSqlUtils.deleteProductTagsForSite(site)
+        assertEquals(tags.size, rowsAffected)
+        savedTags = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(0, savedTags.size)
+    }
+
+    @Test
+    fun testDeleteSiteDeletesProductTags() {
+        val tags = ProductTestUtils.generateProductTags(site.id)
+        assertTrue(tags.isNotEmpty())
+
+        val rowsAffected = ProductSqlUtils.insertOrUpdateProductTags(tags)
+        assertEquals(tags.size, rowsAffected)
+
+        // Verify tags inserted
+        var savedTags = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(tags.size, savedTags.size)
+
+        // Delete site and verify tags are deleted via foreign key constraint
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+        savedTags = ProductSqlUtils.getProductTagsForSite(site.id)
+        assertEquals(0, savedTags.size)
+    }
+
+    private fun getProductReviews(localSiteId: Int): List<WCProductReviewModel> {
+        val reviewJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/product-reviews.json")
+        return ProductTestUtils.getProductReviewsFromJsonString(reviewJson, localSiteId)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductTestUtils.kt
new file mode 100644
index 00000000000..0f87da67957
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/ProductTestUtils.kt
@@ -0,0 +1,196 @@
+package org.wordpress.android.fluxc.wc.product
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductShippingClassModel
+import org.wordpress.android.fluxc.model.WCProductTagModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductStockStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductCategoryApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductReviewApiResponse
+import kotlin.random.Random
+
+object ProductTestUtils {
+    fun generateSampleProduct(
+        remoteId: Long,
+        type: String = "simple",
+        name: String = "",
+        virtual: Boolean = false,
+        siteId: Int = 6,
+        stockStatus: String = CoreProductStockStatus.IN_STOCK.value,
+        status: String = "publish",
+        stockQuantity: Double = 0.0,
+        categories: String = "",
+        description: String = "",
+        shortDescription: String = "",
+    ): WCProductModel {
+        return WCProductModel().apply {
+            remoteProductId = remoteId
+            localSiteId = siteId
+            this.type = type
+            this.name = name
+            this.virtual = virtual
+            this.stockStatus = stockStatus
+            this.status = status
+            this.stockQuantity = stockQuantity
+            this.categories = categories
+            this.description = description
+            this.shortDescription = shortDescription
+        }
+    }
+
+    fun generateSampleVariation(
+        remoteId: Long,
+        variationId: Long,
+        siteId: Int = 6,
+        status: String = "publish",
+        stockQuantity: Double = 0.0
+    ): WCProductVariationModel {
+        return WCProductVariationModel().apply {
+            remoteProductId = remoteId
+            remoteVariationId = variationId
+            localSiteId = siteId
+            this.status = status
+            this.stockQuantity = stockQuantity
+        }
+    }
+
+    fun generateSampleVariations(number: Int, productId: Long, siteId: Int): List<WCProductVariationModel> {
+        return (0 until number).map {
+            generateSampleVariation(
+                remoteId = productId,
+                variationId = Random.nextLong(),
+                siteId = siteId,
+                stockQuantity = Random.nextDouble()
+            )
+        }
+    }
+
+    fun generateSampleProductShippingClass(
+        remoteId: Long = 1L,
+        name: String = "",
+        slug: String = "",
+        description: String = "",
+        siteId: Int = 6
+    ): WCProductShippingClassModel {
+        return WCProductShippingClassModel().apply {
+            remoteShippingClassId = remoteId
+            localSiteId = siteId
+            this.name = name
+            this.slug = slug
+            this.description = description
+        }
+    }
+
+    fun generateSampleProductReview(
+        remoteProductId: Long = 1L,
+        remoteProductReviewId: Long = 2L,
+        siteId: Int = 6
+    ): WCProductReviewModel {
+        return WCProductReviewModel(1).apply {
+            this.remoteProductId = remoteProductId
+            this.remoteProductReviewId = remoteProductReviewId
+            this.localSiteId = siteId
+        }
+    }
+
+    fun generateProductShippingClassList(siteId: Int = 6) = List(5) {
+        generateSampleProductShippingClass(it + 1L, siteId = siteId)
+    }
+
+    fun generateProductList(siteId: Int = 6) = List(5) {
+        generateSampleProduct(it + 1L, siteId = siteId)
+    }
+
+    fun getProductReviewsFromJsonString(json: String, siteId: Int): List<WCProductReviewModel> {
+        val responseType = object : TypeToken<List<ProductReviewApiResponse>>() {}.type
+        val converted = Gson().fromJson(json, responseType) as? List<ProductReviewApiResponse> ?: emptyList()
+        return converted.map {
+            WCProductReviewModel().apply {
+                localSiteId = siteId
+                remoteProductReviewId = it.id
+                remoteProductId = it.product_id
+                dateCreated = it.date_created_gmt?.let { "${it}Z" } ?: ""
+                status = it.status ?: ""
+                reviewerName = it.reviewer ?: ""
+                reviewerEmail = it.reviewer_email ?: ""
+                review = it.review ?: ""
+                rating = it.rating
+                verified = it.verified
+                reviewerAvatarsJson = it.reviewer_avatar_urls.toString()
+            }
+        }
+    }
+
+    fun generateCategory(siteId: Int, remoteId: Long) =
+        WCProductCategoryModel().apply {
+            localSiteId = siteId
+            remoteCategoryId = remoteId
+            name = "Category $remoteId"
+            slug = "category$remoteId"
+            parent = 0L
+        }
+
+    fun generateCategoryList(siteId: Int): List<WCProductCategoryModel> {
+        return List(5) {
+            WCProductCategoryModel().apply {
+                localSiteId = siteId
+                remoteCategoryId = it.toLong()
+                name = "Category $it"
+                slug = "category$it"
+                parent = 0L
+            }
+        }
+    }
+
+    fun getProductCategories(siteId: Int): List<WCProductCategoryModel> {
+        val categoryJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/product-categories.json")
+        val responseType = object : TypeToken<List<ProductCategoryApiResponse>>() {}.type
+        val converted = Gson().fromJson(categoryJson, responseType) as? List<ProductCategoryApiResponse> ?: emptyList()
+        return converted.map {
+            WCProductCategoryModel().apply {
+                localSiteId = siteId
+                remoteCategoryId = it.id
+                name = it.name ?: ""
+                slug = it.slug ?: ""
+                parent = it.parent ?: 0L
+            }
+        }
+    }
+
+    fun generateSampleProductTag(
+        remoteId: Long = 1L,
+        name: String = "",
+        slug: String = "",
+        description: String = "",
+        count: Int = 3,
+        siteId: Int = 6
+    ): WCProductTagModel {
+        return WCProductTagModel().apply {
+            remoteTagId = remoteId
+            localSiteId = siteId
+            this.name = name
+            this.slug = slug
+            this.description = description
+            this.count = count
+        }
+    }
+
+    fun generateProductTags(siteId: Int = 6): List<WCProductTagModel> {
+        val tagList = mutableListOf<WCProductTagModel>()
+        for (i in 0 until 5) {
+            tagList.add(generateSampleProductTag(
+                    i.toLong(),
+                    siteId = siteId,
+                    name = "$i",
+                    slug = "$i",
+                    description = "$i"
+            ))
+        }
+        return tagList
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductReviewModelTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductReviewModelTest.kt
new file mode 100644
index 00000000000..a3a24c166c3
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductReviewModelTest.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.wc.product
+
+import org.junit.Test
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.WCProductReviewModel.AvatarSize.LARGE
+import org.wordpress.android.fluxc.model.WCProductReviewModel.AvatarSize.MEDIUM
+import org.wordpress.android.fluxc.model.WCProductReviewModel.AvatarSize.SMALL
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+class WCProductReviewModelTest {
+    private val testLocalSiteId = 1
+
+    @Test
+    fun testDeserializeProductReviewModel() {
+        val reviewJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/product-reviews.json")
+        val reviews = ProductTestUtils.getProductReviewsFromJsonString(reviewJson, testLocalSiteId)
+        assertTrue(reviews.isNotEmpty(), "Reviews should not be empty")
+
+        val review = reviews[0]
+        assertEquals(0, review.id)
+        assertEquals("2019-07-09T15:48:07Z", review.dateCreated)
+        assertEquals(18, review.remoteProductId)
+        assertEquals("Johnny", review.reviewerName)
+        assertEquals("johnny@gmail.com", review.reviewerEmail)
+        assertEquals("<p>What a lovely cap!</p>\n", review.review)
+        assertEquals(4, review.rating)
+        assertEquals(false, review.verified)
+        assertEquals(5499, review.remoteProductReviewId)
+        assertNotNull(review.reviewerAvatarsJson)
+        assertNotEquals("", review.reviewerAvatarsJson)
+    }
+
+    @Test
+    fun testGetReviewerAvatarBySizeMap() {
+        val reviewJson = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/product-reviews.json")
+        val reviews = ProductTestUtils.getProductReviewsFromJsonString(reviewJson, testLocalSiteId)
+        assertTrue(reviews.isNotEmpty(), "Reviews should not be empty")
+
+        val review = reviews[0]
+        assertEquals(
+                "https://secure.gravatar.com/avatar/136c70acb946f0f37b12bb6fbfe56f2c?s=24&d=mm&r=g",
+                review.reviewerAvatarUrlBySize[SMALL])
+        assertEquals(
+                "https://secure.gravatar.com/avatar/136c70acb946f0f37b12bb6fbfe56f2c?s=48&d=mm&r=g",
+                review.reviewerAvatarUrlBySize[MEDIUM])
+        assertEquals(
+                "https://secure.gravatar.com/avatar/136c70acb946f0f37b12bb6fbfe56f2c?s=96&d=mm&r=g",
+                review.reviewerAvatarUrlBySize[LARGE])
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt
new file mode 100644
index 00000000000..c79ad951ea1
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/product/WCProductStoreTest.kt
@@ -0,0 +1,873 @@
+package org.wordpress.android.fluxc.wc.product
+
+import androidx.room.Room
+import com.google.gson.JsonObject
+import com.yarolegovich.wellsql.WellSql
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.generated.WCProductActionBuilder
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.ProductWithMetaData
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.metadata.WCMetaData
+import org.wordpress.android.fluxc.model.WCProductCategoryModel
+import org.wordpress.android.fluxc.model.WCProductModel
+import org.wordpress.android.fluxc.model.WCProductReviewModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel
+import org.wordpress.android.fluxc.model.WCProductVariationModel.ProductVariantOption
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.BatchProductVariationsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.CoreProductStockStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductVariationApiResponse
+import org.wordpress.android.fluxc.persistence.ProductSqlUtils
+import org.wordpress.android.fluxc.persistence.ProductStorageHelper
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCProductStore
+import org.wordpress.android.fluxc.store.WCProductStore.BatchGenerateVariationsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.BatchUpdateProductsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.BatchUpdateVariationsPayload
+import org.wordpress.android.fluxc.store.WCProductStore.FetchSingleProductReviewPayload
+import org.wordpress.android.fluxc.store.WCProductStore.ProductFilterOption
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteAddProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteProductReviewPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateProductPayload
+import org.wordpress.android.fluxc.store.WCProductStore.RemoteUpdateVariationPayload
+import org.wordpress.android.fluxc.store.WCProductStore.UpdateVariationPayload
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.wc.utils.SiteTestUtils
+import kotlin.random.Random
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+@Suppress("LargeClass")
+class WCProductStoreTest {
+    private val productRestClient: ProductRestClient = mock()
+    private lateinit var productStore: WCProductStore
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        WCProductModel::class.java,
+                        WCProductVariationModel::class.java,
+                        WCProductCategoryModel::class.java,
+                        WCProductReviewModel::class.java,
+                        SiteModel::class.java,
+                        AccountModel::class.java
+                ),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        val roomDb = Room.inMemoryDatabaseBuilder(appContext, WCAndroidDatabase::class.java)
+            .allowMainThreadQueries()
+            .build()
+
+        val productStorageHelper = ProductStorageHelper(
+            productSqlUtils = ProductSqlUtils,
+            metaDataDao = roomDb.metaDataDao
+        )
+        productStore = WCProductStore(
+            Dispatcher(),
+            productRestClient,
+            addonsDao = mock(),
+            logger = mock(),
+            productStorageHelper = productStorageHelper,
+            coroutineEngine = initCoroutineEngine()
+        )
+    }
+
+    @Test
+    fun testSimpleInsertionAndRetrieval() {
+        val productModel = ProductTestUtils.generateSampleProduct(42)
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+
+        val storedProduct = productStore.getProductByRemoteId(site, productModel.remoteProductId)
+        assertEquals(42, storedProduct?.remoteProductId)
+        assertEquals(productModel, storedProduct)
+    }
+
+    @Test
+    fun testGetProductsBySiteAndProductIds() {
+        val productIds = listOf<Long>(30, 31, 2)
+
+        val product1 = ProductTestUtils.generateSampleProduct(30)
+        val product2 = ProductTestUtils.generateSampleProduct(31)
+        val product3 = ProductTestUtils.generateSampleProduct(42)
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+        val products = productStore.getProductsByRemoteIds(site, productIds)
+        assertEquals(2, products.size)
+
+        // insert products with the same productId but for a different site
+        val differentSiteProduct1 = ProductTestUtils.generateSampleProduct(10, siteId = 10)
+        val differentSiteProduct2 = ProductTestUtils.generateSampleProduct(11, siteId = 10)
+        val differentSiteProduct3 = ProductTestUtils.generateSampleProduct(2, siteId = 10)
+
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct1)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct2)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct3)
+
+        // verify that the products for the first site is still 2
+        assertEquals(2, productStore.getProductsByRemoteIds(site, productIds).size)
+
+        // verify that the products for the second site is 3
+        val site2 = SiteModel().apply { id = differentSiteProduct1.localSiteId }
+        val differentSiteProducts = productStore.getProductsByRemoteIds(site2, listOf(10, 11, 2))
+        assertEquals(3, differentSiteProducts.size)
+        assertEquals(differentSiteProduct1.remoteProductId, differentSiteProducts[0].remoteProductId)
+        assertEquals(differentSiteProduct2.remoteProductId, differentSiteProducts[1].remoteProductId)
+        assertEquals(differentSiteProduct3.remoteProductId, differentSiteProducts[2].remoteProductId)
+    }
+
+    @Test
+    fun testUpdateProduct() {
+        val productModel = ProductTestUtils.generateSampleProduct(42).apply {
+            name = "test product"
+            description = "test description"
+        }
+        val site = SiteModel().apply { id = productModel.localSiteId }
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+
+        // Simulate incoming action with updated product model
+        val payload = RemoteUpdateProductPayload(site,
+            ProductWithMetaData(
+                productModel.apply {
+                    description = "Updated description"
+                }
+            )
+        )
+        productStore.onAction(WCProductActionBuilder.newUpdatedProductAction(payload))
+
+        with(productStore.getProductByRemoteId(site, productModel.remoteProductId)) {
+            // The version of the product model in the database should have the updated description
+            assertEquals(productModel.description, this?.description)
+            // Other fields should not be altered by the update
+            assertEquals(productModel.name, this?.name)
+        }
+    }
+
+    @Test
+    fun testUpdateVariation() = runBlocking {
+        val variationModel = ProductTestUtils.generateSampleVariation(42, 24).apply {
+            description = "test description"
+        }
+        val site = SiteModel().apply { id = variationModel.localSiteId }
+        whenever(productRestClient.updateVariation(site, null, variationModel))
+            .thenReturn(RemoteUpdateVariationPayload(site, variationModel))
+
+        productStore.updateVariation(UpdateVariationPayload(site, variationModel))
+
+        with(productStore.getVariationByRemoteId(
+                site,
+                variationModel.remoteProductId,
+                variationModel.remoteVariationId
+        )) {
+            // The version of the product model in the database should have the updated description
+            assertEquals(variationModel.description, this?.description)
+            // Other fields should not be altered by the update
+            assertEquals(variationModel.status, this?.status)
+        }
+    }
+
+    @Test
+    fun testVerifySkuExistsLocally() {
+        val sku = "woo-cap"
+        val productModel = ProductTestUtils.generateSampleProduct(42).apply {
+            name = "test product"
+            description = "test description"
+            this.sku = sku
+        }
+        val site = SiteModel().apply { id = productModel.localSiteId }
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+
+        // verify if product with sku: woo-cap exists in local cache
+        val skuAvailable = ProductSqlUtils.getProductExistsBySku(site, sku)
+        assertTrue(skuAvailable)
+
+        // verify if product with non existent sku returns false
+        assertFalse(ProductSqlUtils.getProductExistsBySku(site, "woooo"))
+    }
+
+    @Test
+    fun testGetProductsWithFilterOptions() {
+        val filterOptions = mapOf<ProductFilterOption, String>(
+                ProductFilterOption.TYPE to "simple",
+                ProductFilterOption.STOCK_STATUS to "instock",
+                ProductFilterOption.STATUS to "publish",
+                ProductFilterOption.CATEGORY to "1337"
+        )
+        val product1 = ProductTestUtils.generateSampleProduct(3)
+        val product2 = ProductTestUtils.generateSampleProduct(
+                31, type = "variable", status = "draft"
+        )
+        val product3 = ProductTestUtils.generateSampleProduct(
+                42, stockStatus = "onbackorder", status = "pending"
+                )
+
+        val product4 = ProductTestUtils.generateSampleProduct(
+                43, categories = "[{\"id\":1337,\"name\":\"Clothing\",\"slug\":\"clothing\"}]")
+
+        ProductSqlUtils.insertOrUpdateProduct(product1)
+        ProductSqlUtils.insertOrUpdateProduct(product2)
+        ProductSqlUtils.insertOrUpdateProduct(product3)
+        ProductSqlUtils.insertOrUpdateProduct(product4)
+
+        val site = SiteModel().apply { id = product1.localSiteId }
+        val products = productStore.getProducts(site, filterOptions)
+        assertEquals(1, products.size)
+
+        // insert products with the same product options but for a different site
+        val differentSiteProduct1 = ProductTestUtils.generateSampleProduct(10, siteId = 10)
+        val differentSiteProduct2 = ProductTestUtils.generateSampleProduct(
+                11, siteId = 10, type = "variable", status = "draft"
+        )
+        val differentSiteProduct3 = ProductTestUtils.generateSampleProduct(
+                12, siteId = 10, stockStatus = "onbackorder", status = "pending"
+        )
+        val differentSiteProduct4 = ProductTestUtils.generateSampleProduct(
+                13, siteId = 10, categories = "[{\"id\":1337,\"name\":\"Clothing\",\"slug\":\"clothing\"}]")
+
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct1)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct2)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct3)
+        ProductSqlUtils.insertOrUpdateProduct(differentSiteProduct4)
+
+        // verify that the products for the first site is still 1
+        assertEquals(1, productStore.getProducts(site, filterOptions).size)
+
+        // verify that the products for the second site is 3
+        val site2 = SiteModel().apply { id = differentSiteProduct1.localSiteId }
+        val filterOptions2 = mapOf(ProductFilterOption.STATUS to "draft")
+        val differentSiteProducts = productStore.getProducts(site2, filterOptions2)
+        assertEquals(1, differentSiteProducts.size)
+        assertEquals(differentSiteProduct2.status, differentSiteProducts[0].status)
+
+        val filterOptions3 = mapOf(ProductFilterOption.STOCK_STATUS to "onbackorder")
+        val differentProductFilters = productStore.getProducts(site2, filterOptions3)
+        assertEquals(1, differentProductFilters.size)
+        assertEquals(differentSiteProduct3.stockStatus, differentProductFilters[0].stockStatus)
+
+        val filterByCategory = mapOf(ProductFilterOption.CATEGORY to "1337")
+        val productsFilteredByCategory = productStore.getProducts(site2, filterByCategory)
+        assertEquals(1, productsFilteredByCategory.size)
+        assertTrue(productsFilteredByCategory[0].categories.contains("1337"))
+    }
+
+    @Test
+    fun `test AddProduct Action triggered correctly`() {
+        // given
+        val productModel = ProductTestUtils.generateSampleProduct(remoteId = 0).apply {
+            name = "test new product"
+            description = "test new description"
+        }
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        // when
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+        val payload = RemoteAddProductPayload(site, ProductWithMetaData(productModel))
+        productStore.onAction(WCProductActionBuilder.newAddedProductAction(payload))
+
+        // then
+        with(productStore.getProductByRemoteId(site, productModel.remoteProductId)) {
+            assertNotNull(this)
+            assertEquals(productModel.description, this.description)
+            assertEquals(productModel.name, this.name)
+        }
+    }
+
+    @Test
+    fun `test that product insert emits a flow event`() = test {
+        // given
+        val productModel = ProductTestUtils.generateSampleProduct(remoteId = 0).apply {
+            name = "test new product"
+            description = "test new description"
+        }
+        val productList = ProductTestUtils.generateProductList()
+        ProductSqlUtils.insertOrUpdateProducts(productList)
+        val site = SiteModel().apply { id = productModel.localSiteId }
+
+        var observedProducts = productStore.observeProducts(site).first()
+        assertThat(observedProducts).isEqualTo(productList)
+
+        // when
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+        observedProducts = productStore.observeProducts(site).first()
+
+        // then
+        assertThat(observedProducts).isEqualTo(productList + productModel)
+    }
+
+    @Test
+    fun `test that variation insert emits a flow event`() = test {
+        // given
+        val variation = ProductTestUtils.generateSampleVariation(
+            remoteId = 0,
+            variationId = 1
+        ).apply {
+            description = "test new description"
+        }
+        val site = SiteModel().apply { id = variation.localSiteId }
+        val variations = ProductTestUtils.generateSampleVariations(
+            number = 5,
+            productId = variation.remoteProductId,
+            siteId = site.id
+        )
+        ProductSqlUtils.insertOrUpdateProductVariations(variations)
+
+        var observedVariations = productStore.observeVariations(site, variation.remoteProductId)
+            .first()
+        assertThat(observedVariations).isEqualTo(variations)
+
+        // when
+        ProductSqlUtils.insertOrUpdateProductVariation(variation)
+        observedVariations = productStore.observeVariations(site, variation.remoteProductId).first()
+
+        // then
+        assertThat(observedVariations).isEqualTo(variations + variation)
+    }
+
+    @Test
+    fun `given product review exists, when fetch product review, then local database updated`() = runBlocking {
+        val site = SiteTestUtils.insertTestAccountAndSiteIntoDb()
+        val productModel = ProductTestUtils.generateSampleProduct(remoteId = 1).apply {
+            localSiteId = site.id
+        }
+        ProductSqlUtils.insertOrUpdateProduct(productModel)
+
+        val reviewModel = ProductTestUtils.generateSampleProductReview(
+                productModel.remoteProductId,
+                123L,
+                site.id
+        )
+        whenever(productRestClient.fetchProductReviewById(site, reviewModel.remoteProductReviewId))
+                .thenReturn(RemoteProductReviewPayload(site, reviewModel))
+
+        productStore.fetchSingleProductReview(FetchSingleProductReviewPayload(site, reviewModel.remoteProductReviewId))
+
+        assertThat(productStore.getProductReviewByRemoteId(site.id, reviewModel.remoteProductReviewId)).isNotNull
+        Unit
+    }
+
+    @Test
+    fun `batch variations update should return positive result on successful backend request`() =
+        runBlocking {
+            // given
+            val product = ProductTestUtils.generateSampleProduct(Random.nextLong())
+            val site = SiteModel().apply { id = product.localSiteId }
+            val variations = ProductTestUtils.generateSampleVariations(
+                number = 64,
+                productId = product.remoteProductId,
+                siteId = site.id
+            )
+
+            // when
+            val variationsIds = variations.map { it.remoteVariationId }
+            val variationsUpdatePayload = BatchUpdateVariationsPayload.Builder(
+                site,
+                product.remoteProductId,
+                variationsIds
+            ).build()
+            val response = BatchProductVariationsApiResponse(updatedVariations = emptyList())
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    any(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(response)
+            val result = productStore.batchUpdateVariations(variationsUpdatePayload)
+
+            // then
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+            Unit
+        }
+
+    @Test
+    fun `batch variations update should return negative result on failed backend request`() =
+        runBlocking {
+            // given
+            val product = ProductTestUtils.generateSampleProduct(Random.nextLong())
+            val site = SiteModel().apply { id = product.localSiteId }
+            val variations = ProductTestUtils.generateSampleVariations(
+                number = 64,
+                productId = product.remoteProductId,
+                siteId = site.id
+            )
+
+            // when
+            val variationsIds = variations.map { it.remoteVariationId }
+            val variationsUpdatePayload =
+                BatchUpdateVariationsPayload.Builder(site, product.remoteProductId, variationsIds)
+                    .build()
+            val errorResponse = WooError(GENERIC_ERROR, NETWORK_ERROR, "🔴")
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    any(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(errorResponse)
+            val result = productStore.batchUpdateVariations(variationsUpdatePayload)
+
+            // then
+            assertThat(result.isError).isTrue
+            Unit
+        }
+
+    @Test
+    fun `batch variations update should update variations locally after successful backend request`() =
+        runBlocking {
+            // given
+            val product = ProductTestUtils.generateSampleProduct(Random.nextLong())
+            ProductSqlUtils.insertOrUpdateProduct(product)
+            val site = SiteTestUtils.insertTestAccountAndSiteIntoDb()
+            val variations = ProductTestUtils.generateSampleVariations(
+                number = 64,
+                productId = product.remoteProductId,
+                siteId = site.id
+            )
+            ProductSqlUtils.insertOrUpdateProductVariations(variations)
+
+            // when
+            val variationsIds = variations.map { it.remoteVariationId }
+            val newRegularPrice = "1.234 💰"
+            val newSalePrice = "0.234 💰"
+            val variationsUpdatePayload =
+                BatchUpdateVariationsPayload.Builder(site, product.remoteProductId, variationsIds)
+                    .regularPrice(newRegularPrice)
+                    .salePrice(newSalePrice)
+                    .build()
+            val variationsReturnedFromBackend = variations.map {
+                ProductVariationApiResponse().apply {
+                    id = it.remoteVariationId
+                    regular_price = newRegularPrice
+                    sale_price = newSalePrice
+                }
+            }
+            val response = BatchProductVariationsApiResponse(updatedVariations = variationsReturnedFromBackend)
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    any(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(response)
+            val result = productStore.batchUpdateVariations(variationsUpdatePayload)
+
+            // then
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+            with(ProductSqlUtils.getVariationsForProduct(site, product.remoteProductId)) {
+                forEach { variation ->
+                    assertThat(variation.regularPrice).isEqualTo(newRegularPrice)
+                    assertThat(variation.salePrice).isEqualTo(newSalePrice)
+                }
+            }
+            Unit
+        }
+
+    @Test
+    fun `batch variations update should not update variations locally after failed backend request`() =
+        runBlocking {
+            // given
+            val product = ProductTestUtils.generateSampleProduct(Random.nextLong())
+            ProductSqlUtils.insertOrUpdateProduct(product)
+            val site = SiteTestUtils.insertTestAccountAndSiteIntoDb()
+            val variations = ProductTestUtils.generateSampleVariations(
+                number = 64,
+                productId = product.remoteProductId,
+                siteId = site.id
+            )
+            ProductSqlUtils.insertOrUpdateProductVariations(variations)
+
+            // when
+            val variationsIds = variations.map { it.remoteVariationId }
+            val newRegularPrice = "1.234 💰"
+            val newSalePrice = "0.234 💰"
+            val variationsUpdatePayload =
+                BatchUpdateVariationsPayload.Builder(site, product.remoteProductId, variationsIds)
+                    .regularPrice(newRegularPrice)
+                    .salePrice(newSalePrice)
+                    .build()
+            val errorResponse = WooError(GENERIC_ERROR, NETWORK_ERROR, "🔴")
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    any(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(errorResponse)
+            val result = productStore.batchUpdateVariations(variationsUpdatePayload)
+
+            // then
+            assertThat(result.isError).isTrue
+            with(ProductSqlUtils.getVariationsForProduct(site, product.remoteProductId)) {
+                forEach { variation ->
+                    assertThat(variation.regularPrice).isNotEqualTo(newRegularPrice)
+                    assertThat(variation.salePrice).isNotEqualTo(newSalePrice)
+                }
+            }
+            Unit
+        }
+
+    @Test
+    fun `BatchUpdateVariationsPayload_Builder should produce correct variations modifications map`() {
+        // given
+        val product = ProductTestUtils.generateSampleProduct(Random.nextLong())
+        val site = SiteModel().apply { id = 23 }
+        val variations = ProductTestUtils.generateSampleVariations(
+            number = 64,
+            productId = product.remoteProductId,
+            siteId = site.id
+        )
+        val builder = BatchUpdateVariationsPayload.Builder(
+            site,
+            product.remoteProductId,
+            variations.map { it.remoteVariationId }
+        )
+
+        val modifiedRegularPrice = "11234.234"
+        val modifiedSalePrice = "123,2.4"
+        val modifiedStartOfSale = "tomorrow"
+        val modifiedEndOfSale = "next week"
+        val modifiedStockQuantity = 1234
+        val modifiedStockStatus = CoreProductStockStatus.IN_STOCK
+        val modifiedWeight = "1234 kg"
+        val modifiedWidth = "5"
+        val modifiedHeight = "10"
+        val modifiedLength = "15"
+        val modifiedShippingClassId = "1234"
+        val modifiedShippingClassSlug = "DHL"
+
+        // when
+        builder.regularPrice(modifiedRegularPrice)
+            .salePrice(modifiedSalePrice)
+            .startOfSale(modifiedStartOfSale)
+            .endOfSale(modifiedEndOfSale)
+            .stockQuantity(modifiedStockQuantity)
+            .stockStatus(modifiedStockStatus)
+            .weight(modifiedWeight)
+            .dimensions(length = modifiedLength, width = modifiedWidth, height = modifiedHeight)
+            .shippingClassId(modifiedShippingClassId)
+            .shippingClassSlug(modifiedShippingClassSlug)
+        val payload = builder.build()
+
+        // then
+        with(payload.modifiedProperties) {
+            assertThat(get("regular_price")).isEqualTo(modifiedRegularPrice)
+            assertThat(get("sale_price")).isEqualTo(modifiedSalePrice)
+            assertThat(get("date_on_sale_from")).isEqualTo(modifiedStartOfSale)
+            assertThat(get("date_on_sale_to")).isEqualTo(modifiedEndOfSale)
+            assertThat(get("stock_quantity")).isEqualTo(modifiedStockQuantity)
+            assertThat(get("stock_status")).isEqualTo(modifiedStockStatus)
+            assertThat(get("weight")).isEqualTo(modifiedWeight)
+            with(get("dimensions") as JsonObject) {
+                assertThat(get("length").asString).isEqualTo(modifiedLength)
+                assertThat(get("height").asString).isEqualTo(modifiedHeight)
+                assertThat(get("width").asString).isEqualTo(modifiedWidth)
+            }
+            assertThat(get("shipping_class_id")).isEqualTo(modifiedShippingClassId)
+            assertThat(get("shipping_class")).isEqualTo(modifiedShippingClassSlug)
+        }
+    }
+
+    @Test
+    fun `when variation generation succeed, result is received`() =
+        test {
+            // given
+            val productId = 6L
+            val site = SiteModel()
+            val firstVariationAttributes = listOf(
+                ProductVariantOption( id = 1, name = "Size", option = "L"),
+                ProductVariantOption( id = 2, name = "Color", option = "Blue"),
+            )
+            val secondVariationAttributes = listOf(
+                ProductVariantOption( id = 1, name = "Size", option = "L"),
+                ProductVariantOption( id = 2, name = "Color", option = "Red"),
+            )
+
+            val variations = listOf(firstVariationAttributes,secondVariationAttributes)
+
+            // when API call succeed
+            val variationsPayload = BatchGenerateVariationsPayload(
+                site,
+                productId,
+                variations
+            )
+
+            val createdVariationsResponse = List(variationsPayload.variations.size) { index ->
+                ProductVariationApiResponse().apply { id = index.toLong() }
+            }
+
+            val response = BatchProductVariationsApiResponse(
+                createdVariations = createdVariationsResponse
+            )
+
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(response)
+
+            val result = productStore.batchGenerateVariations(variationsPayload)
+
+            // then result is expected
+            assertThat(result.isError).isFalse
+            assertThat(result.model).isNotNull
+
+            // then result is saved in DB
+            with(ProductSqlUtils.getVariationsForProduct(site, productId)) {
+                assertThat(this.size).isEqualTo(createdVariationsResponse.size)
+            }
+        }
+
+    @Test
+    fun `when variation generation fails, error is received`() =
+        test {
+            // given
+            val productId = 6L
+            val site = SiteModel()
+            val firstVariationAttributes = listOf(
+                ProductVariantOption( id = 1, name = "Size", option = "L"),
+                ProductVariantOption( id = 2, name = "Color", option = "Blue"),
+            )
+            val secondVariationAttributes = listOf(
+                ProductVariantOption( id = 1, name = "Size", option = "L"),
+                ProductVariantOption( id = 2, name = "Color", option = "Red"),
+            )
+            val variations = listOf(firstVariationAttributes,secondVariationAttributes)
+
+            // when API call failed
+            val variationsPayload = BatchGenerateVariationsPayload(
+                site,
+                productId,
+                variations
+            )
+
+            val errorResponse = WooError(GENERIC_ERROR, NETWORK_ERROR, "🔴")
+            whenever(
+                productRestClient.batchUpdateVariations(
+                    any(),
+                    any(),
+                    any(),
+                    anyOrNull(),
+                    anyOrNull()
+                )
+            ) doReturn WooPayload(errorResponse)
+
+            val result = productStore.batchGenerateVariations(variationsPayload)
+
+            // then result is error
+            assertThat(result.isError).isTrue
+
+            // then result is NOT saved in DB
+            with(ProductSqlUtils.getVariationsForProduct(site, productId)) {
+                assertThat(this.size).isEqualTo(0)
+            }
+        }
+
+    @Test
+    fun `when products bulk update is requested, correct existing and updated products are matched`(): Unit =
+        runBlocking {
+            // given
+            val existingProducts = listOf(
+                ProductTestUtils.generateSampleProduct(42),
+                ProductTestUtils.generateSampleProduct(43),
+                ProductTestUtils.generateSampleProduct(45),
+                ProductTestUtils.generateSampleProduct(48),
+            )
+            ProductSqlUtils.insertOrUpdateProducts(existingProducts)
+            val site = SiteModel().apply { id = existingProducts.first().localSiteId }
+            val updatedProductsInDifferentOrder = existingProducts.sortedByDescending(WCProductModel::remoteProductId)
+            val argumentCaptor = argumentCaptor<Map<WCProductModel, WCProductModel>>()
+            whenever(
+                productRestClient.batchUpdateProducts(
+                    eq(site),
+                    argumentCaptor.capture()
+                )
+            ).thenReturn(WooPayload())
+
+            // when
+            productStore.batchUpdateProducts(
+                BatchUpdateProductsPayload(
+                    site,
+                    updatedProducts = updatedProductsInDifferentOrder
+                )
+            )
+
+            // then
+            assertThat(argumentCaptor.allValues).hasSize(1)
+            assertThat(argumentCaptor.allValues.first()).hasSize(4)
+            argumentCaptor.allValues.first().onEach {(existing, updated) ->
+                assertThat(existing.remoteProductId).isEqualTo(updated.remoteProductId)
+            }
+        }
+
+    @Test
+    fun `when variation bulk creation, request creation on core`(): Unit =
+        runBlocking {
+            // given
+            val site = SiteModel()
+            val productId = RemoteId(123)
+            val variationsToCreate = listOf(
+                WCProductVariationModel(5).apply { description = "test$id" },
+                WCProductVariationModel(6).apply { description = "test$id" }
+            )
+            whenever(productRestClient.createVariations(any(), any(), any())) doReturn WooPayload()
+
+            // when
+            productStore.createVariations(site, productId, variationsToCreate)
+
+            // then
+            verify(productRestClient).createVariations(
+                site = site, productId = productId, variations = listOf(
+                mapOf("description" to "test5"),
+                mapOf("description" to "test6")
+            )
+            )
+        }
+
+    @Test
+    fun `when product variation bulk creation is successful, save results to database`(): Unit =
+        runBlocking {
+            // given
+            val site = SiteModel()
+            val productId = RemoteId(123)
+            val createdVariations = listOf(
+                ProductVariationApiResponse().apply { id = 5 },
+                ProductVariationApiResponse().apply { id = 6 },
+            )
+            whenever(productRestClient.createVariations(any(), any(), any())) doReturn WooPayload(
+                BatchProductVariationsApiResponse(createdVariations = createdVariations)
+            )
+
+            // when
+            productStore.createVariations(
+                site,
+                productId,
+                ProductTestUtils.generateSampleVariations(2, productId.value, site.id)
+            )
+
+            // then
+            val storedVariations = ProductSqlUtils.getVariationsForProduct(site, productId.value)
+            assertThat(storedVariations).hasSize(2).anyMatch {
+                it.remoteVariationId == 5L
+            }.anyMatch {
+                it.remoteVariationId == 6L
+            }
+        }
+
+    @Test
+    fun `when fetching product with metadata, then save results to database`(): Unit = runBlocking {
+        // given
+        val site = SiteModel().apply { id = 1 }
+        val product = ProductTestUtils.generateSampleProduct(remoteId = 123, siteId = site.id)
+        val metadata = listOf(
+            WCMetaData(0, "key1", "value1"),
+            WCMetaData(1, "key2", "value2"),
+        )
+        whenever(productRestClient.fetchSingleProduct(site, product.remoteProductId)).thenReturn(
+            WCProductStore.RemoteProductPayload(ProductWithMetaData(product, metadata), site)
+        )
+
+        // when
+        productStore.fetchSingleProduct(WCProductStore.FetchSingleProductPayload(site, product.remoteProductId))
+
+        // then
+        val storedProduct = productStore.getProductWithMetaData(site, product.remoteProductId)
+        assertThat(storedProduct).isNotNull
+        assertThat(storedProduct?.product).isEqualTo(product)
+        assertThat(storedProduct?.metaData).isEqualTo(metadata)
+    }
+
+    @Test
+    fun `given include_type simple, then return type Simple` () {
+        assertThat(WCProductStore.IncludeType.fromValue("simple")).isEqualTo(WCProductStore.IncludeType.Simple)
+    }
+
+    @Test
+    fun `given include_type variable, then return type Variable` () {
+        assertThat(
+            WCProductStore.IncludeType.fromValue("variable")
+        ).isEqualTo(WCProductStore.IncludeType.Variable)
+    }
+
+    @Test
+    fun `given include_type external, then return type External` () {
+        assertThat(
+            WCProductStore.IncludeType.fromValue("external")
+        ).isEqualTo(WCProductStore.IncludeType.External)
+    }
+
+    @Test
+    fun `given include_type grouped, then return type Grouped` () {
+        assertThat(
+            WCProductStore.IncludeType.fromValue("grouped")
+        ).isEqualTo(WCProductStore.IncludeType.Grouped)
+    }
+
+    @Test
+    fun `given include_type empty, then return type null` () {
+        assertThat(
+            WCProductStore.IncludeType.fromValue("")
+        ).isNull()
+    }
+
+    @Test
+    fun `given include_type invalid, then return type null` () {
+        assertThat(
+            WCProductStore.IncludeType.fromValue("invalid")
+        ).isNull()
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundFixtures.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundFixtures.kt
new file mode 100644
index 00000000000..d386829efa4
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundFixtures.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.wc.refunds
+
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds.RefundRestClient.RefundResponse
+
+val REFUND_RESPONSE = RefundResponse(
+        1L,
+        "2011-10-10T14:48:00",
+        "10.00",
+        "No reason",
+        false,
+        emptyList(),
+        emptyList(),
+        emptyList()
+)
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundStoreTest.kt
new file mode 100644
index 00000000000..c0f18d99939
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/RefundStoreTest.kt
@@ -0,0 +1,141 @@
+package org.wordpress.android.fluxc.wc.refunds
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.refunds.RefundMapper
+import org.wordpress.android.fluxc.model.refunds.WCRefundModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_ID
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.refunds.RefundRestClient
+import org.wordpress.android.fluxc.persistence.WCRefundSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCRefundStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class RefundStoreTest {
+    private val restClient = mock<RefundRestClient>()
+    private val site = mock<SiteModel>()
+    private val mapper = RefundMapper()
+    private lateinit var store: WCRefundStore
+
+    private val orderId = 1L
+    private val refundId = REFUND_RESPONSE.refundId
+    private val error = WooError(INVALID_ID, NOT_FOUND, "Invalid order ID")
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(WCRefundSqlUtils.RefundBuilder::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCRefundStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper
+        )
+    }
+
+    @Test
+    fun `fetch all refunds of an order`() = test {
+        val data = arrayOf(REFUND_RESPONSE, REFUND_RESPONSE)
+        val result = fetchAllTestRefunds()
+
+        assertThat(result.model?.size).isEqualTo(data.size)
+        assertThat(result.model?.first()).isEqualTo(mapper.map(data.first()))
+
+        val invalidRequestResult = store.fetchAllRefunds(site, 2)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get all refunds of an order`() = test {
+        fetchAllTestRefunds()
+
+        val refunds = store.getAllRefunds(site, orderId)
+
+        assertThat(refunds.size).isEqualTo(1)
+        assertThat(refunds.first()).isEqualTo(mapper.map(REFUND_RESPONSE))
+
+        val invalidRequestResult = store.getAllRefunds(site, 2)
+        assertThat(invalidRequestResult.size).isEqualTo(0)
+    }
+
+    @Test
+    fun `fetch specific refund`() = test {
+        val refund = fetchSpecificTestRefund()
+
+        assertThat(refund.model).isEqualTo(mapper.map(REFUND_RESPONSE))
+    }
+
+    @Test
+    fun `get specific refund`() = test {
+        fetchSpecificTestRefund()
+        val refund = store.getRefund(site, orderId, refundId)
+
+        assertThat(refund).isEqualTo(mapper.map(REFUND_RESPONSE))
+    }
+
+    private suspend fun fetchSpecificTestRefund(): WooResult<WCRefundModel> {
+        val fetchRefundsPayload = WooPayload(
+                REFUND_RESPONSE
+        )
+        whenever(restClient.fetchRefund(site, orderId, refundId)).thenReturn(
+                fetchRefundsPayload
+        )
+
+        whenever(restClient.fetchRefund(site, 2, refundId)).thenReturn(
+                WooPayload(error)
+        )
+        return store.fetchRefund(site, orderId, refundId)
+    }
+
+    private suspend fun fetchAllTestRefunds(): WooResult<List<WCRefundModel>> {
+        val data = arrayOf(REFUND_RESPONSE, REFUND_RESPONSE)
+        val fetchRefundsPayload = WooPayload(
+                data
+        )
+        whenever(
+                restClient.fetchAllRefunds(
+                        site,
+                        orderId,
+                        WCRefundStore.DEFAULT_PAGE,
+                        WCRefundStore.DEFAULT_PAGE_SIZE
+                )
+        ).thenReturn(
+                fetchRefundsPayload
+        )
+        whenever(
+                restClient.fetchAllRefunds(
+                        site,
+                        2,
+                        WCRefundStore.DEFAULT_PAGE,
+                        WCRefundStore.DEFAULT_PAGE_SIZE
+                )
+        ).thenReturn(
+                WooPayload(error)
+        )
+        return store.fetchAllRefunds(site, orderId)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/WCRefundSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/WCRefundSqlUtilsTest.kt
new file mode 100644
index 00000000000..0c88fe304b6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/refunds/WCRefundSqlUtilsTest.kt
@@ -0,0 +1,80 @@
+package org.wordpress.android.fluxc.wc.refunds
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.WCRefundSqlUtils
+import org.wordpress.android.fluxc.persistence.WCRefundSqlUtils.RefundBuilder
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCRefundSqlUtilsTest {
+    private val orderId = 1L
+    private val site = SiteModel().apply { id = 2 }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(RefundBuilder::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    fun `test refund insert`() {
+        WCRefundSqlUtils.insertOrUpdate(site, orderId, REFUND_RESPONSE)
+        val refunds = WCRefundSqlUtils.selectAllRefunds(site, orderId)
+        assertEquals(1, refunds.size)
+        assertEquals(REFUND_RESPONSE, refunds.first())
+    }
+
+    @Test
+    fun `test refund update`() {
+        val newAmount = "20"
+
+        WCRefundSqlUtils.insertOrUpdate(site, orderId, REFUND_RESPONSE)
+        val refund = WCRefundSqlUtils.selectRefund(site, orderId, REFUND_RESPONSE.refundId)!!
+        assertEquals(REFUND_RESPONSE.amount, refund.amount)
+
+        WCRefundSqlUtils.insertOrUpdate(site, orderId, REFUND_RESPONSE.copy(amount = "20"))
+        val updatedRefund = WCRefundSqlUtils.selectRefund(site, orderId, REFUND_RESPONSE.refundId)!!
+        assertEquals(newAmount, updatedRefund.amount)
+    }
+
+    @Test
+    fun `test select`() {
+        val inserted = listOf(REFUND_RESPONSE, REFUND_RESPONSE.copy(refundId = 2, amount = "20"))
+
+        WCRefundSqlUtils.insertOrUpdate(site, orderId, inserted)
+        val refunds = WCRefundSqlUtils.selectAllRefunds(site, orderId)
+        assertEquals(inserted, refunds)
+
+        val refund = WCRefundSqlUtils.selectRefund(site, orderId, 2)
+        assertEquals(refunds[1], refund)
+    }
+
+    @Test
+    fun `test select empty result`() {
+        val inserted = listOf(REFUND_RESPONSE, REFUND_RESPONSE.copy(refundId = 2, amount = "20"))
+
+        WCRefundSqlUtils.insertOrUpdate(site, orderId, inserted)
+        val refunds = WCRefundSqlUtils.selectAllRefunds(site, 2)
+        assertTrue(refunds.isEmpty())
+
+        val refund = WCRefundSqlUtils.selectRefund(site, orderId, 3)
+        assertNull(refund)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsMapperTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsMapperTest.kt
new file mode 100644
index 00000000000..cebf2ca8219
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsMapperTest.kt
@@ -0,0 +1,79 @@
+package org.wordpress.android.fluxc.wc.settings
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCProductSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition
+import org.wordpress.android.fluxc.model.settings.WCSettingsMapper
+import kotlin.test.assertEquals
+
+class WCSettingsMapperTest {
+    private val site = SiteModel().apply {
+        id = 1
+        siteId = 1337L
+    }
+
+    val mapper = WCSettingsMapper()
+
+    @Test
+    fun `mapper maps to correct settings model`() {
+        // given
+        val expectedModel = WCSettingsModel(
+            localSiteId = site.id,
+            currencyCode = "USD",
+            currencyPosition = CurrencyPosition.LEFT,
+            currencyThousandSeparator = ",",
+            currencyDecimalSeparator = ".",
+            currencyDecimalNumber = 4,
+            countryCode = "US",
+            stateCode = "CA",
+            address = "60 29th Street #343",
+            address2 = "",
+            city = "San Francisco",
+            postalCode = "94110",
+            couponsEnabled = true
+        )
+
+        // when
+        val siteSettingsResponse = WCSettingsTestUtils.getSiteSettingsResponse()
+        val result = mapper.mapSiteSettings(siteSettingsResponse!!, site)
+
+        // then
+        with(result) {
+            assertEquals(expectedModel.localSiteId, localSiteId)
+            assertEquals(expectedModel.currencyCode, currencyCode)
+            assertEquals(expectedModel.currencyPosition, currencyPosition)
+            assertEquals(expectedModel.currencyThousandSeparator, currencyThousandSeparator)
+            assertEquals(expectedModel.currencyDecimalSeparator, currencyDecimalSeparator)
+            assertEquals(expectedModel.currencyDecimalNumber, currencyDecimalNumber)
+            assertEquals(expectedModel.countryCode, countryCode)
+            assertEquals(expectedModel.stateCode, stateCode)
+            assertEquals(expectedModel.address, address)
+            assertEquals(expectedModel.address2, address2)
+            assertEquals(expectedModel.city, city)
+            assertEquals(expectedModel.postalCode, postalCode)
+        }
+    }
+
+    @Test
+    fun `mapper maps to correct product settings model`() {
+        // given
+        val expectedModel = WCProductSettingsModel().apply {
+            localSiteId = site.id
+            dimensionUnit = "in"
+            weightUnit = "oz"
+        }
+
+        // when
+        val siteProductSettingsResponse = WCSettingsTestUtils.getSiteProductSettingsResponse()
+        val result = mapper.mapProductSettings(siteProductSettingsResponse!!, site)
+
+        // then
+        with(result) {
+            assertEquals(expectedModel.localSiteId, localSiteId)
+            assertEquals(expectedModel.dimensionUnit, dimensionUnit)
+            assertEquals(expectedModel.weightUnit, weightUnit)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsTestUtils.kt
new file mode 100644
index 00000000000..4cf13adfc84
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/settings/WCSettingsTestUtils.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.wc.settings
+
+import org.wordpress.android.fluxc.JsonLoaderUtils.jsonFileAs
+import org.wordpress.android.fluxc.network.discovery.RootWPAPIRestResponse
+import org.wordpress.android.fluxc.network.discovery.RootWPAPIRestResponse.Authentication
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.SiteSettingOptionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.SiteSettingsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.system.WooSystemRestClient.SSRResponse
+
+object WCSettingsTestUtils {
+    fun getSiteSettingsResponse() =
+        "wc/site-settings-general-response.json"
+            .jsonFileAs(Array<SiteSettingsResponse>::class.java)
+            ?.toList()
+
+    fun getSiteProductSettingsResponse() =
+        "wc/product-settings-response.json"
+            .jsonFileAs(Array<SiteSettingsResponse>::class.java)
+            ?.toList()
+
+    fun getTaxBasedOnSettingsResponse() =
+        "wc/tax-based-on-settings-response.json"
+            .jsonFileAs(SiteSettingOptionResponse::class.java)
+
+    fun getSiteSettingOptionResponse() =
+        "wc/site-setting-option-response.json"
+            .jsonFileAs(SiteSettingOptionResponse::class.java)
+
+    fun getSSRResponse() =
+        "wc/system-status.json"
+            .jsonFileAs(SSRResponse::class.java)
+
+    fun getSupportedApiVersionResponse() =
+        RootWPAPIRestResponse(
+            authentication = Authentication(),
+            namespaces = arrayListOf("wc/v3")
+        )
+
+    fun getUnsupportedApiVersionResponse() =
+        RootWPAPIRestResponse(
+            authentication = Authentication(),
+            namespaces = arrayListOf("wc/v1")
+        )
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelSqlUtilsTest.kt
new file mode 100644
index 00000000000..f2a35d4bcd4
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelSqlUtilsTest.kt
@@ -0,0 +1,157 @@
+package org.wordpress.android.fluxc.wc.shippinglabels
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.WCShippingLabelSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCShippingLabelSqlUtilsTest {
+    val site = SiteModel().apply {
+        email = "test@example.org"
+        name = "Test Site"
+        siteId = 24
+    }
+
+    private val orderId = 25L
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(SiteModel::class.java, WCShippingLabelModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+
+        // Insert the site into the db so it's available later for shipping labels
+        SiteSqlUtils().insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun testInsertOrUpdateShippingLabelForOrder() {
+        val shippingLabel = WCShippingLabelTestUtils.generateShippingLabelList(site.id, orderId)[0]
+        assertNotNull(shippingLabel)
+
+        // Test inserting a shipping label for an order
+        var rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabel(shippingLabel)
+        assertEquals(1, rowsAffected)
+        var savedShippingLabels = WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+        assertEquals(savedShippingLabels.size, 1)
+        assertEquals(savedShippingLabels[0].localSiteId, shippingLabel.localSiteId)
+        assertEquals(savedShippingLabels[0].remoteOrderId, shippingLabel.remoteOrderId)
+        assertEquals(savedShippingLabels[0].remoteShippingLabelId, shippingLabel.remoteShippingLabelId)
+        assertEquals(savedShippingLabels[0].serviceName, shippingLabel.serviceName)
+        assertNotNull(savedShippingLabels[0].refund)
+
+        // Test updating the same shipping label
+        shippingLabel.apply {
+            serviceName = "Test service name"
+            refund = ""
+        }
+        rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabel(shippingLabel)
+        assertEquals(1, rowsAffected)
+        savedShippingLabels = WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+        assertEquals(savedShippingLabels.size, 1)
+        assertEquals(savedShippingLabels[0].localSiteId, shippingLabel.localSiteId)
+        assertEquals(savedShippingLabels[0].remoteOrderId, shippingLabel.remoteOrderId)
+        assertEquals(savedShippingLabels[0].remoteShippingLabelId, shippingLabel.remoteShippingLabelId)
+        assertEquals(savedShippingLabels[0].serviceName, shippingLabel.serviceName)
+        assertEquals(savedShippingLabels[0].refund, shippingLabel.refund)
+    }
+
+    @Test
+    fun testInsertOrUpdateShippingLabelListForOrder() {
+        val shippingLabels = WCShippingLabelTestUtils.generateShippingLabelList(site.id, orderId)
+        assertNotNull(shippingLabels)
+
+        // Insert shipping label list
+        val rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+        assertEquals(shippingLabels.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetShippingLabelsForOrder() {
+        val shippingLabels = WCShippingLabelTestUtils.generateShippingLabelList(site.id, orderId)
+        assertTrue(shippingLabels.isNotEmpty())
+
+        // Insert shipping label list
+        val rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+        assertEquals(shippingLabels.size, rowsAffected)
+
+        // Get shipping label list for site and order and verify
+        val savedShippingLabelListExists = WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+        assertEquals(shippingLabels.size, savedShippingLabelListExists.size)
+        assertEquals(shippingLabels[0].getProductNameList(), savedShippingLabelListExists[0].getProductNameList())
+        assertEquals(shippingLabels[0].getProductIdsList(), savedShippingLabelListExists[0].getProductIdsList())
+
+        // Get shipping label list for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedShippingLabelList = WCShippingLabelSqlUtils.getShippingClassesForOrder(nonExistingSite.id, orderId)
+        assertEquals(0, savedShippingLabelList.size)
+
+        // Get shipping label list for an order that does not exist
+        val nonExistingOrderId = 45L
+        val nonExistentOrderShippingLabelList =
+                WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, nonExistingOrderId)
+        assertEquals(0, nonExistentOrderShippingLabelList.size)
+    }
+
+    @Test
+    fun testGetShippingLabelsById() {
+        val shippingLabelId = 1L
+        val shippingLabels = WCShippingLabelTestUtils.generateShippingLabelList(
+                site.id, orderId, shippingLabelId
+        )
+        assertTrue(shippingLabels.isNotEmpty())
+
+        // Insert shipping label list
+        val rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+        assertEquals(shippingLabels.size, rowsAffected)
+
+        // Get shipping label list by id and verify
+        val savedShippingLabelExists = WCShippingLabelSqlUtils.getShippingLabelById(
+                site.id, orderId, shippingLabelId + 1
+        )
+        assertEquals(shippingLabels[0].remoteOrderId, savedShippingLabelExists?.remoteOrderId)
+        assertEquals(shippingLabels[0].remoteShippingLabelId, savedShippingLabelExists?.remoteShippingLabelId)
+        assertEquals(shippingLabels[0].localSiteId, savedShippingLabelExists?.localSiteId)
+
+        // Get shipping label for am id that does not exist
+        val savedShippingLabel = WCShippingLabelSqlUtils.getShippingLabelById(site.id, orderId, 100)
+        assertNull(savedShippingLabel)
+    }
+
+    @Test
+    fun testDeleteShippingLabelListForOrder() {
+        val shippingLabels = WCShippingLabelTestUtils.generateShippingLabelList(site.id, orderId)
+
+        var rowsAffected = WCShippingLabelSqlUtils.insertOrUpdateShippingLabels(shippingLabels)
+        assertEquals(shippingLabels.size, rowsAffected)
+
+        // Verify shipping label list inserted
+        var savedShippingLabelList = WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+        assertEquals(shippingLabels.size, savedShippingLabelList.size)
+
+        // Delete shipping label list for order and verify
+        rowsAffected = WCShippingLabelSqlUtils.deleteShippingLabelsForOrder(orderId)
+        assertEquals(shippingLabels.size, rowsAffected)
+        savedShippingLabelList = WCShippingLabelSqlUtils.getShippingClassesForOrder(site.id, orderId)
+        assertEquals(0, savedShippingLabelList.size)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelStoreTest.kt
new file mode 100644
index 00000000000..5305591db25
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelStoreTest.kt
@@ -0,0 +1,822 @@
+package org.wordpress.android.fluxc.wc.shippinglabels
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowLooper
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCAddressVerificationResult.Valid
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.CustomPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.PredefinedOption
+import org.wordpress.android.fluxc.model.shippinglabels.WCPackagesResult.PredefinedOption.PredefinedPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCPaymentMethod
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingAccountSettings
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelCreationEligibility
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelMapper
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress.Type.DESTINATION
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelAddress.Type.ORIGIN
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel.ShippingLabelPackage
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelPackageData
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult.ShippingOption
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingRatesResult.ShippingPackage
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.LabelItem
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.SLCreationEligibilityApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.ShippingRatesApiResponse.ShippingOption.Rate
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.VerifyAddressResponse
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCShippingLabelStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import java.math.BigDecimal
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@Suppress("LargeClass")
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCShippingLabelStoreTest {
+    private val restClient = mock<ShippingLabelRestClient>()
+    private val orderId = 25L
+    private val refundShippingLabelId = 12L
+    private val site = SiteModel().apply { id = 321 }
+    private val errorSite = SiteModel().apply { id = 123 }
+    private val mapper = WCShippingLabelMapper()
+    private lateinit var store: WCShippingLabelStore
+
+    private val sampleShippingLabelApiResponse = WCShippingLabelTestUtils.generateSampleShippingLabelApiResponse()
+    private val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+
+    private val printPaperSize = "label"
+    private val samplePrintShippingLabelApiResponse =
+            WCShippingLabelTestUtils.generateSamplePrintShippingLabelApiResponse()
+
+    private val address = ShippingLabelAddress(country = "CA", address = "1370 Lewisham Dr.")
+    private val successfulVerifyAddressApiResponse = VerifyAddressResponse(
+            isSuccess = true,
+            isTrivialNormalization = false,
+            suggestedAddress = address,
+            error = null
+    )
+
+    private val samplePackagesApiResponse = WCShippingLabelTestUtils.generateSampleGetPackagesApiResponse()
+
+    private val sampleAccountSettingsApiResponse = WCShippingLabelTestUtils.generateSampleAccountSettingsApiResponse()
+
+    private val sampleShippingRatesApiResponse = WCShippingLabelTestUtils.generateSampleGetShippingRatesApiResponse()
+
+    private val samplePurchaseShippingLabelsResponse =
+            WCShippingLabelTestUtils.generateSamplePurchaseShippingLabelsApiResponse()
+
+    private val originAddress = ShippingLabelAddress(
+            "Company",
+            "Ondrej Ruttkay",
+            "",
+            "US",
+            "NY",
+            "42 Jewel St.",
+            "",
+            "Brooklyn",
+            "11222"
+    )
+
+    private val destAddress = ShippingLabelAddress(
+            "Company",
+            "Ondrej Ruttkay",
+            "",
+            "US",
+            "NY",
+            "82 Jewel St.",
+            "",
+            "Brooklyn",
+            "11222"
+    )
+
+    private val packages = listOf(
+            ShippingLabelPackage(
+                    "Krabka 1",
+                    "medium_flat_box_top",
+                    10f,
+                    10f,
+                    10f,
+                    10f,
+                    false
+            ),
+            ShippingLabelPackage(
+                    "Krabka 2",
+                    "medium_flat_box_side",
+                    5f,
+                    5f,
+                    5f,
+                    5f,
+                    false
+            )
+    )
+
+    private val purchaseLabelPackagesData = listOf(
+            WCShippingLabelPackageData(
+                    id = "id1",
+                    boxId = "medium_flat_box_top",
+                    isLetter = false,
+                    height = 10f,
+                    width = 10f,
+                    length = 10f,
+                    weight = 10f,
+                    shipmentId = "shp_id",
+                    rateId = "rate_id",
+                    serviceId = "service-1",
+                    serviceName = "USPS - Priority Mail International label",
+                    carrierId = "usps",
+                    products = listOf(10)
+            )
+    )
+
+    private val sampleListOfOneCustomPackage = listOf(
+            CustomPackage(
+                    "Package 1",
+                    false,
+                    "10 x 10 x 10",
+                    1.0f
+            )
+    )
+
+    private val sampleListOfOnePredefinedPackage = listOf(
+            PredefinedOption(
+                    title = "USPS Priority Mail Flat Rate Boxes",
+                    carrier = "usps",
+                    predefinedPackages = listOf(
+                            PredefinedPackage(
+                                    id = "small_flat_box",
+                                    title = "Small Flat Box",
+                                    isLetter = false,
+                                    dimensions = "10 x 10 x 10",
+                                    boxWeight = 1.0f
+                            )
+                    )
+            )
+    )
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        SiteModel::class.java,
+                        WCShippingLabelModel::class.java,
+                        WCShippingLabelCreationEligibility::class.java
+                ),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCShippingLabelStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper
+        )
+
+        // Insert the site into the db so it's available later when testing shipping labels
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun `fetch shipping labels for order`() = test {
+        val result = fetchShippingLabelsForOrder()
+        val shippingLabelModels = mapper.map(sampleShippingLabelApiResponse!!, site)
+
+        assertThat(result.model?.size).isEqualTo(shippingLabelModels.size)
+        assertThat(result.model?.first()?.remoteOrderId).isEqualTo(shippingLabelModels.first().remoteOrderId)
+        assertThat(result.model?.first()?.localSiteId).isEqualTo(shippingLabelModels.first().localSiteId)
+        assertThat(result.model?.first()?.remoteShippingLabelId)
+                .isEqualTo(shippingLabelModels.first().remoteShippingLabelId)
+        assertThat(result.model?.first()?.carrierId).isEqualTo(shippingLabelModels.first().carrierId)
+        assertThat(result.model?.first()?.packageName).isEqualTo(shippingLabelModels.first().packageName)
+        assertThat(result.model?.first()?.refundableAmount).isEqualTo(shippingLabelModels.first().refundableAmount)
+        assertThat(result.model?.first()?.rate).isEqualTo(shippingLabelModels.first().rate)
+        assertThat(result.model?.first()?.getProductNameList()?.size)
+                .isEqualTo(shippingLabelModels.first().getProductNameList().size)
+        assertThat(result.model?.first()?.getProductIdsList()?.size)
+                .isEqualTo(shippingLabelModels.first().getProductIdsList().size)
+        assertThat(result.model?.get(1)?.getProductIdsList()?.size).isEqualTo(0)
+        assertNotNull(result.model?.first()?.refund)
+
+        val invalidRequestResult = store.fetchShippingLabelsForOrder(errorSite, orderId)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get stored shipping labels for order`() = test {
+        fetchShippingLabelsForOrder()
+
+        val storedShippingLabelsList = store.getShippingLabelsForOrder(site, orderId)
+
+        val shippingLabelModels = mapper.map(sampleShippingLabelApiResponse!!, site)
+        assertThat(storedShippingLabelsList.size).isEqualTo(shippingLabelModels.size)
+        assertThat(storedShippingLabelsList.first().remoteOrderId).isEqualTo(shippingLabelModels.first().remoteOrderId)
+        assertThat(storedShippingLabelsList.first().localSiteId).isEqualTo(shippingLabelModels.first().localSiteId)
+        assertThat(storedShippingLabelsList.first().remoteShippingLabelId)
+                .isEqualTo(shippingLabelModels.first().remoteShippingLabelId)
+        assertThat(storedShippingLabelsList.first().carrierId).isEqualTo(shippingLabelModels.first().carrierId)
+        assertThat(storedShippingLabelsList.first().packageName).isEqualTo(shippingLabelModels.first().packageName)
+        assertThat(storedShippingLabelsList.first().refundableAmount)
+                .isEqualTo(shippingLabelModels.first().refundableAmount)
+        assertThat(storedShippingLabelsList.first().rate).isEqualTo(shippingLabelModels.first().rate)
+        assertNotNull(storedShippingLabelsList.first().refund)
+        assertThat(storedShippingLabelsList.first().getProductNameList().size)
+                .isEqualTo(shippingLabelModels.first().getProductNameList().size)
+        assertThat(storedShippingLabelsList.first().getProductIdsList().size)
+                .isEqualTo(shippingLabelModels.first().getProductIdsList().size)
+        assertThat(storedShippingLabelsList[1].getProductIdsList().size).isEqualTo(0)
+
+        val invalidRequestResult = store.getShippingLabelsForOrder(errorSite, orderId)
+        assertThat(invalidRequestResult.size).isEqualTo(0)
+    }
+
+    @Test
+    fun `refund shipping label for order`() = test {
+        val result = refundShippingLabelForOrder()
+        assertTrue(result.model!!)
+
+        val invalidRequestResult = store.refundShippingLabelForOrder(errorSite, orderId, refundShippingLabelId)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `print shipping label for order`() = test {
+        val result = printShippingLabelForOrder()
+        assertThat(result.model).isEqualTo(samplePrintShippingLabelApiResponse?.b64Content)
+
+        val invalidRequestResult = store.printShippingLabel(errorSite, printPaperSize, refundShippingLabelId)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `verify shipping address`() = test {
+        val result = verifyAddress(ORIGIN)
+        assertThat(result.model).isEqualTo(Valid(address, successfulVerifyAddressApiResponse.isTrivialNormalization))
+
+        val invalidRequestResult = verifyAddress(DESTINATION)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun `get shipping rates`() = test {
+        val expectedRatesResult = WCShippingRatesResult(
+            listOf(
+                ShippingPackage(
+                    "default_box",
+                    listOf(
+                        ShippingOption(
+                            "default",
+                            listOf(
+                                Rate(
+                                    title = "USPS - Media Mail",
+                                    insurance = "100",
+                                    rate = BigDecimal(3.5),
+                                    rateId = "rate_cb976896a09c4171a93ace57ed66ce5b",
+                                    serviceId = "MediaMail",
+                                    carrierId = "usps",
+                                    shipmentId = "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+                                    hasTracking = false,
+                                    retailRate = BigDecimal(3.5),
+                                    isSelected = false,
+                                    isPickupFree = false,
+                                    deliveryDays = 2,
+                                    deliveryDateGuaranteed = false,
+                                    deliveryDate = null
+                                ),
+                                Rate(
+                                    title = "FedEx - Ground",
+                                    insurance = "100",
+                                    rate = BigDecimal(21.5),
+                                    rateId = "rate_1b202bd43a8c4c929c73bb46989ef745",
+                                    serviceId = "FEDEX_GROUND",
+                                    carrierId = "fedex",
+                                    shipmentId = "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+                                    hasTracking = false,
+                                    retailRate = BigDecimal(21.5),
+                                    isSelected = false,
+                                    isPickupFree = false,
+                                    deliveryDays = 1,
+                                    deliveryDateGuaranteed = true,
+                                    deliveryDate = null
+                                )
+                        )
+                ),
+                ShippingOption(
+                        "with_signature",
+                        listOf(
+                                Rate(
+                                    title = "USPS - Media Mail",
+                                    insurance = "100",
+                                    rate = BigDecimal(13.5),
+                                    rateId = "rate_cb976896a09c4171a93ace57ed66ce5b",
+                                    serviceId = "MediaMail",
+                                    carrierId = "usps",
+                                    shipmentId = "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+                                    hasTracking = true,
+                                    retailRate = BigDecimal(13.5),
+                                    isSelected = false,
+                                    isPickupFree = true,
+                                    deliveryDays = 2,
+                                    deliveryDateGuaranteed = false,
+                                    deliveryDate = null
+                                ),
+                                Rate(
+                                    title = "FedEx - Ground",
+                                    insurance = "100",
+                                    rate = BigDecimal(121.5),
+                                    rateId = "rate_1b202bd43a8c4c929c73bb46989ef745",
+                                    serviceId = "FEDEX_GROUND",
+                                    carrierId = "fedex",
+                                    shipmentId = "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+                                    hasTracking = true,
+                                    retailRate = BigDecimal(121.5),
+                                    isSelected = false,
+                                    isPickupFree = true,
+                                    deliveryDays = 1,
+                                    deliveryDateGuaranteed = true,
+                                    deliveryDate = null
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        val result = getShippingRates()
+        assertThat(result.model).isEqualTo(expectedRatesResult)
+    }
+
+    @Test
+    fun `get packages`() = test {
+        val expectedResult = WCPackagesResult(
+                listOf(
+                        CustomPackage("Krabica", false, "1 x 2 x 3", 1f),
+                        CustomPackage("Obalka", true, "2 x 3 x 4", 5f),
+                        CustomPackage("Flat Box", true, "5 x 6 x 4", 1f),
+                        CustomPackage("Weird Box", false, "0 x 0 x 0", 0f)
+                ),
+                listOf(
+                        PredefinedOption("USPS Priority Mail Flat Rate Boxes",
+                                "usps",
+                                listOf(
+                                        PredefinedPackage(
+                                                "small_flat_box",
+                                                "Small Flat Rate Box",
+                                                false,
+                                                "21.91 x 13.65 x 4.13",
+                                                0f
+                                        ),
+                                        PredefinedPackage(
+                                                "medium_flat_box_top",
+                                                "Medium Flat Rate Box 1, Top Loading",
+                                                false,
+                                                "28.57 x 22.22 x 15.24",
+                                                0f
+                                        )
+                                )
+                        ),
+                        PredefinedOption(
+                                "DHL Express",
+                                "dhlexpress",
+                                listOf(PredefinedPackage(
+                                        "LargePaddedPouch",
+                                        "Large Padded Pouch",
+                                        true,
+                                        "30.22 x 35.56 x 2.54",
+                                        0f
+                                ))
+                        )
+                )
+        )
+        val result = getPackages()
+        assertThat(result.model).isEqualTo(expectedResult)
+
+        val invalidRequestResult = getPackages(true)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get account settings`() = test {
+        val expectedPaymentMethodList = listOf(WCPaymentMethod(
+                paymentMethodId = 4144354,
+                name = "John Doe",
+                cardType = "visa",
+                cardDigits = "5454",
+                expiry = "2023-12-31"
+        ))
+        val result = getAccountSettings()
+        val model = result.model!!
+        assertThat(model.canManagePayments).isTrue()
+        assertThat(model.lastUsedBoxId).isEqualTo("small_flat_box")
+        assertThat(model.selectedPaymentMethodId).isEqualTo(4144354)
+        assertThat(model.paymentMethods).isEqualTo(expectedPaymentMethodList)
+
+        val invalidRequestResult = getAccountSettings(true)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `purchase shipping label error`() = test {
+        whenever(restClient.purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        ))
+                .thenReturn(WooPayload(error))
+
+        val invalidRequestResult = store.purchaseShippingLabels(
+                site,
+                orderId,
+                originAddress,
+                destAddress,
+                purchaseLabelPackagesData,
+                null
+        )
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun `purchase shipping labels with polling`() = test {
+        val response = WooPayload(samplePurchaseShippingLabelsResponse)
+        whenever(restClient.purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        )).thenReturn(response)
+
+        val statusIntermediateResponse = WCShippingLabelTestUtils.generateSampleShippingLabelsStatusApiResponse(false)
+        val statusDoneReponse = WCShippingLabelTestUtils.generateSampleShippingLabelsStatusApiResponse(true)
+        whenever(restClient.fetchShippingLabelsStatus(any(), any(), any()))
+                .thenReturn(WooPayload(statusIntermediateResponse))
+                .thenReturn(WooPayload(statusDoneReponse))
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
+
+        val result = store.purchaseShippingLabels(
+                site,
+                orderId,
+                originAddress,
+                destAddress,
+                purchaseLabelPackagesData,
+                null
+        )
+        val shippingLabelModels = mapper.map(
+                samplePurchaseShippingLabelsResponse,
+                orderId,
+                originAddress,
+                destAddress,
+                site
+        )
+
+        verify(restClient).purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        )
+        verify(restClient).fetchShippingLabelsStatus(
+                site,
+                orderId,
+                samplePurchaseShippingLabelsResponse.labels!!.map { it.labelId!! })
+        verify(restClient).fetchShippingLabelsStatus(
+                site,
+                orderId,
+                statusIntermediateResponse.labels!!
+                        .filter { it.status != LabelItem.STATUS_PURCHASED }
+                        .map { it.labelId!! })
+
+        assertThat(result.model!!.size).isEqualTo(shippingLabelModels.size)
+        assertThat(result.model!!.first().remoteOrderId).isEqualTo(shippingLabelModels.first().remoteOrderId)
+        assertThat(result.model!!.first().localSiteId).isEqualTo(shippingLabelModels.first().localSiteId)
+        assertThat(result.model!!.first().remoteShippingLabelId)
+                .isEqualTo(shippingLabelModels.first().remoteShippingLabelId)
+        assertThat(result.model!!.first().carrierId).isEqualTo(shippingLabelModels.first().carrierId)
+        assertThat(result.model!!.first().packageName).isEqualTo(shippingLabelModels.first().packageName)
+        assertThat(result.model!!.first().refundableAmount).isEqualTo(shippingLabelModels.first().refundableAmount)
+    }
+
+    @Test
+    fun `purchase shipping labels with polling fail after 3 retries`() = test {
+        val response = WooPayload(samplePurchaseShippingLabelsResponse)
+        whenever(restClient.purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        )).thenReturn(response)
+
+        whenever(restClient.fetchShippingLabelsStatus(any(), any(), any())).thenReturn(WooPayload(error))
+
+        val result = store.purchaseShippingLabels(
+                site,
+                orderId,
+                originAddress,
+                destAddress,
+                purchaseLabelPackagesData,
+                null
+        )
+
+        verify(restClient).purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        )
+        verify(restClient, times(3)).fetchShippingLabelsStatus(
+                site,
+                orderId,
+                samplePurchaseShippingLabelsResponse.labels!!.map { it.labelId!! })
+
+        assertThat(result.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `purchase shipping labels with polling one label failed`() = test {
+        val response = WooPayload(samplePurchaseShippingLabelsResponse)
+        whenever(restClient.purchaseShippingLabels(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+                anyOrNull(),
+                any()
+        )).thenReturn(response)
+
+        val statusIntermediateResponse = WCShippingLabelTestUtils.generateSampleShippingLabelsStatusApiResponse(false)
+        val statusErrorResponse = WCShippingLabelTestUtils.generateErrorShippingLabelsStatusApiResponse()
+        whenever(restClient.fetchShippingLabelsStatus(any(), any(), any()))
+                .thenReturn(WooPayload(statusIntermediateResponse))
+                .thenReturn(WooPayload(statusErrorResponse))
+
+        val result = store.purchaseShippingLabels(
+                site,
+                orderId,
+                originAddress,
+                destAddress,
+                purchaseLabelPackagesData,
+                null
+        )
+
+        assertThat(result.isError).isTrue()
+        assertThat(result.error.message).isEqualTo(statusErrorResponse.labels!!.first().error)
+    }
+
+    @Test
+    fun `fetch shipping label eligibility`() = test {
+        val result = fetchSLCreationEligibility(
+                canCreatePackage = false,
+                canCreatePaymentMethod = false,
+                canCreateCustomsForm = false,
+                isEligible = true,
+                isError = false
+        )
+        assertThat(result.model).isNotNull
+        assertThat(result.model!!.isEligible).isTrue
+
+        val failedResult = fetchSLCreationEligibility(
+            canCreatePackage = false,
+            canCreatePaymentMethod = false,
+            canCreateCustomsForm = false,
+            isError = true
+        )
+        assertThat(failedResult.model).isNull()
+        assertThat(failedResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get stored eligibility`() = test {
+        fetchSLCreationEligibility(
+                canCreatePackage = false,
+                canCreatePaymentMethod = false,
+                canCreateCustomsForm = false,
+                isEligible = true,
+                isError = false
+        )
+
+        val eligibility = store.isOrderEligibleForShippingLabelCreation(
+                site = site,
+                orderId = orderId,
+                canCreatePackage = false,
+                canCreatePaymentMethod = false,
+                canCreateCustomsForm = false
+        )
+        assertThat(eligibility).isNotNull
+        assertThat(eligibility!!.isEligible).isTrue
+    }
+
+    @Test
+    fun `invalidate cached data if parameters are different`() = test {
+        fetchSLCreationEligibility(
+                canCreatePackage = false,
+                canCreatePaymentMethod = false,
+                canCreateCustomsForm = false,
+                isEligible = true,
+                isError = false
+        )
+
+        val eligibility = store.isOrderEligibleForShippingLabelCreation(
+                site = site,
+                orderId = orderId,
+                canCreatePackage = true,
+                canCreatePaymentMethod = false,
+                canCreateCustomsForm = false
+        )
+        assertThat(eligibility).isNull()
+    }
+
+    @Test
+    fun `creating packages returns true if the API call succeeds`() = test {
+        val response = WooPayload(true)
+        whenever(restClient.createPackages(site = any(), customPackages = any(), predefinedOptions = any()))
+                .thenReturn(response)
+
+        val expectedResult = WooResult(true)
+        val successfulRequestResult = store.createPackages(
+                site = site,
+                customPackages = sampleListOfOneCustomPackage,
+                predefinedPackages = emptyList()
+        )
+        assertEquals(successfulRequestResult, expectedResult)
+    }
+
+    @Test
+    fun `creating packages returns error if the API call fails`() = test {
+        // In practice, the API returns more specific error message(s) depending on the error case.
+        // In `createPackages()` that error message isn't modified further, so here we use a mock message instead.
+        val errorMessage = "error message"
+        val response = WooPayload<Boolean>(WooError(GENERIC_ERROR, UNKNOWN, errorMessage))
+        whenever(restClient.createPackages(site = any(), customPackages = any(), predefinedOptions = any()))
+                .thenReturn(response)
+
+        val expectedResult = WooResult<Boolean>(response.error)
+        val errorRequestResult = store.createPackages(
+                site = site,
+                customPackages = emptyList(),
+                predefinedPackages = sampleListOfOnePredefinedPackage
+        )
+        assertEquals(errorRequestResult, expectedResult)
+        assertEquals(expectedResult.error.message, errorMessage)
+    }
+
+    private suspend fun fetchShippingLabelsForOrder(): WooResult<List<WCShippingLabelModel>> {
+        val fetchShippingLabelsPayload = WooPayload(sampleShippingLabelApiResponse)
+        whenever(restClient.fetchShippingLabelsForOrder(orderId, site)).thenReturn(fetchShippingLabelsPayload)
+        whenever(restClient.fetchShippingLabelsForOrder(orderId, errorSite)).thenReturn(WooPayload(error))
+        return store.fetchShippingLabelsForOrder(site, orderId)
+    }
+
+    private suspend fun refundShippingLabelForOrder(): WooResult<Boolean> {
+        val refundShippingLabelPayload = WooPayload(sampleShippingLabelApiResponse)
+        whenever(restClient.refundShippingLabelForOrder(
+                site, orderId, refundShippingLabelId
+        )).thenReturn(refundShippingLabelPayload)
+
+        whenever(restClient.refundShippingLabelForOrder(
+                errorSite, orderId, refundShippingLabelId
+        )).thenReturn(WooPayload(error))
+
+        return store.refundShippingLabelForOrder(site, orderId, refundShippingLabelId)
+    }
+
+    private suspend fun printShippingLabelForOrder(): WooResult<String> {
+        val printShippingLabelPayload = WooPayload(samplePrintShippingLabelApiResponse)
+        whenever(restClient.printShippingLabels(
+                site, printPaperSize, listOf(refundShippingLabelId)
+        )).thenReturn(printShippingLabelPayload)
+
+        whenever(restClient.printShippingLabels(
+                errorSite, printPaperSize, listOf(refundShippingLabelId)
+        )).thenReturn(WooPayload(error))
+
+        return store.printShippingLabel(site, printPaperSize, refundShippingLabelId)
+    }
+
+    private suspend fun verifyAddress(type: ShippingLabelAddress.Type): WooResult<WCAddressVerificationResult> {
+        val verifyAddressPayload = WooPayload(successfulVerifyAddressApiResponse)
+        whenever(restClient.verifyAddress(
+                site,
+                address,
+                ORIGIN
+        )).thenReturn(verifyAddressPayload)
+
+        whenever(restClient.verifyAddress(
+                site,
+                address,
+                DESTINATION
+        )).thenReturn(WooPayload(error))
+
+        return store.verifyAddress(site, address, type)
+    }
+
+    private suspend fun getShippingRates(): WooResult<WCShippingRatesResult> {
+        val rates = WooPayload(sampleShippingRatesApiResponse)
+
+        whenever(restClient.getShippingRates(any(), any(), any(), any(), any(), anyOrNull()))
+                .thenReturn(rates)
+
+        return store.getShippingRates(site, orderId, originAddress, destAddress, packages, null)
+    }
+
+    private suspend fun getPackages(isError: Boolean = false): WooResult<WCPackagesResult> {
+        val getPackagesPayload = WooPayload(samplePackagesApiResponse)
+        if (isError) {
+            whenever(restClient.getPackageTypes(any())).thenReturn(WooPayload(error))
+        } else {
+            whenever(restClient.getPackageTypes(any())).thenReturn(getPackagesPayload)
+        }
+        return store.getPackageTypes(site)
+    }
+
+    private suspend fun getAccountSettings(isError: Boolean = false): WooResult<WCShippingAccountSettings> {
+        if (isError) {
+            whenever(restClient.getAccountSettings(any())).thenReturn(WooPayload(error))
+        } else {
+            val accountSettingsPayload = WooPayload(sampleAccountSettingsApiResponse)
+            whenever(restClient.getAccountSettings(any())).thenReturn(accountSettingsPayload)
+        }
+        return store.getAccountSettings(site)
+    }
+
+    private suspend fun fetchSLCreationEligibility(
+        canCreatePackage: Boolean,
+        canCreatePaymentMethod: Boolean,
+        canCreateCustomsForm: Boolean,
+        isEligible: Boolean = false,
+        isError: Boolean = false
+    ): WooResult<WCShippingLabelCreationEligibility> {
+        if (isError) {
+            whenever(restClient.checkShippingLabelCreationEligibility(any(), any(), any(), any(), any()))
+                    .thenReturn(WooPayload(error))
+        } else {
+            val result = SLCreationEligibilityApiResponse(
+                    isEligible = isEligible,
+                    reason = if (isEligible) null else "reason"
+            )
+            whenever(restClient.checkShippingLabelCreationEligibility(any(), any(), any(), any(), any()))
+                    .thenReturn(WooPayload(result))
+        }
+        return store.fetchShippingLabelCreationEligibility(
+                site = site,
+                orderId = orderId,
+                canCreatePackage = canCreatePackage,
+                canCreatePaymentMethod = canCreatePaymentMethod,
+                canCreateCustomsForm = canCreateCustomsForm
+        )
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelTestUtils.kt
new file mode 100644
index 00000000000..ec34fb23523
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/shippinglabels/WCShippingLabelTestUtils.kt
@@ -0,0 +1,128 @@
+package org.wordpress.android.fluxc.wc.shippinglabels
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.shippinglabels.WCShippingLabelModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.AccountSettingsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.GetPackageTypesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.PrintShippingLabelApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelRestClient.ShippingRatesApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.shippinglabels.ShippingLabelStatusApiResponse
+
+object WCShippingLabelTestUtils {
+    private fun generateSampleShippingLabel(
+        remoteId: Long,
+        orderId: Long = 12,
+        siteId: Int = 6,
+        carrierId: String = "usps",
+        serviceName: String = "USPS - Priority Mail",
+        status: String = "PURCHASED",
+        packageName: String = "Small Flat Rate Box",
+        rate: Float = 7.65F,
+        refundableAmount: Float = 7.65F,
+        currency: String = "USD",
+        refund: String? = null,
+        productNames: String = "[Woo T-shirt, Herman Chair]",
+        productIds: String = "[60, 61, 62]"
+    ): WCShippingLabelModel {
+        return WCShippingLabelModel().apply {
+            localSiteId = siteId
+            remoteOrderId = orderId
+            remoteShippingLabelId = remoteId
+            this.carrierId = carrierId
+            this.serviceName = serviceName
+            this.packageName = packageName
+            this.status = status
+            this.rate = rate
+            this.refundableAmount = refundableAmount
+            this.currency = currency
+            this.productNames = productNames
+            this.productIds = productIds
+            refund?.let { this.refund = it }
+        }
+    }
+
+    fun generateShippingLabelList(
+        siteId: Int = 6,
+        orderId: Long = 12,
+        remoteShippingLabelId: Long = 0
+    ): List<WCShippingLabelModel> {
+        with(ArrayList<WCShippingLabelModel>()) {
+            add(generateSampleShippingLabel(
+                    siteId = siteId,
+                    orderId = orderId,
+                    remoteId = remoteShippingLabelId + 1,
+                    refund = "{\"status\": \"pending\",\"request_date\": 1604847663000}"
+            ))
+            add(generateSampleShippingLabel(siteId = siteId, orderId = orderId, remoteId = remoteShippingLabelId + 2))
+            add(generateSampleShippingLabel(siteId = siteId, orderId = orderId, remoteId = remoteShippingLabelId + 3))
+            add(generateSampleShippingLabel(siteId = siteId, orderId = orderId, remoteId = remoteShippingLabelId + 4))
+            add(generateSampleShippingLabel(siteId = siteId, orderId = orderId, remoteId = remoteShippingLabelId + 5))
+            return this
+        }
+    }
+
+    fun generateSampleShippingLabelApiResponse(): ShippingLabelApiResponse? {
+        val json = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/shipping-labels.json")
+        val responseType = object : TypeToken<ShippingLabelApiResponse>() {}.type
+        return Gson().fromJson(json, responseType) as? ShippingLabelApiResponse
+    }
+
+    fun generateSamplePrintShippingLabelApiResponse(): PrintShippingLabelApiResponse? {
+        val json = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/print-shipping-labels.json")
+        val responseType = object : TypeToken<PrintShippingLabelApiResponse>() {}.type
+        return Gson().fromJson(json, responseType) as? PrintShippingLabelApiResponse
+    }
+
+    fun generateSampleGetPackagesApiResponse(): GetPackageTypesResponse? {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/shipping-labels-packages.json"
+        )
+        val responseType = object : TypeToken<GetPackageTypesResponse>() {}.type
+        return Gson().fromJson(json, responseType) as? GetPackageTypesResponse
+    }
+
+    fun generateSampleGetShippingRatesApiResponse(): ShippingRatesApiResponse? {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/shipping-labels-carriers.json"
+        )
+        val responseType = object : TypeToken<ShippingRatesApiResponse>() {}.type
+        return Gson().fromJson(json, responseType) as? ShippingRatesApiResponse
+    }
+
+    fun generateSampleAccountSettingsApiResponse(): AccountSettingsApiResponse {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/shipping-labels-account-settings.json"
+        )
+        return Gson().fromJson(json, AccountSettingsApiResponse::class.java)
+    }
+
+    fun generateSamplePurchaseShippingLabelsApiResponse(): ShippingLabelStatusApiResponse {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/purchase-shipping-labels.json"
+        )
+        return Gson().fromJson(json, ShippingLabelStatusApiResponse::class.java)
+    }
+
+    fun generateSampleShippingLabelsStatusApiResponse(done: Boolean): ShippingLabelStatusApiResponse {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/status-shipping-labels-${if (done) 2 else 1}.json"
+        )
+        return Gson().fromJson(json, ShippingLabelStatusApiResponse::class.java)
+    }
+
+    fun generateErrorShippingLabelsStatusApiResponse(): ShippingLabelStatusApiResponse {
+        val json = UnitTestUtils.getStringFromResourceFile(
+                this.javaClass,
+                "wc/status-shipping-labels-error.json"
+        )
+        return Gson().fromJson(json, ShippingLabelStatusApiResponse::class.java)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsSqlUtilsTest.kt
new file mode 100644
index 00000000000..07ad9062db5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsSqlUtilsTest.kt
@@ -0,0 +1,209 @@
+package org.wordpress.android.fluxc.wc.stats
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.persistence.WCStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCStatsSqlUtilsTest {
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(WCRevenueStatsModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testSimpleInsertionAndRetrievalOfRevenueStats() {
+        // insert a first stats entry and verify that it is stored correctly
+        val revenueStatsModel = WCStatsTestUtils.generateSampleRevenueStatsModel()
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(revenueStatsModel)
+
+        with(WellSql.select(WCRevenueStatsModel::class.java).asModel) {
+            assertEquals(1, size)
+            assertEquals(revenueStatsModel.interval, first().interval)
+            assertEquals(revenueStatsModel.startDate, first().startDate)
+            assertEquals(revenueStatsModel.endDate, first().endDate)
+        }
+
+        // Create a second stats entry for this site with same start & end date but with different interval
+        val revenueStatsModel2 =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        interval = StatsGranularity.MONTHS.toString(), data = "fake-data"
+                )
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(revenueStatsModel2)
+
+        with(WellSql.select(WCRevenueStatsModel::class.java).asModel) {
+            assertEquals(2, size)
+            assertEquals(revenueStatsModel.interval, first().interval)
+            assertEquals(revenueStatsModel.startDate, first().startDate)
+            assertEquals(revenueStatsModel.endDate, first().endDate)
+            assertEquals(revenueStatsModel2.interval, get(1).interval)
+            assertEquals(revenueStatsModel2.startDate, get(1).startDate)
+            assertEquals(revenueStatsModel2.endDate, get(1).endDate)
+        }
+
+        // Create a third stats entry for this site with same interval but different start & end date
+        val revenueStatsModel3 =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        data = "fake-data2", startDate = "2019-07-07 00:00:00", endDate = "2019-07-13 23:59:59"
+                )
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(revenueStatsModel3)
+
+        with(WellSql.select(WCRevenueStatsModel::class.java).asModel) {
+            assertEquals(3, size)
+            assertEquals(revenueStatsModel.interval, first().interval)
+            assertEquals(revenueStatsModel.startDate, first().startDate)
+            assertEquals(revenueStatsModel.endDate, first().endDate)
+            assertEquals(revenueStatsModel2.interval, get(1).interval)
+            assertEquals(revenueStatsModel2.startDate, get(1).startDate)
+            assertEquals(revenueStatsModel2.endDate, get(1).endDate)
+            assertEquals(revenueStatsModel3.interval, get(2).interval)
+            assertEquals(revenueStatsModel3.startDate, get(2).startDate)
+            assertEquals(revenueStatsModel3.endDate, get(2).endDate)
+        }
+
+        // Overwrite an existing entry and verify that update is happening correctly
+        val revenueStatsModel4 = WCStatsTestUtils.generateSampleRevenueStatsModel()
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(revenueStatsModel4)
+
+        with(WellSql.select(WCRevenueStatsModel::class.java).asModel) {
+            assertEquals(3, size)
+            assertEquals(revenueStatsModel.interval, first().interval)
+            assertEquals(revenueStatsModel.startDate, first().startDate)
+            assertEquals(revenueStatsModel.endDate, first().endDate)
+            assertEquals(revenueStatsModel2.interval, get(1).interval)
+            assertEquals(revenueStatsModel2.startDate, get(1).startDate)
+            assertEquals(revenueStatsModel2.endDate, get(1).endDate)
+            assertEquals(revenueStatsModel3.interval, get(2).interval)
+            assertEquals(revenueStatsModel3.startDate, get(2).startDate)
+            assertEquals(revenueStatsModel3.endDate, get(2).endDate)
+        }
+
+        // Add another "day" entry, but for another site
+        val revenueStatsModel5 = WCStatsTestUtils.generateSampleRevenueStatsModel(localSiteId = 8)
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(revenueStatsModel5)
+
+        with(WellSql.select(WCRevenueStatsModel::class.java).asModel) {
+            assertEquals(4, size)
+            assertEquals(revenueStatsModel.interval, first().interval)
+            assertEquals(revenueStatsModel.startDate, first().startDate)
+            assertEquals(revenueStatsModel.endDate, first().endDate)
+            assertEquals(revenueStatsModel2.interval, get(1).interval)
+            assertEquals(revenueStatsModel2.startDate, get(1).startDate)
+            assertEquals(revenueStatsModel2.endDate, get(1).endDate)
+            assertEquals(revenueStatsModel3.interval, get(2).interval)
+            assertEquals(revenueStatsModel3.startDate, get(2).startDate)
+            assertEquals(revenueStatsModel3.endDate, get(2).endDate)
+            assertEquals(revenueStatsModel5.interval, get(3).interval)
+            assertEquals(revenueStatsModel5.localSiteId, get(3).localSiteId)
+            assertEquals(revenueStatsModel5.startDate, get(3).startDate)
+            assertEquals(revenueStatsModel5.endDate, get(3).endDate)
+        }
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testGetRawRevenueStatsForSiteAndUnit() {
+        // revenue stats model for current day
+        val currentDayStatsModel = WCStatsTestUtils.generateSampleRevenueStatsModel()
+        val site = SiteModel().apply { id = currentDayStatsModel.localSiteId }
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(currentDayStatsModel)
+
+        // revenue stats model for this week
+        val currentWeekStatsModel =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        interval = StatsGranularity.WEEKS.toString(),
+                        data = "fake-data", startDate = "2019-07-07", endDate = "2019-07-09"
+                )
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(currentWeekStatsModel)
+
+        // revenue stats model for this month
+        val currentMonthStatsModel =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        interval = StatsGranularity.MONTHS.toString(),
+                        data = "fake-data", startDate = "2019-07-01", endDate = "2019-07-09"
+                )
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(currentMonthStatsModel)
+
+        // current day stats for alternate site
+        val site2 = SiteModel().apply { id = 8 }
+        val altSiteOrderStatsModel = WCStatsTestUtils.generateSampleRevenueStatsModel(
+                localSiteId = site2.id
+        )
+        WCStatsSqlUtils.insertOrUpdateRevenueStats(altSiteOrderStatsModel)
+
+        val currentDayStats = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site, StatsGranularity.DAYS, currentDayStatsModel.startDate, currentDayStatsModel.endDate
+        )
+        assertNotNull(currentDayStats)
+        with(currentDayStats) {
+            assertEquals(currentDayStatsModel.interval, interval)
+            assertEquals(currentDayStatsModel.startDate, startDate)
+            assertEquals(currentDayStatsModel.endDate, endDate)
+            assertEquals(currentDayStatsModel.localSiteId, localSiteId)
+        }
+
+        val currentWeekStats = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site, StatsGranularity.WEEKS, currentWeekStatsModel.startDate, currentWeekStatsModel.endDate
+        )
+        assertNotNull(currentWeekStats)
+        with(currentWeekStats) {
+            assertEquals(currentWeekStatsModel.interval, interval)
+            assertEquals(currentWeekStatsModel.startDate, startDate)
+            assertEquals(currentWeekStatsModel.endDate, endDate)
+            assertEquals(currentWeekStatsModel.localSiteId, localSiteId)
+        }
+
+        val currentMonthStats = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site, StatsGranularity.MONTHS, currentMonthStatsModel.startDate, currentMonthStatsModel.endDate
+        )
+        assertNotNull(currentMonthStats)
+        with(currentMonthStats) {
+            assertEquals(currentMonthStatsModel.interval, interval)
+            assertEquals(currentMonthStatsModel.startDate, startDate)
+            assertEquals(currentMonthStatsModel.endDate, endDate)
+            assertEquals(currentMonthStatsModel.localSiteId, localSiteId)
+        }
+
+        val altCurrentDayStats = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site2, StatsGranularity.DAYS, altSiteOrderStatsModel.startDate, altSiteOrderStatsModel.endDate
+        )
+        assertNotNull(altCurrentDayStats)
+        with(altCurrentDayStats) {
+            assertEquals(altCurrentDayStats.interval, interval)
+            assertEquals(altSiteOrderStatsModel.startDate, startDate)
+            assertEquals(altSiteOrderStatsModel.endDate, endDate)
+            assertEquals(altSiteOrderStatsModel.localSiteId, localSiteId)
+        }
+
+        val nonExistentSite = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                SiteModel().apply { id = 88 },
+                StatsGranularity.DAYS, currentDayStatsModel.startDate, currentDayStatsModel.endDate
+        )
+        assertNull(nonExistentSite)
+
+        val missingData = WCStatsSqlUtils.getRevenueStatsForSiteIntervalAndDate(
+                site, StatsGranularity.YEARS, currentDayStatsModel.startDate, currentDayStatsModel.endDate)
+        assertNull(missingData)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsStoreTest.kt
new file mode 100644
index 00000000000..71f35d2d2ff
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsStoreTest.kt
@@ -0,0 +1,1015 @@
+package org.wordpress.android.fluxc.wc.stats
+
+import androidx.room.Room
+import com.yarolegovich.wellsql.WellSql
+import junit.framework.TestCase.assertFalse
+import kotlinx.coroutines.runBlocking
+import org.hamcrest.CoreMatchers.anyOf
+import org.hamcrest.CoreMatchers.not
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.WCNewVisitorStatsModel
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.model.WCVisitorStatsSummary
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats.BundleStatsApiResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats.BundleStatsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bundlestats.BundleStatsTotals
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats.OrderStatsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.orderstats.VisitorStatsSummaryApiResponse
+import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
+import org.wordpress.android.fluxc.persistence.WCVisitorStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCStatsStore
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsPayload
+import org.wordpress.android.fluxc.store.WCStatsStore.FetchRevenueStatsResponsePayload
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import org.wordpress.android.fluxc.utils.DateUtils
+import org.wordpress.android.fluxc.utils.SiteUtils.getCurrentDateTimeForSite
+import java.text.SimpleDateFormat
+import java.util.Date
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import org.hamcrest.CoreMatchers.`is` as isEqual
+
+@Suppress("LargeClass")
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCStatsStoreTest {
+    private val mockOrderStatsRestClient = mock<OrderStatsRestClient>()
+    private val mockBundleStatsRestClient = mock<BundleStatsRestClient>()
+    private val appContext = RuntimeEnvironment.application.applicationContext
+    private lateinit var wcStatsStore: WCStatsStore
+
+    @Before
+    fun setUp() {
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                    WCRevenueStatsModel::class.java,
+                    WCNewVisitorStatsModel::class.java
+                ),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        val database = Room.inMemoryDatabaseBuilder(appContext, WCAndroidDatabase::class.java)
+            .allowMainThreadQueries()
+            .build()
+
+        wcStatsStore = WCStatsStore(
+            dispatcher = Dispatcher(),
+            wcOrderStatsClient = mockOrderStatsRestClient,
+            bundleStatsRestClient = mockBundleStatsRestClient,
+            coroutineEngine = initCoroutineEngine(),
+            visitorSummaryStatsDao = database.visitorSummaryStatsDao
+        )
+    }
+
+    @Test
+    fun testGetQuantityForDays() {
+        val quantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-25",
+            "2018-01-28"
+        )
+        assertEquals(4, quantity1)
+
+        val quantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-01",
+            "2018-01-01"
+        )
+        assertEquals(1, quantity2)
+
+        val quantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-01",
+            "2018-01-31"
+        )
+        assertEquals(31, quantity3)
+
+        val quantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-28",
+            "2018-01-25"
+        )
+        assertEquals(4, quantity4)
+
+        val quantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-01",
+            "2018-01-01"
+        )
+        assertEquals(1, quantity5)
+
+        val quantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.DAYS, "2018-01-31",
+            "2018-01-01"
+        )
+        assertEquals(31, quantity6)
+    }
+
+    @Suppress("LongMethod")
+    @Test
+    fun testGetQuantityForWeeks() {
+        val quantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-10-22",
+            "2018-10-23"
+        )
+        assertEquals(1, quantity1)
+
+        val quantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2017-01-01",
+            "2018-01-01"
+        )
+        assertEquals(53, quantity2)
+
+        val quantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2019-01-20",
+            "2019-01-13"
+        )
+        assertEquals(2, quantity3)
+
+        val quantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2017-01-01",
+            "2018-03-01"
+        )
+        assertEquals(61, quantity4)
+
+        val quantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-01-01",
+            "2018-01-31"
+        )
+        assertEquals(5, quantity5)
+
+        val quantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-12-01",
+            "2018-12-31"
+        )
+        assertEquals(6, quantity6)
+
+        val quantity7 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-11-01",
+            "2018-11-30"
+        )
+        assertEquals(5, quantity7)
+
+        val inverseQuantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-10-23",
+            "2018-10-22"
+        )
+        assertEquals(1, inverseQuantity1)
+
+        val inverseQuantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-01-01",
+            "2017-01-01"
+        )
+        assertEquals(53, inverseQuantity2)
+
+        val inverseQuantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2019-01-13",
+            "2019-01-20"
+        )
+        assertEquals(2, inverseQuantity3)
+
+        val inverseQuantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-03-01",
+            "2017-01-01"
+        )
+        assertEquals(61, inverseQuantity4)
+
+        val inverseQuantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-01-31",
+            "2018-01-01"
+        )
+        assertEquals(5, inverseQuantity5)
+
+        val inverseQuantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-12-31",
+            "2018-12-01"
+        )
+        assertEquals(6, inverseQuantity6)
+
+        val inverseQuantity7 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.WEEKS, "2018-11-30",
+            "2018-11-01"
+        )
+        assertEquals(5, inverseQuantity7)
+    }
+
+    @Suppress("LongMethod")
+    @Test
+    fun testGetQuantityForMonths() {
+        val quantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-10-22",
+            "2018-10-23"
+        )
+        assertEquals(1, quantity1)
+
+        val quantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2017-01-01",
+            "2018-01-01"
+        )
+        assertEquals(13, quantity2)
+
+        val quantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-01-01",
+            "2018-01-01"
+        )
+        assertEquals(1, quantity3)
+
+        val quantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2017-01-01",
+            "2018-03-01"
+        )
+        assertEquals(15, quantity4)
+
+        val quantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2017-01-01",
+            "2018-01-31"
+        )
+        assertEquals(13, quantity5)
+
+        val quantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-12-31",
+            "2019-01-01"
+        )
+        assertEquals(2, quantity6)
+
+        val inverseQuantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-10-23",
+            "2018-10-22"
+        )
+        assertEquals(1, inverseQuantity1)
+
+        val inverseQuantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-01-01",
+            "2017-01-01"
+        )
+        assertEquals(13, inverseQuantity2)
+
+        val inverseQuantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-01-01",
+            "2018-01-01"
+        )
+        assertEquals(1, inverseQuantity3)
+
+        val inverseQuantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-03-01",
+            "2017-01-01"
+        )
+        assertEquals(15, inverseQuantity4)
+
+        val inverseQuantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2018-01-31",
+            "2017-01-01"
+        )
+        assertEquals(13, inverseQuantity5)
+
+        val inverseQuantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.MONTHS, "2019-01-01",
+            "2018-12-31"
+        )
+        assertEquals(2, inverseQuantity6)
+    }
+
+    @Suppress("LongMethod")
+    @Test
+    fun testGetQuantityForYears() {
+        val quantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2017-01-01",
+            "2018-01-01"
+        )
+        assertEquals(2, quantity1)
+
+        val quantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2017-01-01",
+            "2018-03-01"
+        )
+        assertEquals(2, quantity2)
+
+        val quantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2017-01-01",
+            "2018-01-05"
+        )
+        assertEquals(2, quantity3)
+
+        val quantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2017-01-01",
+            "2019-03-01"
+        )
+        assertEquals(3, quantity4)
+
+        val quantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2015-03-05",
+            "2017-01-01"
+        )
+        assertEquals(3, quantity5)
+
+        val quantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2018-12-31",
+            "2019-01-01"
+        )
+        assertEquals(2, quantity6)
+
+        val quantity7 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2019-01-25",
+            "2019-01-25"
+        )
+        assertEquals(1, quantity7)
+
+        val inverseQuantity1 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2018-01-01",
+            "2017-01-01"
+        )
+        assertEquals(2, inverseQuantity1)
+
+        val inverseQuantity2 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2018-03-01",
+            "2017-01-01"
+        )
+        assertEquals(2, inverseQuantity2)
+
+        val inverseQuantity3 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2018-01-05",
+            "2017-01-01"
+        )
+        assertEquals(2, inverseQuantity3)
+
+        val inverseQuantity4 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2019-03-01",
+            "2017-01-01"
+        )
+        assertEquals(3, inverseQuantity4)
+
+        val inverseQuantity5 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2017-01-01",
+            "2015-03-05"
+        )
+        assertEquals(3, inverseQuantity5)
+
+        val inverseQuantity6 = wcStatsStore.getVisitorStatsQuantity(
+            StatsGranularity.YEARS, "2019-01-01",
+            "2018-12-31"
+        )
+        assertEquals(2, inverseQuantity6)
+    }
+
+    @Test
+    fun testFetchCurrentDayRevenueStatsDate() = runBlocking {
+        val plus12SiteDate = SiteModel().apply { timezone = "12" }.let {
+            whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any())
+            ).thenReturn(FetchRevenueStatsResponsePayload(it, StatsGranularity.DAYS, WCRevenueStatsModel()))
+            val startDate = DateUtils.getStartDateForSite(it, DateUtils.formatDate("yyyy-MM-dd'T'00:00:00", Date()))
+            val endDate = DateUtils.getEndDateForSite(it)
+            val payload = FetchRevenueStatsPayload(it, StatsGranularity.DAYS, startDate, endDate)
+            wcStatsStore.fetchRevenueStats(payload)
+
+            val timeOnSite = getCurrentDateTimeForSite(it, "yyyy-MM-dd'T'00:00:00")
+
+            // The date value passed to the network client should match the current date on the site
+            val dateArgument = argumentCaptor<String>()
+            verify(mockOrderStatsRestClient).fetchRevenueStats(any(), any(),
+                    dateArgument.capture(), any(), any(), any(), any(), any())
+            val siteDate = dateArgument.firstValue
+            assertEquals(timeOnSite, siteDate)
+            return@let siteDate
+        }
+
+        reset(mockOrderStatsRestClient)
+
+        val minus12SiteDate = SiteModel().apply { timezone = "-12" }.let {
+            whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any())
+            ).thenReturn(FetchRevenueStatsResponsePayload(it, StatsGranularity.DAYS, WCRevenueStatsModel()))
+            val startDate = DateUtils.getStartDateForSite(it, DateUtils.formatDate("yyyy-MM-dd'T'00:00:00", Date()))
+            val endDate = DateUtils.getEndDateForSite(it)
+            val payload = FetchRevenueStatsPayload(it, StatsGranularity.DAYS, startDate, endDate)
+            wcStatsStore.fetchRevenueStats(payload)
+
+            val timeOnSite = getCurrentDateTimeForSite(it, "yyyy-MM-dd'T'00:00:00")
+
+            // The date value passed to the network client should match the current date on the site
+            val dateArgument = argumentCaptor<String>()
+            verify(mockOrderStatsRestClient).fetchRevenueStats(any(), any(), dateArgument.capture(), any(),
+                    any(), any(), any(), any())
+            val siteDate = dateArgument.firstValue
+            assertEquals(timeOnSite, siteDate)
+            return@let siteDate
+        }
+
+        // The two test sites are 24 hours apart, so we are guaranteed to have one site date match the local date,
+        // and the other not match it
+        val localDate = SimpleDateFormat("yyyy-MM-dd'T'00:00:00").format(Date())
+        assertThat(localDate, anyOf(isEqual(plus12SiteDate), isEqual(minus12SiteDate)))
+        assertThat(localDate, anyOf(not(plus12SiteDate), not(minus12SiteDate)))
+    }
+
+    @Test
+    fun testFetchCurrentDayRevenueStatsDateSpecificEndDate() = runBlocking {
+        val plus12SiteDate = SiteModel().apply { timezone = "12" }.let {
+            whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any())
+            ).thenReturn(FetchRevenueStatsResponsePayload(it, StatsGranularity.DAYS, WCRevenueStatsModel()))
+            val startDate = DateUtils.getStartDateForSite(it, DateUtils.formatDate("yyyy-MM-dd'T'00:00:00", Date()))
+            val endDate = DateUtils.formatDate("yyyy-MM-dd", Date())
+
+            val payload = FetchRevenueStatsPayload(it, StatsGranularity.DAYS, startDate, endDate)
+            wcStatsStore.fetchRevenueStats(payload)
+
+            val timeOnSite = getCurrentDateTimeForSite(it, "yyyy-MM-dd'T'00:00:00")
+
+            // The date value passed to the network client should match the current date on the site
+            val dateArgument = argumentCaptor<String>()
+            verify(mockOrderStatsRestClient).fetchRevenueStats(any(), any(),
+                    dateArgument.capture(), any(), any(), any(), any(), any())
+            val siteDate = dateArgument.firstValue
+            assertEquals(timeOnSite, siteDate)
+            return@let siteDate
+        }
+
+        reset(mockOrderStatsRestClient)
+
+        val minus12SiteDate = SiteModel().apply { timezone = "-12" }.let {
+            whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any())
+            ).thenReturn(FetchRevenueStatsResponsePayload(it, StatsGranularity.DAYS, WCRevenueStatsModel()))
+            val startDate = DateUtils.getStartDateForSite(it, DateUtils.formatDate("yyyy-MM-dd'T'00:00:00", Date()))
+            val endDate = DateUtils.getEndDateForSite(it)
+            val payload = FetchRevenueStatsPayload(it, StatsGranularity.DAYS, startDate, endDate)
+            wcStatsStore.fetchRevenueStats(payload)
+
+            val timeOnSite = getCurrentDateTimeForSite(it, "yyyy-MM-dd'T'00:00:00")
+
+            // The date value passed to the network client should match the current date on the site
+            val dateArgument = argumentCaptor<String>()
+            verify(mockOrderStatsRestClient).fetchRevenueStats(any(), any(), dateArgument.capture(), any(),
+                    any(), any(), any(), any())
+            val siteDate = dateArgument.firstValue
+            assertEquals(timeOnSite, siteDate)
+            return@let siteDate
+        }
+
+        // The two test sites are 24 hours apart, so we are guaranteed to have one site date match the local date,
+        // and the other not match it
+        val localDate = SimpleDateFormat("yyyy-MM-dd'T'00:00:00").format(Date())
+        assertThat(localDate, anyOf(isEqual(plus12SiteDate), isEqual(minus12SiteDate)))
+        assertThat(localDate, anyOf(not(plus12SiteDate), not(minus12SiteDate)))
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testGetRevenueAndOrderStatsForSite() = runBlocking {
+        // revenue stats model for current day
+        val currentDayStatsModel = WCStatsTestUtils.generateSampleRevenueStatsModel()
+        val site = SiteModel().apply { id = currentDayStatsModel.localSiteId }
+        val currentDayGranularity = StatsGranularity.valueOf(currentDayStatsModel.interval.toUpperCase())
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(
+                        FetchRevenueStatsResponsePayload(
+                                site,
+                                currentDayGranularity,
+                                currentDayStatsModel
+                        )
+                )
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                        site,
+                        currentDayGranularity,
+                        currentDayStatsModel.startDate,
+                        currentDayStatsModel.endDate
+                )
+        )
+
+        // verify that the revenue stats & order count is not empty
+        val currentDayRevenueStats = wcStatsStore.getGrossRevenueStats(
+                site, StatsGranularity.valueOf(currentDayStatsModel.interval.toUpperCase()),
+                currentDayStatsModel.startDate, currentDayStatsModel.endDate
+        )
+        val currentDayOrderStats = wcStatsStore.getOrderCountStats(
+                site, StatsGranularity.valueOf(currentDayStatsModel.interval.toUpperCase()),
+                currentDayStatsModel.startDate, currentDayStatsModel.endDate
+        )
+
+        assertTrue(currentDayRevenueStats.isNotEmpty())
+        assertTrue(currentDayOrderStats.isNotEmpty())
+
+        // revenue stats model for this week
+        val currentWeekStatsModel =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        interval = StatsGranularity.WEEKS.toString(), startDate = "2019-07-07", endDate = "2019-07-09"
+                )
+        val curretnWeekGranularity = StatsGranularity.valueOf(currentWeekStatsModel.interval.toUpperCase())
+        val currentWeekPayload = FetchRevenueStatsResponsePayload(
+                site, curretnWeekGranularity, currentWeekStatsModel
+        )
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(currentWeekPayload)
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                        site,
+                        curretnWeekGranularity,
+                        currentWeekStatsModel.startDate,
+                        currentWeekStatsModel.endDate
+                )
+        )
+
+        // verify that the revenue stats & order count is not empty
+        val currentWeekRevenueStats = wcStatsStore.getGrossRevenueStats(
+                site, StatsGranularity.valueOf(currentWeekStatsModel.interval.toUpperCase()),
+                currentWeekStatsModel.startDate, currentWeekStatsModel.endDate
+        )
+        val currentWeekOrderStats = wcStatsStore.getOrderCountStats(
+                site, StatsGranularity.valueOf(currentWeekStatsModel.interval.toUpperCase()),
+                currentWeekStatsModel.startDate, currentWeekStatsModel.endDate
+        )
+
+        assertTrue(currentWeekRevenueStats.isNotEmpty())
+        assertTrue(currentWeekOrderStats.isNotEmpty())
+
+        // revenue stats model for this month
+        val currentMonthStatsModel =
+                WCStatsTestUtils.generateSampleRevenueStatsModel(
+                        interval = StatsGranularity.MONTHS.toString(), startDate = "2019-07-01", endDate = "2019-07-09"
+                )
+        val currentMonthGranularity = StatsGranularity.valueOf(currentMonthStatsModel.interval.toUpperCase())
+        val currentMonthPayload = FetchRevenueStatsResponsePayload(
+                site, currentMonthGranularity, currentMonthStatsModel
+        )
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(currentMonthPayload)
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                        site,
+                        currentMonthGranularity,
+                        currentMonthStatsModel.startDate,
+                        currentMonthStatsModel.endDate
+                )
+        )
+
+        // verify that the revenue stats & order count is not empty
+        val currentMonthRevenueStats = wcStatsStore.getGrossRevenueStats(
+                site, StatsGranularity.valueOf(currentMonthStatsModel.interval.toUpperCase()),
+                currentMonthStatsModel.startDate, currentMonthStatsModel.endDate
+        )
+        val currentMonthOrderStats = wcStatsStore.getOrderCountStats(
+                site, StatsGranularity.valueOf(currentMonthStatsModel.interval.toUpperCase()),
+                currentMonthStatsModel.startDate, currentMonthStatsModel.endDate
+        )
+
+        assertTrue(currentMonthRevenueStats.isNotEmpty())
+        assertTrue(currentMonthOrderStats.isNotEmpty())
+
+        // current day stats for alternate site
+        val site2 = SiteModel().apply { id = 8 }
+        val altSiteOrderStatsModel = WCStatsTestUtils.generateSampleRevenueStatsModel(
+                localSiteId = site2.id, interval = StatsGranularity.DAYS.toString()
+        )
+        val allSiteCurrentDayGranularity = StatsGranularity.valueOf(altSiteOrderStatsModel.interval.toUpperCase())
+        val allSiteCurrentDayPayload = FetchRevenueStatsResponsePayload(
+                site, allSiteCurrentDayGranularity, altSiteOrderStatsModel
+        )
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(allSiteCurrentDayPayload)
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                        site,
+                        allSiteCurrentDayGranularity,
+                        altSiteOrderStatsModel.startDate,
+                        altSiteOrderStatsModel.endDate
+                )
+        )
+
+        // verify that the revenue stats & order count is not empty
+        val altSiteCurrentDayRevenueStats = wcStatsStore.getGrossRevenueStats(
+                site, StatsGranularity.valueOf(altSiteOrderStatsModel.interval.toUpperCase()),
+                altSiteOrderStatsModel.startDate, altSiteOrderStatsModel.endDate
+        )
+        val altSiteCurrentDayOrderStats = wcStatsStore.getOrderCountStats(
+                site, StatsGranularity.valueOf(altSiteOrderStatsModel.interval.toUpperCase()),
+                altSiteOrderStatsModel.startDate, altSiteOrderStatsModel.endDate
+        )
+
+        assertTrue(altSiteCurrentDayRevenueStats.isNotEmpty())
+        assertTrue(altSiteCurrentDayOrderStats.isNotEmpty())
+
+        // non existentSite
+        val nonExistentSite = SiteModel().apply { id = 88 }
+        val nonExistentSiteGranularity = StatsGranularity.valueOf(altSiteOrderStatsModel.interval)
+        val nonExistentPayload = FetchRevenueStatsResponsePayload(
+                nonExistentSite, nonExistentSiteGranularity, altSiteOrderStatsModel
+        )
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(nonExistentPayload)
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                        site,
+                        nonExistentSiteGranularity,
+                        altSiteOrderStatsModel.startDate,
+                        altSiteOrderStatsModel.endDate
+                )
+        )
+
+        // verify that the revenue stats & order count is empty
+        val nonExistentRevenueStats = wcStatsStore.getGrossRevenueStats(
+                nonExistentSite, StatsGranularity.valueOf(altSiteOrderStatsModel.interval.toUpperCase()),
+                altSiteOrderStatsModel.startDate, altSiteOrderStatsModel.endDate
+        )
+        val nonExistentOrderStats = wcStatsStore.getOrderCountStats(
+                nonExistentSite, StatsGranularity.valueOf(altSiteOrderStatsModel.interval.toUpperCase()),
+                altSiteOrderStatsModel.startDate, altSiteOrderStatsModel.endDate
+        )
+
+        assertTrue(nonExistentRevenueStats.isEmpty())
+        assertTrue(nonExistentOrderStats.isEmpty())
+
+        // missing data
+        whenever(mockOrderStatsRestClient.fetchRevenueStats(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenReturn(nonExistentPayload)
+        wcStatsStore.fetchRevenueStats(
+                FetchRevenueStatsPayload(
+                    site = site,
+                    granularity = StatsGranularity.YEARS,
+                    startDate = "2019-01-01",
+                    endDate = "2019-01-07"
+                )
+        )
+
+        // verify that the revenue stats & order count is empty
+        val missingRevenueStats = wcStatsStore.getGrossRevenueStats(
+                site, StatsGranularity.YEARS, "2019-01-01", "2019-01-07"
+        )
+        val missingOrderStats = wcStatsStore.getOrderCountStats(
+                site, StatsGranularity.YEARS, "2019-01-01", "2019-01-07"
+        )
+        assertTrue(missingRevenueStats.isEmpty())
+        assertTrue(missingOrderStats.isEmpty())
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testGetVisitorStatsForCurrentDayGranularity() {
+        // Test Scenario - 1: Generate default visitor stats i.e. isCustomField - false
+        // Get visitor Stats of the same site and granularity and assert not null
+        val defaultDayVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel()
+        val site = SiteModel().apply { id = defaultDayVisitorStatsModel.localSiteId }
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(defaultDayVisitorStatsModel)
+
+        val defaultDayVisitorStats = wcStatsStore.getNewVisitorStats(site, StatsGranularity.DAYS)
+        assertTrue(defaultDayVisitorStats.isNotEmpty())
+
+        // Test Scenario - 2: Generate default visitor stats with a different date
+        // Get visitor of the same site and granularity and assert not null
+        val defaultDayVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                endDate = "2019-08-02"
+        )
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(defaultDayVisitorStatsModel2)
+        val defaultDayVisitorStats2 = wcStatsStore.getNewVisitorStats(site, StatsGranularity.DAYS)
+        assertTrue(defaultDayVisitorStats2.isNotEmpty())
+
+        // Test Scenario - 3: Generate custom stats for same site i.e. isCustomField - true
+        // Get visitor Stats of the same site and granularity and assert not null
+        val customDayVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                quantity = "1", endDate = "2019-08-06", startDate = "2019-08-06"
+        )
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customDayVisitorStatsModel)
+
+        val customDayVisitorStats = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.DAYS, customDayVisitorStatsModel.quantity,
+                customDayVisitorStatsModel.endDate, customDayVisitorStatsModel.isCustomField
+        )
+        assertTrue(customDayVisitorStats.isNotEmpty())
+
+        // Test Scenario - 4: Query for custom visitor stats that is not present in local cache:
+        // for same site, same quantity, different date
+        // Get visitor Stats of the same site and granularity and assert null
+        val customDayVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                quantity = "1", endDate = "2019-01-01", startDate = "2019-01-01"
+        )
+        val customDayVisitorStats2 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.DAYS, customDayVisitorStatsModel2.quantity,
+                customDayVisitorStatsModel2.endDate, customDayVisitorStatsModel2.isCustomField
+        )
+        assertTrue(customDayVisitorStats2.isEmpty())
+
+        // Test Scenario - 5: Query for custom visitor stats that is not present in local cache:
+        // for same site, different quantity, different date
+        // Get visitor Stats of the same site and granularity and assert null
+        val customDayVisitorStatsModel3 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                quantity = "1", endDate = "2019-01-01", startDate = "2019-01-01"
+        )
+
+        val customDayVisitorStats3 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.DAYS, customDayVisitorStatsModel3.quantity,
+                customDayVisitorStatsModel3.endDate, customDayVisitorStatsModel3.isCustomField
+        )
+        assertTrue(customDayVisitorStats3.isEmpty())
+
+        // Test Scenario - 6: Generate custom visitor stats for same site with different granularity (WEEKS),
+        // same date(2019-01-01), same quantity (1) i.e. isCustomField - true
+        // Get visitor Stats and assert Not Null
+        // Now if another query ran for granularity - DAYS, with same date and same quantity: assert null
+        val customWeekVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                quantity = "1",
+                endDate = "2019-02-01", startDate = "2019-02-01",
+                granularity = StatsGranularity.WEEKS.toString()
+        )
+
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customWeekVisitorStatsModel)
+
+        val customWeekVisitorStats = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel.quantity,
+                customWeekVisitorStatsModel.endDate, customWeekVisitorStatsModel.isCustomField
+        )
+        assertTrue(customWeekVisitorStats.isNotEmpty())
+
+        val customDayVisitorStats4 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.DAYS, customDayVisitorStatsModel.quantity,
+                customDayVisitorStatsModel.endDate, customDayVisitorStatsModel.isCustomField
+        )
+        assertTrue(customDayVisitorStats4.isEmpty())
+
+        // Test Scenario - 7: Generate custom stats for different site(8) with same granularity(WEEKS),
+        // same date(2019-01-01), same quantity(1) i.e. isCustomField - true
+        // Get visitor Stats and assert Not Null
+        // Now if scenario 4 is run again it should assert NOT NULL, since the stats is for different sites
+        val customWeekVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                localSiteId = 8, granularity = StatsGranularity.WEEKS.toString(),
+                quantity = "1", endDate = "2019-02-01", startDate = "2019-02-01"
+        )
+
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customWeekVisitorStatsModel2)
+
+        val customWeekVisitorStats2 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel2.quantity,
+                customWeekVisitorStatsModel2.endDate, customWeekVisitorStatsModel2.isCustomField
+        )
+        assertTrue(customWeekVisitorStats2.isNotEmpty())
+        assertTrue(customWeekVisitorStats.isNotEmpty())
+    }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testGetVisitorStatsForThisWeekGranularity() {
+        // Test Scenario - 1: Generate default visitor stats i.e. isCustomField - false
+        // Get visitor Stats of the same site and granularity and assert not null
+        val defaultWeekVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                granularity = StatsGranularity.WEEKS.toString()
+        )
+        val site = SiteModel().apply { id = defaultWeekVisitorStatsModel.localSiteId }
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(defaultWeekVisitorStatsModel)
+
+        val defaultWeekVisitorStats = wcStatsStore.getNewVisitorStats(site, StatsGranularity.WEEKS)
+        assertTrue(defaultWeekVisitorStats.isNotEmpty())
+
+        // query for days granularity. the visitor stats should be empty
+        val defaultDayVisitorStats = wcStatsStore.getNewVisitorStats(site, StatsGranularity.DAYS)
+        assertTrue(defaultDayVisitorStats.isEmpty())
+
+        // Test Scenario - 2: Generate default visitor stats with a different date
+        // Get visitor of the same site and granularity and assert not null
+        val defaultWeekVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                granularity = StatsGranularity.WEEKS.toString(), endDate = "2019-03-20"
+        )
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(defaultWeekVisitorStatsModel2)
+        val defaultWeekVisitorStats2 = wcStatsStore.getNewVisitorStats(site, StatsGranularity.WEEKS)
+        assertTrue(defaultWeekVisitorStats2.isNotEmpty())
+
+        // Test Scenario - 3: Generate custom stats for same site i.e. isCustomField - true
+        // Get visitor Stats of the same site and granularity and assert not null
+        val customWeekVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                granularity = StatsGranularity.WEEKS.toString(), quantity = "1",
+                endDate = "2019-08-01", startDate = "2019-08-01"
+        )
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customWeekVisitorStatsModel)
+
+        val customWeekVisitorStats = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel.quantity,
+                customWeekVisitorStatsModel.endDate, customWeekVisitorStatsModel.isCustomField
+        )
+        assertTrue(customWeekVisitorStats.isNotEmpty())
+
+        // Test Scenario - 4: Query for custom visitor stats that is not present in local cache:
+        // for same site, same quantity, different date
+        // Get visitor Stats of the same site and granularity and assert null
+        val customWeekVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                granularity = StatsGranularity.WEEKS.toString(), quantity = "1",
+                endDate = "2019-07-01", startDate = "2019-07-01"
+        )
+        val customWeekVisitorStats2 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel2.quantity,
+                customWeekVisitorStatsModel2.endDate, customWeekVisitorStatsModel2.isCustomField
+        )
+        assertTrue(customWeekVisitorStats2.isEmpty())
+
+        // Test Scenario - 5: Query for custom visitor stats that is not present in local cache:
+        // for same site, different quantity, different date
+        // Get visitor Stats of the same site and granularity and assert null
+        val customWeekVisitorStatsModel3 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                granularity = StatsGranularity.WEEKS.toString(), quantity = "1",
+                endDate = "2019-07-01", startDate = "2019-07-01"
+        )
+
+        val customWeekVisitorStats3 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel3.quantity,
+                customWeekVisitorStatsModel3.endDate, customWeekVisitorStatsModel3.isCustomField
+        )
+        assertTrue(customWeekVisitorStats3.isEmpty())
+
+        // Test Scenario - 6: Generate custom visitor stats for same site with different granularity (MONTHS),
+        // same date(2019-01-01), same quantity (1) i.e. isCustomField - true
+        // Get visitor Stats and assert Not Null
+        // Now if another query ran for granularity - WEEKS, with same date and same quantity: assert null
+        val customMonthVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                quantity = "1", endDate = "2019-08-01", startDate = "2019-08-01",
+                granularity = StatsGranularity.MONTHS.toString())
+
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customMonthVisitorStatsModel)
+
+        val customMonthVisitorStats = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.MONTHS, customMonthVisitorStatsModel.quantity,
+                customMonthVisitorStatsModel.endDate, customMonthVisitorStatsModel.isCustomField
+        )
+        assertTrue(customMonthVisitorStats.isNotEmpty())
+
+        val customWeekVisitorStats4 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.WEEKS, customWeekVisitorStatsModel.quantity,
+                customWeekVisitorStatsModel.endDate, customWeekVisitorStatsModel.isCustomField
+        )
+        assertTrue(customWeekVisitorStats4.isEmpty())
+
+        // Test Scenario - 7: Generate custom stats for different site(8) with same granularity(MONTHS),
+        // same date(2019-01-01), same quantity(1) i.e. isCustomField - true
+        // Get visitor Stats and assert Not Null
+        // Now if scenario 4 is run again it should assert NOT NULL, since the stats is for different sites
+        val customMonthVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+                localSiteId = 8, granularity = StatsGranularity.MONTHS.toString(),
+                quantity = "1", endDate = "2019-08-01", startDate = "2019-08-01"
+        )
+
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(customMonthVisitorStatsModel2)
+
+        val customMonthVisitorStats2 = wcStatsStore.getNewVisitorStats(
+                site, StatsGranularity.MONTHS, customMonthVisitorStatsModel2.quantity,
+                customMonthVisitorStatsModel2.endDate, customMonthVisitorStatsModel2.isCustomField
+        )
+        assertTrue(customMonthVisitorStats2.isNotEmpty())
+        assertTrue(customMonthVisitorStats.isNotEmpty())
+    }
+
+    @Test
+    fun testGetNewVisitorStatsWithInvalidData() {
+        // wrong-visitor-stats-data.json includes different wrong formatted data to ensure
+        // that getNewVisitorStats is resilient and can recover from unexpected data
+        //
+        val defaultWeekVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
+            granularity = StatsGranularity.WEEKS.toString(),
+            data = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/wrong-visitor-stats-data.json")
+        )
+        val site = SiteModel().apply { id = defaultWeekVisitorStatsModel.localSiteId }
+        WCVisitorStatsSqlUtils.insertOrUpdateNewVisitorStats(defaultWeekVisitorStatsModel)
+
+        val defaultWeekVisitorStats = wcStatsStore.getNewVisitorStats(site, StatsGranularity.WEEKS)
+        assertTrue(defaultWeekVisitorStats.isNotEmpty())
+        assertEquals(defaultWeekVisitorStats["2019-06-23"],10)
+        assertEquals(defaultWeekVisitorStats["2019-06-22"],20)
+        assertEquals(defaultWeekVisitorStats["2019-07-16"],0)
+        assertEquals(defaultWeekVisitorStats["2019-07-17"],0)
+        assertEquals(defaultWeekVisitorStats["2019-07-18"],0)
+    }
+
+    @Test
+    fun testFetchBundlesErrorResponse() = runBlocking {
+        val error = WooError(
+            type = WooErrorType.INVALID_RESPONSE,
+            original = GenericErrorType.INVALID_RESPONSE,
+            message = "Invalid Response"
+        )
+        val response: WooPayload<BundleStatsApiResponse> = WooPayload(error)
+
+        whenever(mockBundleStatsRestClient.fetchBundleStats(any(), any(), any(), any()))
+            .thenReturn(response)
+
+        val result = wcStatsStore.fetchProductBundlesStats(
+            SiteModel(),
+            "2024-03-01",
+            endDate = "2024-04-01",
+            interval = "day"
+        )
+
+        assertTrue(result.isError)
+        assertTrue(result.model == null)
+        assertThat(result.error, isEqual(error))
+    }
+
+    @Test
+    fun testFetchBundlesNullResponse() = runBlocking {
+        val response: WooPayload<BundleStatsApiResponse> = WooPayload(null)
+
+        whenever(mockBundleStatsRestClient.fetchBundleStats(any(), any(), any(), any()))
+            .thenReturn(response)
+
+        val result = wcStatsStore.fetchProductBundlesStats(
+            SiteModel(),
+            "2024-03-01",
+            endDate = "2024-04-01",
+            interval = "day"
+        )
+
+        assertTrue(result.isError)
+        assertTrue(result.model == null)
+        assertThat(result.error.type, isEqual(WooErrorType.GENERIC_ERROR))
+    }
+
+    @Test
+    fun testFetchBundlesSuccessResponse() = runBlocking {
+        val totals = BundleStatsTotals(
+            itemsSold = 5,
+            netRevenue = 1000.00
+        )
+        val statsResponse = BundleStatsApiResponse(totals = totals)
+        val response: WooPayload<BundleStatsApiResponse> = WooPayload(statsResponse)
+
+        whenever(mockBundleStatsRestClient.fetchBundleStats(any(), any(), any(), any()))
+            .thenReturn(response)
+
+        val result = wcStatsStore.fetchProductBundlesStats(
+            SiteModel(),
+            "2024-03-01",
+            endDate = "2024-04-01",
+            interval = "day"
+        )
+
+        assertFalse(result.isError)
+        assertTrue(result.model != null)
+        assertEquals(result.model!!.itemsSold, totals.itemsSold)
+        assertEquals(result.model!!.netRevenue, totals.netRevenue)
+    }
+
+    @Test
+    fun testSuccessfulFetchingVisitorSummaryStats() = runBlocking {
+        val site = SiteModel().apply { id = 0 }
+        val apiResponse = VisitorStatsSummaryApiResponse(
+            date = "2024-03-01",
+            period = "day",
+            views = 3,
+            visitors = 2
+        )
+        whenever(
+            mockOrderStatsRestClient.fetchVisitorStatsSummary(
+                site = site,
+                granularity = StatsGranularity.DAYS,
+                date = "2024-03-01",
+                force = false
+            )
+        ).thenReturn(WooPayload(apiResponse))
+
+        val result = wcStatsStore.fetchVisitorStatsSummary(
+            site = site,
+            granularity = StatsGranularity.DAYS,
+            date = "2024-03-01"
+        )
+
+        assertEquals(false, result.isError)
+        assertEquals(WCVisitorStatsSummary(StatsGranularity.DAYS, "2024-03-01", 3, 2), result.model)
+        assertEquals(
+            WCVisitorStatsSummary(StatsGranularity.DAYS, "2024-03-01", 3, 2),
+            wcStatsStore.getVisitorStatsSummary(site, StatsGranularity.DAYS, "2024-03-01")
+        )
+    }
+
+    @Test
+    fun testFailedFetchingVisitorSummaryStats() = runBlocking {
+        val site = SiteModel().apply { id = 0 }
+        whenever(
+            mockOrderStatsRestClient.fetchVisitorStatsSummary(
+                site = site,
+                granularity = StatsGranularity.DAYS,
+                date = "2024-03-01",
+                force = false
+            )
+        ).thenReturn(WooPayload(WooError(GENERIC_ERROR, GenericErrorType.UNKNOWN)))
+
+        val result = wcStatsStore.fetchVisitorStatsSummary(
+            site = site,
+            granularity = StatsGranularity.DAYS,
+            date = "2024-03-01"
+        )
+
+        assertEquals(true, result.isError)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsTestUtils.kt
new file mode 100644
index 00000000000..f3710fa3079
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/stats/WCStatsTestUtils.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.fluxc.wc.stats
+
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.WCNewVisitorStatsModel
+import org.wordpress.android.fluxc.model.WCRevenueStatsModel
+import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+object WCStatsTestUtils {
+    private val dateTimeFormatter by lazy {
+        DateTimeFormatter.ofPattern("YYYY-MM-dd'T'HH:mm:ss")
+    }
+
+    /**
+     * Generates a sample [WCRevenueStatsModel]
+     */
+    fun generateSampleRevenueStatsModel(
+        localSiteId: Int = 6,
+        interval: String = StatsGranularity.DAYS.toString(),
+        startDate: String = dateTimeFormatter.format(LocalDate.now().atStartOfDay()),
+        endDate: String = dateTimeFormatter.format(LocalDate.now().atTime(23, 59, 59)),
+        data: String = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/revenue-stats-data.json")
+    ): WCRevenueStatsModel {
+        return WCRevenueStatsModel().apply {
+            this.localSiteId = localSiteId
+            this.interval = interval
+            this.endDate = endDate
+            this.data = data
+            this.startDate = startDate
+        }
+    }
+
+    /**
+     * Generates a sample [WCNewVisitorStatsModel]
+     */
+    fun generateSampleNewVisitorStatsModel(
+        localSiteId: Int = 6,
+        granularity: String = StatsGranularity.DAYS.toString(),
+        quantity: String = "30",
+        startDate: String? = null,
+        endDate: String = DateTimeFormatter.ofPattern("YYYY-MM-dd").format(LocalDateTime.now()),
+        fields: String = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/visitor-stats-fields.json"),
+        data: String = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/visitor-stats-data.json")
+    ): WCNewVisitorStatsModel {
+        return WCNewVisitorStatsModel().apply {
+            this.localSiteId = localSiteId
+            this.granularity = granularity
+            this.quantity = quantity
+            this.endDate = endDate
+            this.fields = fields
+            this.data = data
+            this.date = endDate
+            startDate?.let {
+                this.startDate = it
+                this.isCustomField = true
+            }
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/TaxTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/TaxTestUtils.kt
new file mode 100644
index 00000000000..ecd4c50c499
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/TaxTestUtils.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.fluxc.wc.taxes
+
+import org.wordpress.android.fluxc.JsonLoaderUtils.jsonFileAs
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.TaxRateDto
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.WCTaxRestClient.TaxClassApiResponse
+
+object TaxTestUtils {
+    private fun generateSampleTaxClass(
+        name: String = "",
+        slug: String = "",
+        siteId: Int = 6
+    ): WCTaxClassModel {
+        return WCTaxClassModel().apply {
+            localSiteId = siteId
+            this.name = name
+            this.slug = slug
+        }
+    }
+
+    fun generateTaxClassList(siteId: Int = 6, slug: String = "slug"): List<WCTaxClassModel> {
+        with(ArrayList<WCTaxClassModel>()) {
+            add(generateSampleTaxClass(siteId = siteId, slug = slug.plus(1)))
+            add(generateSampleTaxClass(siteId = siteId, slug = slug.plus(2)))
+            add(generateSampleTaxClass(siteId = siteId, slug = slug.plus(3)))
+            add(generateSampleTaxClass(siteId = siteId, slug = slug.plus(4)))
+            add(generateSampleTaxClass(siteId = siteId, slug = slug.plus(5)))
+            return this
+        }
+    }
+
+    fun generateSampleTaxClassApiResponse(): List<TaxClassApiResponse> {
+        return listOf(TaxClassApiResponse("example1", "example1"),
+                TaxClassApiResponse("example2", "example2"))
+    }
+
+    fun generateSampleTaxRateApiResponse() =
+        "wc/tax-rate-response.json"
+            .jsonFileAs(Array<TaxRateDto>::class.java)
+}
+
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxSqlUtilsTest.kt
new file mode 100644
index 00000000000..7a14eaae77f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxSqlUtilsTest.kt
@@ -0,0 +1,134 @@
+package org.wordpress.android.fluxc.wc.taxes
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassModel
+import org.wordpress.android.fluxc.persistence.WCTaxSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCTaxSqlUtilsTest {
+    val site = SiteModel().apply {
+        email = "test@example.org"
+        name = "Test Site"
+        siteId = 24
+    }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(SiteModel::class.java, WCTaxClassModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+
+        // Insert the site into the db so it's available later for tax classes
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun testInsertOrUpdateTaxClassForSite() {
+        val taxClass = TaxTestUtils.generateTaxClassList(site.id)[0]
+        assertNotNull(taxClass)
+
+        // Test inserting a tax class
+        var rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClass(taxClass)
+        assertEquals(1, rowsAffected)
+        var savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(savedTaxClassList.size, 1)
+        assertEquals(savedTaxClassList[0].localSiteId, taxClass.localSiteId)
+        assertEquals(savedTaxClassList[0].name, taxClass.name)
+        assertEquals(savedTaxClassList[0].slug, taxClass.slug)
+
+        // Test updating the same product shipping class
+        taxClass.apply {
+            name = "Test tax class"
+        }
+        rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClass(taxClass)
+        assertEquals(1, rowsAffected)
+        savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(savedTaxClassList.size, 1)
+        assertEquals(savedTaxClassList[0].localSiteId, taxClass.localSiteId)
+        assertEquals(savedTaxClassList[0].name, taxClass.name)
+        assertEquals(savedTaxClassList[0].slug, taxClass.slug)
+    }
+
+    @Test
+    fun testInsertOrUpdateProductTaxClassList() {
+        val taxClassList = TaxTestUtils.generateTaxClassList(site.id)
+        assertTrue(taxClassList.isNotEmpty())
+
+        // Insert product shipping class list
+        val rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClasses(taxClassList)
+        assertEquals(taxClassList.size, rowsAffected)
+    }
+
+    @Test
+    fun testGetTaxClassListForSite() {
+        val taxClassList = TaxTestUtils.generateTaxClassList(site.id)
+        assertTrue(taxClassList.isNotEmpty())
+
+        // Insert product shipping class list
+        val rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClasses(taxClassList)
+        assertEquals(taxClassList.size, rowsAffected)
+
+        // Get tax class list for site and verify
+        val savedTaxClassListExists = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(taxClassList.size, savedTaxClassListExists.size)
+
+        // Get tax class list for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(nonExistingSite.id)
+        assertEquals(0, savedTaxClassList.size)
+    }
+
+    @Test
+    fun testDeleteTaxClassListForSite() {
+        val taxClassList = TaxTestUtils.generateTaxClassList(site.id)
+
+        var rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClasses(taxClassList)
+        assertEquals(taxClassList.size, rowsAffected)
+
+        // Verify tax class list inserted
+        var savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(taxClassList.size, savedTaxClassList.size)
+
+        // Delete tax class list for site and verify
+        rowsAffected = WCTaxSqlUtils.deleteTaxClassesForSite(site)
+        assertEquals(taxClassList.size, rowsAffected)
+        savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(0, savedTaxClassList.size)
+    }
+
+    @Test
+    fun testDeleteSiteDeletesProductShippingClassList() {
+        val taxClassList = TaxTestUtils.generateTaxClassList(site.id)
+        assertTrue(taxClassList.isNotEmpty())
+
+        val rowsAffected = WCTaxSqlUtils.insertOrUpdateTaxClasses(taxClassList)
+        assertEquals(taxClassList.size, rowsAffected)
+
+        // Verify tax class list inserted
+        var savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(taxClassList.size, savedTaxClassList.size)
+
+        // Delete site and verify tac class list  deleted via foreign key constraint
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+        savedTaxClassList = WCTaxSqlUtils.getTaxClassesForSite(site.id)
+        assertEquals(0, savedTaxClassList.size)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxStoreTest.kt
new file mode 100644
index 00000000000..8883cf8055b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/taxes/WCTaxStoreTest.kt
@@ -0,0 +1,121 @@
+package org.wordpress.android.fluxc.wc.taxes
+
+import com.yarolegovich.wellsql.WellSql
+import kotlinx.coroutines.runBlocking
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassMapper
+import org.wordpress.android.fluxc.model.taxes.WCTaxClassModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.taxes.WCTaxRestClient
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.persistence.dao.TaxRateDao
+import org.wordpress.android.fluxc.store.WCTaxStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCTaxStoreTest {
+    private val restClient = mock<WCTaxRestClient>()
+    private val site = SiteModel().apply { id = 321 }
+    private val errorSite = SiteModel().apply { id = 123 }
+    private val mapper = WCTaxClassMapper()
+    private lateinit var store: WCTaxStore
+    private val taxRateDao = mock<TaxRateDao>()
+
+    private val sampleTaxClassList = TaxTestUtils.generateSampleTaxClassApiResponse()
+    private val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(SiteModel::class.java, WCTaxClassModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCTaxStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper,
+                taxRateDao
+        )
+
+        // Insert the site into the db so it's available later when fetching tax classes
+        SiteSqlUtils().insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun `fetch tax class list for site`() = test {
+        val result = fetchTaxClassListForSite()
+
+        assertThat(result.model?.size).isEqualTo(sampleTaxClassList.size)
+        assertThat(result.model?.first()?.name).isEqualTo(mapper.map(sampleTaxClassList.first()).name)
+        assertThat(result.model?.first()?.slug).isEqualTo(mapper.map(sampleTaxClassList.first()).slug)
+
+        val invalidRequestResult = store.fetchTaxClassList(errorSite)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get stored tax class list for site`() = test {
+        fetchTaxClassListForSite()
+
+        val storedTaxClassList = store.getTaxClassListForSite(site)
+
+        assertThat(storedTaxClassList.size).isEqualTo(2)
+        assertThat(storedTaxClassList.first().name).isEqualTo(mapper.map(sampleTaxClassList.first()).name)
+        assertThat(storedTaxClassList.first().slug).isEqualTo(mapper.map(sampleTaxClassList.first()).slug)
+
+        val invalidRequestResult = store.getTaxClassListForSite(errorSite)
+        assertThat(invalidRequestResult.size).isEqualTo(0)
+    }
+
+    @Test
+    fun`when fetch tax rate fails, then error is returned` () {
+        runBlocking {
+            val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+            whenever(restClient.fetchTaxRateList(site, 1, 100)).thenReturn(WooPayload(error))
+            val result = store.fetchTaxRateList(site, 1, 100)
+            assertThat(result.error).isEqualTo(error)
+        }
+    }
+
+    @Test
+    fun `when fetch tax rate succeeds, then success returns` () {
+        runBlocking {
+            val taxRateApiResponse = TaxTestUtils.generateSampleTaxRateApiResponse()
+            whenever(restClient.fetchTaxRateList(site, 1, 100)).thenReturn(WooPayload(taxRateApiResponse))
+            val result = store.fetchTaxRateList(site, 1, 100)
+            assertThat(this).isNotNull
+            assertThat(result.isError).isFalse
+            assertThat(result).isEqualTo(WooResult(false))
+        }
+    }
+
+    private suspend fun fetchTaxClassListForSite(): WooResult<List<WCTaxClassModel>> {
+        val fetchTaxClassListPayload = WooPayload(sampleTaxClassList.toTypedArray())
+        whenever(restClient.fetchTaxClassList(site)).thenReturn(fetchTaxClassListPayload)
+        whenever(restClient.fetchTaxClassList(errorSite)).thenReturn(WooPayload(error))
+        return store.fetchTaxClassList(site)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserSqlUtilsTest.kt
new file mode 100644
index 00000000000..0285040b12e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserSqlUtilsTest.kt
@@ -0,0 +1,127 @@
+package org.wordpress.android.fluxc.wc.user
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.TestSiteSqlUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.user.WCUserModel
+import org.wordpress.android.fluxc.persistence.WCUserSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCUserSqlUtilsTest {
+    val site = SiteModel().apply {
+        email = "test@example.org"
+        name = "Test Site"
+        siteId = 24
+    }
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(SiteModel::class.java, WCUserModel::class.java),
+                WellSqlConfig.ADDON_WOOCOMMERCE)
+        WellSql.init(config)
+        config.reset()
+
+        // Insert the site into the db so it's available later
+        TestSiteSqlUtils.siteSqlUtils.insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun testInsertOrUpdateUserSite() {
+        val userApiResponse = WCUserTestUtils.generateSampleUApiResponse()
+        val user = WCUserTestUtils.getSampleUser(userApiResponse, site)
+
+        // Test inserting a user
+        var rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+
+        var savedUser = WCUserSqlUtils.getUserBySiteAndEmail(site.id, user.email)
+        assertEquals(savedUser?.localSiteId, user.localSiteId)
+        assertEquals(savedUser?.username, user.username)
+        assertEquals(savedUser?.email, user.email)
+        assertEquals(savedUser?.roles, user.roles)
+
+        // Test updating the same user
+        user.apply {
+            username = "testing"
+        }
+        rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+        savedUser = WCUserSqlUtils.getUserBySiteAndEmail(site.id, user.email)
+        assertEquals(savedUser?.localSiteId, user.localSiteId)
+        assertEquals(savedUser?.username, user.username)
+        assertEquals(savedUser?.email, user.email)
+        assertEquals(savedUser?.roles, user.roles)
+        assertTrue(savedUser?.isUserEligible() == true)
+
+        // Test updating user's role
+        user.apply { roles = "[\"author\",\"administrator\"]" }
+        rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+        savedUser = WCUserSqlUtils.getUserBySiteAndEmail(site.id, user.email)
+        assertTrue(savedUser?.isUserEligible() == true)
+
+        user.apply { roles = "[\"author\",\"customer\"]" }
+        rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+        savedUser = WCUserSqlUtils.getUserBySiteAndEmail(site.id, user.email)
+        assertTrue(savedUser?.isUserEligible() == false)
+
+        user.apply { roles = "[\"administrator\",\"shop_manager\"]" }
+        rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+        savedUser = WCUserSqlUtils.getUserBySiteAndEmail(site.id, user.email)
+        assertTrue(savedUser?.isUserEligible() == true)
+    }
+
+    @Test
+    fun testGetUsersForSite() {
+        val userApiResponse = WCUserTestUtils.generateSampleUApiResponse()
+        val user = WCUserTestUtils.getSampleUser(userApiResponse, site)
+
+        // Insert user
+        val rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+
+        // Get user for site and verify
+        val savedUsersExists = WCUserSqlUtils.getUsersBySite(site.id)
+        assertEquals(1, savedUsersExists.size)
+
+        // Get user for a site that does not exist
+        val nonExistingSite = SiteModel().apply { id = 400 }
+        val savedUsers = WCUserSqlUtils.getUsersBySite(nonExistingSite.id)
+        assertEquals(0, savedUsers.size)
+    }
+
+    @Test
+    fun testDeleteSiteDeletesUserList() {
+        val userApiResponse = WCUserTestUtils.generateSampleUApiResponse()
+        val user = WCUserTestUtils.getSampleUser(userApiResponse, site)
+
+        // Insert user
+        val rowsAffected = WCUserSqlUtils.insertOrUpdateUser(user)
+        assertEquals(1, rowsAffected)
+
+        // Get user for site and verify
+        var savedUsers = WCUserSqlUtils.getUsersBySite(site.id)
+        assertEquals(1, savedUsers.size)
+
+        // Delete site and verify users are deleted via foreign key constraint
+        TestSiteSqlUtils.siteSqlUtils.deleteSite(site)
+        savedUsers = WCUserSqlUtils.getUsersBySite(site.id)
+        assertEquals(0, savedUsers.size)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserStoreTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserStoreTest.kt
new file mode 100644
index 00000000000..ffe5d4ebfd9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserStoreTest.kt
@@ -0,0 +1,106 @@
+package org.wordpress.android.fluxc.wc.user
+
+import com.yarolegovich.wellsql.WellSql
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.user.WCUserMapper
+import org.wordpress.android.fluxc.model.user.WCUserModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.user.WCUserRestClient
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.WellSqlConfig
+import org.wordpress.android.fluxc.store.WCUserStore
+import org.wordpress.android.fluxc.test
+import org.wordpress.android.fluxc.tools.initCoroutineEngine
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner::class)
+class WCUserStoreTest {
+    private val restClient = mock <WCUserRestClient>()
+    private val site = SiteModel().apply { id = 321 }
+    private val errorSite = SiteModel().apply { id = 123 }
+    private val mapper = WCUserMapper()
+    private lateinit var store: WCUserStore
+
+    private val sampleUserApiResponse = WCUserTestUtils.generateSampleUApiResponse()
+    private val error = WooError(INVALID_RESPONSE, NETWORK_ERROR, "Invalid site ID")
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(
+                        SiteModel::class.java,
+                        WCUserModel::class.java
+                ),
+                WellSqlConfig.ADDON_WOOCOMMERCE
+        )
+        WellSql.init(config)
+        config.reset()
+
+        store = WCUserStore(
+                restClient,
+                initCoroutineEngine(),
+                mapper
+        )
+
+        // Insert the site into the db so it's available later when testing user role
+        SiteSqlUtils().insertOrUpdateSite(site)
+    }
+
+    @Test
+    fun `fetch user role`() = test {
+        val result = fetchUserRole()
+        val userRole = mapper.map(sampleUserApiResponse!!, site)
+        assertThat(result.model?.remoteUserId).isEqualTo(userRole.remoteUserId)
+        assertThat(result.model?.username).isEqualTo(userRole.username)
+        assertThat(result.model?.firstName).isEqualTo(userRole.firstName)
+        assertThat(result.model?.lastName).isEqualTo(userRole.lastName)
+        assertThat(result.model?.email).isEqualTo(userRole.email)
+        assertThat(result.model?.getUserRoles()?.size).isEqualTo(userRole.getUserRoles().size)
+        assertThat(result.model?.getUserRoles()?.get(0)?.isSupported() == true)
+
+        val invalidRequestResult = store.fetchUserRole(errorSite)
+        assertThat(invalidRequestResult.model).isNull()
+        assertThat(invalidRequestResult.error).isEqualTo(error)
+    }
+
+    @Test
+    fun `get user role from db`() = test {
+        val result = fetchUserRole()
+        val userRole = mapper.map(sampleUserApiResponse!!, site)
+
+        val savedUser = store.getUserByEmail(site, userRole.email)
+        assertNotNull(savedUser)
+        assertThat(savedUser.remoteUserId).isEqualTo(userRole.remoteUserId)
+        assertThat(savedUser.username).isEqualTo(userRole.username)
+        assertThat(savedUser.firstName).isEqualTo(userRole.firstName)
+        assertThat(savedUser.lastName).isEqualTo(userRole.lastName)
+        assertThat(savedUser.email).isEqualTo(userRole.email)
+        assertThat(savedUser.getUserRoles().size).isEqualTo(userRole.getUserRoles().size)
+        assertTrue(savedUser.isUserEligible())
+    }
+
+    private suspend fun fetchUserRole(): WooResult<WCUserModel> {
+        val fetchUserRolePayload = WooPayload(sampleUserApiResponse)
+        whenever(restClient.fetchUserInfo(site)).thenReturn(fetchUserRolePayload)
+        whenever(restClient.fetchUserInfo(errorSite)).thenReturn(WooPayload(error))
+        return store.fetchUserRole(site)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserTestUtils.kt
new file mode 100644
index 00000000000..13054d0199c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/user/WCUserTestUtils.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.wc.user
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.UnitTestUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.user.WCUserModel
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.user.WCUserRestClient.UserApiResponse
+
+object WCUserTestUtils {
+    fun generateSampleUApiResponse(): UserApiResponse? {
+        val json = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/store-user-role.json")
+        val responseType = object : TypeToken<UserApiResponse>() {}.type
+        return Gson().fromJson(json, responseType) as? UserApiResponse
+    }
+
+    fun getSampleUser(
+        userApiResponse: UserApiResponse?,
+        siteModel: SiteModel
+    ): WCUserModel {
+        return WCUserModel().apply {
+            remoteUserId = userApiResponse?.id ?: 0L
+            username = userApiResponse?.username ?: ""
+            firstName = userApiResponse?.firstName ?: ""
+            lastName = userApiResponse?.lastName ?: ""
+            email = userApiResponse?.email ?: ""
+            roles = userApiResponse?.roles.toString()
+
+            localSiteId = siteModel.id
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/DateUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/DateUtilsTest.kt
new file mode 100644
index 00000000000..4e51e78bf50
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/DateUtilsTest.kt
@@ -0,0 +1,410 @@
+package org.wordpress.android.fluxc.wc.utils
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.utils.DateUtils
+import org.wordpress.android.fluxc.utils.SiteUtils
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.ZoneId
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+import kotlin.test.assertEquals
+
+class DateUtilsTest {
+    companion object {
+        private const val DATE_FORMAT_DAY = "yyyy-MM-dd"
+        private const val DATE_TIME_FORMAT_START = "yyyy-MM-dd'T'00:00:00"
+    }
+
+    @Test
+    fun testGetDateFromDateString() {
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT)
+
+        val d1 = "2018-01-25"
+        val date1 = DateUtils.getDateFromString(d1)
+        assertEquals(dateFormat.parse(d1), date1)
+
+        val d2 = "2018-01-28"
+        val date2 = DateUtils.getDateFromString(d2)
+        assertEquals(dateFormat.parse(d2), date2)
+
+        val d3 = "2018-01-01"
+        val date3 = DateUtils.getDateFromString(d3)
+        assertEquals(dateFormat.parse(d3), date3)
+    }
+
+    @Test
+    fun testFormatDateFromString() {
+        val d1 = DateUtils.formatDate(DATE_FORMAT_DAY, Date())
+
+        val site = SiteModel().apply { id = 1 }
+        val date1 = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, d1)
+        assertEquals(d1, date1)
+
+        site.timezone = "12"
+        val date2 = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, d1)
+        assertEquals(SiteUtils.getCurrentDateTimeForSite(site, "yyyy-MM-dd"), date2)
+
+        site.timezone = "-12"
+        val date3 = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, d1)
+        assertEquals(SiteUtils.getCurrentDateTimeForSite(site, "yyyy-MM-dd"), date3)
+
+        site.timezone = "0"
+        val date4 = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, d1)
+        assertEquals(d1, date4)
+
+        site.timezone = ""
+        val date5 = DateUtils.getDateTimeForSite(site, DATE_FORMAT_DAY, d1)
+        assertEquals(d1, date5)
+    }
+
+    @Test
+    fun testGetQuantityInDays() {
+        val startDate = DateUtils.getDateFromString("2018-01-25")
+        val endDate = DateUtils.getDateFromString("2018-01-28")
+        val startDateCalendar = DateUtils.getStartDateCalendar(startDate)
+        val endDateCalendar = DateUtils.getEndDateCalendar(endDate)
+        val quantity = DateUtils.getQuantityInDays(startDateCalendar, endDateCalendar)
+        assertEquals(4, quantity)
+
+        val startDate2 = DateUtils.getDateFromString("2018-01-25")
+        val endDate2 = DateUtils.getDateFromString("2018-01-25")
+        val startDateCalendar2 = DateUtils.getStartDateCalendar(startDate2)
+        val endDateCalendar2 = DateUtils.getEndDateCalendar(endDate2)
+        val quantity2 = DateUtils.getQuantityInDays(startDateCalendar2, endDateCalendar2)
+        assertEquals(1, quantity2)
+
+        val startDate3 = DateUtils.getDateFromString("2018-01-01")
+        val endDate3 = DateUtils.getDateFromString("2018-01-31")
+        val startDateCalendar3 = DateUtils.getStartDateCalendar(startDate3)
+        val endDateCalendar3 = DateUtils.getEndDateCalendar(endDate3)
+        val quantity3 = DateUtils.getQuantityInDays(startDateCalendar3, endDateCalendar3)
+        assertEquals(31, quantity3)
+    }
+
+    @Test
+    fun testGetQuantityInWeeksUSLocale() {
+        val startDate = DateUtils.getDateFromString("2019-01-13")
+        val endDate = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar = DateUtils.getStartDateCalendar(startDate, Locale.US)
+        val endDateCalendar = DateUtils.getEndDateCalendar(endDate, Locale.US)
+        val quantity = DateUtils.getQuantityInWeeks(startDateCalendar, endDateCalendar)
+        assertEquals(2, quantity)
+
+        val startDate2 = DateUtils.getDateFromString("2018-12-01")
+        val endDate2 = DateUtils.getDateFromString("2018-12-31")
+        val startDateCalendar2 = DateUtils.getStartDateCalendar(startDate2, Locale.US)
+        val endDateCalendar2 = DateUtils.getEndDateCalendar(endDate2, Locale.US)
+        val quantity2 = DateUtils.getQuantityInWeeks(startDateCalendar2, endDateCalendar2)
+        assertEquals(6, quantity2)
+
+        val startDate3 = DateUtils.getDateFromString("2018-10-22")
+        val endDate3 = DateUtils.getDateFromString("2018-10-22")
+        val startDateCalendar3 = DateUtils.getStartDateCalendar(startDate3, Locale.US)
+        val endDateCalendar3 = DateUtils.getEndDateCalendar(endDate3, Locale.US)
+        val quantity3 = DateUtils.getQuantityInWeeks(startDateCalendar3, endDateCalendar3)
+        assertEquals(1, quantity3)
+
+        val startDate4 = DateUtils.getDateFromString("2019-01-14")
+        val endDate4 = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar4 = DateUtils.getStartDateCalendar(startDate4, Locale.US)
+        val endDateCalendar4 = DateUtils.getEndDateCalendar(endDate4, Locale.US)
+        val quantity4 = DateUtils.getQuantityInWeeks(startDateCalendar4, endDateCalendar4)
+        assertEquals(2, quantity4)
+    }
+
+    @Test
+    fun testGetQuantityInWeeksFranceLocale() {
+        val startDate = DateUtils.getDateFromString("2019-01-13")
+        val endDate = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar = DateUtils.getStartDateCalendar(startDate, Locale.FRANCE)
+        val endDateCalendar = DateUtils.getEndDateCalendar(endDate, Locale.FRANCE)
+        val quantity = DateUtils.getQuantityInWeeks(startDateCalendar, endDateCalendar)
+        assertEquals(2, quantity)
+
+        val startDate2 = DateUtils.getDateFromString("2018-12-01")
+        val endDate2 = DateUtils.getDateFromString("2018-12-31")
+        val startDateCalendar2 = DateUtils.getStartDateCalendar(startDate2, Locale.FRANCE)
+        val endDateCalendar2 = DateUtils.getEndDateCalendar(endDate2, Locale.FRANCE)
+        val quantity2 = DateUtils.getQuantityInWeeks(startDateCalendar2, endDateCalendar2)
+        assertEquals(6, quantity2)
+
+        val startDate3 = DateUtils.getDateFromString("2018-10-22")
+        val endDate3 = DateUtils.getDateFromString("2018-10-22")
+        val startDateCalendar3 = DateUtils.getStartDateCalendar(startDate3, Locale.FRANCE)
+        val endDateCalendar3 = DateUtils.getEndDateCalendar(endDate3, Locale.FRANCE)
+        val quantity3 = DateUtils.getQuantityInWeeks(startDateCalendar3, endDateCalendar3)
+        assertEquals(1, quantity3)
+
+        val startDate4 = DateUtils.getDateFromString("2019-01-14")
+        val endDate4 = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar4 = DateUtils.getStartDateCalendar(startDate4, Locale.FRANCE)
+        val endDateCalendar4 = DateUtils.getEndDateCalendar(endDate4, Locale.FRANCE)
+        val quantity4 = DateUtils.getQuantityInWeeks(startDateCalendar4, endDateCalendar4)
+        assertEquals(1, quantity4)
+    }
+
+    @Test
+    fun testGetQuantityInMonths() {
+        val startDate = DateUtils.getDateFromString("2018-12-13")
+        val endDate = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar = DateUtils.getStartDateCalendar(startDate)
+        val endDateCalendar = DateUtils.getEndDateCalendar(endDate)
+        val quantity = DateUtils.getQuantityInMonths(startDateCalendar, endDateCalendar)
+        assertEquals(2, quantity)
+
+        val startDate2 = DateUtils.getDateFromString("2018-12-01")
+        val endDate2 = DateUtils.getDateFromString("2018-12-31")
+        val startDateCalendar2 = DateUtils.getStartDateCalendar(startDate2)
+        val endDateCalendar2 = DateUtils.getEndDateCalendar(endDate2)
+        val quantity2 = DateUtils.getQuantityInMonths(startDateCalendar2, endDateCalendar2)
+        assertEquals(1, quantity2)
+
+        val startDate3 = DateUtils.getDateFromString("2017-10-22")
+        val endDate3 = DateUtils.getDateFromString("2018-10-22")
+        val startDateCalendar3 = DateUtils.getStartDateCalendar(startDate3)
+        val endDateCalendar3 = DateUtils.getEndDateCalendar(endDate3)
+        val quantity3 = DateUtils.getQuantityInMonths(startDateCalendar3, endDateCalendar3)
+        assertEquals(13, quantity3)
+    }
+
+    @Test
+    fun testGetQuantityInYears() {
+        val startDate = DateUtils.getDateFromString("2018-12-13")
+        val endDate = DateUtils.getDateFromString("2019-01-20")
+        val startDateCalendar = DateUtils.getStartDateCalendar(startDate)
+        val endDateCalendar = DateUtils.getEndDateCalendar(endDate)
+        val quantity = DateUtils.getQuantityInYears(startDateCalendar, endDateCalendar)
+        assertEquals(2, quantity)
+
+        val startDate2 = DateUtils.getDateFromString("2018-12-01")
+        val endDate2 = DateUtils.getDateFromString("2018-12-31")
+        val startDateCalendar2 = DateUtils.getStartDateCalendar(startDate2)
+        val endDateCalendar2 = DateUtils.getEndDateCalendar(endDate2)
+        val quantity2 = DateUtils.getQuantityInYears(startDateCalendar2, endDateCalendar2)
+        assertEquals(1, quantity2)
+
+        val startDate3 = DateUtils.getDateFromString("2016-10-22")
+        val endDate3 = DateUtils.getDateFromString("2018-10-22")
+        val startDateCalendar3 = DateUtils.getStartDateCalendar(startDate3)
+        val endDateCalendar3 = DateUtils.getEndDateCalendar(endDate3)
+        val quantity3 = DateUtils.getQuantityInYears(startDateCalendar3, endDateCalendar3)
+        assertEquals(3, quantity3)
+    }
+
+    @Test
+    fun testGetFormattedDateString() {
+        /*
+         * Testing for all dates from 2011-2019
+         * */
+        val startDateString = "2011-01-01"
+        val endDateString = "2019-02-17"
+        val formatter = SimpleDateFormat(DATE_FORMAT_DAY)
+        val startDate = formatter.parse(startDateString)
+        val endDate = formatter.parse(endDateString)
+
+        val start = Calendar.getInstance()
+        start.time = startDate
+        val end = Calendar.getInstance()
+        end.time = endDate
+
+        var date = start.time
+        while (start.before(end)) {
+            val testDateString = DateUtils.formatDate(DATE_FORMAT_DAY, date)
+            val testCalendar = DateUtils.getCalendarInstance(testDateString)
+            assertEquals(start.get(Calendar.YEAR), testCalendar.get(Calendar.YEAR))
+            assertEquals(start.get(Calendar.MONTH), testCalendar.get(Calendar.MONTH))
+            assertEquals(start.get(Calendar.DATE), testCalendar.get(Calendar.DATE))
+            assertEquals(
+                    testDateString, DateUtils.getFormattedDateString(
+                    testCalendar.get(Calendar.YEAR),
+                    testCalendar.get(Calendar.MONTH), testCalendar.get(Calendar.DATE)
+            )
+            )
+            start.add(Calendar.DATE, 1)
+            date = start.time
+        }
+    }
+
+    @Test
+    fun testGetStartDateForSiteFromString() {
+        val site = SiteModel().apply { id = 1 }
+
+        // test get start date for current day
+        for (i in -15..15) {
+            site.timezone = i.toString()
+            // format the current date to string
+            // get the formatted date string for the site in the format yyyy-MM-ddThh:mm:ss
+            // get the expected start date string for the site in the format yyyy-MM-ddThh:mm:ss
+            val dateString1 = DateUtils.formatDate(DATE_FORMAT_DAY, Date())
+            val expectedDate1 = "${SiteUtils.getDateTimeForSite(site, "yyyy-MM-dd", Date())}T00:00:00"
+            val actualDate1 = DateUtils.getStartDateForSite(site, dateString1)
+            assertEquals(expectedDate1, actualDate1)
+        }
+    }
+
+    @Test
+    fun testGetEndDateForSiteFromString() {
+        val site = SiteModel().apply { id = 1 }
+        for (i in -15..15) {
+            site.timezone = i.toString()
+            // format the current date to string
+            // get the formatted date string for the site in the format yyyy-MM-ddThh:mm:ss
+            // get the expected start date string for the site in the format yyyy-MM-ddThh:mm:ss
+            val expectedDate1 = "${SiteUtils.getCurrentDateTimeForSite(site, "yyyy-MM-dd")}T23:59:59"
+            val actualDate1 = DateUtils.getEndDateForSite(site)
+            assertEquals(expectedDate1, actualDate1)
+        }
+    }
+
+    @Test
+    fun testGetStartDayOfCurrentMonthForSite() {
+        val site = SiteModel().apply { id = 1 }
+
+        // test get start date for current day
+        for (i in -15..15) {
+            site.timezone = i.toString()
+            // format the current date to string
+            // get the formatted date string for the site in the format yyyy-MM-ddThh:mm:ss
+            // get the expected start date string for the site in the format yyyy-MM-ddThh:mm:ss
+            val expectedDate = LocalDate.now(SiteUtils.getNormalizedTimezone(site.timezone).toZoneId())
+                    .withDayOfMonth(1)
+                    .atStartOfDay(ZoneId.systemDefault())
+                    .toInstant()
+            val expectedDateString = DateUtils.formatDate(DATE_TIME_FORMAT_START, Date.from(expectedDate))
+
+            val dateString1 = DateUtils.getFirstDayOfCurrentMonthBySite(site)
+            assertEquals(expectedDateString, dateString1)
+        }
+    }
+
+    @Test
+    fun testGetStartDayOfCurrentYearForSite() {
+        val site = SiteModel().apply { id = 1 }
+        val expectedDate = LocalDate.now()
+                .withDayOfYear(1)
+                .atStartOfDay(ZoneId.systemDefault())
+                .toInstant()
+        val expectedDateString = DateUtils.formatDate(DATE_TIME_FORMAT_START, Date.from(expectedDate))
+
+        // test get start date for current day
+        for (i in -20..20) {
+            site.timezone = i.toString()
+            // format the current date to string
+            // get the formatted date string for the site in the format yyyy-MM-ddThh:mm:ss
+            // get the expected start date string for the site in the format yyyy-MM-ddThh:mm:ss
+            val dateString1 = DateUtils.getFirstDayOfCurrentYearBySite(site)
+            assertEquals(expectedDateString, dateString1)
+        }
+    }
+
+    @Test
+    fun testGetConstantForLastDayOfWeekUSLocale() {
+        val constant = DateUtils.getConstantForLastDayOfWeek(Calendar.getInstance(Locale.US))
+        assertEquals(Calendar.SATURDAY, constant)
+    }
+
+    @Test
+    fun testGetConstantForLastDayOfWeekFranceLocale() {
+        val constant = DateUtils.getConstantForLastDayOfWeek(Calendar.getInstance(Locale.FRANCE))
+        assertEquals(Calendar.SUNDAY, constant)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForWednesdayUSLocale() {
+        val cal = Calendar.getInstance(Locale.US)
+        // 2021-03-08 00:00:00 Monday
+        cal.time = Date(1615183200000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-07", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForSundayUSLocale() {
+        val cal = Calendar.getInstance(Locale.US)
+        // 2021-03-07 00:00:00 Sunday
+        cal.time = Date(1615096800000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-07", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForSaturdayUSLocale() {
+        val cal = Calendar.getInstance(Locale.US)
+        // 2021-03-13 00:00:00 Saturday
+        cal.time = Date(1615615200000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-07", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekAcrossMonthsUSLocale() {
+        val cal = Calendar.getInstance(Locale.US)
+        // 2021-04-01 00:00:00 Thursday April
+        cal.time = Date(1617256800000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday March
+        assertEquals("2021-03-28", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForWednesdayFranceLocale() {
+        val cal = Calendar.getInstance(Locale.FRANCE)
+        // 2021-03-08 00:00:00 Monday
+        cal.time = Date(1615183200000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-08", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForSundayFranceLocale() {
+        val cal = Calendar.getInstance(Locale.FRANCE)
+        // 2021-03-07 00:00:00 Sunday
+        cal.time = Date(1615096800000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-01", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekForSaturdayFranceLocale() {
+        val cal = Calendar.getInstance(Locale.FRANCE)
+        // 2021-03-13 00:00:00 Saturday
+        cal.time = Date(1615615200000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday
+        assertEquals("2021-03-08", result)
+    }
+
+    @Test
+    fun testGetFirstDayOfWeekAcrossMonthsFranceLocale() {
+        val cal = Calendar.getInstance(Locale.FRANCE)
+        // 2021-04-01 00:00:00 Thursday April
+        cal.time = Date(1617256800000)
+
+        val result = DateUtils.getFirstDayOfCurrentWeek(cal)
+
+        // Monday March
+        assertEquals("2021-03-29", result)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/SiteTestUtils.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/SiteTestUtils.kt
new file mode 100644
index 00000000000..84a48a77bc2
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/SiteTestUtils.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.wc.utils
+
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.AccountSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+
+object SiteTestUtils {
+    fun insertTestAccountAndSiteIntoDb(): SiteModel {
+        val account = AccountModel().apply { userId = 412 }
+        AccountSqlUtils.insertOrUpdateAccount(account, 5124)
+
+        val site = SiteModel()
+        site.siteId = 6347
+
+        SiteSqlUtils().insertOrUpdateSite(site)
+        return site
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/WCCurrencyUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/WCCurrencyUtilsTest.kt
new file mode 100644
index 00000000000..dfc48980747
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/wc/utils/WCCurrencyUtilsTest.kt
@@ -0,0 +1,98 @@
+package org.wordpress.android.fluxc.wc.utils
+
+import org.junit.Test
+import org.wordpress.android.fluxc.model.WCSettingsModel
+import org.wordpress.android.fluxc.model.WCSettingsModel.CurrencyPosition
+import org.wordpress.android.fluxc.utils.WCCurrencyUtils.formatCurrencyForDisplay
+import kotlin.test.assertEquals
+
+class WCCurrencyUtilsTest {
+    @Test
+    @Suppress("LongMethod")
+    fun testDecimalFormat() {
+        val cadSettings = WCSettingsModel(
+                localSiteId = 6,
+                currencyCode = "CAD",
+                currencyPosition = CurrencyPosition.LEFT,
+                currencyThousandSeparator = ",",
+                currencyDecimalSeparator = ".",
+                currencyDecimalNumber = 2,
+                couponsEnabled = true
+        )
+
+        val eurSettings = WCSettingsModel(
+                localSiteId = 6,
+                currencyCode = "EUR",
+                currencyPosition = CurrencyPosition.RIGHT_SPACE,
+                currencyThousandSeparator = ".",
+                currencyDecimalSeparator = ",",
+                currencyDecimalNumber = 2,
+                couponsEnabled = true
+        )
+
+        val jpySettings = WCSettingsModel(
+                localSiteId = 6,
+                currencyCode = "JPY",
+                currencyPosition = CurrencyPosition.LEFT,
+                currencyThousandSeparator = "",
+                currencyDecimalSeparator = "",
+                currencyDecimalNumber = 0,
+                couponsEnabled = true
+        )
+
+        with(3.22) {
+            val cadFormat = formatCurrencyForDisplay(this, cadSettings)
+            assertEquals("3.22", cadFormat)
+
+            val eurFormat = formatCurrencyForDisplay(this, eurSettings)
+            assertEquals("3,22", eurFormat)
+
+            val jpyFormat = formatCurrencyForDisplay(this, jpySettings)
+            assertEquals("3", jpyFormat)
+        }
+
+        with(1234.22) {
+            val cadFormat = formatCurrencyForDisplay(this, cadSettings)
+            assertEquals("1,234.22", cadFormat)
+
+            val eurFormat = formatCurrencyForDisplay(this, eurSettings)
+            assertEquals("1.234,22", eurFormat)
+
+            val jpyFormat = formatCurrencyForDisplay(this, jpySettings)
+            assertEquals("1234", jpyFormat)
+        }
+
+        with(1234.toDouble()) {
+            val cadFormat = formatCurrencyForDisplay(this, cadSettings)
+            assertEquals("1,234.00", cadFormat)
+
+            val eurFormat = formatCurrencyForDisplay(this, eurSettings)
+            assertEquals("1.234,00", eurFormat)
+
+            val jpyFormat = formatCurrencyForDisplay(this, jpySettings)
+            assertEquals("1234", jpyFormat)
+        }
+
+        with(1234567.11) {
+            val cadFormat = formatCurrencyForDisplay(this, cadSettings)
+            assertEquals("1,234,567.11", cadFormat)
+
+            val eurFormat = formatCurrencyForDisplay(this, eurSettings)
+            assertEquals("1.234.567,11", eurFormat)
+
+            val jpyFormat = formatCurrencyForDisplay(this, jpySettings)
+            assertEquals("1234567", jpyFormat)
+        }
+
+        with(-1234.22) {
+            val cadFormat = formatCurrencyForDisplay(this, cadSettings)
+            assertEquals("-1,234.22", cadFormat)
+
+            val eurFormat = formatCurrencyForDisplay(this, eurSettings)
+            assertEquals("-1.234,22", eurFormat)
+
+            val jpyFormat = formatCurrencyForDisplay(this, jpySettings)
+            assertEquals("-1234", jpyFormat)
+        }
+    }
+}
diff --git a/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/whatsnew/WhatsNewSqlUtilsTest.kt b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/whatsnew/WhatsNewSqlUtilsTest.kt
new file mode 100644
index 00000000000..d00b0e16a4b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/whatsnew/WhatsNewSqlUtilsTest.kt
@@ -0,0 +1,100 @@
+package org.wordpress.android.fluxc.whatsnew
+
+import com.yarolegovich.wellsql.WellSql
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.fluxc.SingleStoreWellSqlConfigForTests
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel.WhatsNewAnnouncementFeature
+import org.wordpress.android.fluxc.persistence.WhatsNewSqlUtils
+import org.wordpress.android.fluxc.persistence.WhatsNewSqlUtils.WhatsNewAnnouncementBuilder
+import org.wordpress.android.fluxc.persistence.WhatsNewSqlUtils.WhatsNewAnnouncementFeatureBuilder
+
+@RunWith(RobolectricTestRunner::class)
+class WhatsNewSqlUtilsTest {
+    private lateinit var whatsNewSqlUtils: WhatsNewSqlUtils
+
+    private val firstAnnouncement = WhatsNewAnnouncementModel(
+            "15.0",
+            1,
+            "14.7",
+            "14.9",
+            emptyList(),
+            "https://wordpress.org",
+            true,
+            "it",
+            listOf(
+                    WhatsNewAnnouncementFeature(
+                            "first announcement feature 1",
+                            "first announcement subtitle 1",
+                            "",
+                            "https://wordpress.org/icon1.png"
+                    ),
+                    WhatsNewAnnouncementFeature(
+                            "first announcement feature 2",
+                            "first announcement subtitle 2",
+                            "<image data>",
+                            ""
+                    )
+            )
+    )
+
+    private val secondAnnouncement = WhatsNewAnnouncementModel(
+            "16.0",
+            2,
+            "14.9",
+            "16.0",
+            arrayListOf("alpha-111", "alpha-112"),
+            "https://wordpress.org/announcement2/",
+            false,
+            "en",
+            listOf(
+                    WhatsNewAnnouncementFeature(
+                            "second announcement feature 1",
+                            "second announcement subtitle 1",
+                            "",
+                            "https://wordpress.org/icon2.png"
+                    ),
+                    WhatsNewAnnouncementFeature(
+                            "second announcement feature 2",
+                            "first announcement subtitle 2",
+                            "<second image data>",
+                            ""
+                    )
+            )
+    )
+
+    private val testAnnouncements = listOf(firstAnnouncement, secondAnnouncement)
+
+    @Before
+    fun setUp() {
+        val appContext = RuntimeEnvironment.application.applicationContext
+        val config = SingleStoreWellSqlConfigForTests(
+                appContext,
+                listOf(WhatsNewAnnouncementBuilder::class.java, WhatsNewAnnouncementFeatureBuilder::class.java), ""
+        )
+        WellSql.init(config)
+        config.reset()
+
+        whatsNewSqlUtils = WhatsNewSqlUtils()
+    }
+
+    @Test
+    fun `announcements are stored and retrieved correctly`() {
+        whatsNewSqlUtils.updateAnnouncementCache(testAnnouncements)
+
+        val cachedAnnouncements = whatsNewSqlUtils.getAnnouncements()
+        assertEquals(testAnnouncements, cachedAnnouncements)
+    }
+
+    @Test
+    fun `hasCachedAnnouncements returns true when there are cached announcements`() {
+        assertEquals(whatsNewSqlUtils.hasCachedAnnouncements(), false)
+        whatsNewSqlUtils.updateAnnouncementCache(testAnnouncements)
+        assertEquals(whatsNewSqlUtils.hasCachedAnnouncements(), true)
+    }
+}
diff --git a/libs/fluxc-tests/src/test/resources/activitylog/body-response.json b/libs/fluxc-tests/src/test/resources/activitylog/body-response.json
new file mode 100644
index 00000000000..27aed24fe34
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/activitylog/body-response.json
@@ -0,0 +1,30 @@
+{
+  "text": "Comment text",
+  "ranges": [
+    {
+      "url": "https://www.wordpress.com",
+      "indices": [
+        27,
+        39
+      ],
+      "site_id": 123,
+      "section": "post",
+      "intent": "edit",
+      "context": "single",
+      "id": 111
+    },
+    {
+      "url": "https://www.wordpress.com",
+      "indices": [
+        0,
+        7
+      ],
+      "site_id": 123,
+      "section": "comment",
+      "intent": "edit",
+      "context": "single",
+      "id": 17,
+      "root_id": 68
+    }
+  ]
+}
diff --git a/libs/fluxc-tests/src/test/resources/media/media-upload-wp-api-success.json b/libs/fluxc-tests/src/test/resources/media/media-upload-wp-api-success.json
new file mode 100644
index 00000000000..0d18516938f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/media/media-upload-wp-api-success.json
@@ -0,0 +1,207 @@
+{
+  "id": 44,
+  "date": "2021-10-25T11:45:28",
+  "date_gmt": "2021-10-25T11:45:28",
+  "guid": {
+    "rendered": "https://siteurl.com/wp-content/uploads/2021/10/file_name.png",
+    "raw": "https://siteurl.com/wp-content/uploads/2021/10/file_name.png"
+  },
+  "modified": "2021-10-25T11:45:28",
+  "modified_gmt": "2021-10-25T11:45:28",
+  "slug": "file_name",
+  "status": "inherit",
+  "type": "attachment",
+  "link": "https://siteurl.com/file_name/",
+  "title": {
+    "raw": "file_name",
+    "rendered": "file_name"
+  },
+  "author": 1,
+  "comment_status": "open",
+  "ping_status": "closed",
+  "template": "",
+  "meta": [],
+  "permalink_template": "https://siteurl.com/?attachment_id=44",
+  "generated_slug": "file_name",
+  "description": {
+    "raw": "",
+    "rendered": "<p class=\"attachment\"><a href='https://siteurl.com/wp-content/uploads/2021/10/file_name.png'><img width=\"300\" height=\"211\" src=\"https://siteurl.com/wp-content/uploads/2021/10/file_name-300x211.png\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https://siteurl.com/wp-content/uploads/2021/10/file_name-300x211.png 300w, https://siteurl.com/wp-content/uploads/2021/10/file_name-1024x720.png 1024w, https://siteurl.com/wp-content/uploads/2021/10/file_name-768x540.png 768w, https://siteurl.com/wp-content/uploads/2021/10/file_name-1536x1080.png 1536w, https://siteurl.com/wp-content/uploads/2021/10/file_name-2048x1440.png 2048w, https://siteurl.com/wp-content/uploads/2021/10/file_name-1568x1103.png 1568w, https://siteurl.com/wp-content/uploads/2021/10/file_name-600x422.png 600w\" sizes=\"(max-width: 300px) 100vw, 300px\" style=\"width:100%;height:70.31%;max-width:2560px;\" /></a></p>\n"
+  },
+  "caption": {
+    "raw": "",
+    "rendered": ""
+  },
+  "alt_text": "",
+  "media_type": "image",
+  "mime_type": "image/png",
+  "media_details": {
+    "width": 2560,
+    "height": 1800,
+    "file": "2021/10/file_name.png",
+    "sizes": {
+      "medium": {
+        "file": "file_name-300x211.png",
+        "width": 300,
+        "height": 211,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-300x211.png"
+      },
+      "large": {
+        "file": "file_name-1024x720.png",
+        "width": 1024,
+        "height": 720,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-1024x720.png"
+      },
+      "thumbnail": {
+        "file": "file_name-150x150.png",
+        "width": 150,
+        "height": 150,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-150x150.png"
+      },
+      "medium_large": {
+        "file": "file_name-768x540.png",
+        "width": 768,
+        "height": 540,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-768x540.png"
+      },
+      "1536x1536": {
+        "file": "file_name-1536x1080.png",
+        "width": 1536,
+        "height": 1080,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-1536x1080.png"
+      },
+      "2048x2048": {
+        "file": "file_name-2048x1440.png",
+        "width": 2048,
+        "height": 1440,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-2048x1440.png"
+      },
+      "post-thumbnail": {
+        "file": "file_name-1568x1103.png",
+        "width": 1568,
+        "height": 1103,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-1568x1103.png"
+      },
+      "woocommerce_thumbnail": {
+        "file": "file_name-450x450.png",
+        "width": 450,
+        "height": 450,
+        "uncropped": false,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-450x450.png"
+      },
+      "woocommerce_single": {
+        "file": "file_name-600x422.png",
+        "width": 600,
+        "height": 422,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-600x422.png"
+      },
+      "woocommerce_gallery_thumbnail": {
+        "file": "file_name-100x100.png",
+        "width": 100,
+        "height": 100,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-100x100.png"
+      },
+      "shop_catalog": {
+        "file": "file_name-450x450.png",
+        "width": 450,
+        "height": 450,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-450x450.png"
+      },
+      "shop_single": {
+        "file": "file_name-600x422.png",
+        "width": 600,
+        "height": 422,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-600x422.png"
+      },
+      "shop_thumbnail": {
+        "file": "file_name-100x100.png",
+        "width": 100,
+        "height": 100,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name-100x100.png"
+      },
+      "full": {
+        "file": "file_name.png",
+        "width": 2560,
+        "height": 1800,
+        "mime_type": "image/png",
+        "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name.png"
+      }
+    },
+    "image_meta": {
+      "aperture": "0",
+      "credit": "",
+      "camera": "",
+      "caption": "",
+      "created_timestamp": "0",
+      "copyright": "",
+      "focal_length": "0",
+      "iso": "0",
+      "shutter_speed": "0",
+      "title": "",
+      "orientation": "0",
+      "keywords": []
+    }
+  },
+  "post": null,
+  "source_url": "https://siteurl.com/wp-content/uploads/2021/10/file_name.png",
+  "missing_image_sizes": [],
+  "_links": {
+    "self": [
+      {
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/media/44"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/media"
+      }
+    ],
+    "about": [
+      {
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/types/attachment"
+      }
+    ],
+    "author": [
+      {
+        "embeddable": true,
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/users/1"
+      }
+    ],
+    "replies": [
+      {
+        "embeddable": true,
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/comments?post=44"
+      }
+    ],
+    "wp:action-unfiltered-html": [
+      {
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/media/44?post=44"
+      }
+    ],
+    "wp:action-assign-author": [
+      {
+        "href": "https://public-api.wordpress.com/wp/v2/sites/[site_id]/media/44?post=44"
+      }
+    ],
+    "curies": [
+      {
+        "name": "wp",
+        "href": "https://api.w.org/{rel}",
+        "templated": true
+      }
+    ]
+  },
+  "author_wpcom": 191289149
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/libs/fluxc-tests/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..1f0955d450f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/libs/fluxc-tests/src/test/resources/notifications/body-response.json b/libs/fluxc-tests/src/test/resources/notifications/body-response.json
new file mode 100644
index 00000000000..7c8972f1604
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/body-response.json
@@ -0,0 +1,57 @@
+{
+  "text": "This site was created by Author",
+  "ranges": [
+    {
+      "email": "user@automattic.com",
+      "url": "https://www.wordpress.com",
+      "id": 111,
+      "site_id": 123,
+      "type": "user",
+      "indices": [
+        0,
+        9
+      ]
+    }
+  ,{
+      "email": "user@automattic.com",
+      "url": "https://www.wordpress.com",
+      "id": 1999,
+      "site_id": 123,
+      "type": "scan",
+      "indices": [
+        10,
+        15
+      ]
+    }
+  ],
+  "media": [
+    {
+      "type": "image",
+      "indices": [
+        0,
+        0
+      ],
+      "height": "256",
+      "width": "256",
+      "url": "https://gravatar.jpg"
+    }
+  ],
+  "actions": {
+    "follow": false
+  },
+  "meta": {
+    "links": {
+      "email": "user@wp.com",
+      "home": "https://user.blog"
+    },
+    "ids": {
+      "user": 1,
+      "site": 2
+    },
+    "titles": {
+      "home": "Title"
+    },
+    "is_mobile_button": true
+  },
+  "type": "user"
+}
diff --git a/libs/fluxc-tests/src/test/resources/notifications/comment-response.json b/libs/fluxc-tests/src/test/resources/notifications/comment-response.json
new file mode 100644
index 00000000000..071339d31d5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/comment-response.json
@@ -0,0 +1,69 @@
+{
+  "text": "Hello. Attached is the fancy GB file block.\n\nimageDownload",
+  "ranges": [
+    {
+      "type": "div",
+      "indices": [
+        45,
+        58
+      ],
+      "parent": null,
+      "class": "wp-block-file"
+    },
+    {
+      "url": "https://wordpress.org/image.png",
+      "indices": [
+        50,
+        58
+      ],
+      "id": "16",
+      "parent": "13",
+      "type": "a",
+      "class": "wp-block-file__button"
+    },
+    {
+      "url": "https://wordpress.org/image.png",
+      "indices": [
+        45,
+        50
+      ],
+      "id": "wp-block-file--media-5c443d80-5da6",
+      "parent": "13",
+      "type": "a"
+    },
+    {
+      "type": "p",
+      "indices": [
+        0,
+        43
+      ],
+      "id": "10",
+      "parent": null
+    }
+  ],
+  "actions": {
+    "spam-comment": false,
+    "trash-comment": false,
+    "approve-comment": true,
+    "edit-comment": true,
+    "replyto-comment": true,
+    "like-comment": false
+  },
+  "meta": {
+    "ids": {
+      "comment": 437,
+      "user": 121310380,
+      "post": 35,
+      "site": 185525191
+    },
+    "links": {
+      "comment": "https://public-api.wordpress.com/rest/v1/comments/456",
+      "user": "https://public-api.wordpress.com/rest/v1/users/123",
+      "post": "https://public-api.wordpress.com/rest/v1/posts/789",
+      "site": "https://public-api.wordpress.com/rest/v1/sites/000"
+    }
+  },
+  "type": "comment",
+  "nest_level": 0,
+  "edit_comment_link": "https://wordpress.org/comment/1?action=edit"
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/notifications/formattable-content-array.json b/libs/fluxc-tests/src/test/resources/notifications/formattable-content-array.json
new file mode 100644
index 00000000000..8eabd3e5f41
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/formattable-content-array.json
@@ -0,0 +1 @@
+[{"media":[{"height":"256","width":"256","type":"image","url":"https://2.gravatar.com/avatar/ebab642c3eb6022e6986f9dcf3147c1e?s\u003d256\u0026d\u003dhttps%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256\u0026r\u003dG","indices":[0,0]}],"meta":{"links":{"email":"jshultz@test.com"}},"text":"Jennifer Shultz","type":"user","ranges":[{"type":"user","indices":[0,15]}]},{"actions":{"spam-comment":false,"trash-comment":false,"approve-comment":false,"edit-comment":true,"replyto-comment":true},"meta":{"ids":{"site":153482281,"comment":2716,"post":2231},"links":{"site":"https://public-api.wordpress.com/rest/v1/sites/153482281","comment":"https://public-api.wordpress.com/rest/v1/comments/2716","post":"https://public-api.wordpress.com/rest/v1/posts/2231"}},"text":"I bought this for my daughter and it fits beautifully!","type":"comment","nest_level":0},{"text":"Review for Ninja Hoodie","ranges":[{"type":"link","url":"https://testwooshop.mystagingwebsite.com/product/ninja-hoodie/","indices":[11,23]}]}]
diff --git a/libs/fluxc-tests/src/test/resources/notifications/notifications-api-response.json b/libs/fluxc-tests/src/test/resources/notifications/notifications-api-response.json
new file mode 100644
index 00000000000..0c14d71d187
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/notifications-api-response.json
@@ -0,0 +1,737 @@
+{
+  "last_seen_time": "1541086974",
+  "number": 5,
+  "notes": [
+    {
+      "id": 3633457829,
+      "type": "new_post",
+      "read": 0,
+      "noticon": "\uf455",
+      "timestamp": "2018-11-09T04:45:41+00:00",
+      "icon": "https:\/\/1.gravatar.com\/avatar\/767fc9c115a1b989744c755db47feb60?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+      "url": "https:\/\/ma.tt\/2018\/11\/gutenberg-in-portland-oregon-and-podcasts\/",
+      "subject": [
+        {
+          "text": "Matt posted Gutenberg in Portland Oregon and Podcasts on Matt Mullenweg",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                4
+              ],
+              "url": "https:\/\/matt.blog\/",
+              "site_id": 4,
+              "email": "m@mullenweg.com",
+              "id": 5
+            },
+            {
+              "type": "post",
+              "indices": [
+                12,
+                53
+              ],
+              "url": "https:\/\/ma.tt\/2018\/11\/gutenberg-in-portland-oregon-and-podcasts\/",
+              "site_id": 1047865,
+              "id": 48589
+            },
+            {
+              "type": "site",
+              "indices": [
+                57,
+                71
+              ],
+              "url": "https:\/\/ma.tt\/blog",
+              "id": 1047865
+            }
+          ]
+        },
+        {
+          "text": "I\u2019ve had the opportunity to talk about Gutenberg at two great venues recently. The first\u2026"
+        }
+      ],
+      "body": [
+        {
+          "text": "\nI\u2019ve had the opportunity to talk about Gutenberg at two great venues recently. The first was at WordCamp Portland which graciously allowed me to join for a Q&A at the end of the event. The questions were great and covered a lot of the latest and greatest about Gutenberg and WordPress 5.0:\n\n\n\n\n\nhttps:\/\/videopress.com\/embed\/9bsypEIk?hd=0https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243\n\n\n\n\nLast week I also joined Episode 101 of the WP Builds podcast, where as Nathan put it: \u201cWe talk about Gutenberg, why Matt thinks that we need it, and why we need it now. We go on to chat about how it\u2019s divided the WordPress community, especially from the perspective of users with accessibility needs.\u201d\n\n\n\n\nThey may be out of seats already, but I\u2019ll be on the other coast to do a small meetup in Portland, Maine this week. As we lead up to release and WordCamp US I\u2019m really enjoying the opportunity to hear from WordPress users of all levels all over the country.",
+          "ranges": [
+            {
+              "url": "https:\/\/2018.us.wordcamp.org\/",
+              "indices": [
+                860,
+                871
+              ]
+            },
+            {
+              "url": "https:\/\/www.meetup.com\/Southern-Maine-WordPress-Meetup\/events\/256212528\/",
+              "indices": [
+                753,
+                819
+              ]
+            },
+            {
+              "url": "https:\/\/wpbuilds.com\/2018\/11\/08\/episode-101-matt-mullenweg-why-gutenberg-and-why-now\/",
+              "indices": [
+                433,
+                469
+              ]
+            },
+            {
+              "url": "https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243",
+              "indices": [
+                338,
+                404
+              ]
+            },
+            {
+              "url": "https:\/\/videopress.com\/embed\/9bsypEIk?hd=0",
+              "indices": [
+                296,
+                338
+              ]
+            }
+          ],
+          "actions": {
+            "replyto-comment": true,
+            "like-post": false
+          },
+          "meta": {
+            "ids": {
+              "post": 48589,
+              "site": 1047865
+            },
+            "links": {
+              "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/48589",
+              "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/1047865"
+            }
+          },
+          "type": "post"
+        }
+      ],
+      "meta": {
+        "ids": {
+          "site": 1047865,
+          "post": 48589,
+          "user": 5
+        },
+        "links": {
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/1047865",
+          "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/48589",
+          "user": "https:\/\/public-api.wordpress.com\/rest\/v1\/users\/5"
+        }
+      },
+      "title": "New Post",
+      "header": [
+        {
+          "text": "Matt",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                4
+              ],
+              "url": "https:\/\/matt.blog\/",
+              "site_id": 4,
+              "email": "m@mullenweg.com",
+              "id": 5
+            }
+          ],
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "256",
+              "width": "256",
+              "url": "https:\/\/1.gravatar.com\/avatar\/767fc9c115a1b989744c755db47feb60?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+            }
+          ]
+        },
+        {
+          "text": "Gutenberg in Portland Oregon and Podcasts",
+          "ranges": [
+            {
+              "type": "post",
+              "indices": [
+                0,
+                41
+              ],
+              "url": "https:\/\/ma.tt\/2018\/11\/gutenberg-in-portland-oregon-and-podcasts\/",
+              "site_id": 1047865,
+              "id": 48589
+            }
+          ]
+        }
+      ],
+      "note_hash": 1880451709
+    },
+    {
+      "id": 3616322875,
+      "type": "store_order",
+      "read": 1,
+      "noticon": "\uf447",
+      "timestamp": "2018-11-01T15:42:54+00:00",
+      "icon": "https:\/\/testwooshop.mystagingwebsite.com\/wp-content\/uploads\/2018\/10\/0d1ee0d4-0f9d-4cc6-b7b2-6761eb416bbe.png?w=96",
+      "url": "https:\/\/testwooshop.mystagingwebsite.com\/wp-admin\/post.php?post=2235&action=edit",
+      "subject": [
+        {
+          "text": "\ud83c\udf89 You have a new order!"
+        },
+        {
+          "text": "Someone placed a UGX47.00 order from Woo Test Shop",
+          "ranges": [
+            {
+              "type": "site",
+              "indices": [
+                37,
+                50
+              ],
+              "url": "https:\/\/testwooshop.mystagingwebsite.com",
+              "id": 153482281
+            }
+          ]
+        }
+      ],
+      "body": [
+        {
+          "text": "",
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "48",
+              "width": "48",
+              "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/notes\/images\/store-cart-icon.png"
+            }
+          ]
+        },
+        {
+          "text": "Order Number: 2235\nDate: November 1, 2018\nTotal: UGX47.00\nPayment Method: Cash on delivery\nShipping Method: Flat rate"
+        },
+        {
+          "text": "Products:\n\nCap \u00d7 2\n"
+        },
+        {
+          "text": "\u2139\ufe0f View Order",
+          "ranges": [
+            {
+              "url": "https:\/\/testwooshop.mystagingwebsite.com\/wp-admin\/post.php?post=2235&action=edit",
+              "indices": [
+                0,
+                13
+              ],
+              "type": "link"
+            }
+          ]
+        }
+      ],
+      "meta": {
+        "ids": {
+          "site": 153482281,
+          "order": 2235
+        },
+        "links": {
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/153482281",
+          "order": "https:\/\/public-api.wordpress.com\/rest\/v1\/orders\/2235"
+        }
+      },
+      "title": "New Order",
+      "note_hash": 854333643
+    },
+    {
+      "id": 3675336239,
+      "type": "comment",
+      "subtype": "store_review",
+      "read": 0,
+      "noticon": "",
+      "timestamp": "2018-12-04T01:29:03+00:00",
+      "icon": "https://1.gravatar.com/avatar/4aa04cfcaaaa1045cfc6656c8449429c?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+      "url": "https://testwooshop.mystagingwebsite.com/product/beanie-with-logo/#comment-2733",
+      "subject": [
+        {
+          "text": "Amanda Droid left a review on Beanie with Logo",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                12
+              ],
+              "email": "amanda.droid2014@gmail.com"
+            },
+            {
+              "type": "post",
+              "indices": [
+                30,
+                46
+              ],
+              "url": "https://testwooshop.mystagingwebsite.com/product/beanie-with-logo/",
+              "site_id": 153482281,
+              "id": 33
+            }
+          ]
+        },
+        {
+          "text": "Nice and warm\n",
+          "ranges": [
+            {
+              "type": "comment",
+              "indices": [
+                0,
+                14
+              ],
+              "url": "https://testwooshop.mystagingwebsite.com/product/beanie-with-logo/#comment-2733",
+              "site_id": 153482281,
+              "post_id": 33,
+              "id": 2733
+            }
+          ]
+        }
+      ],
+      "body": [
+        {
+          "text": "Amanda Droid",
+          "ranges": [
+            {
+              "email": "amanda.droid2014@gmail.com",
+              "type": "user",
+              "indices": [
+                0,
+                12
+              ]
+            }
+          ],
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "256",
+              "width": "256",
+              "url": "https://1.gravatar.com/avatar/4aa04cfcaaaa1045cfc6656c8449429c?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+            }
+          ],
+          "meta": {
+            "links": {
+              "email": "amanda.droid2014@gmail.com"
+            }
+          },
+          "type": "user"
+        },
+        {
+          "text": "Nice and warm",
+          "actions": {
+            "spam-comment": false,
+            "trash-comment": false,
+            "approve-comment": true,
+            "edit-comment": true,
+            "replyto-comment": true
+          },
+          "meta": {
+            "ids": {
+              "comment": 2733,
+              "post": 33,
+              "site": 153482281
+            },
+            "links": {
+              "comment": "https://public-api.wordpress.com/rest/v1/comments/2733",
+              "post": "https://public-api.wordpress.com/rest/v1/posts/33",
+              "site": "https://public-api.wordpress.com/rest/v1/sites/153482281"
+            }
+          },
+          "type": "comment",
+          "nest_level": 0,
+          "edit_comment_link": "https://testwooshop.mystagingwebsite.com/wp-admin/comment.php?action=editcomment&c=2733"
+        },
+        {
+          "text": "Review for Beanie with Logo\n★ ★ ★ ★ ☆ ",
+          "ranges": [
+            {
+              "url": "https://testwooshop.mystagingwebsite.com/product/beanie-with-logo/",
+              "indices": [
+                28,
+                38
+              ],
+              "type": "link"
+            },
+            {
+              "url": "https://testwooshop.mystagingwebsite.com/product/beanie-with-logo/",
+              "indices": [
+                11,
+                27
+              ],
+              "type": "link"
+            }
+          ]
+        }
+      ],
+      "meta": {
+        "ids": {
+          "user": 0,
+          "comment": 2733,
+          "post": 33,
+          "site": 153482281
+        },
+        "links": {
+          "user": "https://public-api.wordpress.com/rest/v1/users/0",
+          "comment": "https://public-api.wordpress.com/rest/v1/comments/2733",
+          "post": "https://public-api.wordpress.com/rest/v1/posts/33",
+          "site": "https://public-api.wordpress.com/rest/v1/sites/153482281"
+        }
+      },
+      "title": "Product Review",
+      "note_hash": 2624601148
+    },
+    {
+      "id": 3617558725,
+      "type": "comment",
+      "subtype": "store_review",
+      "read": 1,
+      "noticon": "\uf300",
+      "timestamp": "2018-10-30T16:22:11+00:00",
+      "icon": "https:\/\/2.gravatar.com\/avatar\/ebab642c3eb6022e6986f9dcf3147c1e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+      "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/#comment-2716",
+      "subject": [
+        {
+          "text": "Jennifer Shultz left a review on Ninja Hoodie",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                15
+              ],
+              "email": "jshultz@test.com"
+            },
+            {
+              "type": "post",
+              "indices": [
+                33,
+                45
+              ],
+              "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/",
+              "site_id": 153482281,
+              "id": 2231
+            }
+          ]
+        },
+        {
+          "text": "I bought this for my daughter and it fits beautifully!\n",
+          "ranges": [
+            {
+              "type": "comment",
+              "indices": [
+                0,
+                55
+              ],
+              "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/#comment-2716",
+              "site_id": 153482281,
+              "post_id": 2231,
+              "id": 2716
+            }
+          ]
+        }
+      ],
+      "body": [
+        {
+          "text": "Jennifer Shultz",
+          "ranges": [
+            {
+              "email": "jshultz@test.com",
+              "type": "user",
+              "indices": [
+                0,
+                15
+              ]
+            }
+          ],
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "256",
+              "width": "256",
+              "url": "https:\/\/2.gravatar.com\/avatar\/ebab642c3eb6022e6986f9dcf3147c1e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+            }
+          ],
+          "meta": {
+            "links": {
+              "email": "jshultz@test.com"
+            }
+          },
+          "type": "user"
+        },
+        {
+          "text": "I bought this for my daughter and it fits beautifully!",
+          "actions": {
+            "spam-comment": false,
+            "trash-comment": false,
+            "approve-comment": false,
+            "edit-comment": true,
+            "replyto-comment": true
+          },
+          "meta": {
+            "ids": {
+              "comment": 2716,
+              "post": 2231,
+              "site": 153482281
+            },
+            "links": {
+              "comment": "https:\/\/public-api.wordpress.com\/rest\/v1\/comments\/2716",
+              "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/2231",
+              "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/153482281"
+            }
+          },
+          "type": "comment",
+          "nest_level": 0,
+          "edit_comment_link": "https:\/\/testwooshop.mystagingwebsite.com\/wp-admin\/comment.php?action=editcomment&c=2716"
+        },
+        {
+          "text": "Review for Ninja Hoodie",
+          "ranges": [
+            {
+              "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/",
+              "indices": [
+                11,
+                23
+              ],
+              "type": "link"
+            }
+          ]
+        }
+      ],
+      "meta": {
+        "ids": {
+          "user": 0,
+          "comment": 2716,
+          "post": 2231,
+          "site": 153482281
+        },
+        "links": {
+          "user": "https:\/\/public-api.wordpress.com\/rest\/v1\/users\/0",
+          "comment": "https:\/\/public-api.wordpress.com\/rest\/v1\/comments\/2716",
+          "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/2231",
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/153482281"
+        }
+      },
+      "title": "Product Review",
+      "note_hash": 1543255567
+    },
+    {
+      "id": 3604874081,
+      "type": "store_order",
+      "read": 1,
+      "noticon": "\uf447",
+      "timestamp": "2018-10-22T21:08:11+00:00",
+      "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/notes\/images\/update-payment-2x.png",
+      "url": "https:\/\/wordpress.com\/store\/order\/droidtester2018.shop\/88",
+      "subject": [
+        {
+          "text": "\ud83c\udf89 You have a new order!"
+        },
+        {
+          "text": "Someone placed a $18.00 order from Woo Test Store",
+          "ranges": [
+            {
+              "type": "site",
+              "indices": [
+                35,
+                49
+              ],
+              "url": "https:\/\/droidtester2018.shop",
+              "id": 141286411
+            }
+          ]
+        }
+      ],
+      "body": [
+        {
+          "text": "",
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "48",
+              "width": "48",
+              "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/notes\/images\/store-cart-icon.png"
+            }
+          ]
+        },
+        {
+          "text": "Order Number: 88\nDate: October 22, 2018\nTotal: $18.00\nPayment Method: Credit Card (Stripe)"
+        },
+        {
+          "text": "Products:\n\nBeanie \u00d7 1\n"
+        },
+        {
+          "text": "\u2139\ufe0f View Order",
+          "ranges": [
+            {
+              "url": "https:\/\/wordpress.com\/store\/order\/droidtester2018.shop\/88",
+              "indices": [
+                0,
+                13
+              ],
+              "type": "link"
+            }
+          ]
+        }
+      ],
+      "meta": {
+        "ids": {
+          "site": 141286411,
+          "order": 88
+        },
+        "links": {
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/141286411",
+          "order": "https:\/\/public-api.wordpress.com\/rest\/v1\/orders\/88"
+        }
+      },
+      "title": "New Order",
+      "note_hash": 2064099309
+    },
+    {
+      "id": 3600292273,
+      "type": "like",
+      "read": 1,
+      "noticon": "\uf408",
+      "timestamp": "2018-10-19T21:46:35+00:00",
+      "icon": "https:\/\/2.gravatar.com\/avatar\/ea81a72572244d5cd0af5c2d3f20d5ec?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+      "url": "http:\/\/amandatestsatomic1.blog\/welcome\/",
+      "subject": [
+        {
+          "text": "Amanda Riu liked your post Welcome",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                10
+              ],
+              "url": "http:\/\/amandariu.wordpress.com",
+              "site_id": 137327857,
+              "email": "amanda.riu@automattic.com",
+              "id": 57367146
+            },
+            {
+              "type": "post",
+              "indices": [
+                27,
+                34
+              ],
+              "url": "https:\/\/amandatestsatomic1.blog\/welcome\/",
+              "site_id": 140191676,
+              "id": 214
+            }
+          ]
+        }
+      ],
+      "body": [
+        {
+          "text": "Amanda Riu",
+          "ranges": [
+            {
+              "email": "amanda.riu@automattic.com",
+              "url": "http:\/\/amandariu.wordpress.com",
+              "id": 57367146,
+              "site_id": 137327857,
+              "type": "user",
+              "indices": [
+                0,
+                10
+              ]
+            }
+          ],
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "256",
+              "width": "256",
+              "url": "https:\/\/2.gravatar.com\/avatar\/ea81a72572244d5cd0af5c2d3f20d5ec?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+            }
+          ],
+          "actions": {
+            "follow": true
+          },
+          "meta": {
+            "links": {
+              "email": "amanda.riu@automattic.com",
+              "home": "http:\/\/amandariu.wordpress.com"
+            },
+            "ids": {
+              "user": 57367146,
+              "site": 137327857
+            },
+            "titles": {
+              "home": "Lost in Mandyland",
+              "tagline": "Getting lost is the best part of any adventure"
+            }
+          },
+          "type": "user"
+        }
+      ],
+      "meta": {
+        "ids": {
+          "site": 140191676,
+          "post": 214
+        },
+        "links": {
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/140191676",
+          "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/214"
+        }
+      },
+      "title": "1 Like",
+      "header": [
+        {
+          "text": "Droid Tester",
+          "ranges": [
+            {
+              "type": "user",
+              "indices": [
+                0,
+                12
+              ],
+              "url": "http:\/\/droidtester2018.wordpress.com",
+              "site_id": 141286411,
+              "email": "amanda.droid2014@gmail.com",
+              "id": 133520646
+            }
+          ],
+          "media": [
+            {
+              "type": "image",
+              "indices": [
+                0,
+                0
+              ],
+              "height": "256",
+              "width": "256",
+              "url": "https:\/\/1.gravatar.com\/avatar\/4aa04cfcaaaa1045cfc6656c8449429c?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+            }
+          ]
+        },
+        {
+          "text": "Welcome"
+        }
+      ],
+      "note_hash": 3910351479
+    }
+  ]
+}
diff --git a/libs/fluxc-tests/src/test/resources/notifications/rewind-download-ready.json b/libs/fluxc-tests/src/test/resources/notifications/rewind-download-ready.json
new file mode 100644
index 00000000000..2da6e5b9954
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/rewind-download-ready.json
@@ -0,0 +1,36 @@
+{
+  "text": "Jetpack has finished preparing a downloadable backup of your site, Kirby Atomic Business Site, as requested by kirbyzzzzz. Head over to the site’s Backups to download it.",
+  "ranges": [
+    {
+      "url": "https://wordpress.com/backup/kirbyatomicbusinesssite.wpcomstaging.com",
+      "indices": [
+        140,
+        154
+      ],
+      "id": "9",
+      "parent": null,
+      "type": "rewind_download_ready",
+      "site_id": 174754732
+    },
+    {
+      "type": "user",
+      "indices": [
+        111,
+        121
+      ],
+      "id": 182550502,
+      "parent": null,
+      "url": "http://testweb18.wordpress.com"
+    },
+    {
+      "type": "site",
+      "indices": [
+        67,
+        93
+      ],
+      "id": 174754732,
+      "parent": null,
+      "url": "https://kirbyatomicbusinesssite.wpcomstaging.com"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/notifications/store-order-notification.json b/libs/fluxc-tests/src/test/resources/notifications/store-order-notification.json
new file mode 100644
index 00000000000..9ce67927e45
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/store-order-notification.json
@@ -0,0 +1,76 @@
+{
+  "id": 3604874081,
+  "type": "store_order",
+  "read": 1,
+  "noticon": "\uf447",
+  "timestamp": "2018-10-22T21:08:11+00:00",
+  "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/notes\/images\/update-payment-2x.png",
+  "url": "https:\/\/wordpress.com\/store\/order\/droidtester2018.shop\/88",
+  "subject": [
+    {
+      "text": "\ud83c\udf89 You have a new order!"
+    },
+    {
+      "text": "Someone placed a $18.00 order from Woo Test Store",
+      "ranges": [
+        {
+          "type": "site",
+          "indices": [
+            35,
+            49
+          ],
+          "url": "https:\/\/droidtester2018.shop",
+          "id": 141286411
+        }
+      ]
+    }
+  ],
+  "body": [
+    {
+      "text": "",
+      "media": [
+        {
+          "type": "image",
+          "indices": [
+            0,
+            0
+          ],
+          "height": "48",
+          "width": "48",
+          "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/notes\/images\/store-cart-icon.png"
+        }
+      ]
+    },
+    {
+      "text": "Order Number: 88\nDate: October 22, 2018\nTotal: $18.00\nPayment Method: Credit Card (Stripe)"
+    },
+    {
+      "text": "Products:\n\nBeanie \u00d7 1\n"
+    },
+    {
+      "text": "\u2139\ufe0f View Order",
+      "ranges": [
+        {
+          "url": "https:\/\/wordpress.com\/store\/order\/droidtester2018.shop\/88",
+          "indices": [
+            0,
+            13
+          ],
+          "type": "link"
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "ids": {
+      "site": 141286411,
+      "order": 88
+    },
+    "links": {
+      "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/141286411",
+      "order": "https:\/\/public-api.wordpress.com\/rest\/v1\/orders\/88"
+    }
+  },
+  "title": "New Order",
+  "note_hash": 2064099309
+}
diff --git a/libs/fluxc-tests/src/test/resources/notifications/store-review-notification.json b/libs/fluxc-tests/src/test/resources/notifications/store-review-notification.json
new file mode 100644
index 00000000000..17b22f838a7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/store-review-notification.json
@@ -0,0 +1,138 @@
+{
+  "id": 3617558725,
+  "type": "comment",
+  "subtype": "store_review",
+  "read": 1,
+  "noticon": "\uf300",
+  "timestamp": "2018-10-30T16:22:11+00:00",
+  "icon": "https:\/\/2.gravatar.com\/avatar\/ebab642c3eb6022e6986f9dcf3147c1e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+  "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/#comment-2716",
+  "subject": [
+    {
+      "text": "Jennifer Shultz left a review on Ninja Hoodie",
+      "ranges": [
+        {
+          "type": "user",
+          "indices": [
+            0,
+            15
+          ],
+          "email": "jshultz@test.com"
+        },
+        {
+          "type": "post",
+          "indices": [
+            33,
+            45
+          ],
+          "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/",
+          "site_id": 153482281,
+          "id": 2231
+        }
+      ]
+    },
+    {
+      "text": "I bought this for my daughter and it fits beautifully!\n",
+      "ranges": [
+        {
+          "type": "comment",
+          "indices": [
+            0,
+            55
+          ],
+          "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/#comment-2716",
+          "site_id": 153482281,
+          "post_id": 2231,
+          "id": 2716
+        }
+      ]
+    }
+  ],
+  "body": [
+    {
+      "text": "Jennifer Shultz",
+      "ranges": [
+        {
+          "email": "jshultz@test.com",
+          "type": "user",
+          "indices": [
+            0,
+            15
+          ]
+        }
+      ],
+      "media": [
+        {
+          "type": "image",
+          "indices": [
+            0,
+            0
+          ],
+          "height": "256",
+          "width": "256",
+          "url": "https:\/\/2.gravatar.com\/avatar\/ebab642c3eb6022e6986f9dcf3147c1e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+        }
+      ],
+      "meta": {
+        "links": {
+          "email": "jshultz@test.com"
+        }
+      },
+      "type": "user"
+    },
+    {
+      "text": "I bought this for my daughter and it fits beautifully!",
+      "actions": {
+        "spam-comment": false,
+        "trash-comment": false,
+        "approve-comment": false,
+        "edit-comment": true,
+        "replyto-comment": true
+      },
+      "meta": {
+        "ids": {
+          "comment": 2716,
+          "post": 2231,
+          "site": 153482281
+        },
+        "links": {
+          "comment": "https:\/\/public-api.wordpress.com\/rest\/v1\/comments\/2716",
+          "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/2231",
+          "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/153482281"
+        }
+      },
+      "type": "comment",
+      "nest_level": 0,
+      "edit_comment_link": "https:\/\/testwooshop.mystagingwebsite.com\/wp-admin\/comment.php?action=editcomment&c=2716"
+    },
+    {
+      "text": "Review for Ninja Hoodie",
+      "ranges": [
+        {
+          "url": "https:\/\/testwooshop.mystagingwebsite.com\/product\/ninja-hoodie\/",
+          "indices": [
+            11,
+            23
+          ],
+          "type": "link"
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "ids": {
+      "user": 0,
+      "comment": 2716,
+      "post": 2231,
+      "site": 153482281
+    },
+    "links": {
+      "user": "https:\/\/public-api.wordpress.com\/rest\/v1\/users\/0",
+      "comment": "https:\/\/public-api.wordpress.com\/rest\/v1\/comments\/2716",
+      "post": "https:\/\/public-api.wordpress.com\/rest\/v1\/posts\/2231",
+      "site": "https:\/\/public-api.wordpress.com\/rest\/v1\/sites\/153482281"
+    }
+  },
+  "title": "Product Review",
+  "note_hash": 1543255567
+}
diff --git a/libs/fluxc-tests/src/test/resources/notifications/subject-response.json b/libs/fluxc-tests/src/test/resources/notifications/subject-response.json
new file mode 100644
index 00000000000..3d016d31739
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/notifications/subject-response.json
@@ -0,0 +1,21 @@
+{
+  "text": "You've received 20 likes on My Site",
+  "ranges": [
+    {
+      "type": "b",
+      "indices": [
+        16,
+        18
+      ]
+    },
+    {
+      "type": "site",
+      "indices": [
+        28,
+        35
+      ],
+      "url": "http://mysite.wordpress.com",
+      "id": 123
+    }
+  ]
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/attribute-term-operation-response.json b/libs/fluxc-tests/src/test/resources/wc/attribute-term-operation-response.json
new file mode 100644
index 00000000000..815477b554a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/attribute-term-operation-response.json
@@ -0,0 +1,20 @@
+{
+  "id": 23,
+  "name": "XXS",
+  "slug": "xxs",
+  "description": "",
+  "menu_order": 1,
+  "count": 1,
+  "_links": {
+    "self": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/23"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/attribute-terms-full-list.json b/libs/fluxc-tests/src/test/resources/wc/attribute-terms-full-list.json
new file mode 100644
index 00000000000..c6294d6b8a9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/attribute-terms-full-list.json
@@ -0,0 +1,142 @@
+[
+  {
+    "id": 23,
+    "name": "XXS",
+    "slug": "xxs",
+    "description": "",
+    "menu_order": 1,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/23"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 22,
+    "name": "XS",
+    "slug": "xs",
+    "description": "",
+    "menu_order": 2,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/22"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 17,
+    "name": "S",
+    "slug": "s",
+    "description": "",
+    "menu_order": 3,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/17"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 18,
+    "name": "M",
+    "slug": "m",
+    "description": "",
+    "menu_order": 4,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/18"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 19,
+    "name": "L",
+    "slug": "l",
+    "description": "",
+    "menu_order": 5,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/19"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 20,
+    "name": "XL",
+    "slug": "xl",
+    "description": "",
+    "menu_order": 6,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/20"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  },
+  {
+    "id": 21,
+    "name": "XXL",
+    "slug": "xxl",
+    "description": "",
+    "menu_order": 7,
+    "count": 1,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms/21"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2/terms"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/leaderboards-response-example.json b/libs/fluxc-tests/src/test/resources/wc/leaderboards-response-example.json
new file mode 100644
index 00000000000..2e93333edbe
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/leaderboards-response-example.json
@@ -0,0 +1,224 @@
+[
+  {
+    "id": "customers",
+    "label": "Top Customers - Total Spend",
+    "headers": [
+      {
+        "label": "Customer Name"
+      },
+      {
+        "label": "Orders"
+      },
+      {
+        "label": "Total Spend"
+      }
+    ],
+    "rows": [
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/customers&filter=single_customer&customers=2'>Test Test<\/a>",
+          "value": "Test Test"
+        },
+        {
+          "display": "1",
+          "value": 1
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>206.300,00<\/span>",
+          "value": 206300
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/customers&filter=single_customer&customers=3'>More Test From Tester<\/a>",
+          "value": "More Test From Tester"
+        },
+        {
+          "display": "1",
+          "value": 1
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>63.800,00<\/span>",
+          "value": 63800
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/customers&filter=single_customer&customers=1'>Test Order<\/a>",
+          "value": "Test Order"
+        },
+        {
+          "display": "7",
+          "value": 7
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>1.036,00<\/span>",
+          "value": 1036
+        }
+      ]
+    ]
+  },
+  {
+    "id": "coupons",
+    "label": "Top Coupons - Number of Orders",
+    "headers": [
+      {
+        "label": "Coupon Code"
+      },
+      {
+        "label": "Orders"
+      },
+      {
+        "label": "Amount Discounted"
+      }
+    ],
+    "rows": [
+    ]
+  },
+  {
+    "id": "categories",
+    "label": "Top Categories - Items Sold",
+    "headers": [
+      {
+        "label": "Category"
+      },
+      {
+        "label": "Items Sold"
+      },
+      {
+        "label": "Net Sales"
+      }
+    ],
+    "rows": [
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/categories&filter=single_category&categories=16'>Clothing<\/a>",
+          "value": "Clothing"
+        },
+        {
+          "display": "6.650",
+          "value": 6650
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>239.300,00<\/span>",
+          "value": 239300
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/categories&filter=single_category&categories=19'>Accessories<\/a>",
+          "value": "Accessories"
+        },
+        {
+          "display": "4.550",
+          "value": 4550
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>191.800,00<\/span>",
+          "value": 191800
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/categories&filter=single_category&categories=17'>Tshirts<\/a>",
+          "value": "Tshirts"
+        },
+        {
+          "display": "2.000",
+          "value": 2000
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>43.000,00<\/span>",
+          "value": 43000
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/categories&filter=single_category&categories=20'>Music<\/a>",
+          "value": "Music"
+        },
+        {
+          "display": "2.000",
+          "value": 2000
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>30.000,00<\/span>",
+          "value": 30000
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/categories&filter=single_category&categories=18'>Hoodies<\/a>",
+          "value": "Hoodies"
+        },
+        {
+          "display": "100",
+          "value": 100
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>4.500,00<\/span>",
+          "value": 4500
+        }
+      ]
+    ]
+  },
+  {
+    "id": "products",
+    "label": "Top Products - Items Sold",
+    "headers": [
+      {
+        "label": "Product"
+      },
+      {
+        "label": "Items Sold"
+      },
+      {
+        "label": "Net Sales"
+      }
+    ],
+    "rows": [
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/products&filter=single_product&products=14'>Beanie<\/a>",
+          "value": "Beanie"
+        },
+        {
+          "display": "2.000",
+          "value": 2000
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>36.000,00<\/span>",
+          "value": 36000
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/products&filter=single_product&products=22'>Album<\/a>",
+          "value": "Album"
+        },
+        {
+          "display": "2.000",
+          "value": 2000
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>30.000,00<\/span>",
+          "value": 30000
+        }
+      ],
+      [
+        {
+          "display": "<a href='https:\/\/mystagingwebsite.com\/wp-admin\/admin.php?page=wc-admin&path=\/analytics\/products&filter=single_product&products=15'>Belt<\/a>",
+          "value": "Belt"
+        },
+        {
+          "display": "2.000",
+          "value": 2000
+        },
+        {
+          "display": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>110.000,00<\/span>",
+          "value": 110000
+        }
+      ]
+    ]
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/lineitems.json b/libs/fluxc-tests/src/test/resources/wc/lineitems.json
new file mode 100644
index 00000000000..d4051056158
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/lineitems.json
@@ -0,0 +1,121 @@
+[
+  {
+    "id":1,
+    "name":"A test",
+    "product_id":15,
+    "quantity":1,
+    "tax_class":"",
+    "subtotal":"10.00",
+    "subtotal_tax":"0.00",
+    "total":"10.00",
+    "total_tax":"0.00",
+    "taxes":[],
+    "meta_data":[
+      {
+        "id":45512,
+        "key":"pa_color",
+        "value":"red",
+        "display_key":"color",
+        "display_value":"Red"
+      },
+      {
+        "id":45513,
+        "key":"pa_size",
+        "value":"medium",
+        "display_key":"size",
+        "display_value":"Medium"
+      }
+    ],
+    "sku":null,
+    "price":10
+  },
+  {
+    "id":2,
+    "name":"A second test",
+    "parent_name": null,
+    "product_id":65,
+    "variation_id":3,
+    "quantity":2,
+    "tax_class":"",
+    "subtotal":"20.00",
+    "subtotal_tax":"0.00",
+    "total":"20.00",
+    "total_tax":"0.00",
+    "taxes":[],
+    "meta_data":[
+      {
+        "id":45513,
+        "key":"pa_size",
+        "value":"medium",
+        "display_key":"size",
+        "display_value":"medium"
+      }
+    ],
+    "sku":"blabla",
+    "price":20
+  },
+  {
+    "id":5037,
+    "name":"V-Neck T-Shirt - Blue, Medium",
+    "product_id":12,
+    "variation_id":8947,
+    "quantity":2,
+    "tax_class":"",
+    "subtotal":"30.00",
+    "subtotal_tax":"0.00",
+    "total":"30.00",
+    "total_tax":"0.00",
+    "taxes":[],
+    "meta_data":[
+      {
+        "id":45548,
+        "key":"pa_color",
+        "value":"blue",
+        "display_key":"color",
+        "display_value":"Blue"
+      },
+      {
+        "id":45549,
+        "key":"pa_size",
+        "value":"medium",
+        "display_key":"size",
+        "display_value":"medium"
+      },
+      {
+        "id":45560,
+        "key":"pa_size",
+        "value":"medium",
+        "display_key":"size",
+        "display_value":""
+      },
+      {
+        "id": 6412,
+        "key": "_reduced_stock",
+        "value": "1",
+        "display_key": "_reduced_stock",
+        "display_value": "1"
+      },
+      {
+        "id": 6413,
+        "key": "_other_attribute",
+        "value": "2",
+        "display_key": "_other_attribute",
+        "display_value": "2"
+      },
+      {
+        "display_key": "emptyArray",
+        "display_value": []
+      },
+      {
+        "display_value": []
+      },
+      {
+        "display_key": "",
+        "display_value": "empty key"
+      }
+    ],
+    "sku":"woo-vneck-tee",
+    "price":15,
+    "parent_name":"V-Neck T-Shirt"
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/order-shipment-providers.json b/libs/fluxc-tests/src/test/resources/wc/order-shipment-providers.json
new file mode 100644
index 00000000000..3cb8d159934
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order-shipment-providers.json
@@ -0,0 +1,94 @@
+{
+  "Australia": {
+    "Australia Post": "http:\/\/auspost.com.au\/track\/track.html?id=%1$s",
+    "Fastway Couriers": "http:\/\/www.fastway.com.au\/courier-services\/track-your-parcel?l=%1$s"
+  },
+  "Austria": {
+    "post.at": "http:\/\/www.post.at\/sendungsverfolgung.php?pnum1=%1$s",
+    "dhl.at": "http:\/\/www.dhl.at\/content\/at\/de\/express\/sendungsverfolgung.html?brand=DHL&AWB=%1$s",
+    "DPD.at": "https:\/\/tracking.dpd.de\/parcelstatus?locale=de_AT&query=%1$s"
+  },
+  "Brazil": {
+    "Correios": "http:\/\/websro.correios.com.br\/sro_bin\/txect01$.QueryList?P_LINGUA=001&P_TIPO=001&P_COD_UNI=%1$s"
+  },
+  "Belgium": {
+    "bpost": "https:\/\/track.bpost.be\/btr\/web\/#\/search?itemCode=%1$s"
+  },
+  "Canada": {
+    "Canada Post": "http:\/\/www.canadapost.ca\/cpotools\/apps\/track\/personal\/findByTrackNumber?trackingNumber=%1$s"
+  },
+  "Czech Republic": {
+    "PPL.cz": "http:\/\/www.ppl.cz\/main2.aspx?cls=Package&idSearch=%1$s",
+    "\u010cesk\u00e1 po\u0161ta": "https:\/\/www.postaonline.cz\/trackandtrace\/-\/zasilka\/cislo?parcelNumbers=%1$s",
+    "DHL.cz": "http:\/\/www.dhl.cz\/cs\/express\/sledovani_zasilek.html?AWB=%1$s",
+    "DPD.cz": "https:\/\/tracking.dpd.de\/parcelstatus?locale=cs_CZ&query=%1$s"
+  },
+  "Finland": {
+    "Itella": "http:\/\/www.posti.fi\/itemtracking\/posti\/search_by_shipment_id?lang=en&ShipmentId=%1$s"
+  },
+  "France": {
+    "Colissimo": "http:\/\/www.colissimo.fr\/portail_colissimo\/suivre.do?language=fr_FR&colispart=%1$s"
+  },
+  "Germany": {
+    "DHL Intraship (DE)": "http:\/\/nolp.dhl.de\/nextt-online-public\/set_identcodes.do?lang=de&idc=%1$s&rfn=&extendedSearch=true",
+    "Hermes": "https:\/\/tracking.hermesworld.com\/?TrackID=%1$s",
+    "Deutsche Post DHL": "http:\/\/nolp.dhl.de\/nextt-online-public\/set_identcodes.do?lang=de&idc=%1$s",
+    "UPS Germany": "http:\/\/wwwapps.ups.com\/WebTracking\/processInputRequest?sort_by=status&tracknums_displayed=1&TypeOfInquiryNumber=T&loc=de_DE&InquiryNumber1=%1$s",
+    "DPD.de": "https:\/\/tracking.dpd.de\/parcelstatus?query=%1$s&locale=en_DE"
+  },
+  "Ireland": {
+    "DPD.ie": "http:\/\/www2.dpd.ie\/Services\/QuickTrack\/tabid\/222\/ConsignmentID\/%1$s\/Default.aspx",
+    "An Post": "https:\/\/track.anpost.ie\/TrackingResults.aspx?rtt=1&items=%1$s"
+  },
+  "Italy": {
+    "BRT (Bartolini)": "http:\/\/as777.brt.it\/vas\/sped_det_show.hsm?referer=sped_numspe_par.htm&Nspediz=%1$s",
+    "DHL Express": "http:\/\/www.dhl.it\/it\/express\/ricerca.html?AWB=%1$s&brand=DHL"
+  },
+  "India": {
+    "DTDC": "http:\/\/www.dtdc.in\/tracking\/tracking_results.asp?Ttype=awb_no&strCnno=%1$s&TrkType2=awb_no"
+  },
+  "Netherlands": {
+    "PostNL": "https:\/\/mijnpakket.postnl.nl\/Claim?Barcode=%1$s&Postalcode=%2$s&Foreign=False&ShowAnonymousLayover=False&CustomerServiceClaim=False",
+    "DPD.NL": "http:\/\/track.dpdnl.nl\/?parcelnumber=%1$s",
+    "UPS Netherlands": "http:\/\/wwwapps.ups.com\/WebTracking\/processInputRequest?sort_by=status&tracknums_displayed=1&TypeOfInquiryNumber=T&loc=nl_NL&InquiryNumber1=%1$s"
+  },
+  "New Zealand": {
+    "Courier Post": "http:\/\/trackandtrace.courierpost.co.nz\/Search\/%1$s",
+    "NZ Post": "http:\/\/www.nzpost.co.nz\/tools\/tracking?trackid=%1$s",
+    "Fastways": "http:\/\/www.fastway.co.nz\/courier-services\/track-your-parcel?l=%1$s",
+    "PBT Couriers": "http:\/\/www.pbt.com\/nick\/results.cfm?ticketNo=%1$s"
+  },
+  "Romania": {
+    "Fan Courier": "https:\/\/www.fancourier.ro\/awb-tracking\/?xawb=%1$s",
+    "DPD Romania": "https:\/\/tracking.dpd.de\/parcelstatus?query=%1$s&locale=ro_RO",
+    "Urgent Cargus": "https:\/\/app.urgentcargus.ro\/Private\/Tracking.aspx?CodBara=%1$s"
+  },
+  "South African": {
+    "SAPO": "http:\/\/sms.postoffice.co.za\/TrackingParcels\/Parcel.aspx?id=%1$s"
+  },
+  "Sweden": {
+    "PostNord Sverige AB": "http:\/\/www.postnord.se\/sv\/verktyg\/sok\/Sidor\/spara-brev-paket-och-pall.aspx?search=%1$s",
+    "DHL.se": "http:\/\/www.dhl.se\/content\/se\/sv\/express\/godssoekning.shtml?brand=DHL&AWB=%1$s",
+    "Bring.se": "http:\/\/tracking.bring.se\/tracking.html?q=%1$s",
+    "UPS.se": "http:\/\/wwwapps.ups.com\/WebTracking\/track?track=yes&loc=sv_SE&trackNums=%1$s",
+    "DB Schenker": "http:\/\/privpakportal.schenker.nu\/TrackAndTrace\/packagesearch.aspx?packageId=%1$s"
+  },
+  "United Kingdom": {
+    "DHL": "http:\/\/www.dhl.com\/content\/g0\/en\/express\/tracking.shtml?brand=DHL&AWB=%1$s",
+    "DPD.co.uk": "http:\/\/www.dpd.co.uk\/tracking\/trackingSearch.do?search.searchType=0&search.parcelNumber=%1$s",
+    "InterLink": "http:\/\/www.interlinkexpress.com\/apps\/tracking\/?reference=%1$s&postcode=%2$s#results",
+    "ParcelForce": "http:\/\/www.parcelforce.com\/portal\/pw\/track?trackNumber=%1$s",
+    "Royal Mail": "https:\/\/www.royalmail.com\/track-your-item\/?trackNumber=%1$s",
+    "TNT Express (consignment)": "http:\/\/www.tnt.com\/webtracker\/tracking.do?requestType=GEN&searchType=CON&respLang=en&respCountry=GENERIC&sourceID=1&sourceCountry=ww&cons=%1$s&navigation=1&g\nenericSiteIdent=",
+    "TNT Express (reference)": "http:\/\/www.tnt.com\/webtracker\/tracking.do?requestType=GEN&searchType=REF&respLang=en&respCountry=GENERIC&sourceID=1&sourceCountry=ww&cons=%1$s&navigation=1&genericSiteIdent=",
+    "UK Mail": "https:\/\/www.ukmail.com\/manage-my-delivery\/manage-my-delivery?ConsignmentNumber=%1$s"
+  },
+  "United States": {
+    "Fedex": "http:\/\/www.fedex.com\/Tracking?action=track&tracknumbers=%1$s",
+    "FedEx Sameday": "https:\/\/www.fedexsameday.com\/fdx_dotracking_ua.aspx?tracknum=%1$s",
+    "OnTrac": "http:\/\/www.ontrac.com\/trackingdetail.asp?tracking=%1$s",
+    "UPS": "http:\/\/wwwapps.ups.com\/WebTracking\/track?track=yes&trackNums=%1$s",
+    "USPS": "https:\/\/tools.usps.com\/go\/TrackConfirmAction_input?qtc_tLabels1=%1$s",
+    "DHL US": "https:\/\/www.logistics.dhl\/us-en\/home\/tracking\/tracking-ecommerce.html?tracking-id=%1$s"
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/order-shipment-trackings-multiple.json b/libs/fluxc-tests/src/test/resources/wc/order-shipment-trackings-multiple.json
new file mode 100644
index 00000000000..b51adc233c7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order-shipment-trackings-multiple.json
@@ -0,0 +1,50 @@
+[
+  {
+    "tracking_id": "19b28e4151dc5b4ae1c27294ede241f9",
+    "tracking_provider": "USPS",
+    "tracking_link": "https:\/\/tools.usps.com\/go\/TrackConfirmAction_input?qtc_tLabels1=11122233344466666",
+    "tracking_number": "11122233344466666",
+    "date_shipped": "2019-02-19",
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670\/shipment-trackings\/19b28e4151dc5b4ae1c27294ede241f9"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670\/shipment-trackings"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670"
+        }
+      ]
+    }
+  },
+  {
+    "tracking_id": "f2b65a93c13268462525ba77c80e993f",
+    "tracking_provider": "FedEx Sameday",
+    "tracking_link": "https:\/\/www.fedexsameday.com\/fdx_dotracking_ua.aspx?tracknum=4444222333444",
+    "tracking_number": "4444222333444",
+    "date_shipped": "2019-03-19",
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670\/shipment-trackings\/f2b65a93c13268462525ba77c80e993f"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670\/shipment-trackings"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v2\/orders\/2670"
+        }
+      ]
+    }
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/order-shipping-lines.json b/libs/fluxc-tests/src/test/resources/wc/order-shipping-lines.json
new file mode 100644
index 00000000000..4a1910ffbe0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order-shipping-lines.json
@@ -0,0 +1,22 @@
+[
+  {
+    "id": 2,
+    "method_title": "Flat Rate Shipping",
+    "method_id": "flat_rate",
+    "instance_id": "0",
+    "total": "10.00",
+    "total_tax": "0.00",
+    "taxes": [],
+    "meta_data": []
+  },
+  {
+    "id": 3,
+    "method_title": "Local Pickup Shipping",
+    "method_id": "local_pickup",
+    "instance_id": "0",
+    "total": "20.00",
+    "total_tax": "0.00",
+    "taxes": [],
+    "meta_data": []
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/order-summaries-extended.json b/libs/fluxc-tests/src/test/resources/wc/order-summaries-extended.json
new file mode 100644
index 00000000000..01459b31cf0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order-summaries-extended.json
@@ -0,0 +1,1502 @@
+[
+  {
+    "id": 5160,
+    "date_created_gmt": "2020-09-26T07:00:12",
+    "date_modified_gmt": "2019-12-19T22:52:01"
+  },
+  {
+    "id": 5709,
+    "date_created_gmt": "2020-08-01T23:32:51",
+    "date_modified_gmt": "2019-10-24T02:06:43"
+  },
+  {
+    "id": 7945,
+    "date_created_gmt": "2020-01-03T00:32:35",
+    "date_modified_gmt": "2020-01-08T21:58:24"
+  },
+  {
+    "id": 7937,
+    "date_created_gmt": "2020-01-02T18:53:47",
+    "date_modified_gmt": "2020-01-02T18:53:49"
+  },
+  {
+    "id": 7894,
+    "date_created_gmt": "2019-12-31T23:49:18",
+    "date_modified_gmt": "2020-01-08T23:26:15"
+  },
+  {
+    "id": 7865,
+    "date_created_gmt": "2019-12-30T23:55:35",
+    "date_modified_gmt": "2020-01-08T23:26:28"
+  },
+  {
+    "id": 7856,
+    "date_created_gmt": "2019-12-30T21:09:22",
+    "date_modified_gmt": "2020-01-08T23:26:37"
+  },
+  {
+    "id": 7854,
+    "date_created_gmt": "2019-12-30T21:08:31",
+    "date_modified_gmt": "2019-12-31T18:34:58"
+  },
+  {
+    "id": 7858,
+    "date_created_gmt": "2019-12-29T21:10:16",
+    "date_modified_gmt": "2019-12-30T21:11:24"
+  },
+  {
+    "id": 7602,
+    "date_created_gmt": "2019-12-19T23:58:29",
+    "date_modified_gmt": "2019-12-20T00:07:15"
+  },
+  {
+    "id": 7598,
+    "date_created_gmt": "2019-12-19T23:25:32",
+    "date_modified_gmt": "2019-12-19T23:25:32"
+  },
+  {
+    "id": 7569,
+    "date_created_gmt": "2019-12-19T06:27:08",
+    "date_modified_gmt": "2019-12-19T23:10:11"
+  },
+  {
+    "id": 7552,
+    "date_created_gmt": "2019-12-19T01:45:48",
+    "date_modified_gmt": "2019-12-19T01:55:40"
+  },
+  {
+    "id": 7545,
+    "date_created_gmt": "2019-12-18T21:36:22",
+    "date_modified_gmt": "2019-12-19T04:36:20"
+  },
+  {
+    "id": 7525,
+    "date_created_gmt": "2019-12-18T03:56:49",
+    "date_modified_gmt": "2019-12-18T04:00:32"
+  },
+  {
+    "id": 7501,
+    "date_created_gmt": "2019-12-17T05:00:55",
+    "date_modified_gmt": "2019-12-17T05:00:57"
+  },
+  {
+    "id": 7496,
+    "date_created_gmt": "2019-12-17T02:40:52",
+    "date_modified_gmt": "2019-12-17T02:40:55"
+  },
+  {
+    "id": 7472,
+    "date_created_gmt": "2019-12-16T06:47:20",
+    "date_modified_gmt": "2019-12-16T06:47:23"
+  },
+  {
+    "id": 7400,
+    "date_created_gmt": "2019-12-11T04:01:38",
+    "date_modified_gmt": "2019-12-11T04:01:40"
+  },
+  {
+    "id": 7351,
+    "date_created_gmt": "2019-12-09T06:43:27",
+    "date_modified_gmt": "2019-12-09T06:43:30"
+  },
+  {
+    "id": 6933,
+    "date_created_gmt": "2019-11-21T21:27:48",
+    "date_modified_gmt": "2019-11-21T21:27:51"
+  },
+  {
+    "id": 6931,
+    "date_created_gmt": "2019-11-21T21:26:40",
+    "date_modified_gmt": "2019-12-17T01:09:21"
+  },
+  {
+    "id": 6725,
+    "date_created_gmt": "2019-11-14T02:44:39",
+    "date_modified_gmt": "2019-11-21T01:35:04"
+  },
+  {
+    "id": 6723,
+    "date_created_gmt": "2019-11-14T02:37:10",
+    "date_modified_gmt": "2019-11-14T03:04:42"
+  },
+  {
+    "id": 6720,
+    "date_created_gmt": "2019-11-14T02:33:49",
+    "date_modified_gmt": "2019-11-14T03:13:54"
+  },
+  {
+    "id": 6718,
+    "date_created_gmt": "2019-11-14T02:30:52",
+    "date_modified_gmt": "2019-11-15T20:06:18"
+  },
+  {
+    "id": 6715,
+    "date_created_gmt": "2019-11-14T01:58:28",
+    "date_modified_gmt": "2019-11-14T01:58:28"
+  },
+  {
+    "id": 6711,
+    "date_created_gmt": "2019-11-14T01:45:13",
+    "date_modified_gmt": "2019-12-05T04:29:55"
+  },
+  {
+    "id": 6708,
+    "date_created_gmt": "2019-11-14T01:41:29",
+    "date_modified_gmt": "2019-11-21T20:24:12"
+  },
+  {
+    "id": 6705,
+    "date_created_gmt": "2019-11-14T01:38:12",
+    "date_modified_gmt": "2019-11-21T01:36:22"
+  },
+  {
+    "id": 5706,
+    "date_created_gmt": "2019-10-17T23:27:53",
+    "date_modified_gmt": "2019-11-04T23:24:29"
+  },
+  {
+    "id": 5704,
+    "date_created_gmt": "2019-10-17T23:26:19",
+    "date_modified_gmt": "2019-11-05T06:36:52"
+  },
+  {
+    "id": 5460,
+    "date_created_gmt": "2019-10-08T02:15:17",
+    "date_modified_gmt": "2019-10-15T05:14:45"
+  },
+  {
+    "id": 5099,
+    "date_created_gmt": "2019-09-26T21:47:53",
+    "date_modified_gmt": "2019-11-04T23:18:58"
+  },
+  {
+    "id": 4437,
+    "date_created_gmt": "2019-08-29T18:26:35",
+    "date_modified_gmt": "2019-12-03T03:58:50"
+  },
+  {
+    "id": 4435,
+    "date_created_gmt": "2019-08-29T18:22:05",
+    "date_modified_gmt": "2019-10-24T00:43:37"
+  },
+  {
+    "id": 4433,
+    "date_created_gmt": "2019-08-29T18:20:56",
+    "date_modified_gmt": "2019-10-01T16:42:11"
+  },
+  {
+    "id": 4406,
+    "date_created_gmt": "2019-08-28T11:58:34",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4397,
+    "date_created_gmt": "2019-08-28T04:46:59",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4384,
+    "date_created_gmt": "2019-08-27T20:04:08",
+    "date_modified_gmt": "2019-08-27T20:09:49"
+  },
+  {
+    "id": 4286,
+    "date_created_gmt": "2019-08-23T18:11:47",
+    "date_modified_gmt": "2019-09-26T22:35:37"
+  },
+  {
+    "id": 4261,
+    "date_created_gmt": "2019-08-22T17:56:13",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4259,
+    "date_created_gmt": "2019-08-22T17:49:14",
+    "date_modified_gmt": "2019-08-22T17:50:13"
+  },
+  {
+    "id": 4176,
+    "date_created_gmt": "2019-08-07T23:18:00",
+    "date_modified_gmt": "2019-08-07T23:18:02"
+  },
+  {
+    "id": 4174,
+    "date_created_gmt": "2019-08-07T23:16:54",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4171,
+    "date_created_gmt": "2019-08-07T21:31:42",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4161,
+    "date_created_gmt": "2019-08-07T04:50:58",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4159,
+    "date_created_gmt": "2019-08-07T04:49:41",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4143,
+    "date_created_gmt": "2019-08-06T18:02:11",
+    "date_modified_gmt": "2019-09-26T22:35:37"
+  },
+  {
+    "id": 4120,
+    "date_created_gmt": "2019-08-02T23:28:51",
+    "date_modified_gmt": "2019-10-22T19:06:10"
+  },
+  {
+    "id": 4118,
+    "date_created_gmt": "2019-08-02T23:25:46",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 4080,
+    "date_created_gmt": "2019-07-31T03:00:50",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 4066,
+    "date_created_gmt": "2019-07-30T22:26:17",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 3945,
+    "date_created_gmt": "2019-07-25T03:02:25",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 3894,
+    "date_created_gmt": "2019-07-19T02:33:39",
+    "date_modified_gmt": "2019-07-24T07:07:40"
+  },
+  {
+    "id": 3564,
+    "date_created_gmt": "2019-07-17T16:36:40",
+    "date_modified_gmt": "2019-07-17T20:33:53"
+  },
+  {
+    "id": 3562,
+    "date_created_gmt": "2019-07-17T16:11:03",
+    "date_modified_gmt": "2019-07-30T14:25:10"
+  },
+  {
+    "id": 3555,
+    "date_created_gmt": "2019-07-17T02:12:56",
+    "date_modified_gmt": "2019-07-19T01:57:20"
+  },
+  {
+    "id": 3553,
+    "date_created_gmt": "2019-07-17T02:09:39",
+    "date_modified_gmt": "2019-07-17T20:33:53"
+  },
+  {
+    "id": 3548,
+    "date_created_gmt": "2019-07-17T02:03:08",
+    "date_modified_gmt": "2019-07-17T20:33:52"
+  },
+  {
+    "id": 3330,
+    "date_created_gmt": "2019-07-15T06:16:07",
+    "date_modified_gmt": "2019-07-17T20:33:52"
+  },
+  {
+    "id": 3316,
+    "date_created_gmt": "2019-07-12T22:44:24",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 3313,
+    "date_created_gmt": "2019-07-12T22:39:02",
+    "date_modified_gmt": "2019-07-25T23:01:33"
+  },
+  {
+    "id": 3310,
+    "date_created_gmt": "2019-07-12T22:33:01",
+    "date_modified_gmt": "2019-07-17T20:33:52"
+  },
+  {
+    "id": 3293,
+    "date_created_gmt": "2019-07-10T20:09:17",
+    "date_modified_gmt": "2019-07-17T20:33:51"
+  },
+  {
+    "id": 3291,
+    "date_created_gmt": "2019-07-10T19:45:48",
+    "date_modified_gmt": "2019-07-17T20:33:51"
+  },
+  {
+    "id": 3289,
+    "date_created_gmt": "2019-07-10T19:43:06",
+    "date_modified_gmt": "2019-07-17T20:33:51"
+  },
+  {
+    "id": 3262,
+    "date_created_gmt": "2019-07-09T09:49:17",
+    "date_modified_gmt": "2019-07-17T20:33:51"
+  },
+  {
+    "id": 3241,
+    "date_created_gmt": "2019-07-08T03:00:07",
+    "date_modified_gmt": "2019-07-25T21:50:45"
+  },
+  {
+    "id": 3225,
+    "date_created_gmt": "2019-07-05T08:43:56",
+    "date_modified_gmt": "2019-07-17T20:33:50"
+  },
+  {
+    "id": 3154,
+    "date_created_gmt": "2019-07-03T00:35:56",
+    "date_modified_gmt": "2019-07-17T20:33:50"
+  },
+  {
+    "id": 3151,
+    "date_created_gmt": "2019-07-03T00:31:52",
+    "date_modified_gmt": "2019-07-17T20:33:50"
+  },
+  {
+    "id": 3148,
+    "date_created_gmt": "2019-07-03T00:27:58",
+    "date_modified_gmt": "2019-09-26T22:35:37"
+  },
+  {
+    "id": 3145,
+    "date_created_gmt": "2019-07-03T00:26:21",
+    "date_modified_gmt": "2019-07-17T20:33:50"
+  },
+  {
+    "id": 3143,
+    "date_created_gmt": "2019-07-03T00:23:07",
+    "date_modified_gmt": "2019-07-17T20:33:49"
+  },
+  {
+    "id": 3136,
+    "date_created_gmt": "2019-07-02T11:47:18",
+    "date_modified_gmt": "2019-07-30T18:44:42"
+  },
+  {
+    "id": 3130,
+    "date_created_gmt": "2019-07-02T10:19:45",
+    "date_modified_gmt": "2019-07-17T20:33:49"
+  },
+  {
+    "id": 3128,
+    "date_created_gmt": "2019-07-02T10:18:37",
+    "date_modified_gmt": "2019-07-17T20:33:49"
+  },
+  {
+    "id": 3119,
+    "date_created_gmt": "2019-07-02T00:24:33",
+    "date_modified_gmt": "2019-07-17T20:33:49"
+  },
+  {
+    "id": 3116,
+    "date_created_gmt": "2019-07-02T00:15:48",
+    "date_modified_gmt": "2019-07-17T20:33:48"
+  },
+  {
+    "id": 3091,
+    "date_created_gmt": "2019-06-30T22:42:20",
+    "date_modified_gmt": "2019-07-17T20:33:48"
+  },
+  {
+    "id": 3089,
+    "date_created_gmt": "2019-06-30T22:38:24",
+    "date_modified_gmt": "2019-07-17T20:33:48"
+  },
+  {
+    "id": 3063,
+    "date_created_gmt": "2019-06-25T08:40:22",
+    "date_modified_gmt": "2019-07-17T20:33:48"
+  },
+  {
+    "id": 3005,
+    "date_created_gmt": "2019-06-21T01:43:11",
+    "date_modified_gmt": "2019-07-17T20:33:47"
+  },
+  {
+    "id": 2990,
+    "date_created_gmt": "2019-06-19T14:25:33",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2983,
+    "date_created_gmt": "2019-06-18T23:53:49",
+    "date_modified_gmt": "2019-07-17T20:33:47"
+  },
+  {
+    "id": 2981,
+    "date_created_gmt": "2019-06-18T23:52:09",
+    "date_modified_gmt": "2019-07-17T20:33:47"
+  },
+  {
+    "id": 2979,
+    "date_created_gmt": "2019-06-18T23:51:10",
+    "date_modified_gmt": "2019-07-17T20:33:47"
+  },
+  {
+    "id": 2948,
+    "date_created_gmt": "2019-06-15T02:21:44",
+    "date_modified_gmt": "2019-07-17T20:33:47"
+  },
+  {
+    "id": 2944,
+    "date_created_gmt": "2019-06-15T00:14:22",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2942,
+    "date_created_gmt": "2019-06-15T00:13:42",
+    "date_modified_gmt": "2019-07-17T20:33:46"
+  },
+  {
+    "id": 2926,
+    "date_created_gmt": "2019-06-14T01:53:13",
+    "date_modified_gmt": "2019-07-17T20:33:46"
+  },
+  {
+    "id": 2914,
+    "date_created_gmt": "2019-06-13T12:05:33",
+    "date_modified_gmt": "2019-07-17T20:33:46"
+  },
+  {
+    "id": 2904,
+    "date_created_gmt": "2019-06-12T20:35:55",
+    "date_modified_gmt": "2019-07-17T20:33:46"
+  },
+  {
+    "id": 2845,
+    "date_created_gmt": "2019-06-05T16:15:10",
+    "date_modified_gmt": "2019-07-17T20:33:45"
+  },
+  {
+    "id": 2803,
+    "date_created_gmt": "2019-06-01T00:20:30",
+    "date_modified_gmt": "2019-07-17T20:33:45"
+  },
+  {
+    "id": 2800,
+    "date_created_gmt": "2019-06-01T00:13:27",
+    "date_modified_gmt": "2019-07-17T20:33:45"
+  },
+  {
+    "id": 2798,
+    "date_created_gmt": "2019-06-01T00:12:41",
+    "date_modified_gmt": "2019-07-17T20:33:45"
+  },
+  {
+    "id": 2779,
+    "date_created_gmt": "2019-05-30T22:50:35",
+    "date_modified_gmt": "2019-07-17T20:33:44"
+  },
+  {
+    "id": 2744,
+    "date_created_gmt": "2019-05-15T21:45:57",
+    "date_modified_gmt": "2019-07-17T20:33:44"
+  },
+  {
+    "id": 2743,
+    "date_created_gmt": "2019-05-15T21:40:44",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2742,
+    "date_created_gmt": "2019-05-15T21:36:47",
+    "date_modified_gmt": "2019-07-17T20:33:44"
+  },
+  {
+    "id": 2741,
+    "date_created_gmt": "2019-05-15T21:33:24",
+    "date_modified_gmt": "2019-07-17T20:33:44"
+  },
+  {
+    "id": 2740,
+    "date_created_gmt": "2019-05-15T19:40:58",
+    "date_modified_gmt": "2019-07-17T20:33:44"
+  },
+  {
+    "id": 2727,
+    "date_created_gmt": "2019-04-23T04:11:56",
+    "date_modified_gmt": "2019-07-17T20:33:43"
+  },
+  {
+    "id": 2726,
+    "date_created_gmt": "2019-04-23T04:09:15",
+    "date_modified_gmt": "2019-07-17T20:33:43"
+  },
+  {
+    "id": 2709,
+    "date_created_gmt": "2019-04-16T16:08:12",
+    "date_modified_gmt": "2019-07-17T20:33:43"
+  },
+  {
+    "id": 2707,
+    "date_created_gmt": "2019-04-12T13:02:43",
+    "date_modified_gmt": "2019-07-17T20:33:43"
+  },
+  {
+    "id": 2704,
+    "date_created_gmt": "2019-04-10T20:35:56",
+    "date_modified_gmt": "2019-07-17T20:33:42"
+  },
+  {
+    "id": 2703,
+    "date_created_gmt": "2019-04-10T20:35:10",
+    "date_modified_gmt": "2019-07-17T20:33:42"
+  },
+  {
+    "id": 2700,
+    "date_created_gmt": "2019-04-10T19:11:39",
+    "date_modified_gmt": "2019-07-17T20:33:42"
+  },
+  {
+    "id": 2699,
+    "date_created_gmt": "2019-04-09T16:57:12",
+    "date_modified_gmt": "2019-07-17T20:33:42"
+  },
+  {
+    "id": 2698,
+    "date_created_gmt": "2019-04-09T16:54:34",
+    "date_modified_gmt": "2019-07-17T20:33:41"
+  },
+  {
+    "id": 2694,
+    "date_created_gmt": "2019-04-03T22:33:46",
+    "date_modified_gmt": "2019-11-05T06:47:06"
+  },
+  {
+    "id": 2688,
+    "date_created_gmt": "2019-04-01T20:45:06",
+    "date_modified_gmt": "2019-04-03T14:11:36"
+  },
+  {
+    "id": 2687,
+    "date_created_gmt": "2019-04-01T20:43:15",
+    "date_modified_gmt": "2019-07-17T20:33:41"
+  },
+  {
+    "id": 2686,
+    "date_created_gmt": "2019-03-30T00:35:35",
+    "date_modified_gmt": "2019-07-17T20:33:41"
+  },
+  {
+    "id": 2685,
+    "date_created_gmt": "2019-03-27T14:42:45",
+    "date_modified_gmt": "2019-04-03T14:11:15"
+  },
+  {
+    "id": 2684,
+    "date_created_gmt": "2019-03-26T22:46:27",
+    "date_modified_gmt": "2019-07-17T20:33:40"
+  },
+  {
+    "id": 2681,
+    "date_created_gmt": "2019-03-19T16:20:19",
+    "date_modified_gmt": "2019-07-17T20:33:40"
+  },
+  {
+    "id": 2680,
+    "date_created_gmt": "2019-03-15T01:07:12",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2679,
+    "date_created_gmt": "2019-03-11T14:27:54",
+    "date_modified_gmt": "2019-07-17T20:33:40"
+  },
+  {
+    "id": 2678,
+    "date_created_gmt": "2019-03-08T19:36:54",
+    "date_modified_gmt": "2019-07-17T20:33:40"
+  },
+  {
+    "id": 2671,
+    "date_created_gmt": "2019-02-28T02:32:07",
+    "date_modified_gmt": "2019-07-17T20:33:39"
+  },
+  {
+    "id": 2670,
+    "date_created_gmt": "2019-02-27T01:55:23",
+    "date_modified_gmt": "2019-07-17T20:33:39"
+  },
+  {
+    "id": 2669,
+    "date_created_gmt": "2019-02-27T01:35:36",
+    "date_modified_gmt": "2019-07-17T20:33:39"
+  },
+  {
+    "id": 2668,
+    "date_created_gmt": "2019-02-27T00:31:06",
+    "date_modified_gmt": "2019-07-17T20:34:38"
+  },
+  {
+    "id": 2667,
+    "date_created_gmt": "2019-02-26T23:18:18",
+    "date_modified_gmt": "2019-07-17T20:34:37"
+  },
+  {
+    "id": 2666,
+    "date_created_gmt": "2019-02-25T18:41:39",
+    "date_modified_gmt": "2019-07-17T20:34:37"
+  },
+  {
+    "id": 2665,
+    "date_created_gmt": "2019-02-25T16:51:33",
+    "date_modified_gmt": "2019-07-17T20:34:37"
+  },
+  {
+    "id": 2664,
+    "date_created_gmt": "2019-02-25T16:15:50",
+    "date_modified_gmt": "2019-07-17T20:34:37"
+  },
+  {
+    "id": 2663,
+    "date_created_gmt": "2019-02-25T16:14:44",
+    "date_modified_gmt": "2019-07-17T20:34:36"
+  },
+  {
+    "id": 2662,
+    "date_created_gmt": "2019-02-25T15:58:45",
+    "date_modified_gmt": "2019-07-17T20:34:36"
+  },
+  {
+    "id": 2661,
+    "date_created_gmt": "2019-02-22T16:19:12",
+    "date_modified_gmt": "2019-07-17T20:34:36"
+  },
+  {
+    "id": 2660,
+    "date_created_gmt": "2019-02-22T00:02:52",
+    "date_modified_gmt": "2019-07-17T20:34:36"
+  },
+  {
+    "id": 2654,
+    "date_created_gmt": "2019-02-12T19:53:16",
+    "date_modified_gmt": "2019-07-17T20:34:36"
+  },
+  {
+    "id": 2653,
+    "date_created_gmt": "2019-02-12T19:50:45",
+    "date_modified_gmt": "2019-07-17T20:34:35"
+  },
+  {
+    "id": 2652,
+    "date_created_gmt": "2019-02-12T19:38:14",
+    "date_modified_gmt": "2019-07-17T20:34:35"
+  },
+  {
+    "id": 2651,
+    "date_created_gmt": "2019-02-12T19:35:09",
+    "date_modified_gmt": "2019-07-17T20:34:35"
+  },
+  {
+    "id": 2649,
+    "date_created_gmt": "2019-02-06T21:56:11",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2365,
+    "date_created_gmt": "2019-01-10T20:19:46",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2364,
+    "date_created_gmt": "2019-01-10T20:05:39",
+    "date_modified_gmt": "2019-07-17T20:34:35"
+  },
+  {
+    "id": 2360,
+    "date_created_gmt": "2019-01-09T20:56:36",
+    "date_modified_gmt": "2019-07-17T20:34:34"
+  },
+  {
+    "id": 2358,
+    "date_created_gmt": "2019-01-08T22:05:34",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2357,
+    "date_created_gmt": "2019-01-07T16:36:52",
+    "date_modified_gmt": "2019-07-17T20:34:34"
+  },
+  {
+    "id": 2356,
+    "date_created_gmt": "2019-01-07T16:35:58",
+    "date_modified_gmt": "2019-07-17T20:34:34"
+  },
+  {
+    "id": 2355,
+    "date_created_gmt": "2019-01-07T16:19:00",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2354,
+    "date_created_gmt": "2019-01-07T16:16:04",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2353,
+    "date_created_gmt": "2019-01-03T20:48:28",
+    "date_modified_gmt": "2019-07-17T20:34:34"
+  },
+  {
+    "id": 2352,
+    "date_created_gmt": "2019-01-02T20:17:54",
+    "date_modified_gmt": "2019-07-17T20:34:34"
+  },
+  {
+    "id": 2351,
+    "date_created_gmt": "2019-01-02T19:01:27",
+    "date_modified_gmt": "2019-07-17T20:34:33"
+  },
+  {
+    "id": 2350,
+    "date_created_gmt": "2018-12-31T19:04:08",
+    "date_modified_gmt": "2019-07-17T20:34:33"
+  },
+  {
+    "id": 2349,
+    "date_created_gmt": "2018-12-29T04:36:40",
+    "date_modified_gmt": "2019-07-17T20:34:33"
+  },
+  {
+    "id": 2348,
+    "date_created_gmt": "2018-12-28T17:22:43",
+    "date_modified_gmt": "2019-07-17T20:34:33"
+  },
+  {
+    "id": 2347,
+    "date_created_gmt": "2018-12-28T00:10:59",
+    "date_modified_gmt": "2019-09-26T22:35:37"
+  },
+  {
+    "id": 2346,
+    "date_created_gmt": "2018-12-28T00:09:34",
+    "date_modified_gmt": "2019-07-17T20:34:32"
+  },
+  {
+    "id": 2345,
+    "date_created_gmt": "2018-12-28T00:01:01",
+    "date_modified_gmt": "2019-07-17T20:34:32"
+  },
+  {
+    "id": 2344,
+    "date_created_gmt": "2018-12-28T00:00:11",
+    "date_modified_gmt": "2019-07-17T20:34:32"
+  },
+  {
+    "id": 2343,
+    "date_created_gmt": "2018-12-27T21:50:29",
+    "date_modified_gmt": "2019-07-17T20:34:32"
+  },
+  {
+    "id": 2342,
+    "date_created_gmt": "2018-12-27T21:49:41",
+    "date_modified_gmt": "2019-07-17T20:34:32"
+  },
+  {
+    "id": 2341,
+    "date_created_gmt": "2018-12-27T21:46:32",
+    "date_modified_gmt": "2019-07-17T20:34:31"
+  },
+  {
+    "id": 2340,
+    "date_created_gmt": "2018-12-27T21:19:10",
+    "date_modified_gmt": "2019-07-17T20:34:31"
+  },
+  {
+    "id": 2339,
+    "date_created_gmt": "2018-12-27T21:16:23",
+    "date_modified_gmt": "2019-07-17T20:34:31"
+  },
+  {
+    "id": 2338,
+    "date_created_gmt": "2018-12-27T21:00:20",
+    "date_modified_gmt": "2019-07-17T20:34:30"
+  },
+  {
+    "id": 2337,
+    "date_created_gmt": "2018-12-27T20:47:14",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2336,
+    "date_created_gmt": "2018-12-27T20:26:06",
+    "date_modified_gmt": "2019-10-22T19:06:09"
+  },
+  {
+    "id": 2335,
+    "date_created_gmt": "2018-12-27T20:24:23",
+    "date_modified_gmt": "2019-07-17T20:34:30"
+  },
+  {
+    "id": 2334,
+    "date_created_gmt": "2018-12-27T20:22:36",
+    "date_modified_gmt": "2019-07-17T20:35:09"
+  },
+  {
+    "id": 2333,
+    "date_created_gmt": "2018-12-27T20:21:29",
+    "date_modified_gmt": "2019-07-17T20:35:09"
+  },
+  {
+    "id": 2332,
+    "date_created_gmt": "2018-12-27T20:20:52",
+    "date_modified_gmt": "2019-07-17T20:35:09"
+  },
+  {
+    "id": 2331,
+    "date_created_gmt": "2018-12-27T17:58:52",
+    "date_modified_gmt": "2019-07-17T20:35:08"
+  },
+  {
+    "id": 2330,
+    "date_created_gmt": "2018-12-27T17:54:08",
+    "date_modified_gmt": "2019-07-17T20:35:08"
+  },
+  {
+    "id": 2329,
+    "date_created_gmt": "2018-12-27T16:19:46",
+    "date_modified_gmt": "2019-07-17T20:35:08"
+  },
+  {
+    "id": 2328,
+    "date_created_gmt": "2018-12-27T16:09:48",
+    "date_modified_gmt": "2019-07-17T20:35:08"
+  },
+  {
+    "id": 2327,
+    "date_created_gmt": "2018-12-27T16:07:54",
+    "date_modified_gmt": "2019-07-17T20:35:07"
+  },
+  {
+    "id": 2326,
+    "date_created_gmt": "2018-12-27T16:03:00",
+    "date_modified_gmt": "2019-07-17T20:35:07"
+  },
+  {
+    "id": 2325,
+    "date_created_gmt": "2018-12-27T02:41:36",
+    "date_modified_gmt": "2019-07-17T20:35:07"
+  },
+  {
+    "id": 2324,
+    "date_created_gmt": "2018-12-26T22:27:39",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2323,
+    "date_created_gmt": "2018-12-26T22:03:32",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2322,
+    "date_created_gmt": "2018-12-26T19:28:52",
+    "date_modified_gmt": "2019-07-17T20:38:03"
+  },
+  {
+    "id": 2321,
+    "date_created_gmt": "2018-12-26T19:22:09",
+    "date_modified_gmt": "2019-07-17T20:38:04"
+  },
+  {
+    "id": 2320,
+    "date_created_gmt": "2018-12-26T19:16:12",
+    "date_modified_gmt": "2019-07-17T20:37:44"
+  },
+  {
+    "id": 2319,
+    "date_created_gmt": "2018-12-24T18:44:25",
+    "date_modified_gmt": "2019-07-17T20:39:12"
+  },
+  {
+    "id": 2318,
+    "date_created_gmt": "2018-12-23T22:38:02",
+    "date_modified_gmt": "2019-07-18T19:55:03"
+  },
+  {
+    "id": 2317,
+    "date_created_gmt": "2018-12-23T22:37:30",
+    "date_modified_gmt": "2019-07-18T19:56:53"
+  },
+  {
+    "id": 2316,
+    "date_created_gmt": "2018-12-23T21:49:11",
+    "date_modified_gmt": "2019-07-24T07:08:35"
+  },
+  {
+    "id": 2315,
+    "date_created_gmt": "2018-12-23T21:46:37",
+    "date_modified_gmt": "2019-07-27T00:32:50"
+  },
+  {
+    "id": 2314,
+    "date_created_gmt": "2018-12-21T00:27:13",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2313,
+    "date_created_gmt": "2018-12-21T00:26:28",
+    "date_modified_gmt": "2019-07-30T17:07:28"
+  },
+  {
+    "id": 2312,
+    "date_created_gmt": "2018-12-21T00:24:25",
+    "date_modified_gmt": "2019-07-30T17:08:51"
+  },
+  {
+    "id": 2311,
+    "date_created_gmt": "2018-12-21T00:23:26",
+    "date_modified_gmt": "2019-07-30T17:10:10"
+  },
+  {
+    "id": 2310,
+    "date_created_gmt": "2018-12-20T23:18:11",
+    "date_modified_gmt": "2019-07-30T17:10:59"
+  },
+  {
+    "id": 2309,
+    "date_created_gmt": "2018-12-20T21:15:27",
+    "date_modified_gmt": "2019-07-30T17:12:31"
+  },
+  {
+    "id": 2308,
+    "date_created_gmt": "2018-12-20T21:14:22",
+    "date_modified_gmt": "2019-07-30T17:12:57"
+  },
+  {
+    "id": 2307,
+    "date_created_gmt": "2018-12-20T13:53:31",
+    "date_modified_gmt": "2019-07-30T17:17:41"
+  },
+  {
+    "id": 2306,
+    "date_created_gmt": "2018-12-20T02:46:39",
+    "date_modified_gmt": "2019-07-30T17:18:24"
+  },
+  {
+    "id": 2305,
+    "date_created_gmt": "2018-12-20T02:42:12",
+    "date_modified_gmt": "2019-07-30T17:18:31"
+  },
+  {
+    "id": 2304,
+    "date_created_gmt": "2018-12-20T02:33:24",
+    "date_modified_gmt": "2019-07-30T17:19:54"
+  },
+  {
+    "id": 2303,
+    "date_created_gmt": "2018-12-20T02:28:25",
+    "date_modified_gmt": "2019-07-30T17:20:31"
+  },
+  {
+    "id": 2302,
+    "date_created_gmt": "2018-12-20T02:24:35",
+    "date_modified_gmt": "2019-07-30T17:21:07"
+  },
+  {
+    "id": 2301,
+    "date_created_gmt": "2018-12-20T01:40:06",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2300,
+    "date_created_gmt": "2018-12-20T01:27:57",
+    "date_modified_gmt": "2019-07-30T17:22:34"
+  },
+  {
+    "id": 2299,
+    "date_created_gmt": "2018-12-20T01:26:36",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2298,
+    "date_created_gmt": "2018-12-20T01:23:52",
+    "date_modified_gmt": "2019-07-30T17:22:40"
+  },
+  {
+    "id": 2297,
+    "date_created_gmt": "2018-12-20T01:11:52",
+    "date_modified_gmt": "2019-07-17T20:34:30"
+  },
+  {
+    "id": 2296,
+    "date_created_gmt": "2018-12-20T01:08:47",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2295,
+    "date_created_gmt": "2018-12-20T00:56:14",
+    "date_modified_gmt": "2019-07-30T17:25:35"
+  },
+  {
+    "id": 2294,
+    "date_created_gmt": "2018-12-20T00:55:17",
+    "date_modified_gmt": "2019-07-30T17:28:38"
+  },
+  {
+    "id": 2293,
+    "date_created_gmt": "2018-12-20T00:53:30",
+    "date_modified_gmt": "2019-07-30T17:36:59"
+  },
+  {
+    "id": 2292,
+    "date_created_gmt": "2018-12-20T00:45:24",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2291,
+    "date_created_gmt": "2018-12-20T00:06:08",
+    "date_modified_gmt": "2019-07-30T17:56:34"
+  },
+  {
+    "id": 2290,
+    "date_created_gmt": "2018-12-19T23:52:46",
+    "date_modified_gmt": "2019-07-30T17:56:42"
+  },
+  {
+    "id": 2289,
+    "date_created_gmt": "2018-12-19T23:37:43",
+    "date_modified_gmt": "2019-07-30T17:59:06"
+  },
+  {
+    "id": 2288,
+    "date_created_gmt": "2018-12-19T23:35:51",
+    "date_modified_gmt": "2019-07-30T18:19:45"
+  },
+  {
+    "id": 2287,
+    "date_created_gmt": "2018-12-19T00:45:03",
+    "date_modified_gmt": "2019-07-30T18:00:18"
+  },
+  {
+    "id": 2286,
+    "date_created_gmt": "2018-12-19T00:10:46",
+    "date_modified_gmt": "2019-07-30T18:29:10"
+  },
+  {
+    "id": 2285,
+    "date_created_gmt": "2018-12-18T22:27:52",
+    "date_modified_gmt": "2019-07-30T18:32:43"
+  },
+  {
+    "id": 2284,
+    "date_created_gmt": "2018-12-18T22:26:36",
+    "date_modified_gmt": "2019-07-30T18:37:59"
+  },
+  {
+    "id": 2283,
+    "date_created_gmt": "2018-12-18T22:20:00",
+    "date_modified_gmt": "2019-07-30T18:45:29"
+  },
+  {
+    "id": 2282,
+    "date_created_gmt": "2018-12-18T19:40:23",
+    "date_modified_gmt": "2019-07-30T18:47:22"
+  },
+  {
+    "id": 2281,
+    "date_created_gmt": "2018-12-18T19:26:18",
+    "date_modified_gmt": "2019-07-30T19:18:03"
+  },
+  {
+    "id": 2280,
+    "date_created_gmt": "2018-12-18T19:24:16",
+    "date_modified_gmt": "2019-07-30T19:21:27"
+  },
+  {
+    "id": 2279,
+    "date_created_gmt": "2018-12-18T17:04:32",
+    "date_modified_gmt": "2019-07-30T19:21:46"
+  },
+  {
+    "id": 2278,
+    "date_created_gmt": "2018-12-18T17:03:31",
+    "date_modified_gmt": "2019-07-30T19:24:32"
+  },
+  {
+    "id": 2277,
+    "date_created_gmt": "2018-12-18T17:03:12",
+    "date_modified_gmt": "2019-07-30T19:27:28"
+  },
+  {
+    "id": 2276,
+    "date_created_gmt": "2018-12-18T16:42:25",
+    "date_modified_gmt": "2019-07-31T02:10:10"
+  },
+  {
+    "id": 2275,
+    "date_created_gmt": "2018-12-18T16:37:20",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2274,
+    "date_created_gmt": "2018-12-18T15:42:34",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2273,
+    "date_created_gmt": "2018-12-17T23:16:35",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2272,
+    "date_created_gmt": "2018-12-17T23:12:00",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2271,
+    "date_created_gmt": "2018-12-17T23:03:35",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2270,
+    "date_created_gmt": "2018-12-17T22:58:56",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2269,
+    "date_created_gmt": "2018-12-17T22:52:22",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2268,
+    "date_created_gmt": "2018-12-17T22:51:21",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2267,
+    "date_created_gmt": "2018-12-17T22:49:43",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2266,
+    "date_created_gmt": "2018-12-17T22:14:46",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2265,
+    "date_created_gmt": "2018-12-17T18:06:46",
+    "date_modified_gmt": "2019-10-22T19:06:08"
+  },
+  {
+    "id": 2264,
+    "date_created_gmt": "2018-12-15T07:58:01",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2263,
+    "date_created_gmt": "2018-12-15T07:50:30",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2262,
+    "date_created_gmt": "2018-12-15T07:42:24",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2261,
+    "date_created_gmt": "2018-12-15T07:33:13",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2260,
+    "date_created_gmt": "2018-12-15T07:27:39",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2259,
+    "date_created_gmt": "2018-12-15T02:59:28",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2258,
+    "date_created_gmt": "2018-12-15T02:58:46",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2257,
+    "date_created_gmt": "2018-12-15T01:37:50",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2256,
+    "date_created_gmt": "2018-12-15T00:56:57",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2255,
+    "date_created_gmt": "2018-12-15T00:54:46",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2254,
+    "date_created_gmt": "2018-12-13T22:21:58",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2253,
+    "date_created_gmt": "2018-12-13T22:19:36",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2252,
+    "date_created_gmt": "2018-12-13T22:12:57",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2251,
+    "date_created_gmt": "2018-12-13T22:09:28",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2250,
+    "date_created_gmt": "2018-12-13T22:05:17",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2249,
+    "date_created_gmt": "2018-12-13T22:01:43",
+    "date_modified_gmt": "2019-10-22T19:06:07"
+  },
+  {
+    "id": 2248,
+    "date_created_gmt": "2018-12-13T22:00:41",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2247,
+    "date_created_gmt": "2018-12-06T23:21:27",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2242,
+    "date_created_gmt": "2018-12-06T04:09:57",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2229,
+    "date_created_gmt": "2018-12-04T00:23:43",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2234,
+    "date_created_gmt": "2018-12-03T15:22:37",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2235,
+    "date_created_gmt": "2018-12-02T15:42:52",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2228,
+    "date_created_gmt": "2018-10-29T23:14:31",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 2227,
+    "date_created_gmt": "2018-10-25T16:45:08",
+    "date_modified_gmt": "2019-02-21T23:01:30"
+  },
+  {
+    "id": 1557,
+    "date_created_gmt": "2018-10-22T19:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1559,
+    "date_created_gmt": "2018-10-20T14:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1560,
+    "date_created_gmt": "2018-10-19T13:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1561,
+    "date_created_gmt": "2018-10-18T11:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1562,
+    "date_created_gmt": "2018-10-16T17:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1563,
+    "date_created_gmt": "2018-10-15T03:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1564,
+    "date_created_gmt": "2018-10-13T05:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1565,
+    "date_created_gmt": "2018-10-12T21:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:37"
+  },
+  {
+    "id": 1566,
+    "date_created_gmt": "2018-10-12T18:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:06"
+  },
+  {
+    "id": 1567,
+    "date_created_gmt": "2018-10-11T20:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1568,
+    "date_created_gmt": "2018-10-11T06:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1569,
+    "date_created_gmt": "2018-10-10T08:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1570,
+    "date_created_gmt": "2018-10-09T23:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1571,
+    "date_created_gmt": "2018-10-05T16:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1572,
+    "date_created_gmt": "2018-10-05T13:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1573,
+    "date_created_gmt": "2018-10-04T20:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1574,
+    "date_created_gmt": "2018-10-04T17:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1575,
+    "date_created_gmt": "2018-10-04T06:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1576,
+    "date_created_gmt": "2018-10-03T16:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1577,
+    "date_created_gmt": "2018-10-03T00:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:45"
+  },
+  {
+    "id": 1578,
+    "date_created_gmt": "2018-10-02T21:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:46"
+  },
+  {
+    "id": 1579,
+    "date_created_gmt": "2018-10-01T21:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1580,
+    "date_created_gmt": "2018-10-01T17:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1581,
+    "date_created_gmt": "2018-09-30T04:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1582,
+    "date_created_gmt": "2018-09-30T03:00:00",
+    "date_modified_gmt": "2019-07-17T01:57:40"
+  },
+  {
+    "id": 1585,
+    "date_created_gmt": "2018-09-29T19:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:50"
+  },
+  {
+    "id": 1583,
+    "date_created_gmt": "2018-09-30T01:00:00",
+    "date_modified_gmt": "2019-10-22T19:06:05"
+  },
+  {
+    "id": 1584,
+    "date_created_gmt": "2018-09-29T23:00:00",
+    "date_modified_gmt": "2019-10-22T18:24:06"
+  },
+  {
+    "id": 1586,
+    "date_created_gmt": "2018-09-28T22:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:51"
+  },
+  {
+    "id": 1587,
+    "date_created_gmt": "2018-09-28T19:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:52"
+  },
+  {
+    "id": 1588,
+    "date_created_gmt": "2018-09-27T09:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:53"
+  },
+  {
+    "id": 1589,
+    "date_created_gmt": "2018-09-27T08:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:54"
+  },
+  {
+    "id": 1590,
+    "date_created_gmt": "2018-09-27T06:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:54"
+  },
+  {
+    "id": 1591,
+    "date_created_gmt": "2018-09-26T07:00:00",
+    "date_modified_gmt": "2019-07-17T01:57:40"
+  },
+  {
+    "id": 1592,
+    "date_created_gmt": "2018-09-24T15:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:56"
+  },
+  {
+    "id": 1593,
+    "date_created_gmt": "2018-09-23T06:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:56"
+  },
+  {
+    "id": 1594,
+    "date_created_gmt": "2018-09-23T02:00:00",
+    "date_modified_gmt": "2019-07-17T01:57:39"
+  },
+  {
+    "id": 1595,
+    "date_created_gmt": "2018-09-20T14:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:58"
+  },
+  {
+    "id": 1596,
+    "date_created_gmt": "2018-09-20T13:00:00",
+    "date_modified_gmt": "2018-10-24T01:04:59"
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/order-summaries.json b/libs/fluxc-tests/src/test/resources/wc/order-summaries.json
new file mode 100644
index 00000000000..428c5b9f3c6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order-summaries.json
@@ -0,0 +1,52 @@
+[
+  {
+    "id":2904,
+    "date_created_gmt":"2019-06-12T20:35:55",
+    "date_modified_gmt":"2019-06-12T20:35:56"
+  },
+  {
+    "id":2845,
+    "date_created_gmt":"2019-06-05T16:15:10",
+    "date_modified_gmt":"2019-06-06T16:42:57"
+  },
+  {
+    "id":2803,
+    "date_created_gmt":"2019-06-01T00:20:30",
+    "date_modified_gmt":"2019-06-04T14:04:38"
+  },
+  {
+    "id":2800,
+    "date_created_gmt":"2019-06-01T00:13:27",
+    "date_modified_gmt":"2019-06-01T00:14:00"
+  },
+  {
+    "id":2798,
+    "date_created_gmt":"2019-06-01T00:12:41",
+    "date_modified_gmt":"2019-06-05T16:11:14"
+  },
+  {
+    "id":2779,
+    "date_created_gmt":"2019-05-30T22:50:35",
+    "date_modified_gmt":"2019-06-01T00:02:15"
+  },
+  {
+    "id":2744,
+    "date_created_gmt":"2019-05-15T21:45:57",
+    "date_modified_gmt":"2019-05-28T16:40:51"
+  },
+  {
+    "id":2743,
+    "date_created_gmt":"2019-05-15T21:40:44",
+    "date_modified_gmt":"2019-05-15T21:41:15"
+  },
+  {
+    "id":2742,
+    "date_created_gmt":"2019-05-15T21:36:47",
+    "date_modified_gmt":"2019-05-30T18:00:05"
+  },
+  {
+    "id":2741,
+    "date_created_gmt":"2019-05-15T21:33:24",
+    "date_modified_gmt":"2019-05-30T18:24:40"
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/order_notes.json b/libs/fluxc-tests/src/test/resources/wc/order_notes.json
new file mode 100644
index 00000000000..4881e16f009
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order_notes.json
@@ -0,0 +1,146 @@
+[
+  {
+    "id": 1942,
+    "date_created": "2018-04-27T16:48:10",
+    "date_created_gmt": "2018-04-27T20:48:10",
+    "note": "Email queued: Poster Purchase Follow-Up scheduled on Poster Purchase Follow-Up<br\/>Trigger: Poster Purchase Follow-Up",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1942"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  },
+  {
+    "id": 1943,
+    "date_created": "2018-04-27T16:48:10",
+    "date_created_gmt": "2018-04-27T20:48:10",
+    "note": "Order status changed from Pending payment to Completed.",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1943"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  },
+  {
+    "id": 1944,
+    "date_created": "2018-04-27T16:48:10",
+    "date_created_gmt": "2018-04-27T20:48:10",
+    "note": "Stripe charge complete (Charge ID: ch_1CLdUCJK48mSkzFLtLjQTpKt)",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1944"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  },
+  {
+    "id": 1940,
+    "date_created": "2018-04-27T16:48:09",
+    "date_created_gmt": "2018-04-27T20:48:09",
+    "note": "Booking #1053 status changed from \"Unpaid\" to \"Paid\"",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1940"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  },
+  {
+    "id": 1941,
+    "date_created": "2018-04-27T16:48:09",
+    "date_created_gmt": "2018-04-27T20:48:09",
+    "note": "Email queued: 48 Hour Email scheduled on April 28, 2018 10:00 am<br\/>Trigger: 48 hours Before Booked Date",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1941"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  },
+  {
+    "id": 1939,
+    "date_created": "2018-04-27T16:48:07",
+    "date_created_gmt": "2018-04-27T20:48:07",
+    "note": "Booking #1053 status changed from \"In Cart\" to \"Unpaid\"",
+    "customer_note": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes\/1939"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949\/notes"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/example.com\/wp-json\/wc\/v2\/orders\/949"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/order_status_options.json b/libs/fluxc-tests/src/test/resources/wc/order_status_options.json
new file mode 100644
index 00000000000..8f8994a935e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/order_status_options.json
@@ -0,0 +1,42 @@
+[
+  {
+    "slug": "pending",
+    "name": "Pending payment",
+    "total": 0
+  },
+  {
+    "slug": "processing",
+    "name": "Processing",
+    "total": 0
+  },
+  {
+    "slug": "on-hold",
+    "name": "On hold",
+    "total": 2
+  },
+  {
+    "slug": "completed",
+    "name": "Completed",
+    "total": 0
+  },
+  {
+    "slug": "cancelled",
+    "name": "Cancelled",
+    "total": 0
+  },
+  {
+    "slug": "refunded",
+    "name": "Refunded",
+    "total": 0
+  },
+  {
+    "slug": "failed",
+    "name": "Failed",
+    "total": 0
+  },
+  {
+    "slug": "gold",
+    "name": "Gold Member",
+    "total": 0
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/orders-batch.json b/libs/fluxc-tests/src/test/resources/wc/orders-batch.json
new file mode 100644
index 00000000000..614dac826de
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/orders-batch.json
@@ -0,0 +1,160 @@
+{
+  "update": [
+    {
+      "id": 1032,
+      "parent_id": 0,
+      "status": "completed",
+      "currency": "USD",
+      "version": "9.4.3",
+      "prices_include_tax": false,
+      "date_created": "2024-12-04T11:21:17",
+      "date_modified": "2024-12-04T11:23:19",
+      "discount_total": "0.00",
+      "discount_tax": "0.00",
+      "shipping_total": "3.00",
+      "shipping_tax": "0.00",
+      "cart_tax": "0.00",
+      "total": "224.00",
+      "total_tax": "0.00",
+      "customer_id": 0,
+      "order_key": "wc_order_XXXXXXXXXXXX",
+      "billing": {
+        "first_name": "",
+        "last_name": "",
+        "company": "",
+        "address_1": "",
+        "address_2": "",
+        "city": "",
+        "state": "",
+        "postcode": "",
+        "country": "",
+        "email": "",
+        "phone": ""
+      },
+      "shipping": {
+        "first_name": "",
+        "last_name": "",
+        "company": "",
+        "address_1": "",
+        "address_2": "",
+        "city": "",
+        "state": "",
+        "postcode": "",
+        "country": "",
+        "phone": ""
+      },
+      "payment_method": "",
+      "payment_method_title": "",
+      "transaction_id": "",
+      "customer_ip_address": "",
+      "customer_user_agent": "",
+      "created_via": "rest-api",
+      "customer_note": "Asdasd",
+      "date_completed": "2024-12-04T11:23:19",
+      "date_paid": "2024-12-04T11:23:19",
+      "cart_hash": "",
+      "number": "1032",
+      "meta_data": [
+        {
+          "id": 18608,
+          "key": "_wc_order_attribution_source_type",
+          "value": "mobile_app"
+        }
+      ],
+      "line_items": [
+        {
+          "id": 162,
+          "name": "Album",
+          "product_id": 71,
+          "variation_id": 0,
+          "quantity": 1,
+          "tax_class": "",
+          "subtotal": "216.00",
+          "subtotal_tax": "0.00",
+          "total": "216.00",
+          "total_tax": "0.00",
+          "taxes": [],
+          "meta_data": [],
+          "sku": "woo-album",
+          "price": 216,
+          "image": {
+            "id": "100",
+            "src": "https://example.com/images/album-1.jpg"
+          },
+          "parent_name": null,
+          "bundled_by": "",
+          "bundled_item_title": "",
+          "bundled_items": []
+        }
+      ],
+      "tax_lines": [],
+      "shipping_lines": [
+        {
+          "id": 166,
+          "method_title": "Reg ship",
+          "method_id": "flat_rate",
+          "instance_id": "",
+          "total": "3.00",
+          "total_tax": "0.00",
+          "taxes": [],
+          "meta_data": []
+        }
+      ],
+      "fee_lines": [
+        {
+          "id": 165,
+          "name": "Just for you",
+          "tax_class": "",
+          "tax_status": "none",
+          "amount": "",
+          "total": "5.00",
+          "total_tax": "0.00",
+          "taxes": [],
+          "meta_data": []
+        }
+      ],
+      "coupon_lines": [],
+      "refunds": [],
+      "payment_url": "https://example.com/checkout/order-pay/1032/",
+      "is_editable": false,
+      "needs_payment": false,
+      "needs_processing": true,
+      "date_created_gmt": "2024-12-04T04:21:17",
+      "date_modified_gmt": "2024-12-04T04:23:19",
+      "date_completed_gmt": "2024-12-04T04:23:19",
+      "date_paid_gmt": "2024-12-04T04:23:19",
+      "currency_symbol": "$",
+      "_links": {
+        "self": [
+          {
+            "href": "https://example.com/wp-json/wc/v3/orders/1032",
+            "targetHints": {
+              "allow": [
+                "GET",
+                "POST",
+                "PUT",
+                "PATCH",
+                "DELETE"
+              ]
+            }
+          }
+        ],
+        "collection": [
+          {
+            "href": "https://example.com/wp-json/wc/v3/orders"
+          }
+        ]
+      }
+    },
+    {
+      "id": "525",
+      "error": {
+        "code": "woocommerce_rest_shop_order_invalid_id",
+        "message": "Invalid ID.",
+        "data": {
+          "status": 400
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/print-shipping-labels.json b/libs/fluxc-tests/src/test/resources/wc/print-shipping-labels.json
new file mode 100644
index 00000000000..1e736ed9470
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/print-shipping-labels.json
@@ -0,0 +1,7 @@
+{
+  "data": {
+    "mimeType": "application\/pdf",
+    "b64Content": "12345=",
+    "success": true
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-attribute-create.json b/libs/fluxc-tests/src/test/resources/wc/product-attribute-create.json
new file mode 100644
index 00000000000..2208d87bee7
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-attribute-create.json
@@ -0,0 +1,20 @@
+{
+  "id": 1,
+  "name": "Color",
+  "slug": "pa_color",
+  "type": "select",
+  "order_by": "menu_order",
+  "has_archives": true,
+  "_links": {
+    "self": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes/6"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-attribute-delete.json b/libs/fluxc-tests/src/test/resources/wc/product-attribute-delete.json
new file mode 100644
index 00000000000..6feccc4453d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-attribute-delete.json
@@ -0,0 +1,20 @@
+{
+  "id": 17,
+  "name": "Size",
+  "slug": "pa_size",
+  "type": "select",
+  "order_by": "name",
+  "has_archives": true,
+  "_links": {
+    "self": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes/6"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-attribute-update.json b/libs/fluxc-tests/src/test/resources/wc/product-attribute-update.json
new file mode 100644
index 00000000000..1b0dda48626
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-attribute-update.json
@@ -0,0 +1,20 @@
+{
+  "id": 99,
+  "name": "test_name",
+  "slug": "pa_test",
+  "type": "test_type",
+  "order_by": "test",
+  "has_archives": false,
+  "_links": {
+    "self": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes/6"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://example.com/wp-json/wc/v3/products/attributes"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-attributes-all.json b/libs/fluxc-tests/src/test/resources/wc/product-attributes-all.json
new file mode 100644
index 00000000000..dc56fcad701
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-attributes-all.json
@@ -0,0 +1,42 @@
+[
+  {
+    "id": 1,
+    "name": "Color",
+    "slug": "pa_color",
+    "type": "select",
+    "order_by": "menu_order",
+    "has_archives": true,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/6"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes"
+        }
+      ]
+    }
+  },
+  {
+    "id": 2,
+    "name": "Size",
+    "slug": "pa_size",
+    "type": "select",
+    "order_by": "menu_order",
+    "has_archives": false,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes/2"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/attributes"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-max-quantity.json b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-max-quantity.json
new file mode 100644
index 00000000000..5d9d05077b6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-max-quantity.json
@@ -0,0 +1,230 @@
+{
+  "id": 533,
+  "name": "Pizza",
+  "slug": "pizza",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/pizza\/",
+  "date_created": "2021-07-07T13:19:31",
+  "date_created_gmt": "2021-07-07T13:19:31",
+  "date_modified": "2021-07-22T01:57:18",
+  "date_modified_gmt": "2021-07-22T01:57:18",
+  "type": "bundle",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "",
+  "short_description": "",
+  "sku": "",
+  "price": "",
+  "regular_price": "",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "on_sale": false,
+  "purchasable": false,
+  "total_sales": 0,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": -1,
+  "download_expiry": -1,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "none",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "low_stock_amount": null,
+  "sold_individually": true,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": false,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0",
+  "rating_count": 0,
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 15,
+      "name": "Uncategorized",
+      "slug": "uncategorized"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": true,
+      "options": [
+        "Black",
+        "Blue",
+        "Green"
+      ]
+    }
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "price_html": "",
+  "related_ids": [
+  ],
+  "bundle_stock_status": "insufficientstock",
+  "bundle_max_size": 5,
+  "meta_data": [
+    {
+      "id": 11116,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 11118,
+      "key": "_product_addons",
+      "value": [
+        {
+          "name": "Topping",
+          "title_format": "label",
+          "description_enable": 1,
+          "description": "Pizza topping",
+          "type": "checkbox",
+          "display": "select",
+          "position": 0,
+          "required": 0,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Peperoni",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Extra cheese",
+              "price": "4",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Salami",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Ham",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Soda",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "input_multiplier",
+          "display": "select",
+          "position": 1,
+          "required": 0,
+          "restrictions": 1,
+          "restrictions_type": "any_text",
+          "adjust_price": 1,
+          "price_type": "flat_fee",
+          "price": "2",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Delivery",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "multiple_choice",
+          "display": "radiobutton",
+          "position": 2,
+          "required": 1,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Yes",
+              "price": "5",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "No",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11119,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    }
+  ],
+  "stock_status": "outofstock",
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/533"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-min-quantity.json b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-min-quantity.json
new file mode 100644
index 00000000000..1891e7fbd63
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-min-quantity.json
@@ -0,0 +1,230 @@
+{
+  "id": 533,
+  "name": "Pizza",
+  "slug": "pizza",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/pizza\/",
+  "date_created": "2021-07-07T13:19:31",
+  "date_created_gmt": "2021-07-07T13:19:31",
+  "date_modified": "2021-07-22T01:57:18",
+  "date_modified_gmt": "2021-07-22T01:57:18",
+  "type": "bundle",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "",
+  "short_description": "",
+  "sku": "",
+  "price": "",
+  "regular_price": "",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "on_sale": false,
+  "purchasable": false,
+  "total_sales": 0,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": -1,
+  "download_expiry": -1,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "none",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "low_stock_amount": null,
+  "sold_individually": true,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": false,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0",
+  "rating_count": 0,
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 15,
+      "name": "Uncategorized",
+      "slug": "uncategorized"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": true,
+      "options": [
+        "Black",
+        "Blue",
+        "Green"
+      ]
+    }
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "price_html": "",
+  "related_ids": [
+  ],
+  "bundle_stock_status": "insufficientstock",
+  "bundle_min_size": 5,
+  "meta_data": [
+    {
+      "id": 11116,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 11118,
+      "key": "_product_addons",
+      "value": [
+        {
+          "name": "Topping",
+          "title_format": "label",
+          "description_enable": 1,
+          "description": "Pizza topping",
+          "type": "checkbox",
+          "display": "select",
+          "position": 0,
+          "required": 0,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Peperoni",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Extra cheese",
+              "price": "4",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Salami",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Ham",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Soda",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "input_multiplier",
+          "display": "select",
+          "position": 1,
+          "required": 0,
+          "restrictions": 1,
+          "restrictions_type": "any_text",
+          "adjust_price": 1,
+          "price_type": "flat_fee",
+          "price": "2",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Delivery",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "multiple_choice",
+          "display": "radiobutton",
+          "position": 2,
+          "required": 1,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Yes",
+              "price": "5",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "No",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11119,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    }
+  ],
+  "stock_status": "outofstock",
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/533"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-quantity-rules.json b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-quantity-rules.json
new file mode 100644
index 00000000000..9d5cbb167bf
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-bundle-with-quantity-rules.json
@@ -0,0 +1,231 @@
+{
+  "id": 533,
+  "name": "Pizza",
+  "slug": "pizza",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/pizza\/",
+  "date_created": "2021-07-07T13:19:31",
+  "date_created_gmt": "2021-07-07T13:19:31",
+  "date_modified": "2021-07-22T01:57:18",
+  "date_modified_gmt": "2021-07-22T01:57:18",
+  "type": "bundle",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "",
+  "short_description": "",
+  "sku": "",
+  "price": "",
+  "regular_price": "",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "on_sale": false,
+  "purchasable": false,
+  "total_sales": 0,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": -1,
+  "download_expiry": -1,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "none",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "low_stock_amount": null,
+  "sold_individually": true,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": false,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0",
+  "rating_count": 0,
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 15,
+      "name": "Uncategorized",
+      "slug": "uncategorized"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": true,
+      "options": [
+        "Black",
+        "Blue",
+        "Green"
+      ]
+    }
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "price_html": "",
+  "related_ids": [
+  ],
+  "bundle_stock_status": "insufficientstock",
+  "bundle_max_size": 5,
+  "bundle_min_size": 5,
+  "meta_data": [
+    {
+      "id": 11116,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 11118,
+      "key": "_product_addons",
+      "value": [
+        {
+          "name": "Topping",
+          "title_format": "label",
+          "description_enable": 1,
+          "description": "Pizza topping",
+          "type": "checkbox",
+          "display": "select",
+          "position": 0,
+          "required": 0,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Peperoni",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Extra cheese",
+              "price": "4",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Salami",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Ham",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Soda",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "input_multiplier",
+          "display": "select",
+          "position": 1,
+          "required": 0,
+          "restrictions": 1,
+          "restrictions_type": "any_text",
+          "adjust_price": 1,
+          "price_type": "flat_fee",
+          "price": "2",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Delivery",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "multiple_choice",
+          "display": "radiobutton",
+          "position": 2,
+          "required": 1,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Yes",
+              "price": "5",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "No",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11119,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    }
+  ],
+  "stock_status": "outofstock",
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/533"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-categories.json b/libs/fluxc-tests/src/test/resources/wc/product-categories.json
new file mode 100644
index 00000000000..10614a5390d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-categories.json
@@ -0,0 +1,192 @@
+[
+  {
+    "id": 15,
+    "name": "Albums",
+    "slug": "albums",
+    "parent": 11,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 4,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/15"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ],
+      "up": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/11"
+        }
+      ]
+    }
+  },
+  {
+    "id": 9,
+    "name": "Clothing",
+    "slug": "clothing",
+    "parent": 0,
+    "description": "",
+    "display": "default",
+    "image": {
+      "id": 730,
+      "date_created": "2017-03-23T00:01:07",
+      "date_created_gmt": "2017-03-23T03:01:07",
+      "date_modified": "2017-03-23T00:01:07",
+      "date_modified_gmt": "2017-03-23T03:01:07",
+      "src": "https://example.com/wp-content/uploads/2017/03/T_2_front.jpg",
+      "name": "",
+      "alt": ""
+    },
+    "menu_order": 0,
+    "count": 36,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example/wp-json/wc/v3/products/categories/9"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example/wp-json/wc/v3/products/categories"
+        }
+      ]
+    }
+  },
+  {
+    "id": 10,
+    "name": "Hoodies",
+    "slug": "hoodies",
+    "parent": 9,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 6,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/10"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ],
+      "up": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/9"
+        }
+      ]
+    }
+  },
+  {
+    "id": 11,
+    "name": "Music",
+    "slug": "music",
+    "parent": 0,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 7,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/11"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ]
+    }
+  },
+  {
+    "id": 12,
+    "name": "Posters",
+    "slug": "posters",
+    "parent": 0,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 5,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/12"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ]
+    }
+  },
+  {
+    "id": 13,
+    "name": "Singles",
+    "slug": "singles",
+    "parent": 11,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 3,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/13"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ],
+      "up": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/11"
+        }
+      ]
+    }
+  },
+  {
+    "id": 14,
+    "name": "T-shirts",
+    "slug": "t-shirts",
+    "parent": 9,
+    "description": "",
+    "display": "default",
+    "image": [],
+    "menu_order": 0,
+    "count": 6,
+    "_links": {
+      "self": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/14"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories"
+        }
+      ],
+      "up": [
+        {
+          "href": "https://example.com/wp-json/wc/v3/products/categories/9"
+        }
+      ]
+    }
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-reviews.json b/libs/fluxc-tests/src/test/resources/wc/product-reviews.json
new file mode 100644
index 00000000000..15c42fb7c95
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-reviews.json
@@ -0,0 +1,343 @@
+[
+  {
+    "id": 5499,
+    "date_created": "2019-07-09T09:48:07",
+    "date_created_gmt": "2019-07-09T15:48:07",
+    "product_id": 18,
+    "status": "approved",
+    "reviewer": "Johnny",
+    "reviewer_email": "johnny@gmail.com",
+    "review": "<p>What a lovely cap!<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/136c70acb946f0f37b12bb6fbfe56f2c?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/136c70acb946f0f37b12bb6fbfe56f2c?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/136c70acb946f0f37b12bb6fbfe56f2c?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5499"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/18"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5435,
+    "date_created": "2019-07-08T02:56:41",
+    "date_created_gmt": "2019-07-08T08:56:41",
+    "product_id": 18,
+    "status": "approved",
+    "reviewer": "Lara",
+    "reviewer_email": "lara@gmail.com",
+    "review": "<p>It\u2019s a really good cap!<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/8f656d8cb56afcaf509bf82b2b2a3d72?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/8f656d8cb56afcaf509bf82b2b2a3d72?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/8f656d8cb56afcaf509bf82b2b2a3d72?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5435"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/18"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5404,
+    "date_created": "2019-07-05T08:51:12",
+    "date_created_gmt": "2019-07-05T14:51:12",
+    "product_id": 18,
+    "status": "approved",
+    "reviewer": "Steve jobs",
+    "reviewer_email": "stevie@gmail.com",
+    "review": "<p>It\u2019s a great cap!!<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/e7012d4db0d6d329fd1a6c4055b8de5d?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/e7012d4db0d6d329fd1a6c4055b8de5d?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/e7012d4db0d6d329fd1a6c4055b8de5d?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5404"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/18"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5273,
+    "date_created": "2019-07-03T13:38:45",
+    "date_created_gmt": "2019-07-03T19:38:45",
+    "product_id": 19,
+    "status": "approved",
+    "reviewer": "Brian Copernile",
+    "reviewer_email": "bcopernile@example.org",
+    "review": "<p>Review for Sunglasses<br \/>\n\u2605 \u2605 \u2605 \u2605 \u2605 <\/p>\n",
+    "rating": 5,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/7116ede0a0991db4d580367e274ade2d?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/7116ede0a0991db4d580367e274ade2d?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/7116ede0a0991db4d580367e274ade2d?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5273"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/19"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5212,
+    "date_created": "2019-07-03T02:26:26",
+    "date_created_gmt": "2019-07-03T08:26:26",
+    "product_id": 22,
+    "status": "approved",
+    "reviewer": "Kandi",
+    "reviewer_email": "kandi@gmail.com",
+    "review": "<p>Love it!!<\/p>\n",
+    "rating": 5,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/5c73533373b443ff87aabf6ae0a1d495?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/5c73533373b443ff87aabf6ae0a1d495?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/5c73533373b443ff87aabf6ae0a1d495?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5212"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/22"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5211,
+    "date_created": "2019-07-03T02:23:22",
+    "date_created_gmt": "2019-07-03T08:23:22",
+    "product_id": 22,
+    "status": "approved",
+    "reviewer": "Kevin peterson",
+    "reviewer_email": "kevin@gmail.com",
+    "review": "<p>Not really<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/28e70af0551872dd431635b96a65d70d?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/28e70af0551872dd431635b96a65d70d?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/28e70af0551872dd431635b96a65d70d?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5211"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/22"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5205,
+    "date_created": "2019-07-02T19:54:52",
+    "date_created_gmt": "2019-07-03T01:54:52",
+    "product_id": 22,
+    "status": "approved",
+    "reviewer": "Karen Smith",
+    "reviewer_email": "anitaa22@gmail.com",
+    "review": "<p>The sleeves are too big<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/9a7f84dd7216a5a7d7cfde7870f074c0?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/9a7f84dd7216a5a7d7cfde7870f074c0?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/9a7f84dd7216a5a7d7cfde7870f074c0?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5205"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/22"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5112,
+    "date_created": "2019-07-02T04:37:06",
+    "date_created_gmt": "2019-07-02T10:37:06",
+    "product_id": 17,
+    "status": "approved",
+    "reviewer": "Brad",
+    "reviewer_email": "anitaa2@gmail.com",
+    "review": "<p>It&#8217;s a belt!!<\/p>\n",
+    "rating": 3,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/942a803775b965cd9c2dcfda44cb84f0?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/942a803775b965cd9c2dcfda44cb84f0?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/942a803775b965cd9c2dcfda44cb84f0?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5112"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/17"
+        }
+      ]
+    }
+  },
+  {
+    "id": 5060,
+    "date_created": "2019-07-02T00:17:06",
+    "date_created_gmt": "2019-07-02T06:17:06",
+    "product_id": 24,
+    "status": "approved",
+    "reviewer": "Terry Brickheld",
+    "reviewer_email": "tbrickheld2211@example.org",
+    "review": "<p>Half the CD was blank?<\/p>\n",
+    "rating": 2,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/39ab6021225bfc2073e4c5e49d0ebfb6?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/39ab6021225bfc2073e4c5e49d0ebfb6?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/39ab6021225bfc2073e4c5e49d0ebfb6?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/5060"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/24"
+        }
+      ]
+    }
+  },
+  {
+    "id": 4525,
+    "date_created": "2019-06-15T00:12:22",
+    "date_created_gmt": "2019-06-15T06:12:22",
+    "product_id": 2231,
+    "status": "approved",
+    "reviewer": "Jake Towne",
+    "reviewer_email": "jt@example.org",
+    "review": "<p>My kids love lounging around in this hoodie!<\/p>\n",
+    "rating": 4,
+    "verified": false,
+    "reviewer_avatar_urls": {
+      "24": "https:\/\/secure.gravatar.com\/avatar\/d19e8c5e3bc54f331a0ab72b63318285?s=24&d=mm&r=g",
+      "48": "https:\/\/secure.gravatar.com\/avatar\/d19e8c5e3bc54f331a0ab72b63318285?s=48&d=mm&r=g",
+      "96": "https:\/\/secure.gravatar.com\/avatar\/d19e8c5e3bc54f331a0ab72b63318285?s=96&d=mm&r=g"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews\/4525"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/reviews"
+        }
+      ],
+      "up": [
+        {
+          "href": "https:\/\/testwooshop.mystagingwebsite.com\/wp-json\/wc\/v3\/products\/2231"
+        }
+      ]
+    }
+  }
+]
+
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-settings-response.json b/libs/fluxc-tests/src/test/resources/wc/product-settings-response.json
new file mode 100644
index 00000000000..99f06bdb91c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-settings-response.json
@@ -0,0 +1,585 @@
+[
+  {
+    "id": "woocommerce_shop_page_id",
+    "label": "Shop page",
+    "description": "The base page can also be used in your <a href=\"https://awootestshop.mystagingwebsite.com/wp-admin/options-permalink.php\">product permalinks</a>.",
+    "type": "select",
+    "default": "",
+    "tip": "This sets the base page of your shop - this is where your product archive will be.",
+    "value": "5",
+    "options": {
+      "5": "Shop",
+      "6": "Cart",
+      "7": "Checkout",
+      "8": "My account",
+      "90": "Welcome"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_shop_page_id"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_cart_redirect_after_add",
+    "label": "Add to cart behaviour",
+    "description": "Redirect to the cart page after successful addition",
+    "type": "checkbox",
+    "default": "no",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_cart_redirect_after_add"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_enable_ajax_add_to_cart",
+    "label": "",
+    "description": "Enable AJAX add to cart buttons on archives",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_enable_ajax_add_to_cart"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_placeholder_image",
+    "label": "Placeholder image",
+    "description": "",
+    "type": "text",
+    "default": "",
+    "tip": "This is the attachment ID, or image URL, used for placeholder images in the product catalog. Products with no image will use this.",
+    "value": "4",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_placeholder_image"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_weight_unit",
+    "label": "Weight unit",
+    "description": "This controls what unit you will define weights in.",
+    "type": "select",
+    "default": "kg",
+    "options": {
+      "kg": "kg",
+      "g": "g",
+      "lbs": "lbs",
+      "oz": "oz"
+    },
+    "tip": "This controls what unit you will define weights in.",
+    "value": "oz",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_weight_unit"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_dimension_unit",
+    "label": "Dimensions unit",
+    "description": "This controls what unit you will define lengths in.",
+    "type": "select",
+    "default": "cm",
+    "options": {
+      "m": "m",
+      "cm": "cm",
+      "mm": "mm",
+      "in": "in",
+      "yd": "yd"
+    },
+    "tip": "This controls what unit you will define lengths in.",
+    "value": "in",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_dimension_unit"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_enable_reviews",
+    "label": "Enable reviews",
+    "description": "Enable product reviews",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_enable_reviews"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_review_rating_verification_label",
+    "label": "",
+    "description": "Show \"verified owner\" label on customer reviews",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_review_rating_verification_label"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_review_rating_verification_required",
+    "label": "",
+    "description": "Reviews can only be left by \"verified owners\"",
+    "type": "checkbox",
+    "default": "no",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_review_rating_verification_required"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_enable_review_rating",
+    "label": "Product ratings",
+    "description": "Enable star rating on reviews",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_enable_review_rating"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_review_rating_required",
+    "label": "",
+    "description": "Star ratings should be required, not optional",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_review_rating_required"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_manage_stock",
+    "label": "Manage stock",
+    "description": "Enable stock management",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_manage_stock"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_hold_stock_minutes",
+    "label": "Hold stock (minutes)",
+    "description": "Hold stock (for unpaid orders) for x minutes. When this limit is reached, the pending order will be cancelled. Leave blank to disable.",
+    "type": "number",
+    "default": "60",
+    "value": "10080",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_hold_stock_minutes"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_notify_low_stock",
+    "label": "Notifications",
+    "description": "Enable low stock notifications",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_notify_low_stock"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_notify_no_stock",
+    "label": "",
+    "description": "Enable out of stock notifications",
+    "type": "checkbox",
+    "default": "yes",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_notify_no_stock"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_stock_email_recipient",
+    "label": "Notification recipient(s)",
+    "description": "Enter recipients (comma separated) that will receive this notification.",
+    "type": "text",
+    "default": "anitaa.murthy@a8c.com",
+    "tip": "Enter recipients (comma separated) that will receive this notification.",
+    "value": "anitaa.murthy@a8c.com",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_stock_email_recipient"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_notify_low_stock_amount",
+    "label": "Low stock threshold",
+    "description": "When product stock reaches this amount you will be notified via email.",
+    "type": "number",
+    "default": "2",
+    "tip": "When product stock reaches this amount you will be notified via email.",
+    "value": "2",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_notify_low_stock_amount"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_notify_no_stock_amount",
+    "label": "Out of stock threshold",
+    "description": "When product stock reaches this amount the stock status will change to \"out of stock\" and you will be notified via email. This setting does not affect existing \"in stock\" products.",
+    "type": "number",
+    "default": "0",
+    "tip": "When product stock reaches this amount the stock status will change to \"out of stock\" and you will be notified via email. This setting does not affect existing \"in stock\" products.",
+    "value": "0",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_notify_no_stock_amount"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_hide_out_of_stock_items",
+    "label": "Out of stock visibility",
+    "description": "Hide out of stock items from the catalog",
+    "type": "checkbox",
+    "default": "no",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_hide_out_of_stock_items"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_stock_format",
+    "label": "Stock display format",
+    "description": "This controls how stock quantities are displayed on the frontend.",
+    "type": "select",
+    "default": "",
+    "options": {
+      "": "Always show quantity remaining in stock e.g. \"12 in stock\"",
+      "low_amount": "Only show quantity remaining in stock when low e.g. \"Only 2 left in stock\"",
+      "no_amount": "Never show quantity remaining in stock"
+    },
+    "tip": "This controls how stock quantities are displayed on the frontend.",
+    "value": "",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_stock_format"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_file_download_method",
+    "label": "File download method",
+    "description": "If you are using X-Accel-Redirect download method along with NGINX server, make sure that you have applied settings as described in <a href='https://docs.woocommerce.com/document/digital-downloadable-product-handling#nginx-setting'>Digital/Downloadable Product Handling</a> guide.",
+    "type": "select",
+    "default": "force",
+    "options": {
+      "force": "Force downloads",
+      "xsendfile": "X-Accel-Redirect/X-Sendfile",
+      "redirect": "Redirect only (Insecure)"
+    },
+    "tip": "Forcing downloads will keep URLs hidden, but some servers may serve large files unreliably. If supported, <code>X-Accel-Redirect</code> / <code>X-Sendfile</code> can be used to serve downloads instead (server requires <code>mod_xsendfile</code>).",
+    "value": "force",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_file_download_method"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_downloads_redirect_fallback_allowed",
+    "label": "",
+    "description": "Allow using redirect mode (insecure) as a last resort",
+    "type": "checkbox",
+    "default": "no",
+    "tip": "If the \"Force Downloads\" or \"X-Accel-Redirect/X-Sendfile\" download method is selected but does not work, the system will use the \"Redirect\" method as a last resort. <a href=\"https://docs.woocommerce.com/document/digital-downloadable-product-handling/\">See this guide</a> for more details.",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_downloads_redirect_fallback_allowed"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_downloads_require_login",
+    "label": "Access restriction",
+    "description": "Downloads require login",
+    "type": "checkbox",
+    "default": "no",
+    "tip": "This setting does not apply to guest purchases.",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_downloads_require_login"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_downloads_grant_access_after_payment",
+    "label": "",
+    "description": "Grant access to downloadable products after payment",
+    "type": "checkbox",
+    "default": "yes",
+    "tip": "Enable this option to grant access to downloads when orders are \"processing\", rather than \"completed\".",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_downloads_grant_access_after_payment"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_downloads_add_hash_to_filename",
+    "label": "Filename",
+    "description": "Append a unique string to filename for security",
+    "type": "checkbox",
+    "default": "yes",
+    "tip": "Not required if your download directory is protected. <a href='https://docs.woocommerce.com/document/digital-downloadable-product-handling#unique-string'>See this guide</a> for more details. Files already uploaded will not be affected.",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_downloads_add_hash_to_filename"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_attribute_lookup_enabled",
+    "label": "Enable table usage",
+    "description": "Use the product attributes lookup table for catalog filtering.",
+    "type": "checkbox",
+    "default": "no",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_attribute_lookup_enabled"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_attribute_lookup_direct_updates",
+    "label": "Direct updates",
+    "description": "Update the table directly upon product changes, instead of scheduling a deferred update.",
+    "type": "checkbox",
+    "default": "no",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products/woocommerce_attribute_lookup_direct_updates"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/products"
+        }
+      ]
+    }
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-with-addons.json b/libs/fluxc-tests/src/test/resources/wc/product-with-addons.json
new file mode 100644
index 00000000000..3001bcd7830
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-with-addons.json
@@ -0,0 +1,228 @@
+{
+  "id": 533,
+  "name": "Pizza",
+  "slug": "pizza",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/pizza\/",
+  "date_created": "2021-07-07T13:19:31",
+  "date_created_gmt": "2021-07-07T13:19:31",
+  "date_modified": "2021-07-22T01:57:18",
+  "date_modified_gmt": "2021-07-22T01:57:18",
+  "type": "simple",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "",
+  "short_description": "",
+  "sku": "",
+  "price": "",
+  "regular_price": "",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "on_sale": false,
+  "purchasable": false,
+  "total_sales": 0,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": -1,
+  "download_expiry": -1,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "none",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "low_stock_amount": null,
+  "sold_individually": true,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": false,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0",
+  "rating_count": 0,
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 15,
+      "name": "Uncategorized",
+      "slug": "uncategorized"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": true,
+      "options": [
+        "Black",
+        "Blue",
+        "Green"
+      ]
+    }
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "price_html": "",
+  "related_ids": [
+  ],
+  "meta_data": [
+    {
+      "id": 11116,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 11118,
+      "key": "_product_addons",
+      "value": [
+        {
+          "name": "Topping",
+          "title_format": "label",
+          "description_enable": 1,
+          "description": "Pizza topping",
+          "type": "checkbox",
+          "display": "select",
+          "position": 0,
+          "required": 0,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Peperoni",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Extra cheese",
+              "price": "4",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Salami",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Ham",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Soda",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "input_multiplier",
+          "display": "select",
+          "position": 1,
+          "required": 0,
+          "restrictions": 1,
+          "restrictions_type": "any_text",
+          "adjust_price": 1,
+          "price_type": "flat_fee",
+          "price": "2",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Delivery",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "multiple_choice",
+          "display": "radiobutton",
+          "position": 2,
+          "required": 1,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Yes",
+              "price": "5",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "No",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11119,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    }
+  ],
+  "stock_status": "outofstock",
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/533"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product-with-incorrect-addons-key.json b/libs/fluxc-tests/src/test/resources/wc/product-with-incorrect-addons-key.json
new file mode 100644
index 00000000000..7708d2aabcd
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product-with-incorrect-addons-key.json
@@ -0,0 +1,134 @@
+{
+  "id": 533,
+  "name": "Pizza",
+  "meta_data": [
+    {
+      "id": 11116,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 11118,
+      "key": "incorrect_key",
+      "value": [
+        {
+          "name": "Topping",
+          "title_format": "label",
+          "description_enable": 1,
+          "description": "Pizza topping",
+          "type": "checkbox",
+          "display": "select",
+          "position": 0,
+          "required": 0,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Peperoni",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Extra cheese",
+              "price": "4",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Salami",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "Ham",
+              "price": "3",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Soda",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "input_multiplier",
+          "display": "select",
+          "position": 1,
+          "required": 0,
+          "restrictions": 1,
+          "restrictions_type": "any_text",
+          "adjust_price": 1,
+          "price_type": "flat_fee",
+          "price": "2",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        },
+        {
+          "name": "Delivery",
+          "title_format": "label",
+          "description_enable": 0,
+          "description": "",
+          "type": "multiple_choice",
+          "display": "radiobutton",
+          "position": 2,
+          "required": 1,
+          "restrictions": 0,
+          "restrictions_type": "any_text",
+          "adjust_price": 0,
+          "price_type": "flat_fee",
+          "price": "",
+          "min": 0,
+          "max": 0,
+          "options": [
+            {
+              "label": "Yes",
+              "price": "5",
+              "image": "",
+              "price_type": "flat_fee"
+            },
+            {
+              "label": "No",
+              "price": "",
+              "image": "",
+              "price_type": "flat_fee"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 11119,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    }
+  ],
+  "stock_status": "outofstock",
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/533"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/product_reliability_booleans.json b/libs/fluxc-tests/src/test/resources/wc/product_reliability_booleans.json
new file mode 100644
index 00000000000..739d6b0064e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/product_reliability_booleans.json
@@ -0,0 +1,321 @@
+{
+  "id": 19,
+  "name": "Beanie",
+  "slug": "beanie",
+  "permalink": "https://superlativecentaur.wpcomstaging.com/product/beanie/",
+  "date_created": "2023-01-13T10:31:14",
+  "date_created_gmt": "2023-01-13T10:31:14",
+  "date_modified": "2023-07-06T15:20:40",
+  "date_modified_gmt": "2023-07-06T14:20:40",
+  "type": "simple",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>\n",
+  "short_description": "<p>This is a simple product. Great!</p>\n",
+  "sku": "woo-beanie",
+  "price": "20",
+  "regular_price": "20",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "on_sale": false,
+  "purchasable": "true",
+  "total_sales": 24,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [],
+  "download_limit": 0,
+  "download_expiry": 0,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "taxable",
+  "tax_class": "clothing-20010",
+  "manage_stock": true,
+  "stock_quantity": 497,
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "low_stock_amount": null,
+  "sold_individually": 1,
+  "weight": "1",
+  "dimensions": {
+    "length": "20",
+    "width": "20",
+    "height": "40"
+  },
+  "shipping_required": true,
+  "shipping_taxable": true,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0.00",
+  "rating_count": 0,
+  "upsell_ids": [],
+  "cross_sell_ids": [],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 1363,
+      "name": "Accessories",
+      "slug": "accessories"
+    }
+  ],
+  "tags": [],
+  "images": [
+    {
+      "id": 48,
+      "date_created": "2023-01-13T10:31:17",
+      "date_created_gmt": "2023-01-13T10:31:17",
+      "date_modified": "2023-06-16T17:17:46",
+      "date_modified_gmt": "2023-06-16T15:17:46",
+      "src": "https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2.jpg",
+      "name": "beanie-2.jpg",
+      "alt": ""
+    }
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": false,
+      "options": [
+        "Red"
+      ]
+    }
+  ],
+  "default_attributes": [],
+  "variations": [],
+  "grouped_products": [],
+  "menu_order": 0,
+  "price_html": "<span class=\"woocommerce-Price-amount amount\"><bdi><span class=\"woocommerce-Price-currencySymbol\">&#36;</span>20.00</bdi></span><small class=\"wcsatt-sub-options\"> <span class=\"wcsatt-dash\">&mdash;</span> or subscribe and save up to</small> <span class=\"wcsatt-sub-discount\">30&#37;</span><small></small>",
+  "related_ids": [
+    36,
+    20,
+    22,
+    21
+  ],
+  "meta_data": [
+    {
+      "id": 526,
+      "key": "_wpcom_is_markdown",
+      "value": "1"
+    },
+    {
+      "id": 529,
+      "key": "_wpas_done_all",
+      "value": "1"
+    },
+    {
+      "id": 2623,
+      "key": "_wc_gla_synced_at",
+      "value": "1688653284"
+    },
+    {
+      "id": 2624,
+      "key": "_wc_gla_sync_status",
+      "value": "synced"
+    },
+    {
+      "id": 2625,
+      "key": "_wc_gla_visibility",
+      "value": "sync-and-show"
+    },
+    {
+      "id": 2626,
+      "key": "_wc_gla_google_ids",
+      "value": {
+        "US": "online:en:US:gla_19"
+      }
+    },
+    {
+      "id": 2716,
+      "key": "_wc_gla_mc_status",
+      "value": "not_synced"
+    },
+    {
+      "id": 2745,
+      "key": "_last_editor_used_jetpack",
+      "value": "classic-editor"
+    },
+    {
+      "id": 2746,
+      "key": "_product_addons",
+      "value": []
+    },
+    {
+      "id": 2747,
+      "key": "_product_addons_exclude_global",
+      "value": "0"
+    },
+    {
+      "id": 2748,
+      "key": "_wc_pinterest_condition",
+      "value": "new"
+    },
+    {
+      "id": 2749,
+      "key": "_wc_pinterest_google_product_category",
+      "value": "Apparel & Accessories > Clothing Accessories > Hats"
+    },
+    {
+      "id": 2750,
+      "key": "group_of_quantity",
+      "value": ""
+    },
+    {
+      "id": 2751,
+      "key": "minimum_allowed_quantity",
+      "value": ""
+    },
+    {
+      "id": 2752,
+      "key": "maximum_allowed_quantity",
+      "value": ""
+    },
+    {
+      "id": 2753,
+      "key": "minmax_do_not_count",
+      "value": "no"
+    },
+    {
+      "id": 2754,
+      "key": "minmax_cart_exclude",
+      "value": "yes"
+    },
+    {
+      "id": 2755,
+      "key": "minmax_category_group_of_exclude",
+      "value": "yes"
+    },
+    {
+      "id": 2756,
+      "key": "_wc_gla_brand",
+      "value": "woocommerce_brands"
+    },
+    {
+      "id": 2757,
+      "key": "_wc_gla_condition",
+      "value": "new"
+    },
+    {
+      "id": 2758,
+      "key": "_wc_gla_gender",
+      "value": "unisex"
+    },
+    {
+      "id": 2759,
+      "key": "_wc_gla_ageGroup",
+      "value": "adult"
+    },
+    {
+      "id": 2760,
+      "key": "_wc_gla_isBundle",
+      "value": "no"
+    },
+    {
+      "id": 2761,
+      "key": "_wc_gla_adult",
+      "value": "no"
+    },
+    {
+      "id": 11400,
+      "key": "_subscription_one_time_shipping",
+      "value": "no"
+    },
+    {
+      "id": 11401,
+      "key": "_wcsatt_force_subscription",
+      "value": "no"
+    },
+    {
+      "id": 11402,
+      "key": "_subscription_downloads_ids",
+      "value": ""
+    },
+    {
+      "id": 11403,
+      "key": "_wc_pre_orders_enabled",
+      "value": "yes"
+    },
+    {
+      "id": 11404,
+      "key": "_wc_pre_orders_fee",
+      "value": ""
+    },
+    {
+      "id": 12077,
+      "key": "_wc_pre_orders_when_to_charge",
+      "value": "upon_release"
+    },
+    {
+      "id": 17898,
+      "key": "wc_bis_previous_stock",
+      "value": "497"
+    },
+    {
+      "key": "_satt_data",
+      "value": {
+        "subscription_schemes": {
+          "1_month_6": {},
+          "1_year": {},
+          "1_month": {}
+        },
+        "has_forced_subscription": "",
+        "active_subscription_scheme_key": null
+      }
+    },
+    {
+      "key": "_subscription_payment_sync_date",
+      "value": 0
+    }
+  ],
+  "stock_status": "instock",
+  "has_options": true,
+  "composite_virtual": false,
+  "composite_layout": "",
+  "composite_add_to_cart_form_location": "",
+  "composite_editable_in_cart": false,
+  "composite_sold_individually_context": "",
+  "composite_shop_price_calc": "",
+  "composite_components": [],
+  "composite_scenarios": [],
+  "bundled_by": [
+    "133",
+    "423"
+  ],
+  "bundle_stock_status": "instock",
+  "bundle_stock_quantity": 497,
+  "bundle_virtual": false,
+  "bundle_layout": "",
+  "bundle_add_to_cart_form_location": "",
+  "bundle_editable_in_cart": false,
+  "bundle_sold_individually_context": "",
+  "bundle_item_grouping": "",
+  "bundle_min_size": "",
+  "bundle_max_size": "",
+  "bundle_price": [],
+  "bundled_items": [],
+  "bundle_sell_ids": [],
+  "jetpack_publicize_connections": [],
+  "jetpack_sharing_enabled": true,
+  "jetpack_likes_enabled": true,
+  "brands": [],
+  "_links": {
+    "self": [
+      {
+        "href": "https://superlativecentaur.wpcomstaging.com/wp-json/wc/v3/products/19"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://superlativecentaur.wpcomstaging.com/wp-json/wc/v3/products"
+      }
+    ]
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/purchase-shipping-labels.json b/libs/fluxc-tests/src/test/resources/wc/purchase-shipping-labels.json
new file mode 100644
index 00000000000..0bf88bfd8b5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/purchase-shipping-labels.json
@@ -0,0 +1,91 @@
+{
+  "labels": [
+    {
+      "label_id": 1,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 2,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ]
+    },
+    {
+      "label_id": 3,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 4,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 5,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    }
+  ],
+  "success": true
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/reports-product-response-example.json b/libs/fluxc-tests/src/test/resources/wc/reports-product-response-example.json
new file mode 100644
index 00000000000..4648c1b2d34
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/reports-product-response-example.json
@@ -0,0 +1,81 @@
+ [
+    {
+      "product_id": 14,
+      "items_sold": 25,
+      "net_revenue": 506.0000000000001,
+      "orders_count": 26,
+      "extended_info": {
+        "name": "Polo",
+        "price": 29,
+        "image": "<img width=\"450\" height=\"450\" src=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-600x599.jpg\" class=\"attachment-woocommerce_thumbnail size-woocommerce_thumbnail\" alt=\"\" decoding=\"async\" loading=\"lazy\" srcset=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-600x599.jpg 600w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-300x300.jpg 300w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-100x100.jpg?crop=1 100w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-150x150.jpg?crop=1 150w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-768x767.jpg 768w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-400x400.jpg?crop=1 400w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-200x200.jpg?crop=1 200w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2.jpg 801w\" sizes=\"(max-width: 450px) 100vw, 450px\" data-attachment-id=\"55\" data-permalink=\"https://superlativecentaur.wpcomstaging.com/?attachment_id=55\" data-orig-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2.jpg\" data-orig-size=\"801,800\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"polo-2.jpg\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2-300x300.jpg\" data-large-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/polo-2.jpg\" />",
+        "permalink": "https://superlativecentaur.wpcomstaging.com/product/polo/",
+        "stock_status": "instock",
+        "stock_quantity": 0,
+        "manage_stock": false,
+        "low_stock_amount": 2,
+        "category_ids": [
+          1361
+        ],
+        "sku": "woo-polo"
+      },
+      "_links": {
+        "product": [
+          {
+            "href": "https://superlativecentaur.wpcomstaging.com/wp-json/wc-analytics/products/26"
+          }
+        ]
+      }
+    },
+    {
+      "product_id": 22,
+      "items_sold": 25,
+      "net_revenue": 1374,
+      "orders_count": 26,
+      "extended_info": {
+        "name": "Sunglasses Subscription",
+        "price": 60,
+        "image": "<img width=\"450\" height=\"450\" src=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-600x600.jpg\" class=\"attachment-woocommerce_thumbnail size-woocommerce_thumbnail\" alt=\"\" decoding=\"async\" loading=\"lazy\" srcset=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-600x600.jpg 600w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-300x300.jpg 300w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-100x100.jpg?crop=1 100w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-150x150.jpg?crop=1 150w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-768x768.jpg 768w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-400x400.jpg?crop=1 400w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-200x200.jpg?crop=1 200w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2.jpg 801w\" sizes=\"(max-width: 450px) 100vw, 450px\" data-attachment-id=\"51\" data-permalink=\"https://superlativecentaur.wpcomstaging.com/?attachment_id=51\" data-orig-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2.jpg\" data-orig-size=\"801,801\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"sunglasses-2.jpg\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2-300x300.jpg\" data-large-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/sunglasses-2.jpg\" />",
+        "permalink": "https://superlativecentaur.wpcomstaging.com/product/sunglasses-subscription/",
+        "stock_status": "instock",
+        "stock_quantity": 0,
+        "manage_stock": false,
+        "low_stock_amount": 2,
+        "category_ids": [],
+        "sku": ""
+      },
+      "_links": {
+        "product": [
+          {
+            "href": "https://superlativecentaur.wpcomstaging.com/wp-json/wc-analytics/products/218"
+          }
+        ]
+      }
+    },
+    {
+      "product_id": 15,
+      "items_sold": 21,
+      "net_revenue": 385,
+      "orders_count": 10,
+      "extended_info": {
+        "name": "Beanie",
+        "price": 20,
+        "image": "<img width=\"450\" height=\"450\" src=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-600x600.jpg\" class=\"attachment-woocommerce_thumbnail size-woocommerce_thumbnail\" alt=\"\" decoding=\"async\" loading=\"lazy\" srcset=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-600x600.jpg 600w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-300x300.jpg 300w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-100x100.jpg?crop=1 100w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-150x150.jpg?crop=1 150w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-768x768.jpg 768w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-400x400.jpg?crop=1 400w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-200x200.jpg?crop=1 200w, https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2.jpg 801w\" sizes=\"(max-width: 450px) 100vw, 450px\" data-attachment-id=\"48\" data-permalink=\"https://superlativecentaur.wpcomstaging.com/?attachment_id=48\" data-orig-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2.jpg\" data-orig-size=\"801,801\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"beanie-2.jpg\" data-image-description=\"\" data-image-caption=\"\" data-medium-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2-300x300.jpg\" data-large-file=\"https://superlativecentaur.wpcomstaging.com/wp-content/uploads/2023/01/beanie-2.jpg\" />",
+        "permalink": "https://superlativecentaur.wpcomstaging.com/product/beanie/",
+        "stock_status": "instock",
+        "stock_quantity": 498,
+        "manage_stock": true,
+        "low_stock_amount": 2,
+        "category_ids": [
+          1363
+        ],
+        "sku": "woo-beanie"
+      },
+      "_links": {
+        "product": [
+          {
+            "href": "https://superlativecentaur.wpcomstaging.com/wp-json/wc-analytics/products/19"
+          }
+        ]
+      }
+    }
+ ]
diff --git a/libs/fluxc-tests/src/test/resources/wc/revenue-stats-data.json b/libs/fluxc-tests/src/test/resources/wc/revenue-stats-data.json
new file mode 100644
index 00000000000..dde9ba926d8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/revenue-stats-data.json
@@ -0,0 +1,135 @@
+[
+      {
+        "interval": "2019-07-07",
+        "date_start": "2019-07-07 00:00:00",
+        "date_start_gmt": "2019-07-07 06:00:00",
+        "date_end": "2019-07-07 23:59:59",
+        "date_end_gmt": "2019-07-08 05:59:59",
+        "subtotals": {
+          "orders_count": 0,
+          "num_items_sold": 0,
+          "total_sales": 0,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 0,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-06",
+        "date_start": "2019-07-06 00:00:00",
+        "date_start_gmt": "2019-07-06 06:00:00",
+        "date_end": "2019-07-06 23:59:59",
+        "date_end_gmt": "2019-07-07 05:59:59",
+        "subtotals": {
+          "orders_count": 0,
+          "num_items_sold": 0,
+          "total_sales": 0,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 0,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-05",
+        "date_start": "2019-07-05 00:00:00",
+        "date_start_gmt": "2019-07-05 06:00:00",
+        "date_end": "2019-07-05 23:59:59",
+        "date_end_gmt": "2019-07-06 05:59:59",
+        "subtotals": {
+          "orders_count": 1,
+          "num_items_sold": 3,
+          "total_sales": 81,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 81,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-04",
+        "date_start": "2019-07-04 00:00:00",
+        "date_start_gmt": "2019-07-04 06:00:00",
+        "date_end": "2019-07-04 23:59:59",
+        "date_end_gmt": "2019-07-05 05:59:59",
+        "subtotals": {
+          "orders_count": 0,
+          "num_items_sold": 0,
+          "total_sales": 0,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 0,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-03",
+        "date_start": "2019-07-03 00:00:00",
+        "date_start_gmt": "2019-07-03 06:00:00",
+        "date_end": "2019-07-03 23:59:59",
+        "date_end_gmt": "2019-07-04 05:59:59",
+        "subtotals": {
+          "orders_count": 0,
+          "num_items_sold": 0,
+          "total_sales": 0,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 0,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-02",
+        "date_start": "2019-07-02 00:00:00",
+        "date_start_gmt": "2019-07-02 06:00:00",
+        "date_end": "2019-07-02 23:59:59",
+        "date_end_gmt": "2019-07-03 05:59:59",
+        "subtotals": {
+          "orders_count": 7,
+          "num_items_sold": 8,
+          "total_sales": 200.99,
+          "coupons": 0,
+          "coupons_count": 0,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 200.99,
+          "segments": []
+        }
+      },
+      {
+        "interval": "2019-07-01",
+        "date_start": "2019-07-01 00:00:00",
+        "date_start_gmt": "2019-07-01 06:00:00",
+        "date_end": "2019-07-01 23:59:59",
+        "date_end_gmt": "2019-07-02 05:59:59",
+        "subtotals": {
+          "orders_count": 2,
+          "num_items_sold": 2,
+          "total_sales": 2,
+          "coupons": 18,
+          "coupons_count": 1,
+          "refunds": 0,
+          "taxes": 0,
+          "shipping": 0,
+          "net_revenue": 2,
+          "segments": []
+        }
+      }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/shipping-labels-account-settings.json b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-account-settings.json
new file mode 100644
index 00000000000..56561b2e013
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-account-settings.json
@@ -0,0 +1,38 @@
+{
+  "success": true,
+  "storeOptions": {
+    "currency_symbol": "$",
+    "dimension_unit": "in",
+    "weight_unit": "oz",
+    "origin_country": "US"
+  },
+  "formData": {
+    "selected_payment_method_id": 4144354,
+    "enabled": true,
+    "email_receipts": true,
+    "paper_size": "letter"
+  },
+  "formMeta": {
+    "can_manage_payments": true,
+    "can_edit_settings": true,
+    "master_user_name": "John Doe",
+    "master_user_login": "jhon",
+    "master_user_wpcom_login": "jhon",
+    "master_user_email": "jhon@email.com",
+    "payment_methods": [
+      {
+        "payment_method_id": 4144354,
+        "name": "John Doe",
+        "card_type": "visa",
+        "card_digits": "5454",
+        "expiry": "2023-12-31"
+      }
+    ],
+    "warnings": {
+      "payment_methods": false
+    }
+  },
+  "userMeta": {
+    "last_box_id": "small_flat_box"
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/shipping-labels-carriers.json b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-carriers.json
new file mode 100644
index 00000000000..1dbfc70fdd6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-carriers.json
@@ -0,0 +1,73 @@
+{
+  "success": true,
+  "rates": {
+    "default_box": {
+      "default": {
+        "rates": [{
+          "rate_id": "rate_cb976896a09c4171a93ace57ed66ce5b",
+          "service_id": "MediaMail",
+          "carrier_id": "usps",
+          "shipment_id": "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+          "title": "USPS - Media Mail",
+          "rate": 3.5,
+          "insurance": 100,
+          "retail_rate": 3.5,
+          "is_selected": false,
+          "delivery_days": 2,
+          "delivery_date_guaranteed": false,
+          "delivery_date": null,
+          "tracking": false,
+          "free_pickup": false
+        }, {
+          "rate_id": "rate_1b202bd43a8c4c929c73bb46989ef745",
+          "service_id": "FEDEX_GROUND",
+          "carrier_id": "fedex",
+          "title": "FedEx - Ground",
+          "shipment_id": "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+          "rate": 21.5,
+          "insurance": 100,
+          "retail_rate": 21.5,
+          "is_selected": false,
+          "delivery_days": 1,
+          "delivery_date_guaranteed": true,
+          "delivery_date": null,
+          "tracking": false,
+          "free_pickup": false
+        }]
+      },
+      "with_signature": {
+        "rates": [{
+          "rate_id": "rate_cb976896a09c4171a93ace57ed66ce5b",
+          "service_id": "MediaMail",
+          "carrier_id": "usps",
+          "shipment_id": "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+          "title": "USPS - Media Mail",
+          "rate": 13.5,
+          "insurance": 100,
+          "retail_rate": 13.5,
+          "is_selected": false,
+          "delivery_days": 2,
+          "delivery_date_guaranteed": false,
+          "delivery_date": null,
+          "tracking": true,
+          "free_pickup": true
+        }, {
+          "rate_id": "rate_1b202bd43a8c4c929c73bb46989ef745",
+          "service_id": "FEDEX_GROUND",
+          "carrier_id": "fedex",
+          "title": "FedEx - Ground",
+          "shipment_id": "shp_0a9b3ff983c6427eaf1e24cb344de36a",
+          "rate": 121.5,
+          "insurance": 100,
+          "retail_rate": 121.5,
+          "is_selected": false,
+          "delivery_days": 1,
+          "delivery_date_guaranteed": true,
+          "delivery_date": null,
+          "tracking": true,
+          "free_pickup": true
+        }]
+      }
+    }
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/shipping-labels-packages.json b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-packages.json
new file mode 100644
index 00000000000..e55d53e32e8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/shipping-labels-packages.json
@@ -0,0 +1,995 @@
+{
+    "success": true,
+    "storeOptions": {
+      "currency_symbol": "$",
+      "dimension_unit": "cm",
+      "weight_unit": "kg",
+      "origin_country": "US"
+    },
+    "formSchema": {
+      "custom": {
+        "type": "array",
+        "title": "Box Sizes",
+        "description": "Items will be packed into these boxes based on item dimensions and volume. Outer dimensions will be passed to the delivery service, whereas inner dimensions will be used for packing. Items not fitting into boxes will be packed individually.",
+        "default": [],
+        "items": {
+          "type": "object",
+          "title": "Box",
+          "required": [
+            "name",
+            "inner_dimensions",
+            "box_weight",
+            "max_weight"
+          ],
+          "properties": {
+            "name": {
+              "type": "string",
+              "title": "Name"
+            },
+            "is_user_defined": {
+              "type": "boolean"
+            },
+            "inner_dimensions": {
+              "type": "string",
+              "title": "Inner Dimensions (L x W x H)",
+              "pattern": "^(\\d+|(?:\\d*\\.\\d+)) x (\\d+|(?:\\d*\\.\\d+)) x (\\d+|(?:\\d*\\.\\d+))$"
+            },
+            "outer_dimensions": {
+              "type": "string",
+              "title": "Outer Dimensions (L x W x H)",
+              "pattern": "^(\\d+|(?:\\d*\\.\\d+)) x (\\d+|(?:\\d*\\.\\d+)) x (\\d+|(?:\\d*\\.\\d+))$"
+            },
+            "box_weight": {
+              "type": "number",
+              "title": "Weight of Box (lbs)"
+            },
+            "max_weight": {
+              "type": "number",
+              "title": "Max Weight (lbs)"
+            },
+            "is_letter": {
+              "type": "boolean",
+              "title": "Letter"
+            }
+          }
+        }
+      },
+      "predefined": {
+        "usps": {
+          "pri_flat_boxes": {
+            "title": "USPS Priority Mail Flat Rate Boxes",
+            "definitions": [
+              {
+                "inner_dimensions": "21.91 x 13.65 x 4.13",
+                "outer_dimensions": "21.91 x 13.65 x 4.13",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "small_flat_box",
+                "name": "Small Flat Rate Box",
+                "dimensions": "21.91 x 13.65 x 4.13",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "27.94 x 21.59 x 13.97",
+                "outer_dimensions": "28.57 x 22.22 x 15.24",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "medium_flat_box_top",
+                "name": "Medium Flat Rate Box 1, Top Loading",
+                "dimensions": {
+                  "inner": "27.94 x 21.59 x 13.97",
+                  "outer": "28.57 x 22.22 x 15.24"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "34.61 x 30.16 x 8.57",
+                "outer_dimensions": "35.56 x 30.48 x 8.89",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "medium_flat_box_side",
+                "name": "Medium Flat Rate Box 2, Side Loading",
+                "dimensions": {
+                  "inner": "34.61 x 30.16 x 8.57",
+                  "outer": "35.56 x 30.48 x 8.89"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "30.48 x 30.48 x 13.97",
+                "outer_dimensions": "31.11 x 31.11 x 15.24",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "large_flat_box",
+                "name": "Large Flat Rate Box",
+                "dimensions": {
+                  "inner": "30.48 x 30.48 x 13.97",
+                  "outer": "31.11 x 31.11 x 15.24"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "60.16 x 29.84 x 7.62",
+                "outer_dimensions": "61.12 x 30.16 x 7.94",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "large_flat_box_2",
+                "name": "Large Flat Rate Board Game Box",
+                "dimensions": {
+                  "inner": "60.16 x 29.84 x 7.62",
+                  "outer": "61.12 x 30.16 x 7.94"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "19.21 x 13.81 x 1.59",
+                "outer_dimensions": "19.21 x 13.81 x 1.59",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "dvd_flat",
+                "name": "DVD Flat Rate (International Only)",
+                "dimensions": "19.21 x 13.81 x 1.59",
+                "max_weight": 1.81,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "23.49 x 15.87 x 5.08",
+                "outer_dimensions": "23.49 x 15.87 x 5.08",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "large_video_flat",
+                "name": "1096L - Large Video Flat Rate (International Only)",
+                "dimensions": "23.49 x 15.87 x 5.08",
+                "max_weight": 1.81,
+                "is_letter": false,
+                "group_id": "pri_flat_boxes",
+                "can_ship_international": true
+              }
+            ]
+          },
+          "pri_envelopes": {
+            "title": "USPS Priority Mail Flat Rate Envelopes",
+            "definitions": [
+              {
+                "inner_dimensions": "31.75 x 24.13 x 1.27",
+                "outer_dimensions": "31.75 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "flat_envelope",
+                "name": "Flat Rate Envelope",
+                "dimensions": [
+                  "31.75 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "38.1 x 24.13 x 1.27",
+                "outer_dimensions": "38.1 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "legal_flat_envelope",
+                "name": "Legal Flat Rate Envelope",
+                "dimensions": [
+                  "38.1 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "31.75 x 24.13 x 1.27",
+                "outer_dimensions": "31.75 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "padded_flat_envelope",
+                "name": "Padded Flat Rate Envelope",
+                "dimensions": [
+                  "31.75 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "31.75 x 24.13 x 1.27",
+                "outer_dimensions": "31.75 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "window_flat_envelope",
+                "name": "Window Flat Rate Envelope (12.5\" x 9.5\")",
+                "dimensions": [
+                  "31.75 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "25.4 x 15.24 x 1.27",
+                "outer_dimensions": "25.4 x 15.24 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "small_flat_envelope",
+                "name": "Small Flat Rate Envelope",
+                "dimensions": [
+                  "25.4 x 15.24 x 1.27",
+                  "25.4 x 10.16 x 3.81",
+                  "25.4 x 6.35 x 5.71"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_envelopes",
+                "can_ship_international": true
+              }
+            ]
+          },
+          "pri_boxes": {
+            "title": "USPS Priority Mail Boxes",
+            "definitions": [
+              {
+                "inner_dimensions": "95.72 x 15.56 x 12.86",
+                "outer_dimensions": "95.72 x 15.56 x 12.86",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "medium_tube",
+                "name": "Priority Mail Medium Tube",
+                "dimensions": "95.72 x 15.56 x 12.86",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "63.5 x 15.24 x 14.92",
+                "outer_dimensions": "63.5 x 15.24 x 14.92",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "small_tube",
+                "name": "Priority Mail Small Tube",
+                "dimensions": "63.5 x 15.24 x 14.92",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "19.05 x 13.02 x 36.51",
+                "outer_dimensions": "19.05 x 13.02 x 36.51",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "shoe_box",
+                "name": "Priority Mail Shoe Box",
+                "dimensions": "19.05 x 13.02 x 36.51",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "17.78 x 17.78 x 15.24",
+                "outer_dimensions": "17.78 x 17.78 x 15.24",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_4",
+                "name": "Priority Mail Box - 4",
+                "dimensions": "17.78 x 17.78 x 15.24",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "30.48 x 30.48 x 20.32",
+                "outer_dimensions": "30.48 x 30.48 x 20.32",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_7",
+                "name": "Priority Mail Box - 7",
+                "dimensions": "30.48 x 30.48 x 20.32",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "38.73 x 31.43 x 7.62",
+                "outer_dimensions": "39.69 x 31.59 x 7.94",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_1095",
+                "name": "Priority Mail Box - 1095",
+                "dimensions": {
+                  "inner": "38.73 x 31.43 x 7.62",
+                  "outer": "39.69 x 31.59 x 7.94"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "23.49 x 15.87 x 5.08",
+                "outer_dimensions": "24.29 x 16.35 x 5.56",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_1096L",
+                "name": "Priority Mail Box - 1096L",
+                "dimensions": {
+                  "inner": "23.49 x 15.87 x 5.08",
+                  "outer": "24.29 x 16.35 x 5.56"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "29.21 x 33.34 x 6.03",
+                "outer_dimensions": "29.53 x 34.13 x 6.35",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_1097",
+                "name": "Priority Mail Box - 1097",
+                "dimensions": {
+                  "inner": "29.21 x 33.34 x 6.03",
+                  "outer": "29.53 x 34.13 x 6.35"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "19.21 x 13.81 x 1.59",
+                "outer_dimensions": "19.21 x 13.81 x 1.59",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_dvd",
+                "name": "Priority Mail DVD Box",
+                "dimensions": "19.21 x 13.81 x 1.59",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "29.53 x 38.42 x 1.27",
+                "outer_dimensions": "29.53 x 38.42 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "priority_tyvek_envelope",
+                "name": "Priority Mail Tyvek Envelope",
+                "dimensions": "29.53 x 38.42 x 1.27",
+                "max_weight": 31.75,
+                "is_letter": true,
+                "service_group_ids": [
+                  "priority",
+                  "priority_international"
+                ],
+                "group_id": "pri_boxes",
+                "can_ship_international": true
+              }
+            ]
+          },
+          "pri_express_envelopes": {
+            "title": "USPS Priority Mail Express Flat Rate Envelopes",
+            "definitions": [
+              {
+                "inner_dimensions": "31.75 x 24.13 x 1.27",
+                "outer_dimensions": "31.75 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "express_flat_envelope",
+                "name": "Flat Rate Envelope",
+                "dimensions": [
+                  "31.75 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_express_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "38.1 x 24.13 x 1.27",
+                "outer_dimensions": "38.1 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "express_legal_flat_envelope",
+                "name": "Legal Flat Rate Envelope",
+                "dimensions": [
+                  "38.1 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_express_envelopes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "31.75 x 24.13 x 1.27",
+                "outer_dimensions": "31.75 x 24.13 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "express_padded_flat_envelope",
+                "name": "Padded Flat Rate Envelope",
+                "dimensions": [
+                  "31.75 x 24.13 x 1.27",
+                  "31.75 x 19.05 x 3.81",
+                  "31.75 x 13.97 x 6.35",
+                  "31.75 x 8.89 x 8.89"
+                ],
+                "max_weight": 31.75,
+                "is_letter": true,
+                "group_id": "pri_express_envelopes",
+                "can_ship_international": true
+              }
+            ]
+          },
+          "pri_express_boxes": {
+            "title": "USPS Priority Mail Express Boxes",
+            "definitions": [
+              {
+                "inner_dimensions": "38.73 x 31.43 x 7.62",
+                "outer_dimensions": "39.69 x 31.59 x 7.94",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_box",
+                "name": "Priority Mail Express Box",
+                "dimensions": {
+                  "inner": "38.73 x 31.43 x 7.62",
+                  "outer": "39.69 x 31.59 x 7.94"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "27.94 x 21.59 x 13.97",
+                "outer_dimensions": "28.57 x 22.22 x 15.24",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_box_1",
+                "name": "Priority Mail Express Box 1",
+                "dimensions": {
+                  "inner": "27.94 x 21.59 x 13.97",
+                  "outer": "28.57 x 22.22 x 15.24"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "30.16 x 8.57 x 34.61",
+                "outer_dimensions": "30.48 x 8.89 x 35.56",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_box_2",
+                "name": "Priority Mail Express Box 2",
+                "dimensions": {
+                  "inner": "30.16 x 8.57 x 34.61",
+                  "outer": "30.48 x 8.89 x 35.56"
+                },
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "95.72 x 15.56 x 12.86",
+                "outer_dimensions": "95.72 x 15.56 x 12.86",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_medium_tube",
+                "name": "Priority Mail Express Medium Tube",
+                "dimensions": "95.72 x 15.56 x 12.86",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "63.5 x 15.24 x 14.92",
+                "outer_dimensions": "63.5 x 15.24 x 14.92",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_small_tube",
+                "name": "Priority Mail Express Small Tube",
+                "dimensions": "63.5 x 15.24 x 14.92",
+                "max_weight": 31.75,
+                "is_letter": false,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "29.53 x 38.42 x 1.27",
+                "outer_dimensions": "29.53 x 38.42 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_tyvek_envelope",
+                "name": "Priority Mail Express Tyvek Envelope",
+                "dimensions": "29.53 x 38.42 x 1.27",
+                "max_weight": 31.75,
+                "is_letter": true,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "14.92 x 25.4 x 1.27",
+                "outer_dimensions": "14.92 x 25.4 x 1.27",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "express_window_envelope",
+                "name": "Priority Mail Express Window Envelope",
+                "dimensions": "14.92 x 25.4 x 1.27",
+                "max_weight": 31.75,
+                "is_letter": true,
+                "service_group_ids": [
+                  "priority_exp",
+                  "priority_express_international"
+                ],
+                "group_id": "pri_express_boxes",
+                "can_ship_international": true
+              }
+            ]
+          },
+          "pri_regional_boxes": {
+            "title": "USPS Priority Mail Regional Rate Boxes",
+            "definitions": [
+              {
+                "inner_dimensions": "25.72 x 18.1 x 12.7",
+                "outer_dimensions": "25.72 x 18.1 x 12.7",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "regional_a1",
+                "name": "Regional Rate Box A1",
+                "dimensions": "25.72 x 18.1 x 12.7",
+                "max_weight": 6.8,
+                "is_letter": false,
+                "group_id": "pri_regional_boxes",
+                "can_ship_international": false
+              },
+              {
+                "inner_dimensions": "28.1 x 6.35 x 33.18",
+                "outer_dimensions": "28.1 x 6.35 x 33.18",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "regional_a2",
+                "name": "Regional Rate Box A2",
+                "dimensions": "28.1 x 6.35 x 33.18",
+                "max_weight": 6.8,
+                "is_letter": false,
+                "group_id": "pri_regional_boxes",
+                "can_ship_international": false
+              },
+              {
+                "inner_dimensions": "31.11 x 26.67 x 13.97",
+                "outer_dimensions": "31.11 x 26.67 x 13.97",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "regional_b1",
+                "name": "Regional Rate Box B1",
+                "dimensions": "31.11 x 26.67 x 13.97",
+                "max_weight": 9.07,
+                "is_letter": false,
+                "group_id": "pri_regional_boxes",
+                "can_ship_international": false
+              },
+              {
+                "inner_dimensions": "36.83 x 7.62 x 41.27",
+                "outer_dimensions": "36.83 x 7.62 x 41.27",
+                "box_weight": 0,
+                "is_flat_rate": true,
+                "id": "regional_b2",
+                "name": "Regional Rate Box B2",
+                "dimensions": "36.83 x 7.62 x 41.27",
+                "max_weight": 9.07,
+                "is_letter": false,
+                "group_id": "pri_regional_boxes",
+                "can_ship_international": false
+              }
+            ]
+          }
+        },
+        "fedex": {
+          "express": {
+            "title": "FedEx Express Packages",
+            "definitions": [
+              {
+                "inner_dimensions": "33.5 x 23.49 x 1.9",
+                "outer_dimensions": "33.5 x 23.49 x 1.9",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExEnvelope",
+                "name": "Envelope",
+                "dimensions": "33.5 x 23.49 x 1.9",
+                "max_weight": 4.54,
+                "is_letter": true,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "39.37 x 30.48 x 1.9",
+                "outer_dimensions": "39.37 x 30.48 x 1.9",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExPak",
+                "name": "Large Pak",
+                "dimensions": "39.37 x 30.48 x 1.9",
+                "max_weight": 9.07,
+                "is_letter": true,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "31.11 x 27.68 x 3.81",
+                "outer_dimensions": "31.11 x 27.68 x 3.81",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExSmallBox1",
+                "name": "Small Box (S1)",
+                "dimensions": "31.11 x 27.68 x 3.81",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "28.57 x 22.22 x 6.68",
+                "outer_dimensions": "28.57 x 22.22 x 6.68",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExSmallBox2",
+                "name": "Small Box (S2)",
+                "dimensions": "28.57 x 22.22 x 6.68",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "33.65 x 29.21 x 6.04",
+                "outer_dimensions": "33.65 x 29.21 x 6.04",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExMediumBox1",
+                "name": "Medium Box (M1)",
+                "dimensions": "33.65 x 29.21 x 6.04",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "28.57 x 22.22 x 11.12",
+                "outer_dimensions": "28.57 x 22.22 x 11.12",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExMediumBox2",
+                "name": "Medium Box (M2)",
+                "dimensions": "28.57 x 22.22 x 11.12",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "45.41 x 31.44 x 1.9",
+                "outer_dimensions": "45.41 x 31.44 x 1.9",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExLargeBox1",
+                "name": "Large Box (L1)",
+                "dimensions": "45.41 x 31.44 x 1.9",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "28.57 x 22.22 x 19.68",
+                "outer_dimensions": "28.57 x 22.22 x 19.68",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExLargeBox2",
+                "name": "Large Box (L2)",
+                "dimensions": "28.57 x 22.22 x 19.68",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "30.17 x 27.94 x 27.3",
+                "outer_dimensions": "30.17 x 27.94 x 27.3",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExExtraLargeBox1",
+                "name": "Extra Large Box (X1)",
+                "dimensions": "30.17 x 27.94 x 27.3",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "38.73 x 35.89 x 15.24",
+                "outer_dimensions": "38.73 x 35.89 x 15.24",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExExtraLargeBox2",
+                "name": "Extra Large Box (X2)",
+                "dimensions": "38.73 x 35.89 x 15.24",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              },
+              {
+                "inner_dimensions": "96.52 x 15.24 x 12.7",
+                "outer_dimensions": "96.52 x 15.24 x 12.7",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedExTube",
+                "name": "Tube",
+                "dimensions": "96.52 x 15.24 x 12.7",
+                "max_weight": 22.68,
+                "is_letter": false,
+                "group_id": "express"
+              }
+            ]
+          },
+          "international": {
+            "title": "FedEx International Boxes",
+            "definitions": [
+              {
+                "inner_dimensions": "40.16 x 32.87 x 25.88",
+                "outer_dimensions": "40.16 x 32.87 x 25.88",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedEx10kgBox",
+                "name": "10kg Box",
+                "dimensions": "40.16 x 32.87 x 25.88",
+                "max_weight": 9.98,
+                "is_letter": false,
+                "group_id": "international"
+              },
+              {
+                "inner_dimensions": "54.76 x 42.06 x 33.5",
+                "outer_dimensions": "54.76 x 42.06 x 33.5",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "FedEx25kgBox",
+                "name": "25kg Box",
+                "dimensions": "54.76 x 42.06 x 33.5",
+                "max_weight": 24.95,
+                "is_letter": false,
+                "group_id": "international"
+              }
+            ]
+          }
+        },
+        "dhlexpress": {
+          "domestic_and_international": {
+            "title": "DHL Express",
+            "definitions": [
+              {
+                "inner_dimensions": "24.89 x 30.48 x 2.54",
+                "outer_dimensions": "24.89 x 30.48 x 2.54",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "SmallPaddedPouch",
+                "name": "Small Padded Pouch",
+                "dimensions": "24.89 x 30.48 x 2.54",
+                "max_weight": 45.36,
+                "is_letter": true,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "30.22 x 35.56 x 2.54",
+                "outer_dimensions": "30.22 x 35.56 x 2.54",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "LargePaddedPouch",
+                "name": "Large Padded Pouch",
+                "dimensions": "30.22 x 35.56 x 2.54",
+                "max_weight": 45.36,
+                "is_letter": true,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "25.65 x 14.73 x 14.99",
+                "outer_dimensions": "25.65 x 14.73 x 14.99",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "Box2Cube",
+                "name": "Box #2 Cube",
+                "dimensions": "25.65 x 14.73 x 14.99",
+                "max_weight": 45.36,
+                "is_letter": false,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "31.75 x 28.19 x 3.81",
+                "outer_dimensions": "31.75 x 28.19 x 3.81",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "Box2Small",
+                "name": "Box #2 Small",
+                "dimensions": "31.75 x 28.19 x 3.81",
+                "max_weight": 45.36,
+                "is_letter": false,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "33.53 x 32 x 5.08",
+                "outer_dimensions": "33.53 x 32 x 5.08",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "Box2Medium",
+                "name": "Box #2 Medium",
+                "dimensions": "33.53 x 32 x 5.08",
+                "max_weight": 45.36,
+                "is_letter": false,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              },
+              {
+                "inner_dimensions": "44.45 x 31.75 x 7.62",
+                "outer_dimensions": "44.45 x 31.75 x 7.62",
+                "box_weight": 0,
+                "is_flat_rate": false,
+                "id": "Box3Large",
+                "name": "Box #3 Large",
+                "dimensions": "44.45 x 31.75 x 7.62",
+                "max_weight": 45.36,
+                "is_letter": false,
+                "group_id": "domestic_and_international",
+                "can_ship_international": true
+              }
+            ]
+          }
+        }
+      }
+    },
+    "formData": {
+      "custom": [
+        {
+          "is_user_defined": true,
+          "name": "Krabica",
+          "inner_dimensions": "1 x 2 x 3",
+          "box_weight": 1,
+          "max_weight": 0
+        },
+        {
+          "is_user_defined": true,
+          "is_letter": true,
+          "name": "Obalka",
+          "outer_dimensions": "2 x 3 x 4",
+          "box_weight": 5,
+          "max_weight": 0
+        },
+        {
+          "is_user_defined": true,
+          "is_letter": true,
+          "name": "Flat Box",
+          "dimensions": "5 x 6 x 4",
+          "box_weight": 1,
+          "max_weight": 0
+        },
+        {
+          "is_user_defined": true,
+          "is_letter": false,
+          "name": "Weird Box",
+          "weird_dimensions": "2 x 3 x 4",
+          "box_weight": 0,
+          "max_weight": 0
+        }
+      ],
+      "predefined": {
+        "usps": [
+          null,
+          "small_flat_box",
+          "medium_flat_box_top"
+        ],
+        "dhlexpress": [
+          "LargePaddedPouch"
+        ]
+      }
+    }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/shipping-labels.json b/libs/fluxc-tests/src/test/resources/wc/shipping-labels.json
new file mode 100644
index 00000000000..35c6cfed807
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/shipping-labels.json
@@ -0,0 +1,178 @@
+{
+  "orderId": 25,
+  "paperSize": "label",
+  "formData": {
+    "is_packed": true,
+    "selected_packages": {
+      "default_box": {
+        "id": "default_box",
+        "box_id": "not_selected",
+        "height": 0,
+        "length": 0,
+        "weight": 0,
+        "width": 0,
+        "items": [{
+          "height": 0,
+          "product_id": 61,
+          "length": 0,
+          "quantity": 1,
+          "weight": 0,
+          "width": 0,
+          "name": "woo-polo - Polo",
+          "url": "https:\/\/awootestshop.mystagingwebsite.com\/wp-admin\/post.php?post=61&action=edit",
+          "value": 20
+        }, {
+          "height": 0,
+          "product_id": 39,
+          "length": 0,
+          "quantity": 1,
+          "weight": 0,
+          "width": 0,
+          "name": "woo-sunglasses - Sunglasses",
+          "url": "https:\/\/awootestshop.mystagingwebsite.com\/wp-admin\/post.php?post=39&action=edit",
+          "value": 90
+        }, {
+          "height": 0,
+          "product_id": 35,
+          "length": 0,
+          "quantity": 1,
+          "weight": 0,
+          "width": 0,
+          "name": "woo-tshirt - T-Shirt",
+          "url": "https:\/\/awootestshop.mystagingwebsite.com\/wp-admin\/post.php?post=35&action=edit",
+          "value": 18
+        }]
+      }
+    },
+    "origin": {
+      "company": "awootestshop.mystagingwebsite.com",
+      "name": "Anitaa Murthy",
+      "phone": "",
+      "country": "US",
+      "state": "CA",
+      "address": "60 29TH ST # 343",
+      "address_2": "",
+      "city": "SAN FRANCISCO",
+      "postcode": "94110-4929"
+    },
+    "destination": {
+      "company": "",
+      "address_2": "",
+      "city": "SAN FRANCISCO",
+      "state": "CA",
+      "postcode": "94110-4929",
+      "country": "US",
+      "phone": "41535032",
+      "name": "Anitaa OrderTesting29",
+      "address": "60 29TH ST # 343"
+    },
+    "origin_normalized": true,
+    "destination_normalized": true,
+    "rates": {
+      "selected": {}
+    },
+    "order_id": 1427
+  },
+  "labelsData": [{
+    "label_id": 1,
+    "tracking": "9405500205309038753691",
+    "refundable_amount": 7.65,
+    "created": 1589295659638,
+    "carrier_id": "usps",
+    "service_name": "USPS - Priority Mail",
+    "status": "PURCHASED",
+    "package_name": "Small Flat Rate Box",
+    "product_names": ["Polo", "T-Shirt"],
+    "product_ids": [10, 11],
+    "receipt_item_id": 24212914,
+    "created_date": 1589295663000,
+    "main_receipt_id": 19680344,
+    "rate": 7.65,
+    "currency": "USD",
+    "expiry_date": 1604847662000,
+    "label_cached": 1589295666000,
+    "refund":{
+      "status": "pending",
+      "request_date": 1604847663000
+    }
+  }, {
+    "label_id": 2,
+    "tracking": "9405500205309038753691",
+    "refundable_amount": 7.65,
+    "created": 1589295659638,
+    "carrier_id": "usps",
+    "service_name": "USPS - Priority Mail",
+    "status": "PURCHASED",
+    "package_name": "Small Flat Rate Box",
+    "product_names": ["Polo", "T-Shirt"],
+    "receipt_item_id": 24212914,
+    "created_date": 1589295663000,
+    "main_receipt_id": 19680344,
+    "rate": 7.65,
+    "currency": "USD",
+    "expiry_date": 1604847662000,
+    "label_cached": 1589295666000
+  }, {
+    "label_id": 3,
+    "tracking": "9405500205309038753691",
+    "refundable_amount": 7.65,
+    "created": 1589295659638,
+    "carrier_id": "usps",
+    "service_name": "USPS - Priority Mail",
+    "status": "PURCHASED",
+    "package_name": "Small Flat Rate Box",
+    "product_names": ["Polo", "T-Shirt"],
+    "product_ids": [10, 11],
+    "receipt_item_id": 24212914,
+    "created_date": 1589295663000,
+    "main_receipt_id": 19680344,
+    "rate": 7.65,
+    "currency": "USD",
+    "expiry_date": 1604847662000,
+    "label_cached": 1589295666000
+  }, {
+    "label_id": 4,
+    "tracking": "9405500205309038753691",
+    "refundable_amount": 7.65,
+    "created": 1589295659638,
+    "carrier_id": "usps",
+    "service_name": "USPS - Priority Mail",
+    "status": "PURCHASED",
+    "package_name": "Small Flat Rate Box",
+    "product_names": ["Polo", "T-Shirt"],
+    "product_ids": [10, 11],
+    "receipt_item_id": 24212914,
+    "created_date": 1589295663000,
+    "main_receipt_id": 19680344,
+    "rate": 7.65,
+    "currency": "USD",
+    "expiry_date": 1604847662000,
+    "label_cached": 1589295666000
+  }, {
+    "label_id": 5,
+    "tracking": "9405500205309038753691",
+    "refundable_amount": 7.65,
+    "created": 1589295659638,
+    "carrier_id": "usps",
+    "service_name": "USPS - Priority Mail",
+    "status": "PURCHASED",
+    "package_name": "Small Flat Rate Box",
+    "product_names": ["Polo", "T-Shirt"],
+    "product_ids": [10, 11],
+    "receipt_item_id": 24212914,
+    "created_date": 1589295663000,
+    "main_receipt_id": 19680344,
+    "rate": 7.65,
+    "currency": "USD",
+    "expiry_date": 1604847662000,
+    "label_cached": 1589295666000
+  }],
+  "storeOptions": {
+    "currency_symbol": "$",
+    "dimension_unit": "in",
+    "weight_unit": "oz",
+    "origin_country": "US"
+  },
+  "canChangeCountries": true,
+  "success": true
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/site-setting-option-response.json b/libs/fluxc-tests/src/test/resources/wc/site-setting-option-response.json
new file mode 100644
index 00000000000..c5d49b31ccf
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/site-setting-option-response.json
@@ -0,0 +1,21 @@
+{
+  "id": "woocommerce_enable_coupons",
+  "label": "Enable coupons",
+  "description": "Enable the use of coupon codes",
+  "type": "checkbox",
+  "default": "yes",
+  "tip": "Coupons can be applied from the cart and checkout pages.",
+  "value": "yes",
+  "_links": {
+    "self": [
+      {
+        "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_enable_coupons"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/site-settings-general-response.json b/libs/fluxc-tests/src/test/resources/wc/site-settings-general-response.json
new file mode 100644
index 00000000000..539141195a8
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/site-settings-general-response.json
@@ -0,0 +1,3425 @@
+[
+  {
+    "id": "woocommerce_store_address",
+    "label": "Address line 1",
+    "description": "The street address for your business location.",
+    "type": "text",
+    "default": "",
+    "tip": "The street address for your business location.",
+    "value": "60 29th Street #343",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_store_address"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_store_address_2",
+    "label": "Address line 2",
+    "description": "An additional, optional address line for your business location.",
+    "type": "text",
+    "default": "",
+    "tip": "An additional, optional address line for your business location.",
+    "value": "",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_store_address_2"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_store_city",
+    "label": "City",
+    "description": "The city in which your business is located.",
+    "type": "text",
+    "default": "",
+    "tip": "The city in which your business is located.",
+    "value": "San Francisco",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_store_city"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_default_country",
+    "label": "Country / State",
+    "description": "The country and state or province, if any, in which your business is located.",
+    "type": "select",
+    "default": "US:CA",
+    "tip": "The country and state or province, if any, in which your business is located.",
+    "value": "US:CA",
+    "options": {
+      "AF": "Afghanistan",
+      "AX": "Åland Islands",
+      "AL:AL-01": "Albania - Berat",
+      "AL:AL-09": "Albania - Dibër",
+      "AL:AL-02": "Albania - Durrës",
+      "AL:AL-03": "Albania - Elbasan",
+      "AL:AL-04": "Albania - Fier",
+      "AL:AL-05": "Albania - Gjirokastër",
+      "AL:AL-06": "Albania - Korçë",
+      "AL:AL-07": "Albania - Kukës",
+      "AL:AL-08": "Albania - Lezhë",
+      "AL:AL-10": "Albania - Shkodër",
+      "AL:AL-11": "Albania - Tirana",
+      "AL:AL-12": "Albania - Vlorë",
+      "DZ:DZ-01": "Algeria - Adrar",
+      "DZ:DZ-02": "Algeria - Chlef",
+      "DZ:DZ-03": "Algeria - Laghouat",
+      "DZ:DZ-04": "Algeria - Oum El Bouaghi",
+      "DZ:DZ-05": "Algeria - Batna",
+      "DZ:DZ-06": "Algeria - Béjaïa",
+      "DZ:DZ-07": "Algeria - Biskra",
+      "DZ:DZ-08": "Algeria - Béchar",
+      "DZ:DZ-09": "Algeria - Blida",
+      "DZ:DZ-10": "Algeria - Bouira",
+      "DZ:DZ-11": "Algeria - Tamanghasset",
+      "DZ:DZ-12": "Algeria - Tébessa",
+      "DZ:DZ-13": "Algeria - Tlemcen",
+      "DZ:DZ-14": "Algeria - Tiaret",
+      "DZ:DZ-15": "Algeria - Tizi Ouzou",
+      "DZ:DZ-16": "Algeria - Algiers",
+      "DZ:DZ-17": "Algeria - Djelfa",
+      "DZ:DZ-18": "Algeria - Jijel",
+      "DZ:DZ-19": "Algeria - Sétif",
+      "DZ:DZ-20": "Algeria - Saïda",
+      "DZ:DZ-21": "Algeria - Skikda",
+      "DZ:DZ-22": "Algeria - Sidi Bel Abbès",
+      "DZ:DZ-23": "Algeria - Annaba",
+      "DZ:DZ-24": "Algeria - Guelma",
+      "DZ:DZ-25": "Algeria - Constantine",
+      "DZ:DZ-26": "Algeria - Médéa",
+      "DZ:DZ-27": "Algeria - Mostaganem",
+      "DZ:DZ-28": "Algeria - M’Sila",
+      "DZ:DZ-29": "Algeria - Mascara",
+      "DZ:DZ-30": "Algeria - Ouargla",
+      "DZ:DZ-31": "Algeria - Oran",
+      "DZ:DZ-32": "Algeria - El Bayadh",
+      "DZ:DZ-33": "Algeria - Illizi",
+      "DZ:DZ-34": "Algeria - Bordj Bou Arréridj",
+      "DZ:DZ-35": "Algeria - Boumerdès",
+      "DZ:DZ-36": "Algeria - El Tarf",
+      "DZ:DZ-37": "Algeria - Tindouf",
+      "DZ:DZ-38": "Algeria - Tissemsilt",
+      "DZ:DZ-39": "Algeria - El Oued",
+      "DZ:DZ-40": "Algeria - Khenchela",
+      "DZ:DZ-41": "Algeria - Souk Ahras",
+      "DZ:DZ-42": "Algeria - Tipasa",
+      "DZ:DZ-43": "Algeria - Mila",
+      "DZ:DZ-44": "Algeria - Aïn Defla",
+      "DZ:DZ-45": "Algeria - Naama",
+      "DZ:DZ-46": "Algeria - Aïn Témouchent",
+      "DZ:DZ-47": "Algeria - Ghardaïa",
+      "DZ:DZ-48": "Algeria - Relizane",
+      "AS": "American Samoa",
+      "AD": "Andorra",
+      "AO:BGO": "Angola - Bengo",
+      "AO:BLU": "Angola - Benguela",
+      "AO:BIE": "Angola - Bié",
+      "AO:CAB": "Angola - Cabinda",
+      "AO:CNN": "Angola - Cunene",
+      "AO:HUA": "Angola - Huambo",
+      "AO:HUI": "Angola - Huíla",
+      "AO:CCU": "Angola - Kuando Kubango",
+      "AO:CNO": "Angola - Kwanza-Norte",
+      "AO:CUS": "Angola - Kwanza-Sul",
+      "AO:LUA": "Angola - Luanda",
+      "AO:LNO": "Angola - Lunda-Norte",
+      "AO:LSU": "Angola - Lunda-Sul",
+      "AO:MAL": "Angola - Malanje",
+      "AO:MOX": "Angola - Moxico",
+      "AO:NAM": "Angola - Namibe",
+      "AO:UIG": "Angola - Uíge",
+      "AO:ZAI": "Angola - Zaire",
+      "AI": "Anguilla",
+      "AQ": "Antarctica",
+      "AG": "Antigua and Barbuda",
+      "AR:C": "Argentina - Ciudad Autónoma de Buenos Aires",
+      "AR:B": "Argentina - Buenos Aires",
+      "AR:K": "Argentina - Catamarca",
+      "AR:H": "Argentina - Chaco",
+      "AR:U": "Argentina - Chubut",
+      "AR:X": "Argentina - Córdoba",
+      "AR:W": "Argentina - Corrientes",
+      "AR:E": "Argentina - Entre Ríos",
+      "AR:P": "Argentina - Formosa",
+      "AR:Y": "Argentina - Jujuy",
+      "AR:L": "Argentina - La Pampa",
+      "AR:F": "Argentina - La Rioja",
+      "AR:M": "Argentina - Mendoza",
+      "AR:N": "Argentina - Misiones",
+      "AR:Q": "Argentina - Neuquén",
+      "AR:R": "Argentina - Río Negro",
+      "AR:A": "Argentina - Salta",
+      "AR:J": "Argentina - San Juan",
+      "AR:D": "Argentina - San Luis",
+      "AR:Z": "Argentina - Santa Cruz",
+      "AR:S": "Argentina - Santa Fe",
+      "AR:G": "Argentina - Santiago del Estero",
+      "AR:V": "Argentina - Tierra del Fuego",
+      "AR:T": "Argentina - Tucumán",
+      "AM": "Armenia",
+      "AW": "Aruba",
+      "AU:ACT": "Australia - Australian Capital Territory",
+      "AU:NSW": "Australia - New South Wales",
+      "AU:NT": "Australia - Northern Territory",
+      "AU:QLD": "Australia - Queensland",
+      "AU:SA": "Australia - South Australia",
+      "AU:TAS": "Australia - Tasmania",
+      "AU:VIC": "Australia - Victoria",
+      "AU:WA": "Australia - Western Australia",
+      "AT": "Austria",
+      "AZ": "Azerbaijan",
+      "BS": "Bahamas",
+      "BH": "Bahrain",
+      "BD:BD-05": "Bangladesh - Bagerhat",
+      "BD:BD-01": "Bangladesh - Bandarban",
+      "BD:BD-02": "Bangladesh - Barguna",
+      "BD:BD-06": "Bangladesh - Barishal",
+      "BD:BD-07": "Bangladesh - Bhola",
+      "BD:BD-03": "Bangladesh - Bogura",
+      "BD:BD-04": "Bangladesh - Brahmanbaria",
+      "BD:BD-09": "Bangladesh - Chandpur",
+      "BD:BD-10": "Bangladesh - Chattogram",
+      "BD:BD-12": "Bangladesh - Chuadanga",
+      "BD:BD-11": "Bangladesh - Cox's Bazar",
+      "BD:BD-08": "Bangladesh - Cumilla",
+      "BD:BD-13": "Bangladesh - Dhaka",
+      "BD:BD-14": "Bangladesh - Dinajpur",
+      "BD:BD-15": "Bangladesh - Faridpur ",
+      "BD:BD-16": "Bangladesh - Feni",
+      "BD:BD-19": "Bangladesh - Gaibandha",
+      "BD:BD-18": "Bangladesh - Gazipur",
+      "BD:BD-17": "Bangladesh - Gopalganj",
+      "BD:BD-20": "Bangladesh - Habiganj",
+      "BD:BD-21": "Bangladesh - Jamalpur",
+      "BD:BD-22": "Bangladesh - Jashore",
+      "BD:BD-25": "Bangladesh - Jhalokati",
+      "BD:BD-23": "Bangladesh - Jhenaidah",
+      "BD:BD-24": "Bangladesh - Joypurhat",
+      "BD:BD-29": "Bangladesh - Khagrachhari",
+      "BD:BD-27": "Bangladesh - Khulna",
+      "BD:BD-26": "Bangladesh - Kishoreganj",
+      "BD:BD-28": "Bangladesh - Kurigram",
+      "BD:BD-30": "Bangladesh - Kushtia",
+      "BD:BD-31": "Bangladesh - Lakshmipur",
+      "BD:BD-32": "Bangladesh - Lalmonirhat",
+      "BD:BD-36": "Bangladesh - Madaripur",
+      "BD:BD-37": "Bangladesh - Magura",
+      "BD:BD-33": "Bangladesh - Manikganj ",
+      "BD:BD-39": "Bangladesh - Meherpur",
+      "BD:BD-38": "Bangladesh - Moulvibazar",
+      "BD:BD-35": "Bangladesh - Munshiganj",
+      "BD:BD-34": "Bangladesh - Mymensingh",
+      "BD:BD-48": "Bangladesh - Naogaon",
+      "BD:BD-43": "Bangladesh - Narail",
+      "BD:BD-40": "Bangladesh - Narayanganj",
+      "BD:BD-42": "Bangladesh - Narsingdi",
+      "BD:BD-44": "Bangladesh - Natore",
+      "BD:BD-45": "Bangladesh - Nawabganj",
+      "BD:BD-41": "Bangladesh - Netrakona",
+      "BD:BD-46": "Bangladesh - Nilphamari",
+      "BD:BD-47": "Bangladesh - Noakhali",
+      "BD:BD-49": "Bangladesh - Pabna",
+      "BD:BD-52": "Bangladesh - Panchagarh",
+      "BD:BD-51": "Bangladesh - Patuakhali",
+      "BD:BD-50": "Bangladesh - Pirojpur",
+      "BD:BD-53": "Bangladesh - Rajbari",
+      "BD:BD-54": "Bangladesh - Rajshahi",
+      "BD:BD-56": "Bangladesh - Rangamati",
+      "BD:BD-55": "Bangladesh - Rangpur",
+      "BD:BD-58": "Bangladesh - Satkhira",
+      "BD:BD-62": "Bangladesh - Shariatpur",
+      "BD:BD-57": "Bangladesh - Sherpur",
+      "BD:BD-59": "Bangladesh - Sirajganj",
+      "BD:BD-61": "Bangladesh - Sunamganj",
+      "BD:BD-60": "Bangladesh - Sylhet",
+      "BD:BD-63": "Bangladesh - Tangail",
+      "BD:BD-64": "Bangladesh - Thakurgaon",
+      "BB": "Barbados",
+      "BY": "Belarus",
+      "PW": "Belau",
+      "BE": "Belgium",
+      "BZ": "Belize",
+      "BJ:AL": "Benin - Alibori",
+      "BJ:AK": "Benin - Atakora",
+      "BJ:AQ": "Benin - Atlantique",
+      "BJ:BO": "Benin - Borgou",
+      "BJ:CO": "Benin - Collines",
+      "BJ:KO": "Benin - Kouffo",
+      "BJ:DO": "Benin - Donga",
+      "BJ:LI": "Benin - Littoral",
+      "BJ:MO": "Benin - Mono",
+      "BJ:OU": "Benin - Ouémé",
+      "BJ:PL": "Benin - Plateau",
+      "BJ:ZO": "Benin - Zou",
+      "BM": "Bermuda",
+      "BT": "Bhutan",
+      "BO:BO-B": "Bolivia - Beni",
+      "BO:BO-H": "Bolivia - Chuquisaca",
+      "BO:BO-C": "Bolivia - Cochabamba",
+      "BO:BO-L": "Bolivia - La Paz",
+      "BO:BO-O": "Bolivia - Oruro",
+      "BO:BO-N": "Bolivia - Pando",
+      "BO:BO-P": "Bolivia - Potosí",
+      "BO:BO-S": "Bolivia - Santa Cruz",
+      "BO:BO-T": "Bolivia - Tarija",
+      "BQ": "Bonaire, Saint Eustatius and Saba",
+      "BA": "Bosnia and Herzegovina",
+      "BW": "Botswana",
+      "BV": "Bouvet Island",
+      "BR:AC": "Brazil - Acre",
+      "BR:AL": "Brazil - Alagoas",
+      "BR:AP": "Brazil - Amapá",
+      "BR:AM": "Brazil - Amazonas",
+      "BR:BA": "Brazil - Bahia",
+      "BR:CE": "Brazil - Ceará",
+      "BR:DF": "Brazil - Distrito Federal",
+      "BR:ES": "Brazil - Espírito Santo",
+      "BR:GO": "Brazil - Goiás",
+      "BR:MA": "Brazil - Maranhão",
+      "BR:MT": "Brazil - Mato Grosso",
+      "BR:MS": "Brazil - Mato Grosso do Sul",
+      "BR:MG": "Brazil - Minas Gerais",
+      "BR:PA": "Brazil - Pará",
+      "BR:PB": "Brazil - Paraíba",
+      "BR:PR": "Brazil - Paraná",
+      "BR:PE": "Brazil - Pernambuco",
+      "BR:PI": "Brazil - Piauí",
+      "BR:RJ": "Brazil - Rio de Janeiro",
+      "BR:RN": "Brazil - Rio Grande do Norte",
+      "BR:RS": "Brazil - Rio Grande do Sul",
+      "BR:RO": "Brazil - Rondônia",
+      "BR:RR": "Brazil - Roraima",
+      "BR:SC": "Brazil - Santa Catarina",
+      "BR:SP": "Brazil - São Paulo",
+      "BR:SE": "Brazil - Sergipe",
+      "BR:TO": "Brazil - Tocantins",
+      "IO": "British Indian Ocean Territory",
+      "BN": "Brunei",
+      "BG:BG-01": "Bulgaria - Blagoevgrad",
+      "BG:BG-02": "Bulgaria - Burgas",
+      "BG:BG-08": "Bulgaria - Dobrich",
+      "BG:BG-07": "Bulgaria - Gabrovo",
+      "BG:BG-26": "Bulgaria - Haskovo",
+      "BG:BG-09": "Bulgaria - Kardzhali",
+      "BG:BG-10": "Bulgaria - Kyustendil",
+      "BG:BG-11": "Bulgaria - Lovech",
+      "BG:BG-12": "Bulgaria - Montana",
+      "BG:BG-13": "Bulgaria - Pazardzhik",
+      "BG:BG-14": "Bulgaria - Pernik",
+      "BG:BG-15": "Bulgaria - Pleven",
+      "BG:BG-16": "Bulgaria - Plovdiv",
+      "BG:BG-17": "Bulgaria - Razgrad",
+      "BG:BG-18": "Bulgaria - Ruse",
+      "BG:BG-27": "Bulgaria - Shumen",
+      "BG:BG-19": "Bulgaria - Silistra",
+      "BG:BG-20": "Bulgaria - Sliven",
+      "BG:BG-21": "Bulgaria - Smolyan",
+      "BG:BG-23": "Bulgaria - Sofia",
+      "BG:BG-22": "Bulgaria - Sofia-Grad",
+      "BG:BG-24": "Bulgaria - Stara Zagora",
+      "BG:BG-25": "Bulgaria - Targovishte",
+      "BG:BG-03": "Bulgaria - Varna",
+      "BG:BG-04": "Bulgaria - Veliko Tarnovo",
+      "BG:BG-05": "Bulgaria - Vidin",
+      "BG:BG-06": "Bulgaria - Vratsa",
+      "BG:BG-28": "Bulgaria - Yambol",
+      "BF": "Burkina Faso",
+      "BI": "Burundi",
+      "KH": "Cambodia",
+      "CM": "Cameroon",
+      "CA:AB": "Canada - Alberta",
+      "CA:BC": "Canada - British Columbia",
+      "CA:MB": "Canada - Manitoba",
+      "CA:NB": "Canada - New Brunswick",
+      "CA:NL": "Canada - Newfoundland and Labrador",
+      "CA:NT": "Canada - Northwest Territories",
+      "CA:NS": "Canada - Nova Scotia",
+      "CA:NU": "Canada - Nunavut",
+      "CA:ON": "Canada - Ontario",
+      "CA:PE": "Canada - Prince Edward Island",
+      "CA:QC": "Canada - Quebec",
+      "CA:SK": "Canada - Saskatchewan",
+      "CA:YT": "Canada - Yukon Territory",
+      "CV": "Cape Verde",
+      "KY": "Cayman Islands",
+      "CF": "Central African Republic",
+      "TD": "Chad",
+      "CL:CL-AI": "Chile - Aisén del General Carlos Ibañez del Campo",
+      "CL:CL-AN": "Chile - Antofagasta",
+      "CL:CL-AP": "Chile - Arica y Parinacota",
+      "CL:CL-AR": "Chile - La Araucanía",
+      "CL:CL-AT": "Chile - Atacama",
+      "CL:CL-BI": "Chile - Biobío",
+      "CL:CL-CO": "Chile - Coquimbo",
+      "CL:CL-LI": "Chile - Libertador General Bernardo O'Higgins",
+      "CL:CL-LL": "Chile - Los Lagos",
+      "CL:CL-LR": "Chile - Los Ríos",
+      "CL:CL-MA": "Chile - Magallanes",
+      "CL:CL-ML": "Chile - Maule",
+      "CL:CL-NB": "Chile - Ñuble",
+      "CL:CL-RM": "Chile - Región Metropolitana de Santiago",
+      "CL:CL-TA": "Chile - Tarapacá",
+      "CL:CL-VS": "Chile - Valparaíso",
+      "CN:CN1": "China - Yunnan / 云南",
+      "CN:CN2": "China - Beijing / 北京",
+      "CN:CN3": "China - Tianjin / 天津",
+      "CN:CN4": "China - Hebei / 河北",
+      "CN:CN5": "China - Shanxi / 山西",
+      "CN:CN6": "China - Inner Mongolia / 內蒙古",
+      "CN:CN7": "China - Liaoning / 辽宁",
+      "CN:CN8": "China - Jilin / 吉林",
+      "CN:CN9": "China - Heilongjiang / 黑龙江",
+      "CN:CN10": "China - Shanghai / 上海",
+      "CN:CN11": "China - Jiangsu / 江苏",
+      "CN:CN12": "China - Zhejiang / 浙江",
+      "CN:CN13": "China - Anhui / 安徽",
+      "CN:CN14": "China - Fujian / 福建",
+      "CN:CN15": "China - Jiangxi / 江西",
+      "CN:CN16": "China - Shandong / 山东",
+      "CN:CN17": "China - Henan / 河南",
+      "CN:CN18": "China - Hubei / 湖北",
+      "CN:CN19": "China - Hunan / 湖南",
+      "CN:CN20": "China - Guangdong / 广东",
+      "CN:CN21": "China - Guangxi Zhuang / 广西壮族",
+      "CN:CN22": "China - Hainan / 海南",
+      "CN:CN23": "China - Chongqing / 重庆",
+      "CN:CN24": "China - Sichuan / 四川",
+      "CN:CN25": "China - Guizhou / 贵州",
+      "CN:CN26": "China - Shaanxi / 陕西",
+      "CN:CN27": "China - Gansu / 甘肃",
+      "CN:CN28": "China - Qinghai / 青海",
+      "CN:CN29": "China - Ningxia Hui / 宁夏",
+      "CN:CN30": "China - Macao / 澳门",
+      "CN:CN31": "China - Tibet / 西藏",
+      "CN:CN32": "China - Xinjiang / 新疆",
+      "CX": "Christmas Island",
+      "CC": "Cocos (Keeling) Islands",
+      "CO:CO-AMA": "Colombia - Amazonas",
+      "CO:CO-ANT": "Colombia - Antioquia",
+      "CO:CO-ARA": "Colombia - Arauca",
+      "CO:CO-ATL": "Colombia - Atlántico",
+      "CO:CO-BOL": "Colombia - Bolívar",
+      "CO:CO-BOY": "Colombia - Boyacá",
+      "CO:CO-CAL": "Colombia - Caldas",
+      "CO:CO-CAQ": "Colombia - Caquetá",
+      "CO:CO-CAS": "Colombia - Casanare",
+      "CO:CO-CAU": "Colombia - Cauca",
+      "CO:CO-CES": "Colombia - Cesar",
+      "CO:CO-CHO": "Colombia - Chocó",
+      "CO:CO-COR": "Colombia - Córdoba",
+      "CO:CO-CUN": "Colombia - Cundinamarca",
+      "CO:CO-DC": "Colombia - Capital District",
+      "CO:CO-GUA": "Colombia - Guainía",
+      "CO:CO-GUV": "Colombia - Guaviare",
+      "CO:CO-HUI": "Colombia - Huila",
+      "CO:CO-LAG": "Colombia - La Guajira",
+      "CO:CO-MAG": "Colombia - Magdalena",
+      "CO:CO-MET": "Colombia - Meta",
+      "CO:CO-NAR": "Colombia - Nariño",
+      "CO:CO-NSA": "Colombia - Norte de Santander",
+      "CO:CO-PUT": "Colombia - Putumayo",
+      "CO:CO-QUI": "Colombia - Quindío",
+      "CO:CO-RIS": "Colombia - Risaralda",
+      "CO:CO-SAN": "Colombia - Santander",
+      "CO:CO-SAP": "Colombia - San Andrés & Providencia",
+      "CO:CO-SUC": "Colombia - Sucre",
+      "CO:CO-TOL": "Colombia - Tolima",
+      "CO:CO-VAC": "Colombia - Valle del Cauca",
+      "CO:CO-VAU": "Colombia - Vaupés",
+      "CO:CO-VID": "Colombia - Vichada",
+      "KM": "Comoros",
+      "CG": "Congo (Brazzaville)",
+      "CD": "Congo (Kinshasa)",
+      "CK": "Cook Islands",
+      "CR:CR-A": "Costa Rica - Alajuela",
+      "CR:CR-C": "Costa Rica - Cartago",
+      "CR:CR-G": "Costa Rica - Guanacaste",
+      "CR:CR-H": "Costa Rica - Heredia",
+      "CR:CR-L": "Costa Rica - Limón",
+      "CR:CR-P": "Costa Rica - Puntarenas",
+      "CR:CR-SJ": "Costa Rica - San José",
+      "HR": "Croatia",
+      "CU": "Cuba",
+      "CW": "Cura&ccedil;ao",
+      "CY": "Cyprus",
+      "CZ": "Czech Republic",
+      "DK": "Denmark",
+      "DJ": "Djibouti",
+      "DM": "Dominica",
+      "DO:DO-01": "Dominican Republic - Distrito Nacional",
+      "DO:DO-02": "Dominican Republic - Azua",
+      "DO:DO-03": "Dominican Republic - Baoruco",
+      "DO:DO-04": "Dominican Republic - Barahona",
+      "DO:DO-33": "Dominican Republic - Cibao Nordeste",
+      "DO:DO-34": "Dominican Republic - Cibao Noroeste",
+      "DO:DO-35": "Dominican Republic - Cibao Norte",
+      "DO:DO-36": "Dominican Republic - Cibao Sur",
+      "DO:DO-05": "Dominican Republic - Dajabón",
+      "DO:DO-06": "Dominican Republic - Duarte",
+      "DO:DO-08": "Dominican Republic - El Seibo",
+      "DO:DO-37": "Dominican Republic - El Valle",
+      "DO:DO-07": "Dominican Republic - Elías Piña",
+      "DO:DO-38": "Dominican Republic - Enriquillo",
+      "DO:DO-09": "Dominican Republic - Espaillat",
+      "DO:DO-30": "Dominican Republic - Hato Mayor",
+      "DO:DO-19": "Dominican Republic - Hermanas Mirabal",
+      "DO:DO-39": "Dominican Republic - Higüamo",
+      "DO:DO-10": "Dominican Republic - Independencia",
+      "DO:DO-11": "Dominican Republic - La Altagracia",
+      "DO:DO-12": "Dominican Republic - La Romana",
+      "DO:DO-13": "Dominican Republic - La Vega",
+      "DO:DO-14": "Dominican Republic - María Trinidad Sánchez",
+      "DO:DO-28": "Dominican Republic - Monseñor Nouel",
+      "DO:DO-15": "Dominican Republic - Monte Cristi",
+      "DO:DO-29": "Dominican Republic - Monte Plata",
+      "DO:DO-40": "Dominican Republic - Ozama",
+      "DO:DO-16": "Dominican Republic - Pedernales",
+      "DO:DO-17": "Dominican Republic - Peravia",
+      "DO:DO-18": "Dominican Republic - Puerto Plata",
+      "DO:DO-20": "Dominican Republic - Samaná",
+      "DO:DO-21": "Dominican Republic - San Cristóbal",
+      "DO:DO-31": "Dominican Republic - San José de Ocoa",
+      "DO:DO-22": "Dominican Republic - San Juan",
+      "DO:DO-23": "Dominican Republic - San Pedro de Macorís",
+      "DO:DO-24": "Dominican Republic - Sánchez Ramírez",
+      "DO:DO-25": "Dominican Republic - Santiago",
+      "DO:DO-26": "Dominican Republic - Santiago Rodríguez",
+      "DO:DO-32": "Dominican Republic - Santo Domingo",
+      "DO:DO-41": "Dominican Republic - Valdesia",
+      "DO:DO-27": "Dominican Republic - Valverde",
+      "DO:DO-42": "Dominican Republic - Yuma",
+      "EC:EC-A": "Ecuador - Azuay",
+      "EC:EC-B": "Ecuador - Bolívar",
+      "EC:EC-F": "Ecuador - Cañar",
+      "EC:EC-C": "Ecuador - Carchi",
+      "EC:EC-H": "Ecuador - Chimborazo",
+      "EC:EC-X": "Ecuador - Cotopaxi",
+      "EC:EC-O": "Ecuador - El Oro",
+      "EC:EC-E": "Ecuador - Esmeraldas",
+      "EC:EC-W": "Ecuador - Galápagos",
+      "EC:EC-G": "Ecuador - Guayas",
+      "EC:EC-I": "Ecuador - Imbabura",
+      "EC:EC-L": "Ecuador - Loja",
+      "EC:EC-R": "Ecuador - Los Ríos",
+      "EC:EC-M": "Ecuador - Manabí",
+      "EC:EC-S": "Ecuador - Morona-Santiago",
+      "EC:EC-N": "Ecuador - Napo",
+      "EC:EC-D": "Ecuador - Orellana",
+      "EC:EC-Y": "Ecuador - Pastaza",
+      "EC:EC-P": "Ecuador - Pichincha",
+      "EC:EC-SE": "Ecuador - Santa Elena",
+      "EC:EC-SD": "Ecuador - Santo Domingo de los Tsáchilas",
+      "EC:EC-U": "Ecuador - Sucumbíos",
+      "EC:EC-T": "Ecuador - Tungurahua",
+      "EC:EC-Z": "Ecuador - Zamora-Chinchipe",
+      "EG:EGALX": "Egypt - Alexandria",
+      "EG:EGASN": "Egypt - Aswan",
+      "EG:EGAST": "Egypt - Asyut",
+      "EG:EGBA": "Egypt - Red Sea",
+      "EG:EGBH": "Egypt - Beheira",
+      "EG:EGBNS": "Egypt - Beni Suef",
+      "EG:EGC": "Egypt - Cairo",
+      "EG:EGDK": "Egypt - Dakahlia",
+      "EG:EGDT": "Egypt - Damietta",
+      "EG:EGFYM": "Egypt - Faiyum",
+      "EG:EGGH": "Egypt - Gharbia",
+      "EG:EGGZ": "Egypt - Giza",
+      "EG:EGIS": "Egypt - Ismailia",
+      "EG:EGJS": "Egypt - South Sinai",
+      "EG:EGKB": "Egypt - Qalyubia",
+      "EG:EGKFS": "Egypt - Kafr el-Sheikh",
+      "EG:EGKN": "Egypt - Qena",
+      "EG:EGLX": "Egypt - Luxor",
+      "EG:EGMN": "Egypt - Minya",
+      "EG:EGMNF": "Egypt - Monufia",
+      "EG:EGMT": "Egypt - Matrouh",
+      "EG:EGPTS": "Egypt - Port Said",
+      "EG:EGSHG": "Egypt - Sohag",
+      "EG:EGSHR": "Egypt - Al Sharqia",
+      "EG:EGSIN": "Egypt - North Sinai",
+      "EG:EGSUZ": "Egypt - Suez",
+      "EG:EGWAD": "Egypt - New Valley",
+      "SV:SV-AH": "El Salvador - Ahuachapán",
+      "SV:SV-CA": "El Salvador - Cabañas",
+      "SV:SV-CH": "El Salvador - Chalatenango",
+      "SV:SV-CU": "El Salvador - Cuscatlán",
+      "SV:SV-LI": "El Salvador - La Libertad",
+      "SV:SV-MO": "El Salvador - Morazán",
+      "SV:SV-PA": "El Salvador - La Paz",
+      "SV:SV-SA": "El Salvador - Santa Ana",
+      "SV:SV-SM": "El Salvador - San Miguel",
+      "SV:SV-SO": "El Salvador - Sonsonate",
+      "SV:SV-SS": "El Salvador - San Salvador",
+      "SV:SV-SV": "El Salvador - San Vicente",
+      "SV:SV-UN": "El Salvador - La Unión",
+      "SV:SV-US": "El Salvador - Usulután",
+      "GQ": "Equatorial Guinea",
+      "ER": "Eritrea",
+      "EE": "Estonia",
+      "ET": "Ethiopia",
+      "FK": "Falkland Islands",
+      "FO": "Faroe Islands",
+      "FJ": "Fiji",
+      "FI": "Finland",
+      "FR": "France",
+      "GF": "French Guiana",
+      "PF": "French Polynesia",
+      "TF": "French Southern Territories",
+      "GA": "Gabon",
+      "GM": "Gambia",
+      "GE": "Georgia",
+      "DE:DE-BW": "Germany - Baden-Württemberg",
+      "DE:DE-BY": "Germany - Bavaria",
+      "DE:DE-BE": "Germany - Berlin",
+      "DE:DE-BB": "Germany - Brandenburg",
+      "DE:DE-HB": "Germany - Bremen",
+      "DE:DE-HH": "Germany - Hamburg",
+      "DE:DE-HE": "Germany - Hesse",
+      "DE:DE-MV": "Germany - Mecklenburg-Vorpommern",
+      "DE:DE-NI": "Germany - Lower Saxony",
+      "DE:DE-NW": "Germany - North Rhine-Westphalia",
+      "DE:DE-RP": "Germany - Rhineland-Palatinate",
+      "DE:DE-SL": "Germany - Saarland",
+      "DE:DE-SN": "Germany - Saxony",
+      "DE:DE-ST": "Germany - Saxony-Anhalt",
+      "DE:DE-SH": "Germany - Schleswig-Holstein",
+      "DE:DE-TH": "Germany - Thuringia",
+      "GH:AF": "Ghana - Ahafo",
+      "GH:AH": "Ghana - Ashanti",
+      "GH:BA": "Ghana - Brong-Ahafo",
+      "GH:BO": "Ghana - Bono",
+      "GH:BE": "Ghana - Bono East",
+      "GH:CP": "Ghana - Central",
+      "GH:EP": "Ghana - Eastern",
+      "GH:AA": "Ghana - Greater Accra",
+      "GH:NE": "Ghana - North East",
+      "GH:NP": "Ghana - Northern",
+      "GH:OT": "Ghana - Oti",
+      "GH:SV": "Ghana - Savannah",
+      "GH:UE": "Ghana - Upper East",
+      "GH:UW": "Ghana - Upper West",
+      "GH:TV": "Ghana - Volta",
+      "GH:WP": "Ghana - Western",
+      "GH:WN": "Ghana - Western North",
+      "GI": "Gibraltar",
+      "GR:I": "Greece - Attica",
+      "GR:A": "Greece - East Macedonia and Thrace",
+      "GR:B": "Greece - Central Macedonia",
+      "GR:C": "Greece - West Macedonia",
+      "GR:D": "Greece - Epirus",
+      "GR:E": "Greece - Thessaly",
+      "GR:F": "Greece - Ionian Islands",
+      "GR:G": "Greece - West Greece",
+      "GR:H": "Greece - Central Greece",
+      "GR:J": "Greece - Peloponnese",
+      "GR:K": "Greece - North Aegean",
+      "GR:L": "Greece - South Aegean",
+      "GR:M": "Greece - Crete",
+      "GL": "Greenland",
+      "GD": "Grenada",
+      "GP": "Guadeloupe",
+      "GU": "Guam",
+      "GT:GT-AV": "Guatemala - Alta Verapaz",
+      "GT:GT-BV": "Guatemala - Baja Verapaz",
+      "GT:GT-CM": "Guatemala - Chimaltenango",
+      "GT:GT-CQ": "Guatemala - Chiquimula",
+      "GT:GT-PR": "Guatemala - El Progreso",
+      "GT:GT-ES": "Guatemala - Escuintla",
+      "GT:GT-GU": "Guatemala - Guatemala",
+      "GT:GT-HU": "Guatemala - Huehuetenango",
+      "GT:GT-IZ": "Guatemala - Izabal",
+      "GT:GT-JA": "Guatemala - Jalapa",
+      "GT:GT-JU": "Guatemala - Jutiapa",
+      "GT:GT-PE": "Guatemala - Petén",
+      "GT:GT-QZ": "Guatemala - Quetzaltenango",
+      "GT:GT-QC": "Guatemala - Quiché",
+      "GT:GT-RE": "Guatemala - Retalhuleu",
+      "GT:GT-SA": "Guatemala - Sacatepéquez",
+      "GT:GT-SM": "Guatemala - San Marcos",
+      "GT:GT-SR": "Guatemala - Santa Rosa",
+      "GT:GT-SO": "Guatemala - Sololá",
+      "GT:GT-SU": "Guatemala - Suchitepéquez",
+      "GT:GT-TO": "Guatemala - Totonicapán",
+      "GT:GT-ZA": "Guatemala - Zacapa",
+      "GG": "Guernsey",
+      "GN": "Guinea",
+      "GW": "Guinea-Bissau",
+      "GY": "Guyana",
+      "HT": "Haiti",
+      "HM": "Heard Island and McDonald Islands",
+      "HN:HN-AT": "Honduras - Atlántida",
+      "HN:HN-IB": "Honduras - Bay Islands",
+      "HN:HN-CH": "Honduras - Choluteca",
+      "HN:HN-CL": "Honduras - Colón",
+      "HN:HN-CM": "Honduras - Comayagua",
+      "HN:HN-CP": "Honduras - Copán",
+      "HN:HN-CR": "Honduras - Cortés",
+      "HN:HN-EP": "Honduras - El Paraíso",
+      "HN:HN-FM": "Honduras - Francisco Morazán",
+      "HN:HN-GD": "Honduras - Gracias a Dios",
+      "HN:HN-IN": "Honduras - Intibucá",
+      "HN:HN-LE": "Honduras - Lempira",
+      "HN:HN-LP": "Honduras - La Paz",
+      "HN:HN-OC": "Honduras - Ocotepeque",
+      "HN:HN-OL": "Honduras - Olancho",
+      "HN:HN-SB": "Honduras - Santa Bárbara",
+      "HN:HN-VA": "Honduras - Valle",
+      "HN:HN-YO": "Honduras - Yoro",
+      "HK:HONG KONG": "Hong Kong - Hong Kong Island",
+      "HK:KOWLOON": "Hong Kong - Kowloon",
+      "HK:NEW TERRITORIES": "Hong Kong - New Territories",
+      "HU:BK": "Hungary - Bács-Kiskun",
+      "HU:BE": "Hungary - Békés",
+      "HU:BA": "Hungary - Baranya",
+      "HU:BZ": "Hungary - Borsod-Abaúj-Zemplén",
+      "HU:BU": "Hungary - Budapest",
+      "HU:CS": "Hungary - Csongrád-Csanád",
+      "HU:FE": "Hungary - Fejér",
+      "HU:GS": "Hungary - Győr-Moson-Sopron",
+      "HU:HB": "Hungary - Hajdú-Bihar",
+      "HU:HE": "Hungary - Heves",
+      "HU:JN": "Hungary - Jász-Nagykun-Szolnok",
+      "HU:KE": "Hungary - Komárom-Esztergom",
+      "HU:NO": "Hungary - Nógrád",
+      "HU:PE": "Hungary - Pest",
+      "HU:SO": "Hungary - Somogy",
+      "HU:SZ": "Hungary - Szabolcs-Szatmár-Bereg",
+      "HU:TO": "Hungary - Tolna",
+      "HU:VA": "Hungary - Vas",
+      "HU:VE": "Hungary - Veszprém",
+      "HU:ZA": "Hungary - Zala",
+      "IS": "Iceland",
+      "IN:AP": "India - Andhra Pradesh",
+      "IN:AR": "India - Arunachal Pradesh",
+      "IN:AS": "India - Assam",
+      "IN:BR": "India - Bihar",
+      "IN:CT": "India - Chhattisgarh",
+      "IN:GA": "India - Goa",
+      "IN:GJ": "India - Gujarat",
+      "IN:HR": "India - Haryana",
+      "IN:HP": "India - Himachal Pradesh",
+      "IN:JK": "India - Jammu and Kashmir",
+      "IN:JH": "India - Jharkhand",
+      "IN:KA": "India - Karnataka",
+      "IN:KL": "India - Kerala",
+      "IN:LA": "India - Ladakh",
+      "IN:MP": "India - Madhya Pradesh",
+      "IN:MH": "India - Maharashtra",
+      "IN:MN": "India - Manipur",
+      "IN:ML": "India - Meghalaya",
+      "IN:MZ": "India - Mizoram",
+      "IN:NL": "India - Nagaland",
+      "IN:OR": "India - Odisha",
+      "IN:PB": "India - Punjab",
+      "IN:RJ": "India - Rajasthan",
+      "IN:SK": "India - Sikkim",
+      "IN:TN": "India - Tamil Nadu",
+      "IN:TS": "India - Telangana",
+      "IN:TR": "India - Tripura",
+      "IN:UK": "India - Uttarakhand",
+      "IN:UP": "India - Uttar Pradesh",
+      "IN:WB": "India - West Bengal",
+      "IN:AN": "India - Andaman and Nicobar Islands",
+      "IN:CH": "India - Chandigarh",
+      "IN:DN": "India - Dadra and Nagar Haveli",
+      "IN:DD": "India - Daman and Diu",
+      "IN:DL": "India - Delhi",
+      "IN:LD": "India - Lakshadeep",
+      "IN:PY": "India - Pondicherry (Puducherry)",
+      "ID:AC": "Indonesia - Daerah Istimewa Aceh",
+      "ID:SU": "Indonesia - Sumatera Utara",
+      "ID:SB": "Indonesia - Sumatera Barat",
+      "ID:RI": "Indonesia - Riau",
+      "ID:KR": "Indonesia - Kepulauan Riau",
+      "ID:JA": "Indonesia - Jambi",
+      "ID:SS": "Indonesia - Sumatera Selatan",
+      "ID:BB": "Indonesia - Bangka Belitung",
+      "ID:BE": "Indonesia - Bengkulu",
+      "ID:LA": "Indonesia - Lampung",
+      "ID:JK": "Indonesia - DKI Jakarta",
+      "ID:JB": "Indonesia - Jawa Barat",
+      "ID:BT": "Indonesia - Banten",
+      "ID:JT": "Indonesia - Jawa Tengah",
+      "ID:JI": "Indonesia - Jawa Timur",
+      "ID:YO": "Indonesia - Daerah Istimewa Yogyakarta",
+      "ID:BA": "Indonesia - Bali",
+      "ID:NB": "Indonesia - Nusa Tenggara Barat",
+      "ID:NT": "Indonesia - Nusa Tenggara Timur",
+      "ID:KB": "Indonesia - Kalimantan Barat",
+      "ID:KT": "Indonesia - Kalimantan Tengah",
+      "ID:KI": "Indonesia - Kalimantan Timur",
+      "ID:KS": "Indonesia - Kalimantan Selatan",
+      "ID:KU": "Indonesia - Kalimantan Utara",
+      "ID:SA": "Indonesia - Sulawesi Utara",
+      "ID:ST": "Indonesia - Sulawesi Tengah",
+      "ID:SG": "Indonesia - Sulawesi Tenggara",
+      "ID:SR": "Indonesia - Sulawesi Barat",
+      "ID:SN": "Indonesia - Sulawesi Selatan",
+      "ID:GO": "Indonesia - Gorontalo",
+      "ID:MA": "Indonesia - Maluku",
+      "ID:MU": "Indonesia - Maluku Utara",
+      "ID:PA": "Indonesia - Papua",
+      "ID:PB": "Indonesia - Papua Barat",
+      "IR:KHZ": "Iran - Khuzestan (خوزستان)",
+      "IR:THR": "Iran - Tehran (تهران)",
+      "IR:ILM": "Iran - Ilaam (ایلام)",
+      "IR:BHR": "Iran - Bushehr (بوشهر)",
+      "IR:ADL": "Iran - Ardabil (اردبیل)",
+      "IR:ESF": "Iran - Isfahan (اصفهان)",
+      "IR:YZD": "Iran - Yazd (یزد)",
+      "IR:KRH": "Iran - Kermanshah (کرمانشاه)",
+      "IR:KRN": "Iran - Kerman (کرمان)",
+      "IR:HDN": "Iran - Hamadan (همدان)",
+      "IR:GZN": "Iran - Ghazvin (قزوین)",
+      "IR:ZJN": "Iran - Zanjan (زنجان)",
+      "IR:LRS": "Iran - Luristan (لرستان)",
+      "IR:ABZ": "Iran - Alborz (البرز)",
+      "IR:EAZ": "Iran - East Azarbaijan (آذربایجان شرقی)",
+      "IR:WAZ": "Iran - West Azarbaijan (آذربایجان غربی)",
+      "IR:CHB": "Iran - Chaharmahal and Bakhtiari (چهارمحال و بختیاری)",
+      "IR:SKH": "Iran - South Khorasan (خراسان جنوبی)",
+      "IR:RKH": "Iran - Razavi Khorasan (خراسان رضوی)",
+      "IR:NKH": "Iran - North Khorasan (خراسان شمالی)",
+      "IR:SMN": "Iran - Semnan (سمنان)",
+      "IR:FRS": "Iran - Fars (فارس)",
+      "IR:QHM": "Iran - Qom (قم)",
+      "IR:KRD": "Iran - Kurdistan / کردستان)",
+      "IR:KBD": "Iran - Kohgiluyeh and BoyerAhmad (کهگیلوییه و بویراحمد)",
+      "IR:GLS": "Iran - Golestan (گلستان)",
+      "IR:GIL": "Iran - Gilan (گیلان)",
+      "IR:MZN": "Iran - Mazandaran (مازندران)",
+      "IR:MKZ": "Iran - Markazi (مرکزی)",
+      "IR:HRZ": "Iran - Hormozgan (هرمزگان)",
+      "IR:SBN": "Iran - Sistan and Baluchestan (سیستان و بلوچستان)",
+      "IQ": "Iraq",
+      "IE:CW": "Ireland - Carlow",
+      "IE:CN": "Ireland - Cavan",
+      "IE:CE": "Ireland - Clare",
+      "IE:CO": "Ireland - Cork",
+      "IE:DL": "Ireland - Donegal",
+      "IE:D": "Ireland - Dublin",
+      "IE:G": "Ireland - Galway",
+      "IE:KY": "Ireland - Kerry",
+      "IE:KE": "Ireland - Kildare",
+      "IE:KK": "Ireland - Kilkenny",
+      "IE:LS": "Ireland - Laois",
+      "IE:LM": "Ireland - Leitrim",
+      "IE:LK": "Ireland - Limerick",
+      "IE:LD": "Ireland - Longford",
+      "IE:LH": "Ireland - Louth",
+      "IE:MO": "Ireland - Mayo",
+      "IE:MH": "Ireland - Meath",
+      "IE:MN": "Ireland - Monaghan",
+      "IE:OY": "Ireland - Offaly",
+      "IE:RN": "Ireland - Roscommon",
+      "IE:SO": "Ireland - Sligo",
+      "IE:TA": "Ireland - Tipperary",
+      "IE:WD": "Ireland - Waterford",
+      "IE:WH": "Ireland - Westmeath",
+      "IE:WX": "Ireland - Wexford",
+      "IE:WW": "Ireland - Wicklow",
+      "IM": "Isle of Man",
+      "IL": "Israel",
+      "IT:AG": "Italy - Agrigento",
+      "IT:AL": "Italy - Alessandria",
+      "IT:AN": "Italy - Ancona",
+      "IT:AO": "Italy - Aosta",
+      "IT:AR": "Italy - Arezzo",
+      "IT:AP": "Italy - Ascoli Piceno",
+      "IT:AT": "Italy - Asti",
+      "IT:AV": "Italy - Avellino",
+      "IT:BA": "Italy - Bari",
+      "IT:BT": "Italy - Barletta-Andria-Trani",
+      "IT:BL": "Italy - Belluno",
+      "IT:BN": "Italy - Benevento",
+      "IT:BG": "Italy - Bergamo",
+      "IT:BI": "Italy - Biella",
+      "IT:BO": "Italy - Bologna",
+      "IT:BZ": "Italy - Bolzano",
+      "IT:BS": "Italy - Brescia",
+      "IT:BR": "Italy - Brindisi",
+      "IT:CA": "Italy - Cagliari",
+      "IT:CL": "Italy - Caltanissetta",
+      "IT:CB": "Italy - Campobasso",
+      "IT:CE": "Italy - Caserta",
+      "IT:CT": "Italy - Catania",
+      "IT:CZ": "Italy - Catanzaro",
+      "IT:CH": "Italy - Chieti",
+      "IT:CO": "Italy - Como",
+      "IT:CS": "Italy - Cosenza",
+      "IT:CR": "Italy - Cremona",
+      "IT:KR": "Italy - Crotone",
+      "IT:CN": "Italy - Cuneo",
+      "IT:EN": "Italy - Enna",
+      "IT:FM": "Italy - Fermo",
+      "IT:FE": "Italy - Ferrara",
+      "IT:FI": "Italy - Firenze",
+      "IT:FG": "Italy - Foggia",
+      "IT:FC": "Italy - Forlì-Cesena",
+      "IT:FR": "Italy - Frosinone",
+      "IT:GE": "Italy - Genova",
+      "IT:GO": "Italy - Gorizia",
+      "IT:GR": "Italy - Grosseto",
+      "IT:IM": "Italy - Imperia",
+      "IT:IS": "Italy - Isernia",
+      "IT:SP": "Italy - La Spezia",
+      "IT:AQ": "Italy - L'Aquila",
+      "IT:LT": "Italy - Latina",
+      "IT:LE": "Italy - Lecce",
+      "IT:LC": "Italy - Lecco",
+      "IT:LI": "Italy - Livorno",
+      "IT:LO": "Italy - Lodi",
+      "IT:LU": "Italy - Lucca",
+      "IT:MC": "Italy - Macerata",
+      "IT:MN": "Italy - Mantova",
+      "IT:MS": "Italy - Massa-Carrara",
+      "IT:MT": "Italy - Matera",
+      "IT:ME": "Italy - Messina",
+      "IT:MI": "Italy - Milano",
+      "IT:MO": "Italy - Modena",
+      "IT:MB": "Italy - Monza e della Brianza",
+      "IT:NA": "Italy - Napoli",
+      "IT:NO": "Italy - Novara",
+      "IT:NU": "Italy - Nuoro",
+      "IT:OR": "Italy - Oristano",
+      "IT:PD": "Italy - Padova",
+      "IT:PA": "Italy - Palermo",
+      "IT:PR": "Italy - Parma",
+      "IT:PV": "Italy - Pavia",
+      "IT:PG": "Italy - Perugia",
+      "IT:PU": "Italy - Pesaro e Urbino",
+      "IT:PE": "Italy - Pescara",
+      "IT:PC": "Italy - Piacenza",
+      "IT:PI": "Italy - Pisa",
+      "IT:PT": "Italy - Pistoia",
+      "IT:PN": "Italy - Pordenone",
+      "IT:PZ": "Italy - Potenza",
+      "IT:PO": "Italy - Prato",
+      "IT:RG": "Italy - Ragusa",
+      "IT:RA": "Italy - Ravenna",
+      "IT:RC": "Italy - Reggio Calabria",
+      "IT:RE": "Italy - Reggio Emilia",
+      "IT:RI": "Italy - Rieti",
+      "IT:RN": "Italy - Rimini",
+      "IT:RM": "Italy - Roma",
+      "IT:RO": "Italy - Rovigo",
+      "IT:SA": "Italy - Salerno",
+      "IT:SS": "Italy - Sassari",
+      "IT:SV": "Italy - Savona",
+      "IT:SI": "Italy - Siena",
+      "IT:SR": "Italy - Siracusa",
+      "IT:SO": "Italy - Sondrio",
+      "IT:SU": "Italy - Sud Sardegna",
+      "IT:TA": "Italy - Taranto",
+      "IT:TE": "Italy - Teramo",
+      "IT:TR": "Italy - Terni",
+      "IT:TO": "Italy - Torino",
+      "IT:TP": "Italy - Trapani",
+      "IT:TN": "Italy - Trento",
+      "IT:TV": "Italy - Treviso",
+      "IT:TS": "Italy - Trieste",
+      "IT:UD": "Italy - Udine",
+      "IT:VA": "Italy - Varese",
+      "IT:VE": "Italy - Venezia",
+      "IT:VB": "Italy - Verbano-Cusio-Ossola",
+      "IT:VC": "Italy - Vercelli",
+      "IT:VR": "Italy - Verona",
+      "IT:VV": "Italy - Vibo Valentia",
+      "IT:VI": "Italy - Vicenza",
+      "IT:VT": "Italy - Viterbo",
+      "CI": "Ivory Coast",
+      "JM:JM-01": "Jamaica - Kingston",
+      "JM:JM-02": "Jamaica - Saint Andrew",
+      "JM:JM-03": "Jamaica - Saint Thomas",
+      "JM:JM-04": "Jamaica - Portland",
+      "JM:JM-05": "Jamaica - Saint Mary",
+      "JM:JM-06": "Jamaica - Saint Ann",
+      "JM:JM-07": "Jamaica - Trelawny",
+      "JM:JM-08": "Jamaica - Saint James",
+      "JM:JM-09": "Jamaica - Hanover",
+      "JM:JM-10": "Jamaica - Westmoreland",
+      "JM:JM-11": "Jamaica - Saint Elizabeth",
+      "JM:JM-12": "Jamaica - Manchester",
+      "JM:JM-13": "Jamaica - Clarendon",
+      "JM:JM-14": "Jamaica - Saint Catherine",
+      "JP:JP01": "Japan - Hokkaido",
+      "JP:JP02": "Japan - Aomori",
+      "JP:JP03": "Japan - Iwate",
+      "JP:JP04": "Japan - Miyagi",
+      "JP:JP05": "Japan - Akita",
+      "JP:JP06": "Japan - Yamagata",
+      "JP:JP07": "Japan - Fukushima",
+      "JP:JP08": "Japan - Ibaraki",
+      "JP:JP09": "Japan - Tochigi",
+      "JP:JP10": "Japan - Gunma",
+      "JP:JP11": "Japan - Saitama",
+      "JP:JP12": "Japan - Chiba",
+      "JP:JP13": "Japan - Tokyo",
+      "JP:JP14": "Japan - Kanagawa",
+      "JP:JP15": "Japan - Niigata",
+      "JP:JP16": "Japan - Toyama",
+      "JP:JP17": "Japan - Ishikawa",
+      "JP:JP18": "Japan - Fukui",
+      "JP:JP19": "Japan - Yamanashi",
+      "JP:JP20": "Japan - Nagano",
+      "JP:JP21": "Japan - Gifu",
+      "JP:JP22": "Japan - Shizuoka",
+      "JP:JP23": "Japan - Aichi",
+      "JP:JP24": "Japan - Mie",
+      "JP:JP25": "Japan - Shiga",
+      "JP:JP26": "Japan - Kyoto",
+      "JP:JP27": "Japan - Osaka",
+      "JP:JP28": "Japan - Hyogo",
+      "JP:JP29": "Japan - Nara",
+      "JP:JP30": "Japan - Wakayama",
+      "JP:JP31": "Japan - Tottori",
+      "JP:JP32": "Japan - Shimane",
+      "JP:JP33": "Japan - Okayama",
+      "JP:JP34": "Japan - Hiroshima",
+      "JP:JP35": "Japan - Yamaguchi",
+      "JP:JP36": "Japan - Tokushima",
+      "JP:JP37": "Japan - Kagawa",
+      "JP:JP38": "Japan - Ehime",
+      "JP:JP39": "Japan - Kochi",
+      "JP:JP40": "Japan - Fukuoka",
+      "JP:JP41": "Japan - Saga",
+      "JP:JP42": "Japan - Nagasaki",
+      "JP:JP43": "Japan - Kumamoto",
+      "JP:JP44": "Japan - Oita",
+      "JP:JP45": "Japan - Miyazaki",
+      "JP:JP46": "Japan - Kagoshima",
+      "JP:JP47": "Japan - Okinawa",
+      "JE": "Jersey",
+      "JO": "Jordan",
+      "KZ": "Kazakhstan",
+      "KE:KE01": "Kenya - Baringo",
+      "KE:KE02": "Kenya - Bomet",
+      "KE:KE03": "Kenya - Bungoma",
+      "KE:KE04": "Kenya - Busia",
+      "KE:KE05": "Kenya - Elgeyo-Marakwet",
+      "KE:KE06": "Kenya - Embu",
+      "KE:KE07": "Kenya - Garissa",
+      "KE:KE08": "Kenya - Homa Bay",
+      "KE:KE09": "Kenya - Isiolo",
+      "KE:KE10": "Kenya - Kajiado",
+      "KE:KE11": "Kenya - Kakamega",
+      "KE:KE12": "Kenya - Kericho",
+      "KE:KE13": "Kenya - Kiambu",
+      "KE:KE14": "Kenya - Kilifi",
+      "KE:KE15": "Kenya - Kirinyaga",
+      "KE:KE16": "Kenya - Kisii",
+      "KE:KE17": "Kenya - Kisumu",
+      "KE:KE18": "Kenya - Kitui",
+      "KE:KE19": "Kenya - Kwale",
+      "KE:KE20": "Kenya - Laikipia",
+      "KE:KE21": "Kenya - Lamu",
+      "KE:KE22": "Kenya - Machakos",
+      "KE:KE23": "Kenya - Makueni",
+      "KE:KE24": "Kenya - Mandera",
+      "KE:KE25": "Kenya - Marsabit",
+      "KE:KE26": "Kenya - Meru",
+      "KE:KE27": "Kenya - Migori",
+      "KE:KE28": "Kenya - Mombasa",
+      "KE:KE29": "Kenya - Murang’a",
+      "KE:KE30": "Kenya - Nairobi County",
+      "KE:KE31": "Kenya - Nakuru",
+      "KE:KE32": "Kenya - Nandi",
+      "KE:KE33": "Kenya - Narok",
+      "KE:KE34": "Kenya - Nyamira",
+      "KE:KE35": "Kenya - Nyandarua",
+      "KE:KE36": "Kenya - Nyeri",
+      "KE:KE37": "Kenya - Samburu",
+      "KE:KE38": "Kenya - Siaya",
+      "KE:KE39": "Kenya - Taita-Taveta",
+      "KE:KE40": "Kenya - Tana River",
+      "KE:KE41": "Kenya - Tharaka-Nithi",
+      "KE:KE42": "Kenya - Trans Nzoia",
+      "KE:KE43": "Kenya - Turkana",
+      "KE:KE44": "Kenya - Uasin Gishu",
+      "KE:KE45": "Kenya - Vihiga",
+      "KE:KE46": "Kenya - Wajir",
+      "KE:KE47": "Kenya - West Pokot",
+      "KI": "Kiribati",
+      "KW": "Kuwait",
+      "KG": "Kyrgyzstan",
+      "LA:AT": "Laos - Attapeu",
+      "LA:BK": "Laos - Bokeo",
+      "LA:BL": "Laos - Bolikhamsai",
+      "LA:CH": "Laos - Champasak",
+      "LA:HO": "Laos - Houaphanh",
+      "LA:KH": "Laos - Khammouane",
+      "LA:LM": "Laos - Luang Namtha",
+      "LA:LP": "Laos - Luang Prabang",
+      "LA:OU": "Laos - Oudomxay",
+      "LA:PH": "Laos - Phongsaly",
+      "LA:SL": "Laos - Salavan",
+      "LA:SV": "Laos - Savannakhet",
+      "LA:VI": "Laos - Vientiane Province",
+      "LA:VT": "Laos - Vientiane",
+      "LA:XA": "Laos - Sainyabuli",
+      "LA:XE": "Laos - Sekong",
+      "LA:XI": "Laos - Xiangkhouang",
+      "LA:XS": "Laos - Xaisomboun",
+      "LV": "Latvia",
+      "LB": "Lebanon",
+      "LS": "Lesotho",
+      "LR:BM": "Liberia - Bomi",
+      "LR:BN": "Liberia - Bong",
+      "LR:GA": "Liberia - Gbarpolu",
+      "LR:GB": "Liberia - Grand Bassa",
+      "LR:GC": "Liberia - Grand Cape Mount",
+      "LR:GG": "Liberia - Grand Gedeh",
+      "LR:GK": "Liberia - Grand Kru",
+      "LR:LO": "Liberia - Lofa",
+      "LR:MA": "Liberia - Margibi",
+      "LR:MY": "Liberia - Maryland",
+      "LR:MO": "Liberia - Montserrado",
+      "LR:NM": "Liberia - Nimba",
+      "LR:RV": "Liberia - Rivercess",
+      "LR:RG": "Liberia - River Gee",
+      "LR:SN": "Liberia - Sinoe",
+      "LY": "Libya",
+      "LI": "Liechtenstein",
+      "LT": "Lithuania",
+      "LU": "Luxembourg",
+      "MO": "Macao",
+      "MG": "Madagascar",
+      "MW": "Malawi",
+      "MY:JHR": "Malaysia - Johor",
+      "MY:KDH": "Malaysia - Kedah",
+      "MY:KTN": "Malaysia - Kelantan",
+      "MY:LBN": "Malaysia - Labuan",
+      "MY:MLK": "Malaysia - Malacca (Melaka)",
+      "MY:NSN": "Malaysia - Negeri Sembilan",
+      "MY:PHG": "Malaysia - Pahang",
+      "MY:PNG": "Malaysia - Penang (Pulau Pinang)",
+      "MY:PRK": "Malaysia - Perak",
+      "MY:PLS": "Malaysia - Perlis",
+      "MY:SBH": "Malaysia - Sabah",
+      "MY:SWK": "Malaysia - Sarawak",
+      "MY:SGR": "Malaysia - Selangor",
+      "MY:TRG": "Malaysia - Terengganu",
+      "MY:PJY": "Malaysia - Putrajaya",
+      "MY:KUL": "Malaysia - Kuala Lumpur",
+      "MV": "Maldives",
+      "ML": "Mali",
+      "MT": "Malta",
+      "MH": "Marshall Islands",
+      "MQ": "Martinique",
+      "MR": "Mauritania",
+      "MU": "Mauritius",
+      "YT": "Mayotte",
+      "MX:DF": "Mexico - Ciudad de México",
+      "MX:JA": "Mexico - Jalisco",
+      "MX:NL": "Mexico - Nuevo León",
+      "MX:AG": "Mexico - Aguascalientes",
+      "MX:BC": "Mexico - Baja California",
+      "MX:BS": "Mexico - Baja California Sur",
+      "MX:CM": "Mexico - Campeche",
+      "MX:CS": "Mexico - Chiapas",
+      "MX:CH": "Mexico - Chihuahua",
+      "MX:CO": "Mexico - Coahuila",
+      "MX:CL": "Mexico - Colima",
+      "MX:DG": "Mexico - Durango",
+      "MX:GT": "Mexico - Guanajuato",
+      "MX:GR": "Mexico - Guerrero",
+      "MX:HG": "Mexico - Hidalgo",
+      "MX:MX": "Mexico - Estado de México",
+      "MX:MI": "Mexico - Michoacán",
+      "MX:MO": "Mexico - Morelos",
+      "MX:NA": "Mexico - Nayarit",
+      "MX:OA": "Mexico - Oaxaca",
+      "MX:PU": "Mexico - Puebla",
+      "MX:QT": "Mexico - Querétaro",
+      "MX:QR": "Mexico - Quintana Roo",
+      "MX:SL": "Mexico - San Luis Potosí",
+      "MX:SI": "Mexico - Sinaloa",
+      "MX:SO": "Mexico - Sonora",
+      "MX:TB": "Mexico - Tabasco",
+      "MX:TM": "Mexico - Tamaulipas",
+      "MX:TL": "Mexico - Tlaxcala",
+      "MX:VE": "Mexico - Veracruz",
+      "MX:YU": "Mexico - Yucatán",
+      "MX:ZA": "Mexico - Zacatecas",
+      "FM": "Micronesia",
+      "MD:C": "Moldova - Chișinău",
+      "MD:BL": "Moldova - Bălți",
+      "MD:AN": "Moldova - Anenii Noi",
+      "MD:BS": "Moldova - Basarabeasca",
+      "MD:BR": "Moldova - Briceni",
+      "MD:CH": "Moldova - Cahul",
+      "MD:CT": "Moldova - Cantemir",
+      "MD:CL": "Moldova - Călărași",
+      "MD:CS": "Moldova - Căușeni",
+      "MD:CM": "Moldova - Cimișlia",
+      "MD:CR": "Moldova - Criuleni",
+      "MD:DN": "Moldova - Dondușeni",
+      "MD:DR": "Moldova - Drochia",
+      "MD:DB": "Moldova - Dubăsari",
+      "MD:ED": "Moldova - Edineț",
+      "MD:FL": "Moldova - Fălești",
+      "MD:FR": "Moldova - Florești",
+      "MD:GE": "Moldova - UTA Găgăuzia",
+      "MD:GL": "Moldova - Glodeni",
+      "MD:HN": "Moldova - Hîncești",
+      "MD:IL": "Moldova - Ialoveni",
+      "MD:LV": "Moldova - Leova",
+      "MD:NS": "Moldova - Nisporeni",
+      "MD:OC": "Moldova - Ocnița",
+      "MD:OR": "Moldova - Orhei",
+      "MD:RZ": "Moldova - Rezina",
+      "MD:RS": "Moldova - Rîșcani",
+      "MD:SG": "Moldova - Sîngerei",
+      "MD:SR": "Moldova - Soroca",
+      "MD:ST": "Moldova - Strășeni",
+      "MD:SD": "Moldova - Șoldănești",
+      "MD:SV": "Moldova - Ștefan Vodă",
+      "MD:TR": "Moldova - Taraclia",
+      "MD:TL": "Moldova - Telenești",
+      "MD:UN": "Moldova - Ungheni",
+      "MC": "Monaco",
+      "MN": "Mongolia",
+      "ME": "Montenegro",
+      "MS": "Montserrat",
+      "MA": "Morocco",
+      "MZ:MZP": "Mozambique - Cabo Delgado",
+      "MZ:MZG": "Mozambique - Gaza",
+      "MZ:MZI": "Mozambique - Inhambane",
+      "MZ:MZB": "Mozambique - Manica",
+      "MZ:MZL": "Mozambique - Maputo Province",
+      "MZ:MZMPM": "Mozambique - Maputo",
+      "MZ:MZN": "Mozambique - Nampula",
+      "MZ:MZA": "Mozambique - Niassa",
+      "MZ:MZS": "Mozambique - Sofala",
+      "MZ:MZT": "Mozambique - Tete",
+      "MZ:MZQ": "Mozambique - Zambézia",
+      "MM": "Myanmar",
+      "NA:ER": "Namibia - Erongo",
+      "NA:HA": "Namibia - Hardap",
+      "NA:KA": "Namibia - Karas",
+      "NA:KE": "Namibia - Kavango East",
+      "NA:KW": "Namibia - Kavango West",
+      "NA:KH": "Namibia - Khomas",
+      "NA:KU": "Namibia - Kunene",
+      "NA:OW": "Namibia - Ohangwena",
+      "NA:OH": "Namibia - Omaheke",
+      "NA:OS": "Namibia - Omusati",
+      "NA:ON": "Namibia - Oshana",
+      "NA:OT": "Namibia - Oshikoto",
+      "NA:OD": "Namibia - Otjozondjupa",
+      "NA:CA": "Namibia - Zambezi",
+      "NR": "Nauru",
+      "NP:BAG": "Nepal - Bagmati",
+      "NP:BHE": "Nepal - Bheri",
+      "NP:DHA": "Nepal - Dhaulagiri",
+      "NP:GAN": "Nepal - Gandaki",
+      "NP:JAN": "Nepal - Janakpur",
+      "NP:KAR": "Nepal - Karnali",
+      "NP:KOS": "Nepal - Koshi",
+      "NP:LUM": "Nepal - Lumbini",
+      "NP:MAH": "Nepal - Mahakali",
+      "NP:MEC": "Nepal - Mechi",
+      "NP:NAR": "Nepal - Narayani",
+      "NP:RAP": "Nepal - Rapti",
+      "NP:SAG": "Nepal - Sagarmatha",
+      "NP:SET": "Nepal - Seti",
+      "NL": "Netherlands",
+      "NC": "New Caledonia",
+      "NZ:NL": "New Zealand - Northland",
+      "NZ:AK": "New Zealand - Auckland",
+      "NZ:WA": "New Zealand - Waikato",
+      "NZ:BP": "New Zealand - Bay of Plenty",
+      "NZ:TK": "New Zealand - Taranaki",
+      "NZ:GI": "New Zealand - Gisborne",
+      "NZ:HB": "New Zealand - Hawke’s Bay",
+      "NZ:MW": "New Zealand - Manawatu-Wanganui",
+      "NZ:WE": "New Zealand - Wellington",
+      "NZ:NS": "New Zealand - Nelson",
+      "NZ:MB": "New Zealand - Marlborough",
+      "NZ:TM": "New Zealand - Tasman",
+      "NZ:WC": "New Zealand - West Coast",
+      "NZ:CT": "New Zealand - Canterbury",
+      "NZ:OT": "New Zealand - Otago",
+      "NZ:SL": "New Zealand - Southland",
+      "NI:NI-AN": "Nicaragua - Atlántico Norte",
+      "NI:NI-AS": "Nicaragua - Atlántico Sur",
+      "NI:NI-BO": "Nicaragua - Boaco",
+      "NI:NI-CA": "Nicaragua - Carazo",
+      "NI:NI-CI": "Nicaragua - Chinandega",
+      "NI:NI-CO": "Nicaragua - Chontales",
+      "NI:NI-ES": "Nicaragua - Estelí",
+      "NI:NI-GR": "Nicaragua - Granada",
+      "NI:NI-JI": "Nicaragua - Jinotega",
+      "NI:NI-LE": "Nicaragua - León",
+      "NI:NI-MD": "Nicaragua - Madriz",
+      "NI:NI-MN": "Nicaragua - Managua",
+      "NI:NI-MS": "Nicaragua - Masaya",
+      "NI:NI-MT": "Nicaragua - Matagalpa",
+      "NI:NI-NS": "Nicaragua - Nueva Segovia",
+      "NI:NI-RI": "Nicaragua - Rivas",
+      "NI:NI-SJ": "Nicaragua - Río San Juan",
+      "NE": "Niger",
+      "NG:AB": "Nigeria - Abia",
+      "NG:FC": "Nigeria - Abuja",
+      "NG:AD": "Nigeria - Adamawa",
+      "NG:AK": "Nigeria - Akwa Ibom",
+      "NG:AN": "Nigeria - Anambra",
+      "NG:BA": "Nigeria - Bauchi",
+      "NG:BY": "Nigeria - Bayelsa",
+      "NG:BE": "Nigeria - Benue",
+      "NG:BO": "Nigeria - Borno",
+      "NG:CR": "Nigeria - Cross River",
+      "NG:DE": "Nigeria - Delta",
+      "NG:EB": "Nigeria - Ebonyi",
+      "NG:ED": "Nigeria - Edo",
+      "NG:EK": "Nigeria - Ekiti",
+      "NG:EN": "Nigeria - Enugu",
+      "NG:GO": "Nigeria - Gombe",
+      "NG:IM": "Nigeria - Imo",
+      "NG:JI": "Nigeria - Jigawa",
+      "NG:KD": "Nigeria - Kaduna",
+      "NG:KN": "Nigeria - Kano",
+      "NG:KT": "Nigeria - Katsina",
+      "NG:KE": "Nigeria - Kebbi",
+      "NG:KO": "Nigeria - Kogi",
+      "NG:KW": "Nigeria - Kwara",
+      "NG:LA": "Nigeria - Lagos",
+      "NG:NA": "Nigeria - Nasarawa",
+      "NG:NI": "Nigeria - Niger",
+      "NG:OG": "Nigeria - Ogun",
+      "NG:ON": "Nigeria - Ondo",
+      "NG:OS": "Nigeria - Osun",
+      "NG:OY": "Nigeria - Oyo",
+      "NG:PL": "Nigeria - Plateau",
+      "NG:RI": "Nigeria - Rivers",
+      "NG:SO": "Nigeria - Sokoto",
+      "NG:TA": "Nigeria - Taraba",
+      "NG:YO": "Nigeria - Yobe",
+      "NG:ZA": "Nigeria - Zamfara",
+      "NU": "Niue",
+      "NF": "Norfolk Island",
+      "KP": "North Korea",
+      "MK": "North Macedonia",
+      "MP": "Northern Mariana Islands",
+      "NO": "Norway",
+      "OM": "Oman",
+      "PK:JK": "Pakistan - Azad Kashmir",
+      "PK:BA": "Pakistan - Balochistan",
+      "PK:TA": "Pakistan - FATA",
+      "PK:GB": "Pakistan - Gilgit Baltistan",
+      "PK:IS": "Pakistan - Islamabad Capital Territory",
+      "PK:KP": "Pakistan - Khyber Pakhtunkhwa",
+      "PK:PB": "Pakistan - Punjab",
+      "PK:SD": "Pakistan - Sindh",
+      "PS": "Palestinian Territory",
+      "PA:PA-1": "Panama - Bocas del Toro",
+      "PA:PA-2": "Panama - Coclé",
+      "PA:PA-3": "Panama - Colón",
+      "PA:PA-4": "Panama - Chiriquí",
+      "PA:PA-5": "Panama - Darién",
+      "PA:PA-6": "Panama - Herrera",
+      "PA:PA-7": "Panama - Los Santos",
+      "PA:PA-8": "Panama - Panamá",
+      "PA:PA-9": "Panama - Veraguas",
+      "PA:PA-10": "Panama - West Panamá",
+      "PA:PA-EM": "Panama - Emberá",
+      "PA:PA-KY": "Panama - Guna Yala",
+      "PA:PA-NB": "Panama - Ngöbe-Buglé",
+      "PG": "Papua New Guinea",
+      "PY:PY-ASU": "Paraguay - Asunción",
+      "PY:PY-1": "Paraguay - Concepción",
+      "PY:PY-2": "Paraguay - San Pedro",
+      "PY:PY-3": "Paraguay - Cordillera",
+      "PY:PY-4": "Paraguay - Guairá",
+      "PY:PY-5": "Paraguay - Caaguazú",
+      "PY:PY-6": "Paraguay - Caazapá",
+      "PY:PY-7": "Paraguay - Itapúa",
+      "PY:PY-8": "Paraguay - Misiones",
+      "PY:PY-9": "Paraguay - Paraguarí",
+      "PY:PY-10": "Paraguay - Alto Paraná",
+      "PY:PY-11": "Paraguay - Central",
+      "PY:PY-12": "Paraguay - Ñeembucú",
+      "PY:PY-13": "Paraguay - Amambay",
+      "PY:PY-14": "Paraguay - Canindeyú",
+      "PY:PY-15": "Paraguay - Presidente Hayes",
+      "PY:PY-16": "Paraguay - Alto Paraguay",
+      "PY:PY-17": "Paraguay - Boquerón",
+      "PE:CAL": "Peru - El Callao",
+      "PE:LMA": "Peru - Municipalidad Metropolitana de Lima",
+      "PE:AMA": "Peru - Amazonas",
+      "PE:ANC": "Peru - Ancash",
+      "PE:APU": "Peru - Apurímac",
+      "PE:ARE": "Peru - Arequipa",
+      "PE:AYA": "Peru - Ayacucho",
+      "PE:CAJ": "Peru - Cajamarca",
+      "PE:CUS": "Peru - Cusco",
+      "PE:HUV": "Peru - Huancavelica",
+      "PE:HUC": "Peru - Huánuco",
+      "PE:ICA": "Peru - Ica",
+      "PE:JUN": "Peru - Junín",
+      "PE:LAL": "Peru - La Libertad",
+      "PE:LAM": "Peru - Lambayeque",
+      "PE:LIM": "Peru - Lima",
+      "PE:LOR": "Peru - Loreto",
+      "PE:MDD": "Peru - Madre de Dios",
+      "PE:MOQ": "Peru - Moquegua",
+      "PE:PAS": "Peru - Pasco",
+      "PE:PIU": "Peru - Piura",
+      "PE:PUN": "Peru - Puno",
+      "PE:SAM": "Peru - San Martín",
+      "PE:TAC": "Peru - Tacna",
+      "PE:TUM": "Peru - Tumbes",
+      "PE:UCA": "Peru - Ucayali",
+      "PH:ABR": "Philippines - Abra",
+      "PH:AGN": "Philippines - Agusan del Norte",
+      "PH:AGS": "Philippines - Agusan del Sur",
+      "PH:AKL": "Philippines - Aklan",
+      "PH:ALB": "Philippines - Albay",
+      "PH:ANT": "Philippines - Antique",
+      "PH:APA": "Philippines - Apayao",
+      "PH:AUR": "Philippines - Aurora",
+      "PH:BAS": "Philippines - Basilan",
+      "PH:BAN": "Philippines - Bataan",
+      "PH:BTN": "Philippines - Batanes",
+      "PH:BTG": "Philippines - Batangas",
+      "PH:BEN": "Philippines - Benguet",
+      "PH:BIL": "Philippines - Biliran",
+      "PH:BOH": "Philippines - Bohol",
+      "PH:BUK": "Philippines - Bukidnon",
+      "PH:BUL": "Philippines - Bulacan",
+      "PH:CAG": "Philippines - Cagayan",
+      "PH:CAN": "Philippines - Camarines Norte",
+      "PH:CAS": "Philippines - Camarines Sur",
+      "PH:CAM": "Philippines - Camiguin",
+      "PH:CAP": "Philippines - Capiz",
+      "PH:CAT": "Philippines - Catanduanes",
+      "PH:CAV": "Philippines - Cavite",
+      "PH:CEB": "Philippines - Cebu",
+      "PH:COM": "Philippines - Compostela Valley",
+      "PH:NCO": "Philippines - Cotabato",
+      "PH:DAV": "Philippines - Davao del Norte",
+      "PH:DAS": "Philippines - Davao del Sur",
+      "PH:DAC": "Philippines - Davao Occidental",
+      "PH:DAO": "Philippines - Davao Oriental",
+      "PH:DIN": "Philippines - Dinagat Islands",
+      "PH:EAS": "Philippines - Eastern Samar",
+      "PH:GUI": "Philippines - Guimaras",
+      "PH:IFU": "Philippines - Ifugao",
+      "PH:ILN": "Philippines - Ilocos Norte",
+      "PH:ILS": "Philippines - Ilocos Sur",
+      "PH:ILI": "Philippines - Iloilo",
+      "PH:ISA": "Philippines - Isabela",
+      "PH:KAL": "Philippines - Kalinga",
+      "PH:LUN": "Philippines - La Union",
+      "PH:LAG": "Philippines - Laguna",
+      "PH:LAN": "Philippines - Lanao del Norte",
+      "PH:LAS": "Philippines - Lanao del Sur",
+      "PH:LEY": "Philippines - Leyte",
+      "PH:MAG": "Philippines - Maguindanao",
+      "PH:MAD": "Philippines - Marinduque",
+      "PH:MAS": "Philippines - Masbate",
+      "PH:MSC": "Philippines - Misamis Occidental",
+      "PH:MSR": "Philippines - Misamis Oriental",
+      "PH:MOU": "Philippines - Mountain Province",
+      "PH:NEC": "Philippines - Negros Occidental",
+      "PH:NER": "Philippines - Negros Oriental",
+      "PH:NSA": "Philippines - Northern Samar",
+      "PH:NUE": "Philippines - Nueva Ecija",
+      "PH:NUV": "Philippines - Nueva Vizcaya",
+      "PH:MDC": "Philippines - Occidental Mindoro",
+      "PH:MDR": "Philippines - Oriental Mindoro",
+      "PH:PLW": "Philippines - Palawan",
+      "PH:PAM": "Philippines - Pampanga",
+      "PH:PAN": "Philippines - Pangasinan",
+      "PH:QUE": "Philippines - Quezon",
+      "PH:QUI": "Philippines - Quirino",
+      "PH:RIZ": "Philippines - Rizal",
+      "PH:ROM": "Philippines - Romblon",
+      "PH:WSA": "Philippines - Samar",
+      "PH:SAR": "Philippines - Sarangani",
+      "PH:SIQ": "Philippines - Siquijor",
+      "PH:SOR": "Philippines - Sorsogon",
+      "PH:SCO": "Philippines - South Cotabato",
+      "PH:SLE": "Philippines - Southern Leyte",
+      "PH:SUK": "Philippines - Sultan Kudarat",
+      "PH:SLU": "Philippines - Sulu",
+      "PH:SUN": "Philippines - Surigao del Norte",
+      "PH:SUR": "Philippines - Surigao del Sur",
+      "PH:TAR": "Philippines - Tarlac",
+      "PH:TAW": "Philippines - Tawi-Tawi",
+      "PH:ZMB": "Philippines - Zambales",
+      "PH:ZAN": "Philippines - Zamboanga del Norte",
+      "PH:ZAS": "Philippines - Zamboanga del Sur",
+      "PH:ZSI": "Philippines - Zamboanga Sibugay",
+      "PH:00": "Philippines - Metro Manila",
+      "PN": "Pitcairn",
+      "PL": "Poland",
+      "PT": "Portugal",
+      "PR": "Puerto Rico",
+      "QA": "Qatar",
+      "RE": "Reunion",
+      "RO:AB": "Romania - Alba",
+      "RO:AR": "Romania - Arad",
+      "RO:AG": "Romania - Argeș",
+      "RO:BC": "Romania - Bacău",
+      "RO:BH": "Romania - Bihor",
+      "RO:BN": "Romania - Bistrița-Năsăud",
+      "RO:BT": "Romania - Botoșani",
+      "RO:BR": "Romania - Brăila",
+      "RO:BV": "Romania - Brașov",
+      "RO:B": "Romania - București",
+      "RO:BZ": "Romania - Buzău",
+      "RO:CL": "Romania - Călărași",
+      "RO:CS": "Romania - Caraș-Severin",
+      "RO:CJ": "Romania - Cluj",
+      "RO:CT": "Romania - Constanța",
+      "RO:CV": "Romania - Covasna",
+      "RO:DB": "Romania - Dâmbovița",
+      "RO:DJ": "Romania - Dolj",
+      "RO:GL": "Romania - Galați",
+      "RO:GR": "Romania - Giurgiu",
+      "RO:GJ": "Romania - Gorj",
+      "RO:HR": "Romania - Harghita",
+      "RO:HD": "Romania - Hunedoara",
+      "RO:IL": "Romania - Ialomița",
+      "RO:IS": "Romania - Iași",
+      "RO:IF": "Romania - Ilfov",
+      "RO:MM": "Romania - Maramureș",
+      "RO:MH": "Romania - Mehedinți",
+      "RO:MS": "Romania - Mureș",
+      "RO:NT": "Romania - Neamț",
+      "RO:OT": "Romania - Olt",
+      "RO:PH": "Romania - Prahova",
+      "RO:SJ": "Romania - Sălaj",
+      "RO:SM": "Romania - Satu Mare",
+      "RO:SB": "Romania - Sibiu",
+      "RO:SV": "Romania - Suceava",
+      "RO:TR": "Romania - Teleorman",
+      "RO:TM": "Romania - Timiș",
+      "RO:TL": "Romania - Tulcea",
+      "RO:VL": "Romania - Vâlcea",
+      "RO:VS": "Romania - Vaslui",
+      "RO:VN": "Romania - Vrancea",
+      "RU": "Russia",
+      "RW": "Rwanda",
+      "ST": "S&atilde;o Tom&eacute; and Pr&iacute;ncipe",
+      "BL": "Saint Barth&eacute;lemy",
+      "SH": "Saint Helena",
+      "KN": "Saint Kitts and Nevis",
+      "LC": "Saint Lucia",
+      "SX": "Saint Martin (Dutch part)",
+      "MF": "Saint Martin (French part)",
+      "PM": "Saint Pierre and Miquelon",
+      "VC": "Saint Vincent and the Grenadines",
+      "WS": "Samoa",
+      "SM": "San Marino",
+      "SA": "Saudi Arabia",
+      "SN": "Senegal",
+      "RS:RS00": "Serbia - Belgrade",
+      "RS:RS14": "Serbia - Bor",
+      "RS:RS11": "Serbia - Braničevo",
+      "RS:RS02": "Serbia - Central Banat",
+      "RS:RS10": "Serbia - Danube",
+      "RS:RS23": "Serbia - Jablanica",
+      "RS:RS09": "Serbia - Kolubara",
+      "RS:RS08": "Serbia - Mačva",
+      "RS:RS17": "Serbia - Morava",
+      "RS:RS20": "Serbia - Nišava",
+      "RS:RS01": "Serbia - North Bačka",
+      "RS:RS03": "Serbia - North Banat",
+      "RS:RS24": "Serbia - Pčinja",
+      "RS:RS22": "Serbia - Pirot",
+      "RS:RS13": "Serbia - Pomoravlje",
+      "RS:RS19": "Serbia - Rasina",
+      "RS:RS18": "Serbia - Raška",
+      "RS:RS06": "Serbia - South Bačka",
+      "RS:RS04": "Serbia - South Banat",
+      "RS:RS07": "Serbia - Srem",
+      "RS:RS12": "Serbia - Šumadija",
+      "RS:RS21": "Serbia - Toplica",
+      "RS:RS05": "Serbia - West Bačka",
+      "RS:RS15": "Serbia - Zaječar",
+      "RS:RS16": "Serbia - Zlatibor",
+      "RS:RS25": "Serbia - Kosovo",
+      "RS:RS26": "Serbia - Peć",
+      "RS:RS27": "Serbia - Prizren",
+      "RS:RS28": "Serbia - Kosovska Mitrovica",
+      "RS:RS29": "Serbia - Kosovo-Pomoravlje",
+      "RS:RSKM": "Serbia - Kosovo-Metohija",
+      "RS:RSVO": "Serbia - Vojvodina",
+      "SC": "Seychelles",
+      "SL": "Sierra Leone",
+      "SG": "Singapore",
+      "SK": "Slovakia",
+      "SI": "Slovenia",
+      "SB": "Solomon Islands",
+      "SO": "Somalia",
+      "ZA:EC": "South Africa - Eastern Cape",
+      "ZA:FS": "South Africa - Free State",
+      "ZA:GP": "South Africa - Gauteng",
+      "ZA:KZN": "South Africa - KwaZulu-Natal",
+      "ZA:LP": "South Africa - Limpopo",
+      "ZA:MP": "South Africa - Mpumalanga",
+      "ZA:NC": "South Africa - Northern Cape",
+      "ZA:NW": "South Africa - North West",
+      "ZA:WC": "South Africa - Western Cape",
+      "GS": "South Georgia/Sandwich Islands",
+      "KR": "South Korea",
+      "SS": "South Sudan",
+      "ES:C": "Spain - A Coruña",
+      "ES:VI": "Spain - Araba/Álava",
+      "ES:AB": "Spain - Albacete",
+      "ES:A": "Spain - Alicante",
+      "ES:AL": "Spain - Almería",
+      "ES:O": "Spain - Asturias",
+      "ES:AV": "Spain - Ávila",
+      "ES:BA": "Spain - Badajoz",
+      "ES:PM": "Spain - Baleares",
+      "ES:B": "Spain - Barcelona",
+      "ES:BU": "Spain - Burgos",
+      "ES:CC": "Spain - Cáceres",
+      "ES:CA": "Spain - Cádiz",
+      "ES:S": "Spain - Cantabria",
+      "ES:CS": "Spain - Castellón",
+      "ES:CE": "Spain - Ceuta",
+      "ES:CR": "Spain - Ciudad Real",
+      "ES:CO": "Spain - Córdoba",
+      "ES:CU": "Spain - Cuenca",
+      "ES:GI": "Spain - Girona",
+      "ES:GR": "Spain - Granada",
+      "ES:GU": "Spain - Guadalajara",
+      "ES:SS": "Spain - Gipuzkoa",
+      "ES:H": "Spain - Huelva",
+      "ES:HU": "Spain - Huesca",
+      "ES:J": "Spain - Jaén",
+      "ES:LO": "Spain - La Rioja",
+      "ES:GC": "Spain - Las Palmas",
+      "ES:LE": "Spain - León",
+      "ES:L": "Spain - Lleida",
+      "ES:LU": "Spain - Lugo",
+      "ES:M": "Spain - Madrid",
+      "ES:MA": "Spain - Málaga",
+      "ES:ML": "Spain - Melilla",
+      "ES:MU": "Spain - Murcia",
+      "ES:NA": "Spain - Navarra",
+      "ES:OR": "Spain - Ourense",
+      "ES:P": "Spain - Palencia",
+      "ES:PO": "Spain - Pontevedra",
+      "ES:SA": "Spain - Salamanca",
+      "ES:TF": "Spain - Santa Cruz de Tenerife",
+      "ES:SG": "Spain - Segovia",
+      "ES:SE": "Spain - Sevilla",
+      "ES:SO": "Spain - Soria",
+      "ES:T": "Spain - Tarragona",
+      "ES:TE": "Spain - Teruel",
+      "ES:TO": "Spain - Toledo",
+      "ES:V": "Spain - Valencia",
+      "ES:VA": "Spain - Valladolid",
+      "ES:BI": "Spain - Biscay",
+      "ES:ZA": "Spain - Zamora",
+      "ES:Z": "Spain - Zaragoza",
+      "LK": "Sri Lanka",
+      "SD": "Sudan",
+      "SR": "Suriname",
+      "SJ": "Svalbard and Jan Mayen",
+      "SZ": "Swaziland",
+      "SE": "Sweden",
+      "CH:AG": "Switzerland - Aargau",
+      "CH:AR": "Switzerland - Appenzell Ausserrhoden",
+      "CH:AI": "Switzerland - Appenzell Innerrhoden",
+      "CH:BL": "Switzerland - Basel-Landschaft",
+      "CH:BS": "Switzerland - Basel-Stadt",
+      "CH:BE": "Switzerland - Bern",
+      "CH:FR": "Switzerland - Fribourg",
+      "CH:GE": "Switzerland - Geneva",
+      "CH:GL": "Switzerland - Glarus",
+      "CH:GR": "Switzerland - Graubünden",
+      "CH:JU": "Switzerland - Jura",
+      "CH:LU": "Switzerland - Luzern",
+      "CH:NE": "Switzerland - Neuchâtel",
+      "CH:NW": "Switzerland - Nidwalden",
+      "CH:OW": "Switzerland - Obwalden",
+      "CH:SH": "Switzerland - Schaffhausen",
+      "CH:SZ": "Switzerland - Schwyz",
+      "CH:SO": "Switzerland - Solothurn",
+      "CH:SG": "Switzerland - St. Gallen",
+      "CH:TG": "Switzerland - Thurgau",
+      "CH:TI": "Switzerland - Ticino",
+      "CH:UR": "Switzerland - Uri",
+      "CH:VS": "Switzerland - Valais",
+      "CH:VD": "Switzerland - Vaud",
+      "CH:ZG": "Switzerland - Zug",
+      "CH:ZH": "Switzerland - Zürich",
+      "SY": "Syria",
+      "TW": "Taiwan",
+      "TJ": "Tajikistan",
+      "TZ:TZ01": "Tanzania - Arusha",
+      "TZ:TZ02": "Tanzania - Dar es Salaam",
+      "TZ:TZ03": "Tanzania - Dodoma",
+      "TZ:TZ04": "Tanzania - Iringa",
+      "TZ:TZ05": "Tanzania - Kagera",
+      "TZ:TZ06": "Tanzania - Pemba North",
+      "TZ:TZ07": "Tanzania - Zanzibar North",
+      "TZ:TZ08": "Tanzania - Kigoma",
+      "TZ:TZ09": "Tanzania - Kilimanjaro",
+      "TZ:TZ10": "Tanzania - Pemba South",
+      "TZ:TZ11": "Tanzania - Zanzibar South",
+      "TZ:TZ12": "Tanzania - Lindi",
+      "TZ:TZ13": "Tanzania - Mara",
+      "TZ:TZ14": "Tanzania - Mbeya",
+      "TZ:TZ15": "Tanzania - Zanzibar West",
+      "TZ:TZ16": "Tanzania - Morogoro",
+      "TZ:TZ17": "Tanzania - Mtwara",
+      "TZ:TZ18": "Tanzania - Mwanza",
+      "TZ:TZ19": "Tanzania - Coast",
+      "TZ:TZ20": "Tanzania - Rukwa",
+      "TZ:TZ21": "Tanzania - Ruvuma",
+      "TZ:TZ22": "Tanzania - Shinyanga",
+      "TZ:TZ23": "Tanzania - Singida",
+      "TZ:TZ24": "Tanzania - Tabora",
+      "TZ:TZ25": "Tanzania - Tanga",
+      "TZ:TZ26": "Tanzania - Manyara",
+      "TZ:TZ27": "Tanzania - Geita",
+      "TZ:TZ28": "Tanzania - Katavi",
+      "TZ:TZ29": "Tanzania - Njombe",
+      "TZ:TZ30": "Tanzania - Simiyu",
+      "TH:TH-37": "Thailand - Amnat Charoen",
+      "TH:TH-15": "Thailand - Ang Thong",
+      "TH:TH-14": "Thailand - Ayutthaya",
+      "TH:TH-10": "Thailand - Bangkok",
+      "TH:TH-38": "Thailand - Bueng Kan",
+      "TH:TH-31": "Thailand - Buri Ram",
+      "TH:TH-24": "Thailand - Chachoengsao",
+      "TH:TH-18": "Thailand - Chai Nat",
+      "TH:TH-36": "Thailand - Chaiyaphum",
+      "TH:TH-22": "Thailand - Chanthaburi",
+      "TH:TH-50": "Thailand - Chiang Mai",
+      "TH:TH-57": "Thailand - Chiang Rai",
+      "TH:TH-20": "Thailand - Chonburi",
+      "TH:TH-86": "Thailand - Chumphon",
+      "TH:TH-46": "Thailand - Kalasin",
+      "TH:TH-62": "Thailand - Kamphaeng Phet",
+      "TH:TH-71": "Thailand - Kanchanaburi",
+      "TH:TH-40": "Thailand - Khon Kaen",
+      "TH:TH-81": "Thailand - Krabi",
+      "TH:TH-52": "Thailand - Lampang",
+      "TH:TH-51": "Thailand - Lamphun",
+      "TH:TH-42": "Thailand - Loei",
+      "TH:TH-16": "Thailand - Lopburi",
+      "TH:TH-58": "Thailand - Mae Hong Son",
+      "TH:TH-44": "Thailand - Maha Sarakham",
+      "TH:TH-49": "Thailand - Mukdahan",
+      "TH:TH-26": "Thailand - Nakhon Nayok",
+      "TH:TH-73": "Thailand - Nakhon Pathom",
+      "TH:TH-48": "Thailand - Nakhon Phanom",
+      "TH:TH-30": "Thailand - Nakhon Ratchasima",
+      "TH:TH-60": "Thailand - Nakhon Sawan",
+      "TH:TH-80": "Thailand - Nakhon Si Thammarat",
+      "TH:TH-55": "Thailand - Nan",
+      "TH:TH-96": "Thailand - Narathiwat",
+      "TH:TH-39": "Thailand - Nong Bua Lam Phu",
+      "TH:TH-43": "Thailand - Nong Khai",
+      "TH:TH-12": "Thailand - Nonthaburi",
+      "TH:TH-13": "Thailand - Pathum Thani",
+      "TH:TH-94": "Thailand - Pattani",
+      "TH:TH-82": "Thailand - Phang Nga",
+      "TH:TH-93": "Thailand - Phatthalung",
+      "TH:TH-56": "Thailand - Phayao",
+      "TH:TH-67": "Thailand - Phetchabun",
+      "TH:TH-76": "Thailand - Phetchaburi",
+      "TH:TH-66": "Thailand - Phichit",
+      "TH:TH-65": "Thailand - Phitsanulok",
+      "TH:TH-54": "Thailand - Phrae",
+      "TH:TH-83": "Thailand - Phuket",
+      "TH:TH-25": "Thailand - Prachin Buri",
+      "TH:TH-77": "Thailand - Prachuap Khiri Khan",
+      "TH:TH-85": "Thailand - Ranong",
+      "TH:TH-70": "Thailand - Ratchaburi",
+      "TH:TH-21": "Thailand - Rayong",
+      "TH:TH-45": "Thailand - Roi Et",
+      "TH:TH-27": "Thailand - Sa Kaeo",
+      "TH:TH-47": "Thailand - Sakon Nakhon",
+      "TH:TH-11": "Thailand - Samut Prakan",
+      "TH:TH-74": "Thailand - Samut Sakhon",
+      "TH:TH-75": "Thailand - Samut Songkhram",
+      "TH:TH-19": "Thailand - Saraburi",
+      "TH:TH-91": "Thailand - Satun",
+      "TH:TH-17": "Thailand - Sing Buri",
+      "TH:TH-33": "Thailand - Sisaket",
+      "TH:TH-90": "Thailand - Songkhla",
+      "TH:TH-64": "Thailand - Sukhothai",
+      "TH:TH-72": "Thailand - Suphan Buri",
+      "TH:TH-84": "Thailand - Surat Thani",
+      "TH:TH-32": "Thailand - Surin",
+      "TH:TH-63": "Thailand - Tak",
+      "TH:TH-92": "Thailand - Trang",
+      "TH:TH-23": "Thailand - Trat",
+      "TH:TH-34": "Thailand - Ubon Ratchathani",
+      "TH:TH-41": "Thailand - Udon Thani",
+      "TH:TH-61": "Thailand - Uthai Thani",
+      "TH:TH-53": "Thailand - Uttaradit",
+      "TH:TH-95": "Thailand - Yala",
+      "TH:TH-35": "Thailand - Yasothon",
+      "TL": "Timor-Leste",
+      "TG": "Togo",
+      "TK": "Tokelau",
+      "TO": "Tonga",
+      "TT": "Trinidad and Tobago",
+      "TN": "Tunisia",
+      "TR:TR01": "Turkey - Adana",
+      "TR:TR02": "Turkey - Adıyaman",
+      "TR:TR03": "Turkey - Afyon",
+      "TR:TR04": "Turkey - Ağrı",
+      "TR:TR05": "Turkey - Amasya",
+      "TR:TR06": "Turkey - Ankara",
+      "TR:TR07": "Turkey - Antalya",
+      "TR:TR08": "Turkey - Artvin",
+      "TR:TR09": "Turkey - Aydın",
+      "TR:TR10": "Turkey - Balıkesir",
+      "TR:TR11": "Turkey - Bilecik",
+      "TR:TR12": "Turkey - Bingöl",
+      "TR:TR13": "Turkey - Bitlis",
+      "TR:TR14": "Turkey - Bolu",
+      "TR:TR15": "Turkey - Burdur",
+      "TR:TR16": "Turkey - Bursa",
+      "TR:TR17": "Turkey - Çanakkale",
+      "TR:TR18": "Turkey - Çankırı",
+      "TR:TR19": "Turkey - Çorum",
+      "TR:TR20": "Turkey - Denizli",
+      "TR:TR21": "Turkey - Diyarbakır",
+      "TR:TR22": "Turkey - Edirne",
+      "TR:TR23": "Turkey - Elazığ",
+      "TR:TR24": "Turkey - Erzincan",
+      "TR:TR25": "Turkey - Erzurum",
+      "TR:TR26": "Turkey - Eskişehir",
+      "TR:TR27": "Turkey - Gaziantep",
+      "TR:TR28": "Turkey - Giresun",
+      "TR:TR29": "Turkey - Gümüşhane",
+      "TR:TR30": "Turkey - Hakkari",
+      "TR:TR31": "Turkey - Hatay",
+      "TR:TR32": "Turkey - Isparta",
+      "TR:TR33": "Turkey - İçel",
+      "TR:TR34": "Turkey - İstanbul",
+      "TR:TR35": "Turkey - İzmir",
+      "TR:TR36": "Turkey - Kars",
+      "TR:TR37": "Turkey - Kastamonu",
+      "TR:TR38": "Turkey - Kayseri",
+      "TR:TR39": "Turkey - Kırklareli",
+      "TR:TR40": "Turkey - Kırşehir",
+      "TR:TR41": "Turkey - Kocaeli",
+      "TR:TR42": "Turkey - Konya",
+      "TR:TR43": "Turkey - Kütahya",
+      "TR:TR44": "Turkey - Malatya",
+      "TR:TR45": "Turkey - Manisa",
+      "TR:TR46": "Turkey - Kahramanmaraş",
+      "TR:TR47": "Turkey - Mardin",
+      "TR:TR48": "Turkey - Muğla",
+      "TR:TR49": "Turkey - Muş",
+      "TR:TR50": "Turkey - Nevşehir",
+      "TR:TR51": "Turkey - Niğde",
+      "TR:TR52": "Turkey - Ordu",
+      "TR:TR53": "Turkey - Rize",
+      "TR:TR54": "Turkey - Sakarya",
+      "TR:TR55": "Turkey - Samsun",
+      "TR:TR56": "Turkey - Siirt",
+      "TR:TR57": "Turkey - Sinop",
+      "TR:TR58": "Turkey - Sivas",
+      "TR:TR59": "Turkey - Tekirdağ",
+      "TR:TR60": "Turkey - Tokat",
+      "TR:TR61": "Turkey - Trabzon",
+      "TR:TR62": "Turkey - Tunceli",
+      "TR:TR63": "Turkey - Şanlıurfa",
+      "TR:TR64": "Turkey - Uşak",
+      "TR:TR65": "Turkey - Van",
+      "TR:TR66": "Turkey - Yozgat",
+      "TR:TR67": "Turkey - Zonguldak",
+      "TR:TR68": "Turkey - Aksaray",
+      "TR:TR69": "Turkey - Bayburt",
+      "TR:TR70": "Turkey - Karaman",
+      "TR:TR71": "Turkey - Kırıkkale",
+      "TR:TR72": "Turkey - Batman",
+      "TR:TR73": "Turkey - Şırnak",
+      "TR:TR74": "Turkey - Bartın",
+      "TR:TR75": "Turkey - Ardahan",
+      "TR:TR76": "Turkey - Iğdır",
+      "TR:TR77": "Turkey - Yalova",
+      "TR:TR78": "Turkey - Karabük",
+      "TR:TR79": "Turkey - Kilis",
+      "TR:TR80": "Turkey - Osmaniye",
+      "TR:TR81": "Turkey - Düzce",
+      "TM": "Turkmenistan",
+      "TC": "Turks and Caicos Islands",
+      "TV": "Tuvalu",
+      "UG:UG314": "Uganda - Abim",
+      "UG:UG301": "Uganda - Adjumani",
+      "UG:UG322": "Uganda - Agago",
+      "UG:UG323": "Uganda - Alebtong",
+      "UG:UG315": "Uganda - Amolatar",
+      "UG:UG324": "Uganda - Amudat",
+      "UG:UG216": "Uganda - Amuria",
+      "UG:UG316": "Uganda - Amuru",
+      "UG:UG302": "Uganda - Apac",
+      "UG:UG303": "Uganda - Arua",
+      "UG:UG217": "Uganda - Budaka",
+      "UG:UG218": "Uganda - Bududa",
+      "UG:UG201": "Uganda - Bugiri",
+      "UG:UG235": "Uganda - Bugweri",
+      "UG:UG420": "Uganda - Buhweju",
+      "UG:UG117": "Uganda - Buikwe",
+      "UG:UG219": "Uganda - Bukedea",
+      "UG:UG118": "Uganda - Bukomansimbi",
+      "UG:UG220": "Uganda - Bukwa",
+      "UG:UG225": "Uganda - Bulambuli",
+      "UG:UG416": "Uganda - Buliisa",
+      "UG:UG401": "Uganda - Bundibugyo",
+      "UG:UG430": "Uganda - Bunyangabu",
+      "UG:UG402": "Uganda - Bushenyi",
+      "UG:UG202": "Uganda - Busia",
+      "UG:UG221": "Uganda - Butaleja",
+      "UG:UG119": "Uganda - Butambala",
+      "UG:UG233": "Uganda - Butebo",
+      "UG:UG120": "Uganda - Buvuma",
+      "UG:UG226": "Uganda - Buyende",
+      "UG:UG317": "Uganda - Dokolo",
+      "UG:UG121": "Uganda - Gomba",
+      "UG:UG304": "Uganda - Gulu",
+      "UG:UG403": "Uganda - Hoima",
+      "UG:UG417": "Uganda - Ibanda",
+      "UG:UG203": "Uganda - Iganga",
+      "UG:UG418": "Uganda - Isingiro",
+      "UG:UG204": "Uganda - Jinja",
+      "UG:UG318": "Uganda - Kaabong",
+      "UG:UG404": "Uganda - Kabale",
+      "UG:UG405": "Uganda - Kabarole",
+      "UG:UG213": "Uganda - Kaberamaido",
+      "UG:UG427": "Uganda - Kagadi",
+      "UG:UG428": "Uganda - Kakumiro",
+      "UG:UG101": "Uganda - Kalangala",
+      "UG:UG222": "Uganda - Kaliro",
+      "UG:UG122": "Uganda - Kalungu",
+      "UG:UG102": "Uganda - Kampala",
+      "UG:UG205": "Uganda - Kamuli",
+      "UG:UG413": "Uganda - Kamwenge",
+      "UG:UG414": "Uganda - Kanungu",
+      "UG:UG206": "Uganda - Kapchorwa",
+      "UG:UG236": "Uganda - Kapelebyong",
+      "UG:UG126": "Uganda - Kasanda",
+      "UG:UG406": "Uganda - Kasese",
+      "UG:UG207": "Uganda - Katakwi",
+      "UG:UG112": "Uganda - Kayunga",
+      "UG:UG407": "Uganda - Kibaale",
+      "UG:UG103": "Uganda - Kiboga",
+      "UG:UG227": "Uganda - Kibuku",
+      "UG:UG432": "Uganda - Kikuube",
+      "UG:UG419": "Uganda - Kiruhura",
+      "UG:UG421": "Uganda - Kiryandongo",
+      "UG:UG408": "Uganda - Kisoro",
+      "UG:UG305": "Uganda - Kitgum",
+      "UG:UG319": "Uganda - Koboko",
+      "UG:UG325": "Uganda - Kole",
+      "UG:UG306": "Uganda - Kotido",
+      "UG:UG208": "Uganda - Kumi",
+      "UG:UG333": "Uganda - Kwania",
+      "UG:UG228": "Uganda - Kween",
+      "UG:UG123": "Uganda - Kyankwanzi",
+      "UG:UG422": "Uganda - Kyegegwa",
+      "UG:UG415": "Uganda - Kyenjojo",
+      "UG:UG125": "Uganda - Kyotera",
+      "UG:UG326": "Uganda - Lamwo",
+      "UG:UG307": "Uganda - Lira",
+      "UG:UG229": "Uganda - Luuka",
+      "UG:UG104": "Uganda - Luwero",
+      "UG:UG124": "Uganda - Lwengo",
+      "UG:UG114": "Uganda - Lyantonde",
+      "UG:UG223": "Uganda - Manafwa",
+      "UG:UG320": "Uganda - Maracha",
+      "UG:UG105": "Uganda - Masaka",
+      "UG:UG409": "Uganda - Masindi",
+      "UG:UG214": "Uganda - Mayuge",
+      "UG:UG209": "Uganda - Mbale",
+      "UG:UG410": "Uganda - Mbarara",
+      "UG:UG423": "Uganda - Mitooma",
+      "UG:UG115": "Uganda - Mityana",
+      "UG:UG308": "Uganda - Moroto",
+      "UG:UG309": "Uganda - Moyo",
+      "UG:UG106": "Uganda - Mpigi",
+      "UG:UG107": "Uganda - Mubende",
+      "UG:UG108": "Uganda - Mukono",
+      "UG:UG334": "Uganda - Nabilatuk",
+      "UG:UG311": "Uganda - Nakapiripirit",
+      "UG:UG116": "Uganda - Nakaseke",
+      "UG:UG109": "Uganda - Nakasongola",
+      "UG:UG230": "Uganda - Namayingo",
+      "UG:UG234": "Uganda - Namisindwa",
+      "UG:UG224": "Uganda - Namutumba",
+      "UG:UG327": "Uganda - Napak",
+      "UG:UG310": "Uganda - Nebbi",
+      "UG:UG231": "Uganda - Ngora",
+      "UG:UG424": "Uganda - Ntoroko",
+      "UG:UG411": "Uganda - Ntungamo",
+      "UG:UG328": "Uganda - Nwoya",
+      "UG:UG331": "Uganda - Omoro",
+      "UG:UG329": "Uganda - Otuke",
+      "UG:UG321": "Uganda - Oyam",
+      "UG:UG312": "Uganda - Pader",
+      "UG:UG332": "Uganda - Pakwach",
+      "UG:UG210": "Uganda - Pallisa",
+      "UG:UG110": "Uganda - Rakai",
+      "UG:UG429": "Uganda - Rubanda",
+      "UG:UG425": "Uganda - Rubirizi",
+      "UG:UG431": "Uganda - Rukiga",
+      "UG:UG412": "Uganda - Rukungiri",
+      "UG:UG111": "Uganda - Sembabule",
+      "UG:UG232": "Uganda - Serere",
+      "UG:UG426": "Uganda - Sheema",
+      "UG:UG215": "Uganda - Sironko",
+      "UG:UG211": "Uganda - Soroti",
+      "UG:UG212": "Uganda - Tororo",
+      "UG:UG113": "Uganda - Wakiso",
+      "UG:UG313": "Uganda - Yumbe",
+      "UG:UG330": "Uganda - Zombo",
+      "UA:VN": "Ukraine - Vinnytsia Oblast",
+      "UA:VL": "Ukraine - Volyn Oblast",
+      "UA:DP": "Ukraine - Dnipropetrovsk Oblast",
+      "UA:DT": "Ukraine - Donetsk Oblast",
+      "UA:ZT": "Ukraine - Zhytomyr Oblast",
+      "UA:ZK": "Ukraine - Zakarpattia Oblast",
+      "UA:ZP": "Ukraine - Zaporizhzhia Oblast",
+      "UA:IF": "Ukraine - Ivano-Frankivsk Oblast",
+      "UA:KV": "Ukraine - Kyiv Oblast",
+      "UA:KH": "Ukraine - Kirovohrad Oblast",
+      "UA:LH": "Ukraine - Luhansk Oblast",
+      "UA:LV": "Ukraine - Lviv Oblast",
+      "UA:MY": "Ukraine - Mykolaiv Oblast",
+      "UA:OD": "Ukraine - Odessa Oblast",
+      "UA:PL": "Ukraine - Poltava Oblast",
+      "UA:RV": "Ukraine - Rivne Oblast",
+      "UA:SM": "Ukraine - Sumy Oblast",
+      "UA:TP": "Ukraine - Ternopil Oblast",
+      "UA:KK": "Ukraine - Kharkiv Oblast",
+      "UA:KS": "Ukraine - Kherson Oblast",
+      "UA:KM": "Ukraine - Khmelnytskyi Oblast",
+      "UA:CK": "Ukraine - Cherkasy Oblast",
+      "UA:CH": "Ukraine - Chernihiv Oblast",
+      "UA:CV": "Ukraine - Chernivtsi Oblast",
+      "AE": "United Arab Emirates",
+      "GB": "United Kingdom (UK)",
+      "US:AL": "United States (US) - Alabama",
+      "US:AK": "United States (US) - Alaska",
+      "US:AZ": "United States (US) - Arizona",
+      "US:AR": "United States (US) - Arkansas",
+      "US:CA": "United States (US) - California",
+      "US:CO": "United States (US) - Colorado",
+      "US:CT": "United States (US) - Connecticut",
+      "US:DE": "United States (US) - Delaware",
+      "US:DC": "United States (US) - District Of Columbia",
+      "US:FL": "United States (US) - Florida",
+      "US:GA": "United States (US) - Georgia",
+      "US:HI": "United States (US) - Hawaii",
+      "US:ID": "United States (US) - Idaho",
+      "US:IL": "United States (US) - Illinois",
+      "US:IN": "United States (US) - Indiana",
+      "US:IA": "United States (US) - Iowa",
+      "US:KS": "United States (US) - Kansas",
+      "US:KY": "United States (US) - Kentucky",
+      "US:LA": "United States (US) - Louisiana",
+      "US:ME": "United States (US) - Maine",
+      "US:MD": "United States (US) - Maryland",
+      "US:MA": "United States (US) - Massachusetts",
+      "US:MI": "United States (US) - Michigan",
+      "US:MN": "United States (US) - Minnesota",
+      "US:MS": "United States (US) - Mississippi",
+      "US:MO": "United States (US) - Missouri",
+      "US:MT": "United States (US) - Montana",
+      "US:NE": "United States (US) - Nebraska",
+      "US:NV": "United States (US) - Nevada",
+      "US:NH": "United States (US) - New Hampshire",
+      "US:NJ": "United States (US) - New Jersey",
+      "US:NM": "United States (US) - New Mexico",
+      "US:NY": "United States (US) - New York",
+      "US:NC": "United States (US) - North Carolina",
+      "US:ND": "United States (US) - North Dakota",
+      "US:OH": "United States (US) - Ohio",
+      "US:OK": "United States (US) - Oklahoma",
+      "US:OR": "United States (US) - Oregon",
+      "US:PA": "United States (US) - Pennsylvania",
+      "US:RI": "United States (US) - Rhode Island",
+      "US:SC": "United States (US) - South Carolina",
+      "US:SD": "United States (US) - South Dakota",
+      "US:TN": "United States (US) - Tennessee",
+      "US:TX": "United States (US) - Texas",
+      "US:UT": "United States (US) - Utah",
+      "US:VT": "United States (US) - Vermont",
+      "US:VA": "United States (US) - Virginia",
+      "US:WA": "United States (US) - Washington",
+      "US:WV": "United States (US) - West Virginia",
+      "US:WI": "United States (US) - Wisconsin",
+      "US:WY": "United States (US) - Wyoming",
+      "US:AA": "United States (US) - Armed Forces (AA)",
+      "US:AE": "United States (US) - Armed Forces (AE)",
+      "US:AP": "United States (US) - Armed Forces (AP)",
+      "UM:81": "United States (US) Minor Outlying Islands - Baker Island",
+      "UM:84": "United States (US) Minor Outlying Islands - Howland Island",
+      "UM:86": "United States (US) Minor Outlying Islands - Jarvis Island",
+      "UM:67": "United States (US) Minor Outlying Islands - Johnston Atoll",
+      "UM:89": "United States (US) Minor Outlying Islands - Kingman Reef",
+      "UM:71": "United States (US) Minor Outlying Islands - Midway Atoll",
+      "UM:76": "United States (US) Minor Outlying Islands - Navassa Island",
+      "UM:95": "United States (US) Minor Outlying Islands - Palmyra Atoll",
+      "UM:79": "United States (US) Minor Outlying Islands - Wake Island",
+      "UY:UY-AR": "Uruguay - Artigas",
+      "UY:UY-CA": "Uruguay - Canelones",
+      "UY:UY-CL": "Uruguay - Cerro Largo",
+      "UY:UY-CO": "Uruguay - Colonia",
+      "UY:UY-DU": "Uruguay - Durazno",
+      "UY:UY-FS": "Uruguay - Flores",
+      "UY:UY-FD": "Uruguay - Florida",
+      "UY:UY-LA": "Uruguay - Lavalleja",
+      "UY:UY-MA": "Uruguay - Maldonado",
+      "UY:UY-MO": "Uruguay - Montevideo",
+      "UY:UY-PA": "Uruguay - Paysandú",
+      "UY:UY-RN": "Uruguay - Río Negro",
+      "UY:UY-RV": "Uruguay - Rivera",
+      "UY:UY-RO": "Uruguay - Rocha",
+      "UY:UY-SA": "Uruguay - Salto",
+      "UY:UY-SJ": "Uruguay - San José",
+      "UY:UY-SO": "Uruguay - Soriano",
+      "UY:UY-TA": "Uruguay - Tacuarembó",
+      "UY:UY-TT": "Uruguay - Treinta y Tres",
+      "UZ": "Uzbekistan",
+      "VU": "Vanuatu",
+      "VA": "Vatican",
+      "VE:VE-A": "Venezuela - Capital",
+      "VE:VE-B": "Venezuela - Anzoátegui",
+      "VE:VE-C": "Venezuela - Apure",
+      "VE:VE-D": "Venezuela - Aragua",
+      "VE:VE-E": "Venezuela - Barinas",
+      "VE:VE-F": "Venezuela - Bolívar",
+      "VE:VE-G": "Venezuela - Carabobo",
+      "VE:VE-H": "Venezuela - Cojedes",
+      "VE:VE-I": "Venezuela - Falcón",
+      "VE:VE-J": "Venezuela - Guárico",
+      "VE:VE-K": "Venezuela - Lara",
+      "VE:VE-L": "Venezuela - Mérida",
+      "VE:VE-M": "Venezuela - Miranda",
+      "VE:VE-N": "Venezuela - Monagas",
+      "VE:VE-O": "Venezuela - Nueva Esparta",
+      "VE:VE-P": "Venezuela - Portuguesa",
+      "VE:VE-R": "Venezuela - Sucre",
+      "VE:VE-S": "Venezuela - Táchira",
+      "VE:VE-T": "Venezuela - Trujillo",
+      "VE:VE-U": "Venezuela - Yaracuy",
+      "VE:VE-V": "Venezuela - Zulia",
+      "VE:VE-W": "Venezuela - Federal Dependencies",
+      "VE:VE-X": "Venezuela - La Guaira (Vargas)",
+      "VE:VE-Y": "Venezuela - Delta Amacuro",
+      "VE:VE-Z": "Venezuela - Amazonas",
+      "VN": "Vietnam",
+      "VG": "Virgin Islands (British)",
+      "VI": "Virgin Islands (US)",
+      "WF": "Wallis and Futuna",
+      "EH": "Western Sahara",
+      "YE": "Yemen",
+      "ZM:ZM-01": "Zambia - Western",
+      "ZM:ZM-02": "Zambia - Central",
+      "ZM:ZM-03": "Zambia - Eastern",
+      "ZM:ZM-04": "Zambia - Luapula",
+      "ZM:ZM-05": "Zambia - Northern",
+      "ZM:ZM-06": "Zambia - North-Western",
+      "ZM:ZM-07": "Zambia - Southern",
+      "ZM:ZM-08": "Zambia - Copperbelt",
+      "ZM:ZM-09": "Zambia - Lusaka",
+      "ZM:ZM-10": "Zambia - Muchinga",
+      "ZW": "Zimbabwe"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_default_country"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_store_postcode",
+    "label": "Postcode / ZIP",
+    "description": "The postal code, if any, in which your business is located.",
+    "type": "text",
+    "default": "",
+    "tip": "The postal code, if any, in which your business is located.",
+    "value": "94110",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_store_postcode"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_allowed_countries",
+    "label": "Selling location(s)",
+    "description": "This option lets you limit which countries you are willing to sell to.",
+    "type": "select",
+    "default": "all",
+    "options": {
+      "all": "Sell to all countries",
+      "all_except": "Sell to all countries, except for&hellip;",
+      "specific": "Sell to specific countries"
+    },
+    "tip": "This option lets you limit which countries you are willing to sell to.",
+    "value": "all",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_allowed_countries"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_all_except_countries",
+    "label": "Sell to all countries, except for&hellip;",
+    "description": "",
+    "type": "multiselect",
+    "default": "",
+    "value": [],
+    "options": {
+      "AF": "Afghanistan",
+      "AX": "Åland Islands",
+      "AL": "Albania",
+      "DZ": "Algeria",
+      "AS": "American Samoa",
+      "AD": "Andorra",
+      "AO": "Angola",
+      "AI": "Anguilla",
+      "AQ": "Antarctica",
+      "AG": "Antigua and Barbuda",
+      "AR": "Argentina",
+      "AM": "Armenia",
+      "AW": "Aruba",
+      "AU": "Australia",
+      "AT": "Austria",
+      "AZ": "Azerbaijan",
+      "BS": "Bahamas",
+      "BH": "Bahrain",
+      "BD": "Bangladesh",
+      "BB": "Barbados",
+      "BY": "Belarus",
+      "PW": "Belau",
+      "BE": "Belgium",
+      "BZ": "Belize",
+      "BJ": "Benin",
+      "BM": "Bermuda",
+      "BT": "Bhutan",
+      "BO": "Bolivia",
+      "BQ": "Bonaire, Saint Eustatius and Saba",
+      "BA": "Bosnia and Herzegovina",
+      "BW": "Botswana",
+      "BV": "Bouvet Island",
+      "BR": "Brazil",
+      "IO": "British Indian Ocean Territory",
+      "BN": "Brunei",
+      "BG": "Bulgaria",
+      "BF": "Burkina Faso",
+      "BI": "Burundi",
+      "KH": "Cambodia",
+      "CM": "Cameroon",
+      "CA": "Canada",
+      "CV": "Cape Verde",
+      "KY": "Cayman Islands",
+      "CF": "Central African Republic",
+      "TD": "Chad",
+      "CL": "Chile",
+      "CN": "China",
+      "CX": "Christmas Island",
+      "CC": "Cocos (Keeling) Islands",
+      "CO": "Colombia",
+      "KM": "Comoros",
+      "CG": "Congo (Brazzaville)",
+      "CD": "Congo (Kinshasa)",
+      "CK": "Cook Islands",
+      "CR": "Costa Rica",
+      "HR": "Croatia",
+      "CU": "Cuba",
+      "CW": "Cura&ccedil;ao",
+      "CY": "Cyprus",
+      "CZ": "Czech Republic",
+      "DK": "Denmark",
+      "DJ": "Djibouti",
+      "DM": "Dominica",
+      "DO": "Dominican Republic",
+      "EC": "Ecuador",
+      "EG": "Egypt",
+      "SV": "El Salvador",
+      "GQ": "Equatorial Guinea",
+      "ER": "Eritrea",
+      "EE": "Estonia",
+      "ET": "Ethiopia",
+      "FK": "Falkland Islands",
+      "FO": "Faroe Islands",
+      "FJ": "Fiji",
+      "FI": "Finland",
+      "FR": "France",
+      "GF": "French Guiana",
+      "PF": "French Polynesia",
+      "TF": "French Southern Territories",
+      "GA": "Gabon",
+      "GM": "Gambia",
+      "GE": "Georgia",
+      "DE": "Germany",
+      "GH": "Ghana",
+      "GI": "Gibraltar",
+      "GR": "Greece",
+      "GL": "Greenland",
+      "GD": "Grenada",
+      "GP": "Guadeloupe",
+      "GU": "Guam",
+      "GT": "Guatemala",
+      "GG": "Guernsey",
+      "GN": "Guinea",
+      "GW": "Guinea-Bissau",
+      "GY": "Guyana",
+      "HT": "Haiti",
+      "HM": "Heard Island and McDonald Islands",
+      "HN": "Honduras",
+      "HK": "Hong Kong",
+      "HU": "Hungary",
+      "IS": "Iceland",
+      "IN": "India",
+      "ID": "Indonesia",
+      "IR": "Iran",
+      "IQ": "Iraq",
+      "IE": "Ireland",
+      "IM": "Isle of Man",
+      "IL": "Israel",
+      "IT": "Italy",
+      "CI": "Ivory Coast",
+      "JM": "Jamaica",
+      "JP": "Japan",
+      "JE": "Jersey",
+      "JO": "Jordan",
+      "KZ": "Kazakhstan",
+      "KE": "Kenya",
+      "KI": "Kiribati",
+      "KW": "Kuwait",
+      "KG": "Kyrgyzstan",
+      "LA": "Laos",
+      "LV": "Latvia",
+      "LB": "Lebanon",
+      "LS": "Lesotho",
+      "LR": "Liberia",
+      "LY": "Libya",
+      "LI": "Liechtenstein",
+      "LT": "Lithuania",
+      "LU": "Luxembourg",
+      "MO": "Macao",
+      "MG": "Madagascar",
+      "MW": "Malawi",
+      "MY": "Malaysia",
+      "MV": "Maldives",
+      "ML": "Mali",
+      "MT": "Malta",
+      "MH": "Marshall Islands",
+      "MQ": "Martinique",
+      "MR": "Mauritania",
+      "MU": "Mauritius",
+      "YT": "Mayotte",
+      "MX": "Mexico",
+      "FM": "Micronesia",
+      "MD": "Moldova",
+      "MC": "Monaco",
+      "MN": "Mongolia",
+      "ME": "Montenegro",
+      "MS": "Montserrat",
+      "MA": "Morocco",
+      "MZ": "Mozambique",
+      "MM": "Myanmar",
+      "NA": "Namibia",
+      "NR": "Nauru",
+      "NP": "Nepal",
+      "NL": "Netherlands",
+      "NC": "New Caledonia",
+      "NZ": "New Zealand",
+      "NI": "Nicaragua",
+      "NE": "Niger",
+      "NG": "Nigeria",
+      "NU": "Niue",
+      "NF": "Norfolk Island",
+      "KP": "North Korea",
+      "MK": "North Macedonia",
+      "MP": "Northern Mariana Islands",
+      "NO": "Norway",
+      "OM": "Oman",
+      "PK": "Pakistan",
+      "PS": "Palestinian Territory",
+      "PA": "Panama",
+      "PG": "Papua New Guinea",
+      "PY": "Paraguay",
+      "PE": "Peru",
+      "PH": "Philippines",
+      "PN": "Pitcairn",
+      "PL": "Poland",
+      "PT": "Portugal",
+      "PR": "Puerto Rico",
+      "QA": "Qatar",
+      "RE": "Reunion",
+      "RO": "Romania",
+      "RU": "Russia",
+      "RW": "Rwanda",
+      "ST": "S&atilde;o Tom&eacute; and Pr&iacute;ncipe",
+      "BL": "Saint Barth&eacute;lemy",
+      "SH": "Saint Helena",
+      "KN": "Saint Kitts and Nevis",
+      "LC": "Saint Lucia",
+      "SX": "Saint Martin (Dutch part)",
+      "MF": "Saint Martin (French part)",
+      "PM": "Saint Pierre and Miquelon",
+      "VC": "Saint Vincent and the Grenadines",
+      "WS": "Samoa",
+      "SM": "San Marino",
+      "SA": "Saudi Arabia",
+      "SN": "Senegal",
+      "RS": "Serbia",
+      "SC": "Seychelles",
+      "SL": "Sierra Leone",
+      "SG": "Singapore",
+      "SK": "Slovakia",
+      "SI": "Slovenia",
+      "SB": "Solomon Islands",
+      "SO": "Somalia",
+      "ZA": "South Africa",
+      "GS": "South Georgia/Sandwich Islands",
+      "KR": "South Korea",
+      "SS": "South Sudan",
+      "ES": "Spain",
+      "LK": "Sri Lanka",
+      "SD": "Sudan",
+      "SR": "Suriname",
+      "SJ": "Svalbard and Jan Mayen",
+      "SZ": "Swaziland",
+      "SE": "Sweden",
+      "CH": "Switzerland",
+      "SY": "Syria",
+      "TW": "Taiwan",
+      "TJ": "Tajikistan",
+      "TZ": "Tanzania",
+      "TH": "Thailand",
+      "TL": "Timor-Leste",
+      "TG": "Togo",
+      "TK": "Tokelau",
+      "TO": "Tonga",
+      "TT": "Trinidad and Tobago",
+      "TN": "Tunisia",
+      "TR": "Turkey",
+      "TM": "Turkmenistan",
+      "TC": "Turks and Caicos Islands",
+      "TV": "Tuvalu",
+      "UG": "Uganda",
+      "UA": "Ukraine",
+      "AE": "United Arab Emirates",
+      "GB": "United Kingdom (UK)",
+      "US": "United States (US)",
+      "UM": "United States (US) Minor Outlying Islands",
+      "UY": "Uruguay",
+      "UZ": "Uzbekistan",
+      "VU": "Vanuatu",
+      "VA": "Vatican",
+      "VE": "Venezuela",
+      "VN": "Vietnam",
+      "VG": "Virgin Islands (British)",
+      "VI": "Virgin Islands (US)",
+      "WF": "Wallis and Futuna",
+      "EH": "Western Sahara",
+      "YE": "Yemen",
+      "ZM": "Zambia",
+      "ZW": "Zimbabwe"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_all_except_countries"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_specific_allowed_countries",
+    "label": "Sell to specific countries",
+    "description": "",
+    "type": "multiselect",
+    "default": "",
+    "value": [],
+    "options": {
+      "AF": "Afghanistan",
+      "AX": "Åland Islands",
+      "AL": "Albania",
+      "DZ": "Algeria",
+      "AS": "American Samoa",
+      "AD": "Andorra",
+      "AO": "Angola",
+      "AI": "Anguilla",
+      "AQ": "Antarctica",
+      "AG": "Antigua and Barbuda",
+      "AR": "Argentina",
+      "AM": "Armenia",
+      "AW": "Aruba",
+      "AU": "Australia",
+      "AT": "Austria",
+      "AZ": "Azerbaijan",
+      "BS": "Bahamas",
+      "BH": "Bahrain",
+      "BD": "Bangladesh",
+      "BB": "Barbados",
+      "BY": "Belarus",
+      "PW": "Belau",
+      "BE": "Belgium",
+      "BZ": "Belize",
+      "BJ": "Benin",
+      "BM": "Bermuda",
+      "BT": "Bhutan",
+      "BO": "Bolivia",
+      "BQ": "Bonaire, Saint Eustatius and Saba",
+      "BA": "Bosnia and Herzegovina",
+      "BW": "Botswana",
+      "BV": "Bouvet Island",
+      "BR": "Brazil",
+      "IO": "British Indian Ocean Territory",
+      "BN": "Brunei",
+      "BG": "Bulgaria",
+      "BF": "Burkina Faso",
+      "BI": "Burundi",
+      "KH": "Cambodia",
+      "CM": "Cameroon",
+      "CA": "Canada",
+      "CV": "Cape Verde",
+      "KY": "Cayman Islands",
+      "CF": "Central African Republic",
+      "TD": "Chad",
+      "CL": "Chile",
+      "CN": "China",
+      "CX": "Christmas Island",
+      "CC": "Cocos (Keeling) Islands",
+      "CO": "Colombia",
+      "KM": "Comoros",
+      "CG": "Congo (Brazzaville)",
+      "CD": "Congo (Kinshasa)",
+      "CK": "Cook Islands",
+      "CR": "Costa Rica",
+      "HR": "Croatia",
+      "CU": "Cuba",
+      "CW": "Cura&ccedil;ao",
+      "CY": "Cyprus",
+      "CZ": "Czech Republic",
+      "DK": "Denmark",
+      "DJ": "Djibouti",
+      "DM": "Dominica",
+      "DO": "Dominican Republic",
+      "EC": "Ecuador",
+      "EG": "Egypt",
+      "SV": "El Salvador",
+      "GQ": "Equatorial Guinea",
+      "ER": "Eritrea",
+      "EE": "Estonia",
+      "ET": "Ethiopia",
+      "FK": "Falkland Islands",
+      "FO": "Faroe Islands",
+      "FJ": "Fiji",
+      "FI": "Finland",
+      "FR": "France",
+      "GF": "French Guiana",
+      "PF": "French Polynesia",
+      "TF": "French Southern Territories",
+      "GA": "Gabon",
+      "GM": "Gambia",
+      "GE": "Georgia",
+      "DE": "Germany",
+      "GH": "Ghana",
+      "GI": "Gibraltar",
+      "GR": "Greece",
+      "GL": "Greenland",
+      "GD": "Grenada",
+      "GP": "Guadeloupe",
+      "GU": "Guam",
+      "GT": "Guatemala",
+      "GG": "Guernsey",
+      "GN": "Guinea",
+      "GW": "Guinea-Bissau",
+      "GY": "Guyana",
+      "HT": "Haiti",
+      "HM": "Heard Island and McDonald Islands",
+      "HN": "Honduras",
+      "HK": "Hong Kong",
+      "HU": "Hungary",
+      "IS": "Iceland",
+      "IN": "India",
+      "ID": "Indonesia",
+      "IR": "Iran",
+      "IQ": "Iraq",
+      "IE": "Ireland",
+      "IM": "Isle of Man",
+      "IL": "Israel",
+      "IT": "Italy",
+      "CI": "Ivory Coast",
+      "JM": "Jamaica",
+      "JP": "Japan",
+      "JE": "Jersey",
+      "JO": "Jordan",
+      "KZ": "Kazakhstan",
+      "KE": "Kenya",
+      "KI": "Kiribati",
+      "KW": "Kuwait",
+      "KG": "Kyrgyzstan",
+      "LA": "Laos",
+      "LV": "Latvia",
+      "LB": "Lebanon",
+      "LS": "Lesotho",
+      "LR": "Liberia",
+      "LY": "Libya",
+      "LI": "Liechtenstein",
+      "LT": "Lithuania",
+      "LU": "Luxembourg",
+      "MO": "Macao",
+      "MG": "Madagascar",
+      "MW": "Malawi",
+      "MY": "Malaysia",
+      "MV": "Maldives",
+      "ML": "Mali",
+      "MT": "Malta",
+      "MH": "Marshall Islands",
+      "MQ": "Martinique",
+      "MR": "Mauritania",
+      "MU": "Mauritius",
+      "YT": "Mayotte",
+      "MX": "Mexico",
+      "FM": "Micronesia",
+      "MD": "Moldova",
+      "MC": "Monaco",
+      "MN": "Mongolia",
+      "ME": "Montenegro",
+      "MS": "Montserrat",
+      "MA": "Morocco",
+      "MZ": "Mozambique",
+      "MM": "Myanmar",
+      "NA": "Namibia",
+      "NR": "Nauru",
+      "NP": "Nepal",
+      "NL": "Netherlands",
+      "NC": "New Caledonia",
+      "NZ": "New Zealand",
+      "NI": "Nicaragua",
+      "NE": "Niger",
+      "NG": "Nigeria",
+      "NU": "Niue",
+      "NF": "Norfolk Island",
+      "KP": "North Korea",
+      "MK": "North Macedonia",
+      "MP": "Northern Mariana Islands",
+      "NO": "Norway",
+      "OM": "Oman",
+      "PK": "Pakistan",
+      "PS": "Palestinian Territory",
+      "PA": "Panama",
+      "PG": "Papua New Guinea",
+      "PY": "Paraguay",
+      "PE": "Peru",
+      "PH": "Philippines",
+      "PN": "Pitcairn",
+      "PL": "Poland",
+      "PT": "Portugal",
+      "PR": "Puerto Rico",
+      "QA": "Qatar",
+      "RE": "Reunion",
+      "RO": "Romania",
+      "RU": "Russia",
+      "RW": "Rwanda",
+      "ST": "S&atilde;o Tom&eacute; and Pr&iacute;ncipe",
+      "BL": "Saint Barth&eacute;lemy",
+      "SH": "Saint Helena",
+      "KN": "Saint Kitts and Nevis",
+      "LC": "Saint Lucia",
+      "SX": "Saint Martin (Dutch part)",
+      "MF": "Saint Martin (French part)",
+      "PM": "Saint Pierre and Miquelon",
+      "VC": "Saint Vincent and the Grenadines",
+      "WS": "Samoa",
+      "SM": "San Marino",
+      "SA": "Saudi Arabia",
+      "SN": "Senegal",
+      "RS": "Serbia",
+      "SC": "Seychelles",
+      "SL": "Sierra Leone",
+      "SG": "Singapore",
+      "SK": "Slovakia",
+      "SI": "Slovenia",
+      "SB": "Solomon Islands",
+      "SO": "Somalia",
+      "ZA": "South Africa",
+      "GS": "South Georgia/Sandwich Islands",
+      "KR": "South Korea",
+      "SS": "South Sudan",
+      "ES": "Spain",
+      "LK": "Sri Lanka",
+      "SD": "Sudan",
+      "SR": "Suriname",
+      "SJ": "Svalbard and Jan Mayen",
+      "SZ": "Swaziland",
+      "SE": "Sweden",
+      "CH": "Switzerland",
+      "SY": "Syria",
+      "TW": "Taiwan",
+      "TJ": "Tajikistan",
+      "TZ": "Tanzania",
+      "TH": "Thailand",
+      "TL": "Timor-Leste",
+      "TG": "Togo",
+      "TK": "Tokelau",
+      "TO": "Tonga",
+      "TT": "Trinidad and Tobago",
+      "TN": "Tunisia",
+      "TR": "Turkey",
+      "TM": "Turkmenistan",
+      "TC": "Turks and Caicos Islands",
+      "TV": "Tuvalu",
+      "UG": "Uganda",
+      "UA": "Ukraine",
+      "AE": "United Arab Emirates",
+      "GB": "United Kingdom (UK)",
+      "US": "United States (US)",
+      "UM": "United States (US) Minor Outlying Islands",
+      "UY": "Uruguay",
+      "UZ": "Uzbekistan",
+      "VU": "Vanuatu",
+      "VA": "Vatican",
+      "VE": "Venezuela",
+      "VN": "Vietnam",
+      "VG": "Virgin Islands (British)",
+      "VI": "Virgin Islands (US)",
+      "WF": "Wallis and Futuna",
+      "EH": "Western Sahara",
+      "YE": "Yemen",
+      "ZM": "Zambia",
+      "ZW": "Zimbabwe"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_specific_allowed_countries"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_ship_to_countries",
+    "label": "Shipping location(s)",
+    "description": "Choose which countries you want to ship to, or choose to ship to all locations you sell to.",
+    "type": "select",
+    "default": "",
+    "options": {
+      "": "Ship to all countries you sell to",
+      "all": "Ship to all countries",
+      "specific": "Ship to specific countries only",
+      "disabled": "Disable shipping &amp; shipping calculations"
+    },
+    "tip": "Choose which countries you want to ship to, or choose to ship to all locations you sell to.",
+    "value": "",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_ship_to_countries"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_specific_ship_to_countries",
+    "label": "Ship to specific countries",
+    "description": "",
+    "type": "multiselect",
+    "default": "",
+    "value": [],
+    "options": {
+      "AF": "Afghanistan",
+      "AX": "Åland Islands",
+      "AL": "Albania",
+      "DZ": "Algeria",
+      "AS": "American Samoa",
+      "AD": "Andorra",
+      "AO": "Angola",
+      "AI": "Anguilla",
+      "AQ": "Antarctica",
+      "AG": "Antigua and Barbuda",
+      "AR": "Argentina",
+      "AM": "Armenia",
+      "AW": "Aruba",
+      "AU": "Australia",
+      "AT": "Austria",
+      "AZ": "Azerbaijan",
+      "BS": "Bahamas",
+      "BH": "Bahrain",
+      "BD": "Bangladesh",
+      "BB": "Barbados",
+      "BY": "Belarus",
+      "PW": "Belau",
+      "BE": "Belgium",
+      "BZ": "Belize",
+      "BJ": "Benin",
+      "BM": "Bermuda",
+      "BT": "Bhutan",
+      "BO": "Bolivia",
+      "BQ": "Bonaire, Saint Eustatius and Saba",
+      "BA": "Bosnia and Herzegovina",
+      "BW": "Botswana",
+      "BV": "Bouvet Island",
+      "BR": "Brazil",
+      "IO": "British Indian Ocean Territory",
+      "BN": "Brunei",
+      "BG": "Bulgaria",
+      "BF": "Burkina Faso",
+      "BI": "Burundi",
+      "KH": "Cambodia",
+      "CM": "Cameroon",
+      "CA": "Canada",
+      "CV": "Cape Verde",
+      "KY": "Cayman Islands",
+      "CF": "Central African Republic",
+      "TD": "Chad",
+      "CL": "Chile",
+      "CN": "China",
+      "CX": "Christmas Island",
+      "CC": "Cocos (Keeling) Islands",
+      "CO": "Colombia",
+      "KM": "Comoros",
+      "CG": "Congo (Brazzaville)",
+      "CD": "Congo (Kinshasa)",
+      "CK": "Cook Islands",
+      "CR": "Costa Rica",
+      "HR": "Croatia",
+      "CU": "Cuba",
+      "CW": "Cura&ccedil;ao",
+      "CY": "Cyprus",
+      "CZ": "Czech Republic",
+      "DK": "Denmark",
+      "DJ": "Djibouti",
+      "DM": "Dominica",
+      "DO": "Dominican Republic",
+      "EC": "Ecuador",
+      "EG": "Egypt",
+      "SV": "El Salvador",
+      "GQ": "Equatorial Guinea",
+      "ER": "Eritrea",
+      "EE": "Estonia",
+      "ET": "Ethiopia",
+      "FK": "Falkland Islands",
+      "FO": "Faroe Islands",
+      "FJ": "Fiji",
+      "FI": "Finland",
+      "FR": "France",
+      "GF": "French Guiana",
+      "PF": "French Polynesia",
+      "TF": "French Southern Territories",
+      "GA": "Gabon",
+      "GM": "Gambia",
+      "GE": "Georgia",
+      "DE": "Germany",
+      "GH": "Ghana",
+      "GI": "Gibraltar",
+      "GR": "Greece",
+      "GL": "Greenland",
+      "GD": "Grenada",
+      "GP": "Guadeloupe",
+      "GU": "Guam",
+      "GT": "Guatemala",
+      "GG": "Guernsey",
+      "GN": "Guinea",
+      "GW": "Guinea-Bissau",
+      "GY": "Guyana",
+      "HT": "Haiti",
+      "HM": "Heard Island and McDonald Islands",
+      "HN": "Honduras",
+      "HK": "Hong Kong",
+      "HU": "Hungary",
+      "IS": "Iceland",
+      "IN": "India",
+      "ID": "Indonesia",
+      "IR": "Iran",
+      "IQ": "Iraq",
+      "IE": "Ireland",
+      "IM": "Isle of Man",
+      "IL": "Israel",
+      "IT": "Italy",
+      "CI": "Ivory Coast",
+      "JM": "Jamaica",
+      "JP": "Japan",
+      "JE": "Jersey",
+      "JO": "Jordan",
+      "KZ": "Kazakhstan",
+      "KE": "Kenya",
+      "KI": "Kiribati",
+      "KW": "Kuwait",
+      "KG": "Kyrgyzstan",
+      "LA": "Laos",
+      "LV": "Latvia",
+      "LB": "Lebanon",
+      "LS": "Lesotho",
+      "LR": "Liberia",
+      "LY": "Libya",
+      "LI": "Liechtenstein",
+      "LT": "Lithuania",
+      "LU": "Luxembourg",
+      "MO": "Macao",
+      "MG": "Madagascar",
+      "MW": "Malawi",
+      "MY": "Malaysia",
+      "MV": "Maldives",
+      "ML": "Mali",
+      "MT": "Malta",
+      "MH": "Marshall Islands",
+      "MQ": "Martinique",
+      "MR": "Mauritania",
+      "MU": "Mauritius",
+      "YT": "Mayotte",
+      "MX": "Mexico",
+      "FM": "Micronesia",
+      "MD": "Moldova",
+      "MC": "Monaco",
+      "MN": "Mongolia",
+      "ME": "Montenegro",
+      "MS": "Montserrat",
+      "MA": "Morocco",
+      "MZ": "Mozambique",
+      "MM": "Myanmar",
+      "NA": "Namibia",
+      "NR": "Nauru",
+      "NP": "Nepal",
+      "NL": "Netherlands",
+      "NC": "New Caledonia",
+      "NZ": "New Zealand",
+      "NI": "Nicaragua",
+      "NE": "Niger",
+      "NG": "Nigeria",
+      "NU": "Niue",
+      "NF": "Norfolk Island",
+      "KP": "North Korea",
+      "MK": "North Macedonia",
+      "MP": "Northern Mariana Islands",
+      "NO": "Norway",
+      "OM": "Oman",
+      "PK": "Pakistan",
+      "PS": "Palestinian Territory",
+      "PA": "Panama",
+      "PG": "Papua New Guinea",
+      "PY": "Paraguay",
+      "PE": "Peru",
+      "PH": "Philippines",
+      "PN": "Pitcairn",
+      "PL": "Poland",
+      "PT": "Portugal",
+      "PR": "Puerto Rico",
+      "QA": "Qatar",
+      "RE": "Reunion",
+      "RO": "Romania",
+      "RU": "Russia",
+      "RW": "Rwanda",
+      "ST": "S&atilde;o Tom&eacute; and Pr&iacute;ncipe",
+      "BL": "Saint Barth&eacute;lemy",
+      "SH": "Saint Helena",
+      "KN": "Saint Kitts and Nevis",
+      "LC": "Saint Lucia",
+      "SX": "Saint Martin (Dutch part)",
+      "MF": "Saint Martin (French part)",
+      "PM": "Saint Pierre and Miquelon",
+      "VC": "Saint Vincent and the Grenadines",
+      "WS": "Samoa",
+      "SM": "San Marino",
+      "SA": "Saudi Arabia",
+      "SN": "Senegal",
+      "RS": "Serbia",
+      "SC": "Seychelles",
+      "SL": "Sierra Leone",
+      "SG": "Singapore",
+      "SK": "Slovakia",
+      "SI": "Slovenia",
+      "SB": "Solomon Islands",
+      "SO": "Somalia",
+      "ZA": "South Africa",
+      "GS": "South Georgia/Sandwich Islands",
+      "KR": "South Korea",
+      "SS": "South Sudan",
+      "ES": "Spain",
+      "LK": "Sri Lanka",
+      "SD": "Sudan",
+      "SR": "Suriname",
+      "SJ": "Svalbard and Jan Mayen",
+      "SZ": "Swaziland",
+      "SE": "Sweden",
+      "CH": "Switzerland",
+      "SY": "Syria",
+      "TW": "Taiwan",
+      "TJ": "Tajikistan",
+      "TZ": "Tanzania",
+      "TH": "Thailand",
+      "TL": "Timor-Leste",
+      "TG": "Togo",
+      "TK": "Tokelau",
+      "TO": "Tonga",
+      "TT": "Trinidad and Tobago",
+      "TN": "Tunisia",
+      "TR": "Turkey",
+      "TM": "Turkmenistan",
+      "TC": "Turks and Caicos Islands",
+      "TV": "Tuvalu",
+      "UG": "Uganda",
+      "UA": "Ukraine",
+      "AE": "United Arab Emirates",
+      "GB": "United Kingdom (UK)",
+      "US": "United States (US)",
+      "UM": "United States (US) Minor Outlying Islands",
+      "UY": "Uruguay",
+      "UZ": "Uzbekistan",
+      "VU": "Vanuatu",
+      "VA": "Vatican",
+      "VE": "Venezuela",
+      "VN": "Vietnam",
+      "VG": "Virgin Islands (British)",
+      "VI": "Virgin Islands (US)",
+      "WF": "Wallis and Futuna",
+      "EH": "Western Sahara",
+      "YE": "Yemen",
+      "ZM": "Zambia",
+      "ZW": "Zimbabwe"
+    },
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_specific_ship_to_countries"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_default_customer_address",
+    "label": "Default customer location",
+    "description": "",
+    "type": "select",
+    "default": "base",
+    "options": {
+      "": "No location by default",
+      "base": "Shop country/region",
+      "geolocation": "Geolocate",
+      "geolocation_ajax": "Geolocate (with page caching support)"
+    },
+    "tip": "This option determines a customers default location. The MaxMind GeoLite Database will be periodically downloaded to your wp-content directory if using geolocation.",
+    "value": "geolocation",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_default_customer_address"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_calc_taxes",
+    "label": "Enable taxes",
+    "description": "Enable tax rates and calculations",
+    "type": "checkbox",
+    "default": "no",
+    "tip": "Rates will be configurable and taxes will be calculated during checkout.",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_calc_taxes"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_enable_coupons",
+    "label": "Enable coupons",
+    "description": "Enable the use of coupon codes",
+    "type": "checkbox",
+    "default": "yes",
+    "tip": "Coupons can be applied from the cart and checkout pages.",
+    "value": "yes",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_enable_coupons"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_calc_discounts_sequentially",
+    "label": "",
+    "description": "Calculate coupon discounts sequentially",
+    "type": "checkbox",
+    "default": "no",
+    "tip": "When applying multiple coupons, apply the first coupon to the full price and the second coupon to the discounted price and so on.",
+    "value": "no",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_calc_discounts_sequentially"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_currency",
+    "label": "Currency",
+    "description": "This controls what currency prices are listed at in the catalog and which currency gateways will take payments in.",
+    "type": "select",
+    "default": "USD",
+    "options": {
+      "AED": "United Arab Emirates dirham (&#x62f;.&#x625;)",
+      "AFN": "Afghan afghani (&#x60b;)",
+      "ALL": "Albanian lek (L)",
+      "AMD": "Armenian dram (AMD)",
+      "ANG": "Netherlands Antillean guilder (&fnof;)",
+      "AOA": "Angolan kwanza (Kz)",
+      "ARS": "Argentine peso (&#36;)",
+      "AUD": "Australian dollar (&#36;)",
+      "AWG": "Aruban florin (Afl.)",
+      "AZN": "Azerbaijani manat (AZN)",
+      "BAM": "Bosnia and Herzegovina convertible mark (KM)",
+      "BBD": "Barbadian dollar (&#36;)",
+      "BDT": "Bangladeshi taka (&#2547;&nbsp;)",
+      "BGN": "Bulgarian lev (&#1083;&#1074;.)",
+      "BHD": "Bahraini dinar (.&#x62f;.&#x628;)",
+      "BIF": "Burundian franc (Fr)",
+      "BMD": "Bermudian dollar (&#36;)",
+      "BND": "Brunei dollar (&#36;)",
+      "BOB": "Bolivian boliviano (Bs.)",
+      "BRL": "Brazilian real (&#82;&#36;)",
+      "BSD": "Bahamian dollar (&#36;)",
+      "BTC": "Bitcoin (&#3647;)",
+      "BTN": "Bhutanese ngultrum (Nu.)",
+      "BWP": "Botswana pula (P)",
+      "BYR": "Belarusian ruble (old) (Br)",
+      "BYN": "Belarusian ruble (Br)",
+      "BZD": "Belize dollar (&#36;)",
+      "CAD": "Canadian dollar (&#36;)",
+      "CDF": "Congolese franc (Fr)",
+      "CHF": "Swiss franc (&#67;&#72;&#70;)",
+      "CLP": "Chilean peso (&#36;)",
+      "CNY": "Chinese yuan (&yen;)",
+      "COP": "Colombian peso (&#36;)",
+      "CRC": "Costa Rican col&oacute;n (&#x20a1;)",
+      "CUC": "Cuban convertible peso (&#36;)",
+      "CUP": "Cuban peso (&#36;)",
+      "CVE": "Cape Verdean escudo (&#36;)",
+      "CZK": "Czech koruna (&#75;&#269;)",
+      "DJF": "Djiboutian franc (Fr)",
+      "DKK": "Danish krone (DKK)",
+      "DOP": "Dominican peso (RD&#36;)",
+      "DZD": "Algerian dinar (&#x62f;.&#x62c;)",
+      "EGP": "Egyptian pound (EGP)",
+      "ERN": "Eritrean nakfa (Nfk)",
+      "ETB": "Ethiopian birr (Br)",
+      "EUR": "Euro (&euro;)",
+      "FJD": "Fijian dollar (&#36;)",
+      "FKP": "Falkland Islands pound (&pound;)",
+      "GBP": "Pound sterling (&pound;)",
+      "GEL": "Georgian lari (&#x20be;)",
+      "GGP": "Guernsey pound (&pound;)",
+      "GHS": "Ghana cedi (&#x20b5;)",
+      "GIP": "Gibraltar pound (&pound;)",
+      "GMD": "Gambian dalasi (D)",
+      "GNF": "Guinean franc (Fr)",
+      "GTQ": "Guatemalan quetzal (Q)",
+      "GYD": "Guyanese dollar (&#36;)",
+      "HKD": "Hong Kong dollar (&#36;)",
+      "HNL": "Honduran lempira (L)",
+      "HRK": "Croatian kuna (kn)",
+      "HTG": "Haitian gourde (G)",
+      "HUF": "Hungarian forint (&#70;&#116;)",
+      "IDR": "Indonesian rupiah (Rp)",
+      "ILS": "Israeli new shekel (&#8362;)",
+      "IMP": "Manx pound (&pound;)",
+      "INR": "Indian rupee (&#8377;)",
+      "IQD": "Iraqi dinar (&#x62f;.&#x639;)",
+      "IRR": "Iranian rial (&#xfdfc;)",
+      "IRT": "Iranian toman (&#x062A;&#x0648;&#x0645;&#x0627;&#x0646;)",
+      "ISK": "Icelandic kr&oacute;na (kr.)",
+      "JEP": "Jersey pound (&pound;)",
+      "JMD": "Jamaican dollar (&#36;)",
+      "JOD": "Jordanian dinar (&#x62f;.&#x627;)",
+      "JPY": "Japanese yen (&yen;)",
+      "KES": "Kenyan shilling (KSh)",
+      "KGS": "Kyrgyzstani som (&#x441;&#x43e;&#x43c;)",
+      "KHR": "Cambodian riel (&#x17db;)",
+      "KMF": "Comorian franc (Fr)",
+      "KPW": "North Korean won (&#x20a9;)",
+      "KRW": "South Korean won (&#8361;)",
+      "KWD": "Kuwaiti dinar (&#x62f;.&#x643;)",
+      "KYD": "Cayman Islands dollar (&#36;)",
+      "KZT": "Kazakhstani tenge (&#8376;)",
+      "LAK": "Lao kip (&#8365;)",
+      "LBP": "Lebanese pound (&#x644;.&#x644;)",
+      "LKR": "Sri Lankan rupee (&#xdbb;&#xdd4;)",
+      "LRD": "Liberian dollar (&#36;)",
+      "LSL": "Lesotho loti (L)",
+      "LYD": "Libyan dinar (&#x644;.&#x62f;)",
+      "MAD": "Moroccan dirham (&#x62f;.&#x645;.)",
+      "MDL": "Moldovan leu (MDL)",
+      "MGA": "Malagasy ariary (Ar)",
+      "MKD": "Macedonian denar (&#x434;&#x435;&#x43d;)",
+      "MMK": "Burmese kyat (Ks)",
+      "MNT": "Mongolian t&ouml;gr&ouml;g (&#x20ae;)",
+      "MOP": "Macanese pataca (P)",
+      "MRU": "Mauritanian ouguiya (UM)",
+      "MUR": "Mauritian rupee (&#x20a8;)",
+      "MVR": "Maldivian rufiyaa (.&#x783;)",
+      "MWK": "Malawian kwacha (MK)",
+      "MXN": "Mexican peso (&#36;)",
+      "MYR": "Malaysian ringgit (&#82;&#77;)",
+      "MZN": "Mozambican metical (MT)",
+      "NAD": "Namibian dollar (N&#36;)",
+      "NGN": "Nigerian naira (&#8358;)",
+      "NIO": "Nicaraguan c&oacute;rdoba (C&#36;)",
+      "NOK": "Norwegian krone (&#107;&#114;)",
+      "NPR": "Nepalese rupee (&#8360;)",
+      "NZD": "New Zealand dollar (&#36;)",
+      "OMR": "Omani rial (&#x631;.&#x639;.)",
+      "PAB": "Panamanian balboa (B/.)",
+      "PEN": "Sol (S/)",
+      "PGK": "Papua New Guinean kina (K)",
+      "PHP": "Philippine peso (&#8369;)",
+      "PKR": "Pakistani rupee (&#8360;)",
+      "PLN": "Polish z&#x142;oty (&#122;&#322;)",
+      "PRB": "Transnistrian ruble (&#x440;.)",
+      "PYG": "Paraguayan guaran&iacute; (&#8370;)",
+      "QAR": "Qatari riyal (&#x631;.&#x642;)",
+      "RON": "Romanian leu (lei)",
+      "RSD": "Serbian dinar (&#1088;&#1089;&#1076;)",
+      "RUB": "Russian ruble (&#8381;)",
+      "RWF": "Rwandan franc (Fr)",
+      "SAR": "Saudi riyal (&#x631;.&#x633;)",
+      "SBD": "Solomon Islands dollar (&#36;)",
+      "SCR": "Seychellois rupee (&#x20a8;)",
+      "SDG": "Sudanese pound (&#x62c;.&#x633;.)",
+      "SEK": "Swedish krona (&#107;&#114;)",
+      "SGD": "Singapore dollar (&#36;)",
+      "SHP": "Saint Helena pound (&pound;)",
+      "SLL": "Sierra Leonean leone (Le)",
+      "SOS": "Somali shilling (Sh)",
+      "SRD": "Surinamese dollar (&#36;)",
+      "SSP": "South Sudanese pound (&pound;)",
+      "STN": "S&atilde;o Tom&eacute; and Pr&iacute;ncipe dobra (Db)",
+      "SYP": "Syrian pound (&#x644;.&#x633;)",
+      "SZL": "Swazi lilangeni (L)",
+      "THB": "Thai baht (&#3647;)",
+      "TJS": "Tajikistani somoni (&#x405;&#x41c;)",
+      "TMT": "Turkmenistan manat (m)",
+      "TND": "Tunisian dinar (&#x62f;.&#x62a;)",
+      "TOP": "Tongan pa&#x2bb;anga (T&#36;)",
+      "TRY": "Turkish lira (&#8378;)",
+      "TTD": "Trinidad and Tobago dollar (&#36;)",
+      "TWD": "New Taiwan dollar (&#78;&#84;&#36;)",
+      "TZS": "Tanzanian shilling (Sh)",
+      "UAH": "Ukrainian hryvnia (&#8372;)",
+      "UGX": "Ugandan shilling (UGX)",
+      "USD": "United States (US) dollar (&#36;)",
+      "UYU": "Uruguayan peso (&#36;)",
+      "UZS": "Uzbekistani som (UZS)",
+      "VEF": "Venezuelan bol&iacute;var (Bs F)",
+      "VES": "Bol&iacute;var soberano (Bs.S)",
+      "VND": "Vietnamese &#x111;&#x1ed3;ng (&#8363;)",
+      "VUV": "Vanuatu vatu (Vt)",
+      "WST": "Samoan t&#x101;l&#x101; (T)",
+      "XAF": "Central African CFA franc (CFA)",
+      "XCD": "East Caribbean dollar (&#36;)",
+      "XOF": "West African CFA franc (CFA)",
+      "XPF": "CFP franc (Fr)",
+      "YER": "Yemeni rial (&#xfdfc;)",
+      "ZAR": "South African rand (&#82;)",
+      "ZMW": "Zambian kwacha (ZK)"
+    },
+    "tip": "This controls what currency prices are listed at in the catalog and which currency gateways will take payments in.",
+    "value": "USD",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_currency"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_currency_pos",
+    "label": "Currency position",
+    "description": "This controls the position of the currency symbol.",
+    "type": "select",
+    "default": "left",
+    "options": {
+      "left": "Left",
+      "right": "Right",
+      "left_space": "Left with space",
+      "right_space": "Right with space"
+    },
+    "tip": "This controls the position of the currency symbol.",
+    "value": "left",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_currency_pos"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_price_thousand_sep",
+    "label": "Thousand separator",
+    "description": "This sets the thousand separator of displayed prices.",
+    "type": "text",
+    "default": ",",
+    "tip": "This sets the thousand separator of displayed prices.",
+    "value": ",",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_price_thousand_sep"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_price_decimal_sep",
+    "label": "Decimal separator",
+    "description": "This sets the decimal separator of displayed prices.",
+    "type": "text",
+    "default": ".",
+    "tip": "This sets the decimal separator of displayed prices.",
+    "value": ".",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_price_decimal_sep"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  },
+  {
+    "id": "woocommerce_price_num_decimals",
+    "label": "Number of decimals",
+    "description": "This sets the number of decimal points shown in displayed prices.",
+    "type": "number",
+    "default": "2",
+    "tip": "This sets the number of decimal points shown in displayed prices.",
+    "value": "4",
+    "_links": {
+      "self": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general/woocommerce_price_num_decimals"
+        }
+      ],
+      "collection": [
+        {
+          "href": "https://awootestshop.mystagingwebsite.com/wp-json/wc/v3/settings/general"
+        }
+      ]
+    }
+  }
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-1.json b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-1.json
new file mode 100644
index 00000000000..4a062e6cb43
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-1.json
@@ -0,0 +1,91 @@
+{
+  "labels": [
+    {
+      "label_id": 1,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASED",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 2,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASED",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ]
+    },
+    {
+      "label_id": 3,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 4,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 5,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    }
+  ],
+  "success": true
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-2.json b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-2.json
new file mode 100644
index 00000000000..4398c9e7a88
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-2.json
@@ -0,0 +1,59 @@
+{
+  "labels": [
+    {
+      "label_id": 3,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASED",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 4,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASED",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 5,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASED",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    }
+  ],
+  "success": true
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-error.json b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-error.json
new file mode 100644
index 00000000000..b2d43a0a488
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/status-shipping-labels-error.json
@@ -0,0 +1,60 @@
+{
+  "labels": [
+    {
+      "label_id": 3,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_ERROR",
+      "error": "Failed",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 4,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    },
+    {
+      "label_id": 5,
+      "tracking": "9405500205309038753691",
+      "refundable_amount": 7.65,
+      "created": 1589295659638,
+      "carrier_id": "usps",
+      "service_name": "USPS - Priority Mail",
+      "status": "PURCHASE_IN_PROGRESS",
+      "package_name": "Small Flat Rate Box",
+      "product_names": [
+        "Polo",
+        "T-Shirt"
+      ],
+      "product_ids": [
+        10,
+        11
+      ]
+    }
+  ],
+  "success": true
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/store-user-role.json b/libs/fluxc-tests/src/test/resources/wc/store-user-role.json
new file mode 100644
index 00000000000..74c02cf59cc
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/store-user-role.json
@@ -0,0 +1,49 @@
+{
+  "id": 1,
+  "name": "awootestshop",
+  "first_name": "Anitaa",
+  "last_name": "Murthy",
+  "email": "murthyanitaa@gmail.com",
+  "url": "",
+  "description": "",
+  "link": "https:\/\/awootestshop.mystagingwebsite.com\/author\/awootestshop\/",
+  "slug": "awootestshop",
+  "roles": [
+    "administrator"
+  ],
+  "avatar_urls": {
+    "24": "https:\/\/secure.gravatar.com\/avatar\/42968b94e80755359fbfc5965bd2ea61?s=24&d=mm&r=g",
+    "48": "https:\/\/secure.gravatar.com\/avatar\/42968b94e80755359fbfc5965bd2ea61?s=48&d=mm&r=g",
+    "96": "https:\/\/secure.gravatar.com\/avatar\/42968b94e80755359fbfc5965bd2ea61?s=96&d=mm&r=g"
+  },
+  "meta": [],
+  "woocommerce_meta": {
+    "activity_panel_inbox_last_read": "",
+    "activity_panel_reviews_last_read": "",
+    "categories_report_columns": "",
+    "coupons_report_columns": "",
+    "customers_report_columns": "",
+    "orders_report_columns": "",
+    "products_report_columns": "",
+    "revenue_report_columns": "",
+    "taxes_report_columns": "",
+    "variations_report_columns": "",
+    "dashboard_sections": "",
+    "dashboard_chart_type": "",
+    "dashboard_chart_interval": "",
+    "dashboard_leaderboard_rows": "",
+    "homepage_layout": "",
+    "homepage_stats": "",
+    "task_list_tracked_started_tasks": "",
+    "help_panel_highlight_shown": "",
+    "android_app_banner_dismissed": ""
+  },
+  "_links": {
+    "self": [{
+      "href": "https:\/\/awootestshop.mystagingwebsite.com\/wp-json\/wp\/v2\/users\/1"
+    }],
+    "collection": [{
+      "href": "https:\/\/awootestshop.mystagingwebsite.com\/wp-json\/wp\/v2\/users"
+    }]
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wc/system-status.json b/libs/fluxc-tests/src/test/resources/wc/system-status.json
new file mode 100644
index 00000000000..cc68bcac2d1
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/system-status.json
@@ -0,0 +1,144 @@
+{
+  "environment": {
+    "home_url": "http://example.com",
+    "site_url": "http://example.com",
+    "version": "3.0.0",
+    "log_directory": "/var/www/woocommerce/wp-content/uploads/wc-logs/",
+    "log_directory_writable": true,
+    "wp_version": "4.7.3",
+    "wp_multisite": false,
+    "wp_memory_limit": 134217728,
+    "wp_debug_mode": true,
+    "wp_cron": true,
+    "language": "en_US",
+    "server_info": "Apache/2.4.18 (Ubuntu)",
+    "php_version": "7.1.3-2+deb.sury.org~yakkety+1",
+    "php_post_max_size": 8388608,
+    "php_max_execution_time": 30,
+    "php_max_input_vars": 1000,
+    "curl_version": "7.50.1, OpenSSL/1.0.2g",
+    "suhosin_installed": false,
+    "max_upload_size": 2097152,
+    "mysql_version": "5.7.17",
+    "default_timezone": "UTC",
+    "fsockopen_or_curl_enabled": true,
+    "soapclient_enabled": true,
+    "domdocument_enabled": true,
+    "gzip_enabled": true,
+    "mbstring_enabled": true,
+    "remote_post_successful": true,
+    "remote_post_response": "200",
+    "remote_get_successful": true,
+    "remote_get_response": "200"
+  },
+  "database": {
+    "wc_database_version": "3.0.0",
+    "database_prefix": "wp_",
+    "maxmind_geoip_database": "/var/www/woocommerce/wp-content/uploads/GeoIP.dat",
+    "database_tables": {
+      "woocommerce_sessions": true,
+      "woocommerce_api_keys": true,
+      "woocommerce_attribute_taxonomies": true,
+      "woocommerce_downloadable_product_permissions": true,
+      "woocommerce_order_items": true,
+      "woocommerce_order_itemmeta": true,
+      "woocommerce_tax_rates": true,
+      "woocommerce_tax_rate_locations": true,
+      "woocommerce_shipping_zones": true,
+      "woocommerce_shipping_zone_locations": true,
+      "woocommerce_shipping_zone_methods": true,
+      "woocommerce_payment_tokens": true,
+      "woocommerce_payment_tokenmeta": true
+    }
+  },
+  "active_plugins": [
+    {
+      "plugin": "woocommerce/woocommerce.php",
+      "name": "WooCommerce",
+      "version": "3.0.0-rc.1",
+      "version_latest": "2.6.14",
+      "url": "https://woocommerce.com/",
+      "author_name": "Automattic",
+      "author_url": "https://woocommerce.com",
+      "network_activated": false
+    }
+  ],
+  "theme": {
+    "name": "Twenty Sixteen",
+    "version": "1.3",
+    "version_latest": "1.3",
+    "author_url": "https://wordpress.org/",
+    "is_child_theme": false,
+    "has_woocommerce_support": true,
+    "has_woocommerce_file": false,
+    "has_outdated_templates": false,
+    "overrides": [],
+    "parent_name": "",
+    "parent_version": "",
+    "parent_version_latest": "",
+    "parent_author_url": ""
+  },
+  "settings": {
+    "api_enabled": true,
+    "force_ssl": false,
+    "currency": "USD",
+    "currency_symbol": "&#36;",
+    "currency_position": "left",
+    "thousand_separator": ",",
+    "decimal_separator": ".",
+    "number_of_decimals": 2,
+    "geolocation_enabled": false,
+    "taxonomies": {
+      "external": "external",
+      "grouped": "grouped",
+      "simple": "simple",
+      "variable": "variable"
+    }
+  },
+  "security": {
+    "secure_connection": true,
+    "hide_errors": true
+  },
+  "pages": [
+    {
+      "page_name": "Shop base",
+      "page_id": "4",
+      "page_set": true,
+      "page_exists": true,
+      "page_visible": true,
+      "shortcode": "",
+      "shortcode_required": false,
+      "shortcode_present": false
+    },
+    {
+      "page_name": "Cart",
+      "page_id": "5",
+      "page_set": true,
+      "page_exists": true,
+      "page_visible": true,
+      "shortcode": "[woocommerce_cart]",
+      "shortcode_required": true,
+      "shortcode_present": true
+    },
+    {
+      "page_name": "Checkout",
+      "page_id": "6",
+      "page_set": true,
+      "page_exists": true,
+      "page_visible": true,
+      "shortcode": "[woocommerce_checkout]",
+      "shortcode_required": true,
+      "shortcode_present": true
+    },
+    {
+      "page_name": "My account",
+      "page_id": "7",
+      "page_set": true,
+      "page_exists": true,
+      "page_visible": true,
+      "shortcode": "[woocommerce_my_account]",
+      "shortcode_required": true,
+      "shortcode_present": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/tax-based-on-settings-response.json b/libs/fluxc-tests/src/test/resources/wc/tax-based-on-settings-response.json
new file mode 100644
index 00000000000..6f5e973d158
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/tax-based-on-settings-response.json
@@ -0,0 +1,27 @@
+{
+  "id": "woocommerce_tax_based_on",
+  "label": "Calculate tax based on",
+  "description": "",
+  "type": "select",
+  "default": "shipping",
+  "options": {
+    "shipping": "Customer shipping address",
+    "billing": "Customer billing address",
+    "base": "Shop base address"
+  },
+  "tip": "This option determines which address is used to calculate tax.",
+  "value": "base",
+  "group_id": "tax",
+  "_links": {
+    "self": [
+      {
+        "href": "https://cool-shop.mystagingwebsite.com/wp-json/wc/v3/settings/tax/woocommerce_tax_based_on"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://cool-shop.mystagingwebsite.com/wp-json/wc/v3/settings/tax"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/tax-rate-response.json b/libs/fluxc-tests/src/test/resources/wc/tax-rate-response.json
new file mode 100644
index 00000000000..f83193043ca
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/tax-rate-response.json
@@ -0,0 +1,33 @@
+[{
+    "id":1,
+    "country":"US",
+    "state":"GA",
+    "postcode":"31707",
+    "city":"ALBANY",
+    "rate":"10.0000",
+    "name":"Superlong taaaaaaaax nameeeeee",
+    "priority":1,
+    "compound":false,
+    "shipping":true,
+    "order":0,
+    "class":"standard",
+    "postcodes":[
+      "31707"
+    ],
+    "cities":[
+      "ALBANY"
+    ],
+    "_links":{
+      "self":[
+        {
+          "href":"https://testwoomobile.wpcomstaging.com/wp-json/wc/v3/taxes/1"
+        }
+      ],
+      "collection":[
+        {
+          "href":"https://testwoomobile.wpcomstaging.com/wp-json/wc/v3/taxes"
+        }
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/top-performer-product-1.json b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-1.json
new file mode 100644
index 00000000000..7201eefa608
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-1.json
@@ -0,0 +1,119 @@
+{
+  "id": 15,
+  "name": "Belt",
+  "slug": "belt",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/belt\/",
+  "date_created": "2020-06-29T23:23:50",
+  "date_created_gmt": "2020-06-29T23:23:50",
+  "date_modified": "2020-06-29T23:23:53",
+  "date_modified_gmt": "2020-06-29T23:23:53",
+  "type": "simple",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.<\/p>\n",
+  "short_description": "<p>This is a simple product.<\/p>\n",
+  "sku": "woo-belt",
+  "price": "55",
+  "regular_price": "65",
+  "sale_price": "55",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "price_html": "<del><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>65,00<\/span><\/del> <ins><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>55,00<\/span><\/ins>",
+  "on_sale": true,
+  "purchasable": true,
+  "total_sales": 2000,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": 0,
+  "download_expiry": 0,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "taxable",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "stock_status": "instock",
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "sold_individually": false,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": true,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0.00",
+  "rating_count": 0,
+  "related_ids": [
+    17,
+    16,
+    31,
+    14
+  ],
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 19,
+      "name": "Accessories",
+      "slug": "accessories"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+    {
+      "id": 44,
+      "date_created": "2020-06-29T23:23:53",
+      "date_created_gmt": "2020-06-29T23:23:53",
+      "date_modified": "2020-06-29T23:23:53",
+      "date_modified_gmt": "2020-06-29T23:23:53",
+      "src": "https:\/\/mystagingwebsite.com\/wp-content\/uploads\/2020\/06\/belt-2.jpg",
+      "name": "belt-2.jpg",
+      "alt": ""
+    }
+  ],
+  "attributes": [
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "meta_data": [
+    {
+      "id": 491,
+      "key": "_wpcom_is_markdown",
+      "value": "1"
+    }
+  ],
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/15"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/top-performer-product-2.json b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-2.json
new file mode 100644
index 00000000000..bb6f622a946
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-2.json
@@ -0,0 +1,126 @@
+{
+  "id": 22,
+  "name": "Album",
+  "slug": "album",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/album\/",
+  "date_created": "2020-06-29T23:23:50",
+  "date_created_gmt": "2020-06-29T23:23:50",
+  "date_modified": "2020-07-02T22:59:35",
+  "date_modified_gmt": "2020-07-02T22:59:35",
+  "type": "simple",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sagittis orci ac odio dictum tincidunt. Donec ut metus leo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed luctus, dui eu sagittis sodales, nulla nibh sagittis augue, vel porttitor diam enim non metus. Vestibulum aliquam augue neque. Phasellus tincidunt odio eget ullamcorper efficitur. Cras placerat ut turpis pellentesque vulputate. Nam sed consequat tortor. Curabitur finibus sapien dolor. Ut eleifend tellus nec erat pulvinar dignissim. Nam non arcu purus. Vivamus et massa massa.<\/p>\n",
+  "short_description": "<p>This is a simple, virtual product.<\/p>\n",
+  "sku": "woo-album",
+  "price": "15",
+  "regular_price": "15",
+  "sale_price": "",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "price_html": "<span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>15,00<\/span>",
+  "on_sale": false,
+  "purchasable": true,
+  "total_sales": 2002,
+  "virtual": true,
+  "downloadable": true,
+  "downloads": [
+    {
+      "id": "0130c0d2-0389-4543-9469-cfbca7ba3a08",
+      "name": "Single 1",
+      "file": "https:\/\/demo.woothemes.com\/woocommerce\/wp-content\/uploads\/sites\/56\/2017\/08\/single.jpg"
+    },
+    {
+      "id": "33457f4e-a66b-4976-bf99-4e25606c2752",
+      "name": "Single 2",
+      "file": "https:\/\/demo.woothemes.com\/woocommerce\/wp-content\/uploads\/sites\/56\/2017\/08\/album.jpg"
+    }
+  ],
+  "download_limit": 1,
+  "download_expiry": 1,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "taxable",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "stock_status": "instock",
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "sold_individually": false,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": false,
+  "shipping_taxable": false,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "0.00",
+  "rating_count": 0,
+  "related_ids": [
+    23
+  ],
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 20,
+      "name": "Music",
+      "slug": "music"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+    {
+      "id": 51,
+      "date_created": "2020-06-29T23:23:55",
+      "date_created_gmt": "2020-06-29T23:23:55",
+      "date_modified": "2020-06-29T23:23:55",
+      "date_modified_gmt": "2020-06-29T23:23:55",
+      "src": "https:\/\/mystagingwebsite.com\/wp-content\/uploads\/2020\/06\/album-1.jpg",
+      "name": "album-1.jpg",
+      "alt": ""
+    }
+  ],
+  "attributes": [
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "meta_data": [
+    {
+      "id": 554,
+      "key": "_wpcom_is_markdown",
+      "value": "1"
+    }
+  ],
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/22"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/top-performer-product-3.json b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-3.json
new file mode 100644
index 00000000000..e552b31e3b9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/top-performer-product-3.json
@@ -0,0 +1,129 @@
+{
+  "id": 14,
+  "name": "Beanie",
+  "slug": "beanie",
+  "permalink": "https:\/\/mystagingwebsite.com\/product\/beanie\/",
+  "date_created": "2020-06-29T23:23:50",
+  "date_created_gmt": "2020-06-29T23:23:50",
+  "date_modified": "2020-07-03T01:06:28",
+  "date_modified_gmt": "2020-07-03T01:06:28",
+  "type": "simple",
+  "status": "publish",
+  "featured": false,
+  "catalog_visibility": "visible",
+  "description": "<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.<\/p>\n",
+  "short_description": "<p>This is a simple product.<\/p>\n",
+  "sku": "woo-beanie",
+  "price": "18",
+  "regular_price": "20",
+  "sale_price": "18",
+  "date_on_sale_from": null,
+  "date_on_sale_from_gmt": null,
+  "date_on_sale_to": null,
+  "date_on_sale_to_gmt": null,
+  "price_html": "<del><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>20,00<\/span><\/del> <ins><span class=\"woocommerce-Price-amount amount\"><span class=\"woocommerce-Price-currencySymbol\">&#82;&#36;<\/span>18,00<\/span><\/ins>",
+  "on_sale": true,
+  "purchasable": true,
+  "total_sales": 2048,
+  "virtual": false,
+  "downloadable": false,
+  "downloads": [
+  ],
+  "download_limit": 0,
+  "download_expiry": 0,
+  "external_url": "",
+  "button_text": "",
+  "tax_status": "taxable",
+  "tax_class": "",
+  "manage_stock": false,
+  "stock_quantity": null,
+  "stock_status": "instock",
+  "backorders": "no",
+  "backorders_allowed": false,
+  "backordered": false,
+  "sold_individually": false,
+  "weight": "",
+  "dimensions": {
+    "length": "",
+    "width": "",
+    "height": ""
+  },
+  "shipping_required": true,
+  "shipping_taxable": true,
+  "shipping_class": "",
+  "shipping_class_id": 0,
+  "reviews_allowed": true,
+  "average_rating": "5.00",
+  "rating_count": 1,
+  "related_ids": [
+    15,
+    16,
+    17,
+    31
+  ],
+  "upsell_ids": [
+  ],
+  "cross_sell_ids": [
+  ],
+  "parent_id": 0,
+  "purchase_note": "",
+  "categories": [
+    {
+      "id": 19,
+      "name": "Accessories",
+      "slug": "accessories"
+    }
+  ],
+  "tags": [
+  ],
+  "images": [
+    {
+      "id": 43,
+      "date_created": "2020-06-29T23:23:53",
+      "date_created_gmt": "2020-06-29T23:23:53",
+      "date_modified": "2020-06-29T23:23:53",
+      "date_modified_gmt": "2020-06-29T23:23:53",
+      "src": "https:\/\/mystagingwebsite.com\/wp-content\/uploads\/2020\/06\/beanie-2.jpg",
+      "name": "beanie-2.jpg",
+      "alt": ""
+    }
+  ],
+  "attributes": [
+    {
+      "id": 1,
+      "name": "Color",
+      "position": 0,
+      "visible": true,
+      "variation": false,
+      "options": [
+        "Red"
+      ]
+    }
+  ],
+  "default_attributes": [
+  ],
+  "variations": [
+  ],
+  "grouped_products": [
+  ],
+  "menu_order": 0,
+  "meta_data": [
+    {
+      "id": 481,
+      "key": "_wpcom_is_markdown",
+      "value": "1"
+    }
+  ],
+  "_links": {
+    "self": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products\/14"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https:\/\/mystagingwebsite.com\/wp-json\/wc\/v3\/products"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/visitor-stats-data.json b/libs/fluxc-tests/src/test/resources/wc/visitor-stats-data.json
new file mode 100644
index 00000000000..0f5bd27ec5c
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/visitor-stats-data.json
@@ -0,0 +1,122 @@
+[
+    [
+      "2019-06-19",
+      1
+    ],
+    [
+      "2019-06-20",
+      1
+    ],
+    [
+      "2019-06-21",
+      0
+    ],
+    [
+      "2019-06-22",
+      0
+    ],
+    [
+      "2019-06-23",
+      0
+    ],
+    [
+      "2019-06-24",
+      0
+    ],
+    [
+      "2019-06-25",
+      1
+    ],
+    [
+      "2019-06-26",
+      0
+    ],
+    [
+      "2019-06-27",
+      0
+    ],
+    [
+      "2019-06-28",
+      0
+    ],
+    [
+      "2019-06-29",
+      0
+    ],
+    [
+      "2019-06-30",
+      0
+    ],
+    [
+      "2019-07-01",
+      0
+    ],
+    [
+      "2019-07-02",
+      0
+    ],
+    [
+      "2019-07-03",
+      0
+    ],
+    [
+      "2019-07-04",
+      0
+    ],
+    [
+      "2019-07-05",
+      0
+    ],
+    [
+      "2019-07-06",
+      0
+    ],
+    [
+      "2019-07-07",
+      0
+    ],
+    [
+      "2019-07-08",
+      0
+    ],
+    [
+      "2019-07-09",
+      1
+    ],
+    [
+      "2019-07-10",
+      0
+    ],
+    [
+      "2019-07-11",
+      0
+    ],
+    [
+      "2019-07-12",
+      0
+    ],
+    [
+      "2019-07-13",
+      0
+    ],
+    [
+      "2019-07-14",
+      0
+    ],
+    [
+      "2019-07-15",
+      0
+    ],
+    [
+      "2019-07-16",
+      0
+    ],
+    [
+      "2019-07-17",
+      0
+    ],
+    [
+      "2019-07-18",
+      0
+    ]
+  ]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wc/visitor-stats-fields.json b/libs/fluxc-tests/src/test/resources/wc/visitor-stats-fields.json
new file mode 100644
index 00000000000..b7a7382d899
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/visitor-stats-fields.json
@@ -0,0 +1,4 @@
+[
+  "period",
+  "visitors"
+]
diff --git a/libs/fluxc-tests/src/test/resources/wc/wrong-visitor-stats-data.json b/libs/fluxc-tests/src/test/resources/wc/wrong-visitor-stats-data.json
new file mode 100644
index 00000000000..8b29c4aef19
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wc/wrong-visitor-stats-data.json
@@ -0,0 +1,122 @@
+[
+    [
+      "2019-06-19",
+      1
+    ],
+    [
+      "2019-06-20",
+      1
+    ],
+    [
+      "2019-06-21",
+      0
+    ],
+    [
+      "2019-06-22",
+      "20"
+    ],
+    [
+      "2019-06-23",
+      "10.0"
+    ],
+    [
+      "2019-06-24",
+      0
+    ],
+    [
+      "2019-06-25",
+      1
+    ],
+    [
+      "2019-06-26",
+      0
+    ],
+    [
+      "2019-06-27",
+      0
+    ],
+    [
+      "2019-06-28",
+      0
+    ],
+    [
+      "2019-06-29",
+      0
+    ],
+    [
+      "2019-06-30",
+      0
+    ],
+    [
+      "2019-07-01",
+      0
+    ],
+    [
+      "2019-07-02",
+      0
+    ],
+    [
+      "2019-07-03",
+      0
+    ],
+    [
+      "2019-07-04",
+      0
+    ],
+    [
+      "2019-07-05",
+      0
+    ],
+    [
+      "2019-07-06",
+      0
+    ],
+    [
+      "2019-07-07",
+      0
+    ],
+    [
+      "2019-07-08",
+      0
+    ],
+    [
+      "2019-07-09",
+      1
+    ],
+    [
+      "2019-07-10",
+      0
+    ],
+    [
+      "2019-07-11",
+      0
+    ],
+    [
+      "2019-07-12",
+      0
+    ],
+    [
+      "2019-07-13",
+      0
+    ],
+    [
+      "2019-07-14",
+      0
+    ],
+    [
+      "2019-07-15",
+      0
+    ],
+    [
+      "2019-07-16",
+      null
+    ],
+    [
+      "2019-07-17",
+      "null"
+    ],
+    [
+      "2019-07-18",
+      "this is not a number"
+    ]
+  ]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/all-domains/all-domains.json b/libs/fluxc-tests/src/test/resources/wp/all-domains/all-domains.json
new file mode 100644
index 00000000000..881b9e7f99a
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/all-domains/all-domains.json
@@ -0,0 +1,75 @@
+{
+  "domains": [
+    {
+      "domain": "some.test.domain",
+      "blog_id": 11111,
+      "blog_name": "some test blog",
+      "type": "mapping",
+      "is_domain_only_site": false,
+      "is_wpcom_staging_domain": false,
+      "has_registration": false,
+      "registration_date": "2009-03-26T21:20:53+00:00",
+      "expiry": "2024-03-24T00:00:00+00:00",
+      "wpcom_domain": false,
+      "current_user_is_owner": true,
+      "site_slug": "test slug",
+      "domain_status": {
+        "status": "Active",
+        "status_type": "success"
+      }
+    },
+    {
+      "domain": "some.test.domain.with.status.weight",
+      "blog_id": 22222,
+      "blog_name": "some test blog with status_weight",
+      "type": "mapping",
+      "is_domain_only_site": false,
+      "is_wpcom_staging_domain": false,
+      "has_registration": false,
+      "registration_date": "2009-03-26T21:20:53+00:00",
+      "expiry": "2024-03-24T00:00:00+00:00",
+      "wpcom_domain": true,
+      "current_user_is_owner": false,
+      "site_slug": "test slug 2",
+      "domain_status": {
+        "status": "Expiring soon",
+        "status_type": "error",
+        "status_weight": 1000
+      }
+    },
+    {
+      "domain": "some.test.domain.with.action.required",
+      "blog_id": 22222,
+      "blog_name": "some test blog with action_required",
+      "type": "mapping",
+      "is_domain_only_site": false,
+      "is_wpcom_staging_domain": false,
+      "has_registration": false,
+      "registration_date": "2009-03-26T21:20:53+00:00",
+      "expiry": "2024-03-24T00:00:00+00:00",
+      "wpcom_domain": true,
+      "current_user_is_owner": false,
+      "site_slug": "test slug 2",
+      "domain_status": {
+        "status": "Expiring soon",
+        "status_type": "error",
+        "status_weight": 1000,
+        "action_required": true
+      }
+    },
+    {
+      "domain": "some.test.domain.no.domain.status",
+      "blog_id": 22222,
+      "blog_name": "some test blog no domain status",
+      "type": "mapping",
+      "is_domain_only_site": false,
+      "is_wpcom_staging_domain": false,
+      "has_registration": false,
+      "registration_date": "2009-03-26T21:20:53+00:00",
+      "expiry": "2024-03-24T00:00:00+00:00",
+      "wpcom_domain": true,
+      "current_user_is_owner": false,
+      "site_slug": "test slug 2"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/blaze/blaze-campaigns.json b/libs/fluxc-tests/src/test/resources/wp/blaze/blaze-campaigns.json
new file mode 100644
index 00000000000..88c94d9914e
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/blaze/blaze-campaigns.json
@@ -0,0 +1,26 @@
+{
+  "campaigns": [
+    {
+      "id": "1234",
+      "status": "rejected",
+      "start_time": "2023-06-02T00:00:00.000Z",
+      "duration_days": 10,
+      "total_budget": 100.0,
+      "spent_budget": 0.0,
+      "impressions": 0,
+      "clicks": 0,
+      "site_name": "siteName",
+      "text_snippet": "title",
+      "target_url": "https://example.com",
+      "target_urn": "urn:wpcom:post:199247490:9",
+      "main_image": {
+        "url": "imageUrl",
+        "mime_type": "image/jpeg",
+        "width": 100.0,
+        "height": 100.0
+      }
+    }
+  ],
+  "total_count": 1,
+  "skipped": 0
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/bloggingprompts/prompts.json b/libs/fluxc-tests/src/test/resources/wp/bloggingprompts/prompts.json
new file mode 100644
index 00000000000..3991c23161f
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/bloggingprompts/prompts.json
@@ -0,0 +1,48 @@
+[
+  {
+    "id": 1010,
+    "text": "You have 15 minutes to address the whole world live (on television or radio — choose your format). What would you say?",
+    "date": "2022-01-04",
+    "attribution": "",
+    "answered": false,
+    "answered_users_count": 0,
+    "answered_users_sample": [
+    ],
+    "answered_link": "https://wordpress.com/tag/dailyprompt-1010",
+    "answered_link_text": "View all responses",
+    "bloganuary_id": "bloganuary-2022-04"
+  },
+  {
+    "id": 1011,
+    "text": "Do you play in your daily life? What says “playtime” to you?",
+    "date": "2022-01-05",
+    "attribution": "dayone",
+    "answered": true,
+    "answered_users_count": 1,
+    "answered_users_sample": [
+      {
+        "avatar": "http://site/avatar1.jpg"
+      }
+    ],
+    "answered_link": "https://wordpress.com/tag/dailyprompt-1011",
+    "answered_link_text": "View all responses"
+  },
+  {
+    "id": 1012,
+    "text": "Are you good at what you do? What would you like to be better at.",
+    "date": "2022-01-06",
+    "attribution": "",
+    "answered": false,
+    "answered_users_count": 2,
+    "answered_users_sample": [
+      {
+        "avatar": "http://site/avatar2.jpg"
+      },
+      {
+        "avatar": "http://site/avatar3.jpg"
+      }
+    ],
+    "answered_link": "https://wordpress.com/tag/dailyprompt-1012",
+    "answered_link_text": "View all responses"
+  }
+]
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/dashboard/cards.json b/libs/fluxc-tests/src/test/resources/wp/dashboard/cards.json
new file mode 100644
index 00000000000..98905c80997
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/dashboard/cards.json
@@ -0,0 +1,106 @@
+{
+  "todays_stats": {
+    "views": 100,
+    "visitors": 30,
+    "likes": 50,
+    "comments": 10
+  },
+  "posts": {
+    "has_published": true,
+    "draft": [
+      {
+        "id": 708,
+        "title": "",
+        "content": "Draft Content 2",
+        "featured_image": "https:\/\/test.blog\/wp-content\/uploads\/2021\/11\/draft-featured-image-2.jpeg?w=200",
+        "date": "2021-11-02 15:47:42"
+      },
+      {
+        "id": 659,
+        "title": "Draft Title 1",
+        "content": "Draft Content 1",
+        "featured_image": null,
+        "date": "2021-10-27 12:25:57"
+      }
+    ],
+    "scheduled": [
+      {
+        "id": 762,
+        "title": "Scheduled Title 1",
+        "content": "",
+        "featured_image": "https:\/\/test.blog\/wp-content\/uploads\/2021\/11\/scheduled-featured-image-1.jpeg?w=200",
+        "date": "2021-12-26 23:00:33"
+      }
+    ]
+  },
+  "pages": [
+    {
+      "id": 1,
+      "title": "Page title",
+      "content": "Page content",
+      "modified": "2021-11-02 15:47:42",
+      "status": "publish",
+      "date": "2021-11-02 15:47:42"
+    },
+    {
+      "id": 2,
+      "title": "Page title 2",
+      "content": "Page content 2",
+      "modified": "2023-03-02 11:55:49",
+      "status": "publish",
+      "date": "2023-03-02 11:55:49"
+    }
+  ],
+  "activity": {
+    "summary": "response",
+    "totalItems": 1,
+    "current": {
+      "orderedItems": [
+        {
+          "summary": "activity",
+          "name": "name",
+          "actor": {
+            "type": "author",
+            "name": "John Smith",
+            "external_user_id": 10,
+            "wpcom_user_id": 15,
+            "icon": {
+              "type": "jpg",
+              "url": "dog.jpg",
+              "width": 100,
+              "height": 100
+            },
+            "role": "admin"
+          },
+          "type": "create a blog",
+          "generator": {
+            "jetpack_version": 10.3,
+            "blog_id": 123
+          },
+          "is_rewindable": false,
+          "rewind_id": "10.0",
+          "gridicon": "gridicon.jpg",
+          "status": "OK",
+          "activity_id": "activity123"
+        }
+      ]
+    }
+  },
+  "dynamic": [
+    {
+      "id": "year_in_review_2023",
+      "title": "News",
+      "featured_image": "https://path/to/image",
+      "url": "https://wordpress.com",
+      "action": "Call to action",
+      "order": "top",
+      "rows": [
+        {
+          "icon": "https://path/to/image",
+          "title": "Row title",
+          "description": "Row description"
+        }
+      ]
+    }
+  ]
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/dashboard/cards_with_errors.json b/libs/fluxc-tests/src/test/resources/wp/dashboard/cards_with_errors.json
new file mode 100644
index 00000000000..0658cdfb9f9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/dashboard/cards_with_errors.json
@@ -0,0 +1,11 @@
+{
+  "todays_stats": {
+    "error": "jetpack_disconnected"
+  },
+  "posts": {
+    "error": "unauthorized"
+  },
+  "activity": {
+    "error": "unauthorized"
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-scan-unavailable.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-scan-unavailable.json
new file mode 100644
index 00000000000..962cacf6377
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-scan-unavailable.json
@@ -0,0 +1,6 @@
+{
+	"state": "unavailable",
+	"threats": null,
+	"has_cloud": true,
+	"reason": "missing_scan_capability"
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-start-scan-error.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-start-scan-error.json
new file mode 100644
index 00000000000..e5c42472b41
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-backup-daily-start-scan-error.json
@@ -0,0 +1,11 @@
+{
+	"success": false,
+	"error": {
+		"errors": {
+			"vp_api_error": [
+				"Site does not have scan capability."
+			]
+		},
+		"error_data": []
+	}
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-idle.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-idle.json
new file mode 100644
index 00000000000..c99d614c8a6
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-idle.json
@@ -0,0 +1,19 @@
+{
+	"state": "idle",
+	"threats": [],
+	"has_cloud": false,
+	"credentials": [
+		{
+			"still_valid": true,
+			"type": "managed",
+			"role": "main"
+		}
+	],
+	"most_recent": {
+		"is_initial": false,
+		"timestamp": "2020-11-16T06:23:26+00:00",
+		"duration": 12,
+		"progress": 100,
+		"error": false
+	}
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-scanning.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-scanning.json
new file mode 100644
index 00000000000..72bf8ed53ee
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-complete-scan-scanning.json
@@ -0,0 +1,17 @@
+{
+	"state": "scanning",
+	"threats": [],
+	"has_cloud": false,
+	"credentials": [
+		{
+			"still_valid": true,
+			"type": "managed",
+			"role": "main"
+		}
+	],
+	"current": {
+		"is_initial": false,
+		"timestamp": "2020-11-16T08:02:31+00:00",
+		"progress": 80
+	}
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat-without-server-creds.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat-without-server-creds.json
new file mode 100644
index 00000000000..0dc03f978d5
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat-without-server-creds.json
@@ -0,0 +1,32 @@
+{
+	"state": "idle",
+	"threats": [
+		{
+			"id": 35246622,
+			"signature": "Vulnerable.WP.Extension",
+			"description": "The plugin Calendar (version 1.3.1) has a known vulnerability",
+			"first_detected": "2020-11-16T09:56:20.000Z",
+			"status": "current",
+			"fixable": {
+				"fixer": "update",
+				"target": "1.3.14"
+			},
+			"extension": {
+				"type": "plugin",
+				"slug": "calendar",
+				"name": "Calendar",
+				"version": "1.3.1",
+				"isPremium": false
+			}
+		}
+	],
+	"has_cloud": true,
+	"credentials": [],
+	"most_recent": {
+		"is_initial": false,
+		"timestamp": "2020-11-16T09:55:58+00:00",
+		"duration": 23,
+		"progress": 100,
+		"error": false
+	}
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat.json
new file mode 100644
index 00000000000..0b727af7e42
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/jp-scan-daily-scan-idle-with-threat.json
@@ -0,0 +1,38 @@
+{
+	"state": "idle",
+	"threats": [
+		{
+			"id": 35220155,
+			"signature": "Vulnerable.WP.Extension",
+			"description": "The plugin Calendar (version 1.3.1) has a known vulnerability",
+			"first_detected": "2020-11-16T01:33:27.000Z",
+			"status": "current",
+			"fixable": {
+				"fixer": "update",
+				"target": "1.3.14"
+			},
+			"extension": {
+				"type": "plugin",
+				"slug": "calendar",
+				"name": "Calendar",
+				"version": "1.3.1",
+				"isPremium": false
+			}
+		}
+	],
+	"has_cloud": true,
+	"credentials": [
+		{
+			"still_valid": true,
+			"type": "managed",
+			"role": "main"
+		}
+	],
+	"most_recent": {
+		"is_initial": false,
+		"timestamp": "2020-11-16T01:32:30+00:00",
+		"duration": 58,
+		"progress": 100,
+		"error": false
+	}
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-core-file-modification.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-core-file-modification.json
new file mode 100644
index 00000000000..c332053c267
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-core-file-modification.json
@@ -0,0 +1,13 @@
+{
+  "id": 22922422,
+  "signature": "Core.File.Modification",
+  "first_detected": "2020-06-25T14:41:37.000Z",
+  "description": "Core WordPress files are not normally changed. If you did not make these changes you should review the code.",
+  "status": "current",
+  "fixable": {
+    "fixer": "replace",
+    "file": "/srv/users/user7e06fe30/apps/user7e06fe30/public/wp-blog-header.php"
+  },
+  "filename": "/srv/users/user7e06fe30/apps/user7e06fe30/public/wp-blog-header.php",
+  "diff": "--- /tmp/wordpress/5.4.2-en_US/wordpress/wp-blog-header.php\t2020-06-11 19:20:31.379828991 +0000\n+++ /tmp/4253212943/core-file-557lXS8J4crSxgB\t2020-06-25 15:35:57.977974552 +0000\n@@ -5,6 +5,8 @@\n  * @package WordPress\n  */\n \n+// dasdasd\n+// dasdasd\n if ( ! isset( $wp_did_header ) ) {\n \n \t$wp_did_header = true;\n"
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-database.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-database.json
new file mode 100644
index 00000000000..18e7e02424d
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-database.json
@@ -0,0 +1,22 @@
+{
+  "id": 9155430,
+  "signature": "Suspicious.Links",
+  "first_detected": "2019-09-06T14:56:58.000Z",
+  "description": "Jetpack has detected a link to a possible dangerous site. These sites are often related to dangerous or malicious code.",
+  "status": "current",
+  "fixable": false,
+  "table": "wp_posts",
+  "rows": {
+    "949": {
+      "id": 1849,
+      "description": "KiethAbare - 2019-01-20 18:41:40",
+      "url": "http://to.ht/bestforex48357\\n"
+    },
+    "950": {
+      "id": 1850,
+      "description": "KiethAbare - 2019-01-20 18:41:45",
+      "url": "http://to.ht/bestforex48357\\n"
+    }
+  },
+  "objectType": "post"
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-json-object.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-json-object.json
new file mode 100644
index 00000000000..2dcbfa37718
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-json-object.json
@@ -0,0 +1,19 @@
+{
+  "id": 22917236,
+  "signature": "PHP.Generic.BadPattern.5",
+  "first_detected": "2020-06-25T13:10:05.000Z",
+  "description": "This code pattern is often used to run a very dangerous shell programs on your server. The code in these files needs to be reviewed, and possibly cleaned.",
+  "status": "current",
+  "fixable": false,
+  "context": {
+    "3": "echo <<<HTML",
+    "4": "X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*",
+    "5": "HTML;",
+    "marks": {
+      "4": [
+        [0, 68]
+      ]
+    }
+  },
+  "filename": "/homepages/42/d763414509/htdocs/Eldonair3/wp-content/plugins/fs-poster/vendor/react/promise/src/Promise.php"
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-string.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-string.json
new file mode 100644
index 00000000000..ae26c1b0251
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-file-with-context-as-string.json
@@ -0,0 +1,9 @@
+{
+  "id": 22917236,
+  "signature": "PHP.Generic.BadPattern.5",
+  "first_detected": "2020-06-25T13:10:05.000Z",
+  "description": "This code pattern is often used to run a very dangerous shell programs on your server. The code in these files needs to be reviewed, and possibly cleaned.",
+  "status": "current",
+  "fixable": false,
+  "context": ""
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-fixable.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-fixable.json
new file mode 100644
index 00000000000..b42af7d05e9
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-fixable.json
@@ -0,0 +1,18 @@
+{
+  "id": 22856973,
+  "signature": "Vulnerable.WP.Extension",
+  "first_detected": "2020-06-24T21:03:20.000Z",
+  "description": "The plugin WooCommerce (version 4.1.0) has a known vulnerability",
+  "status": "current",
+  "fixable": {
+    "fixer": "update",
+    "target": "4.2.2"
+  },
+  "extension": {
+    "type": "plugin",
+    "slug": "woocommerce",
+    "name": "WooCommerce",
+    "version": "4.1.0",
+    "isPremium": false
+  }
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-generic.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-generic.json
new file mode 100644
index 00000000000..0b9286cbf53
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-generic.json
@@ -0,0 +1,8 @@
+{
+  "id": 16422401,
+  "signature": "GoogleSafeBrowsing.Warning",
+  "first_detected": "2020-03-03T22:50:30.000Z",
+  "description": "Your site has been flagged by Google's Safe Browsing database, which attempts to identify sites that may be phishing sites, hosting malware, or otherwise malicious. This is likely the result of a compromise of your site that has resulted in a malicious payload being installed.\n\nGoogle works to provide the most accurate and up-to-date phishing, malware, and unwanted software information. However, Google cannot guarantee that its information is comprehensive and error-free:  some risky sites may not be identified, and some safe sites may be identified in error. Advisory provided by Google: https://developers.google.com/safe-browsing/safebrowsing_faq#whyAdvisory",
+  "status": "current",
+  "fixable": false
+}
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-not-fixable.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-not-fixable.json
new file mode 100644
index 00000000000..e0bf3375283
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-not-fixable.json
@@ -0,0 +1,8 @@
+{
+  "id": 16422401,
+  "signature": "GoogleSafeBrowsing.Warning",
+  "first_detected": "2020-03-03T22:50:30.000Z",
+  "description": "Your site has been flagged by Google's Safe Browsing database, which attempts to identify sites that may be phishing sites, hosting malware, or otherwise malicious. This is likely the result of a compromise of your site that has resulted in a malicious payload being installed.\n\nGoogle works to provide the most accurate and up-to-date phishing, malware, and unwanted software information. However, Google cannot guarantee that its information is comprehensive and error-free:  some risky sites may not be identified, and some safe sites may be identified in error. Advisory provided by Google: https://developers.google.com/safe-browsing/safebrowsing_faq#whyAdvisory",
+  "status": "current",
+  "fixable": false
+}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-vulnerable-extension.json b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-vulnerable-extension.json
new file mode 100644
index 00000000000..aeb313c3a2b
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/jetpack/scan/threat/threat-vulnerable-extension.json
@@ -0,0 +1,20 @@
+{
+  "id": 22920156,
+  "signature": "Vulnerable.WP.Extension",
+  "first_detected": "2020-06-25T14:03:40.000Z",
+  "description": "The plugin WooCommerce (version 4.1.0) has a known vulnerability",
+  "status": "current",
+  "fixable": {
+    "fixer": "update",
+    "target": "4.2.2"
+  },
+  "extension": {
+    "type": "plugin",
+    "slug": "woocommerce",
+    "name": "WooCommerce",
+    "version": "4.1.0",
+    "isPremium": false
+  }
+}
+
+
diff --git a/libs/fluxc-tests/src/test/resources/wp/mobile/feature-flags-success.json b/libs/fluxc-tests/src/test/resources/wp/mobile/feature-flags-success.json
new file mode 100644
index 00000000000..e34abe88670
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/mobile/feature-flags-success.json
@@ -0,0 +1 @@
+{ "flag-1": true, "flag-2": false}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/mobile/remote-config-success.json b/libs/fluxc-tests/src/test/resources/wp/mobile/remote-config-success.json
new file mode 100644
index 00000000000..fb9e19a0058
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/mobile/remote-config-success.json
@@ -0,0 +1 @@
+{ "jp-deadline": "2022-10-10"}
\ No newline at end of file
diff --git a/libs/fluxc-tests/src/test/resources/wp/qrcode/authenticate-success.json b/libs/fluxc-tests/src/test/resources/wp/qrcode/authenticate-success.json
new file mode 100644
index 00000000000..303838baba0
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/qrcode/authenticate-success.json
@@ -0,0 +1 @@
+{"authenticated":true}
diff --git a/libs/fluxc-tests/src/test/resources/wp/qrcode/validate-success.json b/libs/fluxc-tests/src/test/resources/wp/qrcode/validate-success.json
new file mode 100644
index 00000000000..7a514c4abba
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/wp/qrcode/validate-success.json
@@ -0,0 +1 @@
+{"browser":"Chrome","location":"Secaucus, New Jersey","success":true}
diff --git a/libs/fluxc/build.gradle b/libs/fluxc/build.gradle
new file mode 100644
index 00000000000..4b36b3e6a0d
--- /dev/null
+++ b/libs/fluxc/build.gradle
@@ -0,0 +1,144 @@
+plugins {
+    alias(sharedLibs.plugins.android.library)
+    alias(sharedLibs.plugins.kotlin.android)
+    alias(sharedLibs.plugins.kotlin.parcelize)
+    alias(sharedLibs.plugins.kotlin.kapt)
+    alias(sharedLibs.plugins.automattic.publishToS3)
+}
+
+android {
+    useLibrary 'org.apache.http.legacy'
+
+    namespace "org.wordpress.android.fluxc"
+
+    compileSdkVersion rootProject.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += [
+                        "room.schemaLocation":"$projectDir/schemas".toString(),
+                        "room.incremental":"true",
+                        "room.expandProjection":"true"]
+            }
+        }
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    lint {
+        lintConfig file("${project.rootDir}/config/lint/lint.xml")
+        enable += 'UnknownNullness'
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+    }
+
+    buildFeatures {
+        buildConfig true
+    }
+}
+
+android.buildTypes.all { buildType ->
+    // Load gradle properties and add them to BuildConfig
+    Properties gradleProperties = new Properties()
+    File propertiesFile = file("gradle.properties")
+    if (propertiesFile.exists()) {
+        gradleProperties.load(new FileInputStream(propertiesFile))
+    } else {
+        // Load defaults
+        gradleProperties.load(new FileInputStream(file("gradle.properties-example")))
+    }
+    gradleProperties.any { property ->
+        if (property.value.equals("true") || property.value.equals("false")) {
+            buildType.buildConfigField "boolean", property.key.replace("fluxc.", "").replace(".", "_").toUpperCase(),
+                    "Boolean.parseBoolean(\"${property.value}\")"
+        } else {
+            buildType.buildConfigField "String", property.key.replace("fluxc.", "").replace(".", "_").toUpperCase(),
+                    "\"${property.value}\""
+        }
+    }
+}
+
+dependencies {
+    implementation sharedLibs.androidx.exifinterface
+    implementation sharedLibs.androidx.security.crypto
+
+    implementation(sharedLibs.wordpress.utils) {
+        // Using official volley package
+        exclude group: "com.mcxiaoke.volley"
+        exclude group: "com.android.support"
+    }
+
+    // Custom WellSql version
+    api sharedLibs.wellsql
+    kapt sharedLibs.wellsql.processor
+
+    // FluxC annotations
+    api fluxcAnnotationsProjectDependency
+    kapt fluxcProcessorProjectDependency
+
+    // External libs
+    api sharedLibs.eventbus.android
+    api sharedLibs.eventbus.java
+    api sharedLibs.squareup.okhttp3
+    implementation sharedLibs.squareup.okhttp3.urlconnection
+    api sharedLibs.volley
+    implementation sharedLibs.google.gson
+
+    implementation sharedLibs.apache.commons.text
+    api sharedLibs.androidx.paging.runtime
+    implementation sharedLibs.androidx.room.runtime
+    kapt sharedLibs.androidx.room.compiler
+    implementation sharedLibs.androidx.room.ktx
+
+    // Dagger
+    implementation sharedLibs.google.dagger
+    kapt sharedLibs.google.dagger.compiler
+    compileOnly sharedLibs.glassfish.javax.annotation
+
+    // Coroutines
+    implementation sharedLibs.kotlinx.coroutines.core
+    implementation sharedLibs.kotlinx.coroutines.android
+
+    // Encrypted Logging
+    api "com.goterl:lazysodium-android:5.0.2@aar"
+    api "net.java.dev.jna:jna:5.5.0@aar"
+
+    // Unit tests
+    testImplementation sharedLibs.junit
+    testImplementation sharedLibs.kotlin.test.junit
+    testImplementation sharedLibs.kotlinx.coroutines.test
+    testImplementation sharedLibs.androidx.test.core
+    testImplementation sharedLibs.robolectric
+    testImplementation sharedLibs.mockito.core
+    testImplementation sharedLibs.mockito.kotlin
+    testImplementation sharedLibs.mockito.inline
+
+    lintChecks sharedLibs.wordpress.lint
+}
+
+dependencyAnalysis {
+    issues {
+        onUnusedDependencies {
+            // This dependency is actually needed otherwise the app will crash with a runtime exception.
+            exclude(sharedLibs.eventbus.android.get().module.toString())
+        }
+    }
+}
+
+project.afterEvaluate {
+    publishing {
+        publications {
+            FluxCPublication(MavenPublication) {
+                from components.release
+
+                groupId "org.wordpress"
+                artifactId "fluxc"
+                // version is set by 'publish-to-s3' plugin
+            }
+        }
+   }
+}
diff --git a/libs/fluxc/consumer-rules.pro b/libs/fluxc/consumer-rules.pro
new file mode 100644
index 00000000000..469d9f84535
--- /dev/null
+++ b/libs/fluxc/consumer-rules.pro
@@ -0,0 +1,57 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/max/work/android-sdk-mac/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class mName to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+## Encrypted Logging Start
+-dontwarn java.awt.*
+-keep class com.sun.jna.* { *; }
+-keepclassmembers class * extends com.sun.jna.* { public *; }
+## Encrypted Logging End
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class org.wordpress.android.fluxc.model.** { <fields>; }
+-keep class org.wordpress.android.fluxc.network.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+##---------------End: proguard configuration for Gson  ----------
diff --git a/libs/fluxc/gradle.properties-example b/libs/fluxc/gradle.properties-example
new file mode 100644
index 00000000000..f21a4bfbb32
--- /dev/null
+++ b/libs/fluxc/gradle.properties-example
@@ -0,0 +1,4 @@
+fluxc.ENABLE_WPAPI = false
+wp.ENABLE_DATABASE_DOWNGRADE = true
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/1.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/1.json
new file mode 100644
index 00000000000..176d9998c23
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/1.json
@@ -0,0 +1,76 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "4f29ca40a8cdc7081cbff3a88c7eaa87",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4f29ca40a8cdc7081cbff3a88c7eaa87')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/10.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/10.json
new file mode 100644
index 00000000000..18f8bde5354
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/10.json
@@ -0,0 +1,589 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "bd2f1d129d94734b3fec067334675bfd",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'bd2f1d129d94734b3fec067334675bfd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/11.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/11.json
new file mode 100644
index 00000000000..4d2b92089d3
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/11.json
@@ -0,0 +1,596 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "b2762448697f05a437512b9f25b43cb8",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b2762448697f05a437512b9f25b43cb8')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/12.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/12.json
new file mode 100644
index 00000000000..101be8bfad0
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/12.json
@@ -0,0 +1,622 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "94a7d9bef484b87bd1e9b29a7b956f5b",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeStatus",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `isEligible` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEligible",
+            "columnName": "isEligible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '94a7d9bef484b87bd1e9b29a7b956f5b')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/13.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/13.json
new file mode 100644
index 00000000000..8f621b15233
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/13.json
@@ -0,0 +1,672 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "ea143270b18bcf94049299a930db8dea",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeStatus",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `isEligible` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEligible",
+            "columnName": "isEligible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea143270b18bcf94049299a930db8dea')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/14.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/14.json
new file mode 100644
index 00000000000..58e421528a8
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/14.json
@@ -0,0 +1,710 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 14,
+    "identityHash": "a2c8ec99016bc1700343f338874f89d1",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeStatus",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `isEligible` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEligible",
+            "columnName": "isEligible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a2c8ec99016bc1700343f338874f89d1')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/15.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/15.json
new file mode 100644
index 00000000000..d92daa21c58
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/15.json
@@ -0,0 +1,684 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 15,
+    "identityHash": "69627ce308934aad803fb99a12447b66",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '69627ce308934aad803fb99a12447b66')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/16.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/16.json
new file mode 100644
index 00000000000..2c6c3c77d64
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/16.json
@@ -0,0 +1,684 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 16,
+    "identityHash": "69627ce308934aad803fb99a12447b66",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '69627ce308934aad803fb99a12447b66')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/17.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/17.json
new file mode 100644
index 00000000000..712b83dbfa8
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/17.json
@@ -0,0 +1,807 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 17,
+    "identityHash": "7c8188b7922c1799f473acbb7c60bb2e",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startDate` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startDate",
+            "columnName": "startDate",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7c8188b7922c1799f473acbb7c60bb2e')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/18.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/18.json
new file mode 100644
index 00000000000..e7d1962158a
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/18.json
@@ -0,0 +1,875 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 18,
+    "identityHash": "ad37f9bbd81b9405477b865723077e58",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startDate` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startDate",
+            "columnName": "startDate",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ad37f9bbd81b9405477b865723077e58')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/19.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/19.json
new file mode 100644
index 00000000000..3adc2c9627d
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/19.json
@@ -0,0 +1,875 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "ad37f9bbd81b9405477b865723077e58",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startDate` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startDate",
+            "columnName": "startDate",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ad37f9bbd81b9405477b865723077e58')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/2.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/2.json
new file mode 100644
index 00000000000..e7f9c0f6f18
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/2.json
@@ -0,0 +1,241 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "b096a48b9e2f42699f423e61fe4eb9ae",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b096a48b9e2f42699f423e61fe4eb9ae')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/20.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/20.json
new file mode 100644
index 00000000000..8f42a0dd684
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/20.json
@@ -0,0 +1,875 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "2a927ebf899e36d35b961988d8fcca66",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2a927ebf899e36d35b961988d8fcca66')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/21.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/21.json
new file mode 100644
index 00000000000..ff0c77d4228
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/21.json
@@ -0,0 +1,881 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "cc9b6fb74d814058f43e676516961b97",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'cc9b6fb74d814058f43e676516961b97')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/22.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/22.json
new file mode 100644
index 00000000000..248d277621c
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/22.json
@@ -0,0 +1,875 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "b3791e80e8277844d1b16b090631346f",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b3791e80e8277844d1b16b090631346f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/23.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/23.json
new file mode 100644
index 00000000000..c4917cce60e
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/23.json
@@ -0,0 +1,881 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "1324df3e4e80f9fa36073ce7c9bd5d69",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1324df3e4e80f9fa36073ce7c9bd5d69')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/24.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/24.json
new file mode 100644
index 00000000000..5531d956036
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/24.json
@@ -0,0 +1,977 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 24,
+    "identityHash": "da8cb68764ed29eed6f2bd4c7914b96a",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'da8cb68764ed29eed6f2bd4c7914b96a')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/25.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/25.json
new file mode 100644
index 00000000000..8fc4f3c2cc5
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/25.json
@@ -0,0 +1,1021 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 25,
+    "identityHash": "57bb101fbe0aac539a5b7837b3ce7702",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeAdSuggestions",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `siteId` INTEGER NOT NULL, `productId` INTEGER NOT NULL, `tagLine` TEXT NOT NULL, `description` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tagLine",
+            "columnName": "tagLine",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '57bb101fbe0aac539a5b7837b3ce7702')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/26.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/26.json
new file mode 100644
index 00000000000..bc1de5c0410
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/26.json
@@ -0,0 +1,977 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "da8cb68764ed29eed6f2bd4c7914b96a",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` INTEGER NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `createdAt` TEXT NOT NULL, `endDate` TEXT, `uiStatus` TEXT NOT NULL, `budgetCents` INTEGER NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "budgetCents",
+            "columnName": "budgetCents",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignsPagination",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `page` INTEGER NOT NULL, `totalItems` INTEGER NOT NULL, `totalPages` INTEGER NOT NULL, PRIMARY KEY(`siteId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalItems",
+            "columnName": "totalItems",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalPages",
+            "columnName": "totalPages",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'da8cb68764ed29eed6f2bd4c7914b96a')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/27.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/27.json
new file mode 100644
index 00000000000..1e12f6a16cf
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/27.json
@@ -0,0 +1,945 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 27,
+    "identityHash": "9ed90319e18e6bba1c0dc43a3ec1499e",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "date"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "remoteSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "domain"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` TEXT NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startTime` TEXT NOT NULL, `durationInDays` INTEGER NOT NULL, `uiStatus` TEXT NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, `totalBudget` REAL NOT NULL, `spentBudget` REAL NOT NULL, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startTime",
+            "columnName": "startTime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "durationInDays",
+            "columnName": "durationInDays",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalBudget",
+            "columnName": "totalBudget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spentBudget",
+            "columnName": "spentBudget",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9ed90319e18e6bba1c0dc43a3ec1499e')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/28.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/28.json
new file mode 100644
index 00000000000..2b32b04256b
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/28.json
@@ -0,0 +1,952 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 28,
+    "identityHash": "dc3f0d78cda7cfbc3a50095fed5c732f",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "date"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "remoteSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "domain"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` TEXT NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startTime` TEXT NOT NULL, `durationInDays` INTEGER NOT NULL, `uiStatus` TEXT NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, `totalBudget` REAL NOT NULL, `spentBudget` REAL NOT NULL, `isEndlessCampaign` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startTime",
+            "columnName": "startTime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "durationInDays",
+            "columnName": "durationInDays",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalBudget",
+            "columnName": "totalBudget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spentBudget",
+            "columnName": "spentBudget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEndlessCampaign",
+            "columnName": "isEndlessCampaign",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteLocalId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'dc3f0d78cda7cfbc3a50095fed5c732f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/29.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/29.json
new file mode 100644
index 00000000000..2135c1681b8
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/29.json
@@ -0,0 +1,996 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 29,
+    "identityHash": "da5d8c8bf3e1cdb92936f43ff8e6b907",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, `isPromptsCardOptedIn` INTEGER NOT NULL DEFAULT 1, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptsCardOptedIn",
+            "columnName": "isPromptsCardOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "localSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, `answeredLink` TEXT NOT NULL, `bloganuaryId` TEXT, PRIMARY KEY(`date`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "answeredLink",
+            "columnName": "answeredLink",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bloganuaryId",
+            "columnName": "bloganuaryId",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "date"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "RemoteConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackCPConnectedSites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`remoteSiteId` INTEGER, `localSiteId` INTEGER NOT NULL, `url` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `activeJetpackConnectionPlugins` TEXT NOT NULL, PRIMARY KEY(`remoteSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeJetpackConnectionPlugins",
+            "columnName": "activeJetpackConnectionPlugins",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "remoteSiteId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Domains",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `domain` TEXT NOT NULL, `primaryDomain` INTEGER NOT NULL, `wpcomDomain` INTEGER NOT NULL, PRIMARY KEY(`domain`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryDomain",
+            "columnName": "primaryDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wpcomDomain",
+            "columnName": "wpcomDomain",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "domain"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaigns",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteId` INTEGER NOT NULL, `campaignId` TEXT NOT NULL, `title` TEXT NOT NULL, `imageUrl` TEXT, `startTime` TEXT NOT NULL, `durationInDays` INTEGER NOT NULL, `uiStatus` TEXT NOT NULL, `impressions` INTEGER NOT NULL, `clicks` INTEGER NOT NULL, `targetUrn` TEXT, `totalBudget` REAL NOT NULL, `spentBudget` REAL NOT NULL, `isEndlessCampaign` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`siteId`, `campaignId`))",
+        "fields": [
+          {
+            "fieldPath": "siteId",
+            "columnName": "siteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "campaignId",
+            "columnName": "campaignId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageUrl",
+            "columnName": "imageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "startTime",
+            "columnName": "startTime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "durationInDays",
+            "columnName": "durationInDays",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uiStatus",
+            "columnName": "uiStatus",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impressions",
+            "columnName": "impressions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetUrn",
+            "columnName": "targetUrn",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "totalBudget",
+            "columnName": "totalBudget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spentBudget",
+            "columnName": "spentBudget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEndlessCampaign",
+            "columnName": "isEndlessCampaign",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteId",
+            "campaignId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BlazeCampaigns_siteId",
+            "unique": false,
+            "columnNames": [
+              "siteId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` ON `${TABLE_NAME}` (`siteId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "JetpackSocial",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `isShareLimitEnabled` INTEGER NOT NULL, `toBePublicizedCount` INTEGER NOT NULL, `shareLimit` INTEGER NOT NULL, `publicizedCount` INTEGER NOT NULL, `sharedPostsCount` INTEGER NOT NULL, `sharesRemaining` INTEGER NOT NULL, `isEnhancedPublishingEnabled` INTEGER NOT NULL, `isSocialImageGeneratorEnabled` INTEGER NOT NULL, PRIMARY KEY(`siteLocalId`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShareLimitEnabled",
+            "columnName": "isShareLimitEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toBePublicizedCount",
+            "columnName": "toBePublicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareLimit",
+            "columnName": "shareLimit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicizedCount",
+            "columnName": "publicizedCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharedPostsCount",
+            "columnName": "sharedPostsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharesRemaining",
+            "columnName": "sharesRemaining",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEnhancedPublishingEnabled",
+            "columnName": "isEnhancedPublishingEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSocialImageGeneratorEnabled",
+            "columnName": "isSocialImageGeneratorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "siteLocalId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeCampaignObjectives",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, `suitableForDescription` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "suitableForDescription",
+            "columnName": "suitableForDescription",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingLanguages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BlazeTargetingTopics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `description` TEXT NOT NULL, `locale` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'da5d8c8bf3e1cdb92936f43ff8e6b907')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/3.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/3.json
new file mode 100644
index 00000000000..d5d3a564a82
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/3.json
@@ -0,0 +1,369 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "264f8aa9a1fcd9a55dee7fb6aae8ef94",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `remoteParentCommentId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteParentCommentId",
+            "columnName": "remoteParentCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '264f8aa9a1fcd9a55dee7fb6aae8ef94')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/4.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/4.json
new file mode 100644
index 00000000000..66f0ef6a64a
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/4.json
@@ -0,0 +1,381 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "5ce28445c7752b2fde01068a236db8b8",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `remoteParentCommentId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteParentCommentId",
+            "columnName": "remoteParentCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5ce28445c7752b2fde01068a236db8b8')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/5.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/5.json
new file mode 100644
index 00000000000..83394ee7fe8
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/5.json
@@ -0,0 +1,420 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "30ad07883666cf9a4121a173b49edebd",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `remoteParentCommentId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteParentCommentId",
+            "columnName": "remoteParentCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '30ad07883666cf9a4121a173b49edebd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/6.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/6.json
new file mode 100644
index 00000000000..0e78b59e75d
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/6.json
@@ -0,0 +1,420 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 6,
+    "identityHash": "94bd28643afc0ba350211717d668a714",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '94bd28643afc0ba350211717d668a714')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/7.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/7.json
new file mode 100644
index 00000000000..4ff2f30b043
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/7.json
@@ -0,0 +1,495 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 7,
+    "identityHash": "9eea41612f24c1b8508ff6495af00ac8",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9eea41612f24c1b8508ff6495af00ac8')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/8.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/8.json
new file mode 100644
index 00000000000..a7dd4cfee99
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/8.json
@@ -0,0 +1,501 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 8,
+    "identityHash": "2736fe36a94391a27a29424999c6cd2c",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2736fe36a94391a27a29424999c6cd2c')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/9.json b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/9.json
new file mode 100644
index 00000000000..5a2297a4129
--- /dev/null
+++ b/libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/9.json
@@ -0,0 +1,545 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 9,
+    "identityHash": "5217b3c27808e4d77a0fcdc52fa3d4e2",
+    "entities": [
+      {
+        "tableName": "BloggingReminders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`localSiteId` INTEGER NOT NULL, `monday` INTEGER NOT NULL, `tuesday` INTEGER NOT NULL, `wednesday` INTEGER NOT NULL, `thursday` INTEGER NOT NULL, `friday` INTEGER NOT NULL, `saturday` INTEGER NOT NULL, `sunday` INTEGER NOT NULL, `hour` INTEGER NOT NULL, `minute` INTEGER NOT NULL, `isPromptRemindersOptedIn` INTEGER NOT NULL, PRIMARY KEY(`localSiteId`))",
+        "fields": [
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "monday",
+            "columnName": "monday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tuesday",
+            "columnName": "tuesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wednesday",
+            "columnName": "wednesday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "thursday",
+            "columnName": "thursday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "friday",
+            "columnName": "friday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "saturday",
+            "columnName": "saturday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sunday",
+            "columnName": "sunday",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minute",
+            "columnName": "minute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPromptRemindersOptedIn",
+            "columnName": "isPromptRemindersOptedIn",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "localSiteId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOffers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `name` TEXT, `shortName` TEXT, `tagline` TEXT, `description` TEXT, `icon` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "shortName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tagline",
+            "columnName": "tagline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_PlanOffers_internalPlanId",
+            "unique": true,
+            "columnNames": [
+              "internalPlanId"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` ON `${TABLE_NAME}` (`internalPlanId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PlanOfferIds",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `internalPlanId` INTEGER NOT NULL, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "productId",
+            "columnName": "productId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PlanOfferFeatures",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalPlanId` INTEGER NOT NULL, `stringId` TEXT, `name` TEXT, `description` TEXT, FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "internalPlanId",
+            "columnName": "internalPlanId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringId",
+            "columnName": "stringId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": [
+          {
+            "table": "PlanOffers",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "internalPlanId"
+            ],
+            "referencedColumns": [
+              "internalPlanId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Comments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `remoteCommentId` INTEGER NOT NULL, `remotePostId` INTEGER NOT NULL, `localSiteId` INTEGER NOT NULL, `remoteSiteId` INTEGER NOT NULL, `authorUrl` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorProfileImageUrl` TEXT, `authorId` INTEGER NOT NULL, `postTitle` TEXT, `status` TEXT, `datePublished` TEXT, `publishedTimestamp` INTEGER NOT NULL, `content` TEXT, `url` TEXT, `hasParent` INTEGER NOT NULL, `parentId` INTEGER NOT NULL, `iLike` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteCommentId",
+            "columnName": "remoteCommentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remotePostId",
+            "columnName": "remotePostId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localSiteId",
+            "columnName": "localSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "remoteSiteId",
+            "columnName": "remoteSiteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorUrl",
+            "columnName": "authorUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorProfileImageUrl",
+            "columnName": "authorProfileImageUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "authorId",
+            "columnName": "authorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "postTitle",
+            "columnName": "postTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "datePublished",
+            "columnName": "datePublished",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "publishedTimestamp",
+            "columnName": "publishedTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasParent",
+            "columnName": "hasParent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iLike",
+            "columnName": "iLike",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "DashboardCards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`siteLocalId` INTEGER NOT NULL, `type` TEXT NOT NULL, `date` TEXT NOT NULL, `json` TEXT NOT NULL, PRIMARY KEY(`siteLocalId`, `type`))",
+        "fields": [
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "json",
+            "columnName": "json",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "siteLocalId",
+            "type"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "BloggingPrompts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `siteLocalId` INTEGER NOT NULL, `text` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `date` TEXT NOT NULL, `isAnswered` INTEGER NOT NULL, `respondentsCount` INTEGER NOT NULL, `attribution` TEXT NOT NULL, `respondentsAvatars` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siteLocalId",
+            "columnName": "siteLocalId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAnswered",
+            "columnName": "isAnswered",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsCount",
+            "columnName": "respondentsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attribution",
+            "columnName": "attribution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "respondentsAvatars",
+            "columnName": "respondentsAvatars",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "FeatureFlagConfigurations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER NOT NULL, `source` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "key"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5217b3c27808e4d77a0fcdc52fa3d4e2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Dispatcher.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Dispatcher.java
new file mode 100644
index 00000000000..1e991444b6d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Dispatcher.java
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc;
+
+import org.greenrobot.eventbus.EventBus;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.store.Store;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class Dispatcher {
+    private final EventBus mBus;
+
+    @Inject public Dispatcher() {
+        mBus = EventBus.builder()
+                .logNoSubscriberMessages(true)
+                .sendNoSubscriberEvent(true)
+                .throwSubscriberException(true)
+                .build();
+    }
+
+    public void register(final Object object) {
+        mBus.register(object);
+        if (object instanceof Store) {
+            ((Store) object).onRegister();
+        }
+    }
+
+    public void unregister(final Object object) {
+        mBus.unregister(object);
+    }
+
+    public void dispatch(Action action) {
+        AppLog.d(T.API, "Dispatching action: " + action.getType().getClass().getSimpleName()
+                + "-" + action.getType().toString());
+        post(action);
+    }
+
+    public void emitChange(final Object changeEvent) {
+        mBus.post(changeEvent);
+    }
+
+    private void post(final Object event) {
+        mBus.post(event);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/FluxCError.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/FluxCError.java
new file mode 100644
index 00000000000..15f4cb777ea
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/FluxCError.java
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc;
+
+public interface FluxCError {}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Payload.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Payload.java
new file mode 100644
index 00000000000..5686d0c6762
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/Payload.java
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc;
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+public abstract class Payload<T extends FluxCError> {
+    public T error;
+
+    public boolean isError() {
+        return error != null;
+    }
+
+    @Override
+    protected Payload clone() throws CloneNotSupportedException {
+        if (!(this instanceof Cloneable)) {
+            throw new CloneNotSupportedException("Class " + getClass().getName() + " doesn't implement Cloneable");
+        }
+
+        Payload clonedPayload = (Payload) super.clone();
+
+        // Clone non-primitive, mutable fields
+        if (error != null && error instanceof BaseNetworkError) {
+            clonedPayload.error = new BaseNetworkError((BaseNetworkError) error);
+        }
+
+        return clonedPayload;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AccountAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AccountAction.java
new file mode 100644
index 00000000000..483b7361765
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AccountAction.java
@@ -0,0 +1,113 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.model.SubscriptionsModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountFetchUsernameSuggestionsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushSettingsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushSocialResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushUsernameResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountRestPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.DomainContactPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.FetchAuthOptionsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.IsAvailableResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.NewAccountResponsePayload;
+import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload;
+import org.wordpress.android.fluxc.store.AccountStore.FetchAuthOptionsPayload;
+import org.wordpress.android.fluxc.store.AccountStore.FetchUsernameSuggestionsPayload;
+import org.wordpress.android.fluxc.store.AccountStore.NewAccountPayload;
+import org.wordpress.android.fluxc.store.AccountStore.PushAccountSettingsPayload;
+import org.wordpress.android.fluxc.store.AccountStore.PushSocialAuthPayload;
+import org.wordpress.android.fluxc.store.AccountStore.PushSocialPayload;
+import org.wordpress.android.fluxc.store.AccountStore.PushSocialSmsPayload;
+import org.wordpress.android.fluxc.store.AccountStore.PushUsernamePayload;
+import org.wordpress.android.fluxc.store.AccountStore.SubscriptionResponsePayload;
+import org.wordpress.android.fluxc.store.AccountStore.UpdateSubscriptionPayload;
+import org.wordpress.android.fluxc.store.AccountStore.UpdateTokenPayload;
+
+@ActionEnum
+public enum AccountAction implements IAction {
+    // Remote actions
+    @Action
+    FETCH_ACCOUNT,          // request fetch of Account information
+    @Action
+    FETCH_SETTINGS,         // request fetch of Account Settings
+    @Action(payloadType = FetchUsernameSuggestionsPayload.class)
+    FETCH_USERNAME_SUGGESTIONS,  // request fetch of Username Suggestions
+    @Action
+    SEND_VERIFICATION_EMAIL, // request verification email for unverified accounts
+    @Action(payloadType = PushAccountSettingsPayload.class)
+    PUSH_SETTINGS,          // request saving Account Settings remotely
+    @Action(payloadType = PushSocialAuthPayload.class)
+    PUSH_SOCIAL_AUTH,      // request social auth remotely
+    @Action(payloadType = PushSocialPayload.class)
+    PUSH_SOCIAL_CONNECT,    // request social connect remotely
+    @Action(payloadType = PushSocialPayload.class)
+    PUSH_SOCIAL_LOGIN,      // request social login remotely
+    @Action(payloadType = PushSocialPayload.class)
+    PUSH_SOCIAL_SIGNUP,     // request social signup remotely
+    @Action(payloadType = PushSocialSmsPayload.class)
+    PUSH_SOCIAL_SMS,      // request social sms remotely
+    @Action(payloadType = PushUsernamePayload.class)
+    PUSH_USERNAME,        // request username remotely
+    @Action(payloadType = NewAccountPayload.class)
+    CREATE_NEW_ACCOUNT,     // create a new account (can be used to validate the account before creating it)
+    @Action(payloadType = String.class)
+    IS_AVAILABLE_BLOG,
+    @Action(payloadType = String.class)
+    IS_AVAILABLE_EMAIL,
+    @Action(payloadType = String.class)
+    IS_AVAILABLE_USERNAME,
+    @Action
+    FETCH_SUBSCRIPTIONS,
+    @Action(payloadType = AddOrDeleteSubscriptionPayload.class)
+    UPDATE_SUBSCRIPTION_EMAIL_COMMENT,
+    @Action(payloadType = AddOrDeleteSubscriptionPayload.class)
+    UPDATE_SUBSCRIPTION_EMAIL_POST,
+    @Action(payloadType = UpdateSubscriptionPayload.class)
+    UPDATE_SUBSCRIPTION_EMAIL_POST_FREQUENCY,
+    @Action(payloadType = AddOrDeleteSubscriptionPayload.class)
+    UPDATE_SUBSCRIPTION_NOTIFICATION_POST,
+    @Action
+    FETCH_DOMAIN_CONTACT,
+    @Action(payloadType = FetchAuthOptionsPayload.class)
+    FETCH_AUTH_OPTIONS,
+
+    // Remote responses
+    @Action(payloadType = AccountRestPayload.class)
+    FETCHED_ACCOUNT,        // response received from Account fetch request
+    @Action(payloadType = AccountRestPayload.class)
+    FETCHED_SETTINGS,       // response received from Account Settings fetch
+    @Action(payloadType = AccountFetchUsernameSuggestionsResponsePayload.class)
+    FETCHED_USERNAME_SUGGESTIONS,  // response received from Username Suggestions fetch
+    @Action(payloadType = NewAccountResponsePayload.class)
+    SENT_VERIFICATION_EMAIL,
+    @Action(payloadType = AccountPushSettingsResponsePayload.class)
+    PUSHED_SETTINGS,        // response received from Account Settings post
+    @Action(payloadType = AccountPushSocialResponsePayload.class)
+    PUSHED_SOCIAL,          // response received from social login post
+    @Action(payloadType = AccountPushUsernameResponsePayload.class)
+    PUSHED_USERNAME,        // response received from username post
+    @Action(payloadType = NewAccountResponsePayload.class)
+    CREATED_NEW_ACCOUNT,    // create a new account response
+    @Action(payloadType = IsAvailableResponsePayload.class)
+    CHECKED_IS_AVAILABLE,
+    @Action(payloadType = SubscriptionsModel.class)
+    FETCHED_SUBSCRIPTIONS,
+    @Action(payloadType = SubscriptionResponsePayload.class)
+    UPDATED_SUBSCRIPTION,
+    @Action(payloadType = DomainContactPayload.class)
+    FETCHED_DOMAIN_CONTACT,
+    @Action(payloadType = FetchAuthOptionsResponsePayload.class)
+    FETCHED_AUTH_OPTIONS,
+
+    // Local actions
+    @Action(payloadType = AccountModel.class)
+    UPDATE_ACCOUNT,         // update in-memory and persisted Account in AccountStore
+    @Action(payloadType = UpdateTokenPayload.class)
+    UPDATE_ACCESS_TOKEN,    // update in-memory and persisted Access Token
+    @Action
+    SIGN_OUT                // delete persisted Account, reset in-memory Account, delete access token
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ActivityLogAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ActivityLogAction.java
new file mode 100644
index 00000000000..954c7e15de8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ActivityLogAction.java
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.ActivityLogStore;
+
+@ActionEnum
+public enum ActivityLogAction implements IAction {
+    // Remote actions
+    @Action(payloadType = ActivityLogStore.FetchActivityLogPayload.class)
+    FETCH_ACTIVITIES,
+    @Action(payloadType = ActivityLogStore.FetchRewindStatePayload.class)
+    FETCH_REWIND_STATE,
+    @Action(payloadType = ActivityLogStore.RewindPayload.class)
+    REWIND,
+    @Action(payloadType = ActivityLogStore.BackupDownloadPayload.class)
+    BACKUP_DOWNLOAD,
+    @Action(payloadType = ActivityLogStore.FetchBackupDownloadStatePayload.class)
+    FETCH_BACKUP_DOWNLOAD_STATE,
+    @Action(payloadType = ActivityLogStore.FetchActivityTypesPayload.class)
+    FETCH_ACTIVITY_TYPES,
+    @Action(payloadType = ActivityLogStore.DismissBackupDownloadPayload.class)
+    DISMISS_BACKUP_DOWNLOAD
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AuthenticationAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AuthenticationAction.java
new file mode 100644
index 00000000000..ffdc24d1349
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/AuthenticationAction.java
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.DiscoveryResultPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator.AuthEmailResponsePayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateTwoFactorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.StartWebauthnChallengePayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticatePayload;
+import org.wordpress.android.fluxc.store.AccountStore.FinishWebauthnChallengePayload;
+
+@ActionEnum
+public enum AuthenticationAction implements IAction {
+    // Remote actions
+    @Action(payloadType = AuthenticatePayload.class)
+    AUTHENTICATE,
+    @Action(payloadType = AuthenticateTwoFactorPayload.class)
+    AUTHENTICATE_TWO_FACTOR,
+    @Action(payloadType = String.class)
+    DISCOVER_ENDPOINT,
+    @Action(payloadType = AuthEmailPayload.class)
+    SEND_AUTH_EMAIL,
+
+    // Remote responses
+    @Action(payloadType = AuthenticateErrorPayload.class)
+    AUTHENTICATE_ERROR,
+    @Action(payloadType = DiscoveryResultPayload.class)
+    DISCOVERY_RESULT,
+    @Action(payloadType = AuthEmailResponsePayload.class)
+    SENT_AUTH_EMAIL,
+    @Action(payloadType = StartWebauthnChallengePayload.class)
+    START_SECURITY_KEY_CHALLENGE,
+
+    @Action(payloadType = FinishWebauthnChallengePayload.class)
+    FINISH_SECURITY_KEY_CHALLENGE
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentAction.java
new file mode 100644
index 00000000000..f8916d65c8b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentAction.java
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentLikesPayload;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsPayload;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.FetchedCommentLikesResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCreateCommentPayload;
+
+@ActionEnum
+public enum CommentAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchCommentsPayload.class)
+    FETCH_COMMENTS,
+    @Action(payloadType = RemoteCommentPayload.class)
+    FETCH_COMMENT,
+    @Action(payloadType = RemoteCreateCommentPayload.class)
+    CREATE_NEW_COMMENT,
+    @Action(payloadType = RemoteCommentPayload.class)
+    PUSH_COMMENT,
+    @Action(payloadType = RemoteCommentPayload.class)
+    DELETE_COMMENT,
+    @Action(payloadType = RemoteCommentPayload.class)
+    LIKE_COMMENT,
+    @Action(payloadType = FetchCommentLikesPayload.class)
+    FETCH_COMMENT_LIKES,
+
+    // Remote responses
+    @Action(payloadType = FetchCommentsResponsePayload.class)
+    FETCHED_COMMENTS,
+    @Action(payloadType = RemoteCommentResponsePayload.class)
+    FETCHED_COMMENT,
+    @Action(payloadType = RemoteCommentResponsePayload.class)
+    CREATED_NEW_COMMENT,
+    @Action(payloadType = RemoteCommentResponsePayload.class)
+    PUSHED_COMMENT,
+    @Action(payloadType = RemoteCommentResponsePayload.class)
+    DELETED_COMMENT,
+    @Action(payloadType = RemoteCommentResponsePayload.class)
+    LIKED_COMMENT,
+    @Action(payloadType = FetchedCommentLikesResponsePayload.class)
+    FETCHED_COMMENT_LIKES,
+
+    // Local actions
+    @Action(payloadType = CommentModel.class)
+    UPDATE_COMMENT,
+    @Action(payloadType = SiteModel.class)
+    REMOVE_COMMENTS,
+    @Action(payloadType = CommentModel.class)
+    REMOVE_COMMENT,
+    @Action
+    REMOVE_ALL_COMMENTS,
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentsAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentsAction.kt
new file mode 100644
index 00000000000..a53bfb4158f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/CommentsAction.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsPayload
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsResponsePayload
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentResponsePayload
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCreateCommentPayload
+
+@Deprecated(
+        "This is a temporary code for backward compatibility and will be replaced with " +
+                "Comments Unification project."
+)
+@ActionEnum
+enum class CommentsAction : IAction {
+    // Remote actions
+    @Action(payloadType = FetchCommentsPayload::class)
+    FETCH_COMMENTS,
+
+    @Action(payloadType = RemoteCommentPayload::class)
+    FETCH_COMMENT,
+
+    @Action(payloadType = RemoteCreateCommentPayload::class)
+    CREATE_NEW_COMMENT,
+
+    @Action(payloadType = RemoteCommentPayload::class)
+    PUSH_COMMENT,
+
+    @Action(payloadType = RemoteCommentPayload::class)
+    DELETE_COMMENT,
+
+    @Action(payloadType = RemoteCommentPayload::class)
+    LIKE_COMMENT,
+
+    // Remote responses
+    @Action(payloadType = FetchCommentsResponsePayload::class)
+    FETCHED_COMMENTS,
+
+    @Action(payloadType = RemoteCommentResponsePayload::class)
+    FETCHED_COMMENT,
+
+    @Action(payloadType = RemoteCommentResponsePayload::class)
+    CREATED_NEW_COMMENT,
+
+    @Action(payloadType = RemoteCommentResponsePayload::class)
+    PUSHED_COMMENT,
+
+    @Action(payloadType = RemoteCommentResponsePayload::class)
+    DELETED_COMMENT,
+
+    @Action(payloadType = RemoteCommentResponsePayload::class)
+    LIKED_COMMENT,
+
+    // Local actions
+    @Action(payloadType = CommentModel::class)
+    UPDATE_COMMENT
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EditorThemeAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EditorThemeAction.kt
new file mode 100644
index 00000000000..7da3eb99d23
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EditorThemeAction.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.store.EditorThemeStore.FetchEditorThemePayload
+
+@ActionEnum
+enum class EditorThemeAction : IAction {
+    @Action(payloadType = FetchEditorThemePayload::class)
+    FETCH_EDITOR_THEME
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EncryptedLogAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EncryptedLogAction.kt
new file mode 100644
index 00000000000..cca941622dc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/EncryptedLogAction.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogPayload
+
+@ActionEnum
+enum class EncryptedLogAction : IAction {
+    @Action(payloadType = UploadEncryptedLogPayload::class)
+    UPLOAD_LOG,
+    @Action
+    RESET_UPLOAD_STATES
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/JetpackAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/JetpackAction.java
new file mode 100644
index 00000000000..99718034c19
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/JetpackAction.java
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModulePayload;
+
+@ActionEnum
+public enum JetpackAction implements IAction {
+    @Action(payloadType = SiteModel.class)
+    INSTALL_JETPACK,
+    @Action(payloadType = ActivateStatsModulePayload.class)
+    ACTIVATE_STATS_MODULE
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ListAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ListAction.kt
new file mode 100644
index 00000000000..4d56ba76cbd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ListAction.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.store.ListStore.FetchedListItemsPayload
+import org.wordpress.android.fluxc.store.ListStore.OnListDataFailure
+import org.wordpress.android.fluxc.store.ListStore.ListItemsRemovedPayload
+import org.wordpress.android.fluxc.store.ListStore.RemoveExpiredListsPayload
+
+@ActionEnum
+enum class ListAction : IAction {
+    @Action(payloadType = FetchedListItemsPayload::class)
+    FETCHED_LIST_ITEMS,
+    @Action(payloadType = ListItemsRemovedPayload::class)
+    LIST_ITEMS_REMOVED,
+    @Action(payloadType = ListDescriptorTypeIdentifier::class)
+    LIST_REQUIRES_REFRESH,
+    @Action(payloadType = ListDescriptorTypeIdentifier::class)
+    LIST_DATA_INVALIDATED,
+    @Action(payloadType = RemoveExpiredListsPayload::class)
+    REMOVE_EXPIRED_LISTS,
+    @Action(payloadType = OnListDataFailure::class)
+    LIST_DATA_FAILURE,
+    @Action
+    REMOVE_ALL_LISTS
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/MediaAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/MediaAction.java
new file mode 100644
index 00000000000..52cb62174e9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/MediaAction.java
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.store.MediaStore.CancelMediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListPayload;
+import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListResponsePayload;
+import org.wordpress.android.fluxc.store.MediaStore.MediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload;
+import org.wordpress.android.fluxc.store.MediaStore.UploadMediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.UploadStockMediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.UploadedStockMediaPayload;
+
+@ActionEnum
+public enum MediaAction implements IAction {
+    // Remote actions
+    @Action(payloadType = MediaPayload.class)
+    PUSH_MEDIA,
+    @Action(payloadType = UploadMediaPayload.class)
+    UPLOAD_MEDIA,
+    @Action(payloadType = FetchMediaListPayload.class)
+    FETCH_MEDIA_LIST,
+    @Action(payloadType = MediaPayload.class)
+    FETCH_MEDIA,
+    @Action(payloadType = MediaPayload.class)
+    DELETE_MEDIA,
+    @Action(payloadType = CancelMediaPayload.class)
+    CANCEL_MEDIA_UPLOAD,
+    @Action(payloadType = UploadStockMediaPayload.class)
+    UPLOAD_STOCK_MEDIA,
+
+    // Remote responses
+    @Action(payloadType = MediaPayload.class)
+    PUSHED_MEDIA,
+    @Action(payloadType = ProgressPayload.class)
+    UPLOADED_MEDIA,
+    @Action(payloadType = FetchMediaListResponsePayload.class)
+    FETCHED_MEDIA_LIST,
+    @Action(payloadType = MediaPayload.class)
+    FETCHED_MEDIA,
+    @Action(payloadType = MediaPayload.class)
+    DELETED_MEDIA,
+    @Action(payloadType = ProgressPayload.class)
+    CANCELED_MEDIA_UPLOAD,
+    @Action(payloadType = UploadedStockMediaPayload.class)
+    UPLOADED_STOCK_MEDIA,
+
+    // Local actions
+    @Action(payloadType = MediaModel.class)
+    UPDATE_MEDIA,
+    @Action(payloadType = MediaModel.class)
+    REMOVE_MEDIA,
+    @Action
+    REMOVE_ALL_MEDIA
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/NotificationAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/NotificationAction.java
new file mode 100644
index 00000000000..d47bc717351
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/NotificationAction.java
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.notification.NotificationModel;
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationHashesResponsePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationPayload;
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationResponsePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationsPayload;
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationsResponsePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.MarkNotificationSeenResponsePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.MarkNotificationsSeenPayload;
+import org.wordpress.android.fluxc.store.NotificationStore.RegisterDevicePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.RegisterDeviceResponsePayload;
+import org.wordpress.android.fluxc.store.NotificationStore.UnregisterDeviceResponsePayload;
+
+@ActionEnum
+public enum NotificationAction implements IAction {
+    // Remote actions
+    @Action(payloadType = RegisterDevicePayload.class)
+    @Deprecated
+    REGISTER_DEVICE, // Register device for push notifications with WordPress.com
+    @Action
+    UNREGISTER_DEVICE, // Unregister device for push notifications with WordPress.com
+    @Action(payloadType = FetchNotificationsPayload.class)
+    FETCH_NOTIFICATIONS, // Fetch notifications
+    @Action(payloadType = FetchNotificationPayload.class)
+    FETCH_NOTIFICATION, // Fetch a single notification
+    @Action(payloadType = MarkNotificationsSeenPayload.class)
+    MARK_NOTIFICATIONS_SEEN, // Submit the time notifications were last seen
+
+    // Remote responses
+    @Action(payloadType = RegisterDeviceResponsePayload.class)
+    @Deprecated
+    REGISTERED_DEVICE, // Response to device registration received
+    @Action(payloadType = UnregisterDeviceResponsePayload.class)
+    UNREGISTERED_DEVICE, // Response to device unregistration
+    @Action(payloadType = FetchNotificationHashesResponsePayload.class)
+    FETCHED_NOTIFICATION_HASHES, // Response to an internal request to fetch notification hashes for synchronization
+    @Action(payloadType = FetchNotificationsResponsePayload.class)
+    FETCHED_NOTIFICATIONS, // Response to fetching notifications
+    @Action(payloadType = FetchNotificationResponsePayload.class)
+    FETCHED_NOTIFICATION, // Response to fetching a single notification
+    @Action(payloadType = MarkNotificationSeenResponsePayload.class)
+    MARKED_NOTIFICATIONS_SEEN, // Response to submitting the time notifications were last seen
+
+    // Local actions
+    @Action(payloadType = NotificationModel.class)
+    UPDATE_NOTIFICATION // Save updates to db
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PlanOffersAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PlanOffersAction.kt
new file mode 100644
index 00000000000..a03c567611c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PlanOffersAction.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+
+@ActionEnum
+enum class PlanOffersAction : IAction {
+    FETCH_PLAN_OFFERS
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PluginAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PluginAction.java
new file mode 100644
index 00000000000..ae315962fe7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PluginAction.java
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.PluginStore.ConfigureSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.ConfiguredSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.DeleteSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.DeletedSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedWPOrgPluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.InstallSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.InstalledSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.SearchPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.SearchedPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.UpdateSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.UpdatedSitePluginPayload;
+
+@ActionEnum
+public enum PluginAction implements IAction {
+    // Remote actions
+    @Action(payloadType = ConfigureSitePluginPayload.class)
+    CONFIGURE_SITE_PLUGIN,
+    @Action(payloadType = DeleteSitePluginPayload.class)
+    DELETE_SITE_PLUGIN,
+    @Action(payloadType = FetchPluginDirectoryPayload.class)
+    FETCH_PLUGIN_DIRECTORY,
+    @Action(payloadType = String.class)
+    FETCH_WPORG_PLUGIN,
+    @Action(payloadType = FetchSitePluginPayload.class)
+    FETCH_SITE_PLUGIN,
+    @Action(payloadType = InstallSitePluginPayload.class)
+    INSTALL_SITE_PLUGIN,
+    @Action(payloadType = InstallSitePluginPayload.class)
+    INSTALL_JP_FOR_INDIVIDUAL_PLUGIN_SITE,
+    @Action(payloadType = SearchPluginDirectoryPayload.class)
+    SEARCH_PLUGIN_DIRECTORY,
+    @Action(payloadType = UpdateSitePluginPayload.class)
+    UPDATE_SITE_PLUGIN,
+
+    // Remote responses
+    @Action(payloadType = ConfiguredSitePluginPayload.class)
+    CONFIGURED_SITE_PLUGIN,
+    @Action(payloadType = DeletedSitePluginPayload.class)
+    DELETED_SITE_PLUGIN,
+    @Action(payloadType = FetchedPluginDirectoryPayload.class)
+    FETCHED_PLUGIN_DIRECTORY,
+    @Action(payloadType = FetchedWPOrgPluginPayload.class)
+    FETCHED_WPORG_PLUGIN,
+    @Action(payloadType = FetchedSitePluginPayload.class)
+    FETCHED_SITE_PLUGIN,
+    @Action(payloadType = InstalledSitePluginPayload.class)
+    INSTALLED_SITE_PLUGIN,
+    @Action(payloadType = InstalledSitePluginPayload.class)
+    INSTALLED_JP_FOR_INDIVIDUAL_PLUGIN_SITE,
+    @Action(payloadType = SearchedPluginDirectoryPayload.class)
+    SEARCHED_PLUGIN_DIRECTORY,
+    @Action(payloadType = UpdatedSitePluginPayload.class)
+    UPDATED_SITE_PLUGIN,
+
+    // Local actions
+    @Action(payloadType = SiteModel.class)
+    REMOVE_SITE_PLUGINS
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PostAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PostAction.java
new file mode 100644
index 00000000000..571785ad4f0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/PostAction.java
@@ -0,0 +1,77 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.store.PostStore.DeletedPostPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostLikesPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostListPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostListResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostStatusResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchRevisionsPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchRevisionsResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchedPostLikesResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.RemoteAutoSavePostPayload;
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload;
+
+@ActionEnum
+public enum PostAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchPostListPayload.class)
+    FETCH_POST_LIST,
+    @Action(payloadType = FetchPostsPayload.class)
+    FETCH_POSTS,
+    @Action(payloadType = FetchPostsPayload.class)
+    FETCH_PAGES,
+    @Action(payloadType = RemotePostPayload.class)
+    FETCH_POST,
+    @Action(payloadType = RemotePostPayload.class)
+    FETCH_POST_STATUS,
+    @Action(payloadType = RemotePostPayload.class)
+    PUSH_POST,
+    @Action(payloadType = RemotePostPayload.class)
+    DELETE_POST,
+    @Action(payloadType = RemotePostPayload.class)
+    RESTORE_POST,
+    @Action(payloadType = FetchRevisionsPayload.class)
+    FETCH_REVISIONS,
+    @Action(payloadType = RemotePostPayload.class)
+    REMOTE_AUTO_SAVE_POST,
+    @Action(payloadType = FetchPostLikesPayload.class)
+    FETCH_POST_LIKES,
+
+    // Remote responses
+    @Action(payloadType = FetchPostListResponsePayload.class)
+    FETCHED_POST_LIST,
+    @Action(payloadType = FetchPostsResponsePayload.class)
+    FETCHED_POSTS,
+    @Action(payloadType = FetchPostResponsePayload.class)
+    FETCHED_POST,
+    @Action(payloadType = FetchPostStatusResponsePayload.class)
+    FETCHED_POST_STATUS,
+    @Action(payloadType = RemotePostPayload.class)
+    PUSHED_POST,
+    @Action(payloadType = DeletedPostPayload.class)
+    DELETED_POST,
+    @Action(payloadType = RemotePostPayload.class)
+    RESTORED_POST,
+    @Action(payloadType = FetchRevisionsResponsePayload.class)
+    FETCHED_REVISIONS,
+    @Action(payloadType = RemoteAutoSavePostPayload.class)
+    REMOTE_AUTO_SAVED_POST,
+    @Action(payloadType = FetchedPostLikesResponsePayload.class)
+    FETCHED_POST_LIKES,
+
+    // Local actions
+    @Action(payloadType = PostModel.class)
+    UPDATE_POST,
+    @Action(payloadType = PostModel.class)
+    REMOVE_POST,
+    @Action
+    REMOVE_ALL_POSTS
+}
+
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ProductAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ProductAction.kt
new file mode 100644
index 00000000000..2df7a6193d6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ProductAction.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+
+@ActionEnum
+enum class ProductAction : IAction {
+    FETCH_PRODUCTS
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ReaderAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ReaderAction.java
new file mode 100644
index 00000000000..e47cbbe4975
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ReaderAction.java
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.ReaderStore.ReaderSearchSitesPayload;
+import org.wordpress.android.fluxc.store.ReaderStore.ReaderSearchSitesResponsePayload;
+
+@ActionEnum
+public enum ReaderAction implements IAction {
+    // Remote actions
+    @Action(payloadType = ReaderSearchSitesPayload.class)
+    READER_SEARCH_SITES,
+
+    // Remote responses
+    @Action(payloadType = ReaderSearchSitesResponsePayload.class)
+    READER_SEARCHED_SITES
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ScanAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ScanAction.kt
new file mode 100644
index 00000000000..9b7446c0268
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ScanAction.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.store.ScanStore
+
+@ActionEnum
+enum class ScanAction : IAction {
+    @Action(payloadType = ScanStore.FetchScanStatePayload::class)
+    FETCH_SCAN_STATE,
+    @Action(payloadType = ScanStore.ScanStartPayload::class)
+    START_SCAN,
+    @Action(payloadType = ScanStore.FixThreatsPayload::class)
+    FIX_THREATS,
+    @Action(payloadType = ScanStore.IgnoreThreatPayload::class)
+    IGNORE_THREAT,
+    @Action(payloadType = ScanStore.FetchFixThreatsStatusPayload::class)
+    FETCH_FIX_THREATS_STATUS,
+    @Action(payloadType = ScanStore.FetchScanHistoryPayload::class)
+    FETCH_SCAN_HISTORY,
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/SiteAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/SiteAction.java
new file mode 100644
index 00000000000..a60c5836bf9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/SiteAction.java
@@ -0,0 +1,166 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.SitesModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.DeleteSiteResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.ExportSiteResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.FetchWPComSiteResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.IsWPComResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.AutomatedTransferEligibilityResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.AutomatedTransferStatusResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload;
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload;
+import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorForAllSitesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorForAllSitesResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorPayload;
+import org.wordpress.android.fluxc.store.SiteStore.DesignatePrimaryDomainPayload;
+import org.wordpress.android.fluxc.store.SiteStore.DesignatedPrimaryDomainPayload;
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedCountriesResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedStatesResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchBlockLayoutsPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchJetpackCapabilitiesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchPrivateAtomicCookiePayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchWPAPISitePayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedBlockLayoutsResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedEditorsPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedJetpackCapabilitiesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPlansPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPrivateAtomicCookiePayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchedUserRolesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.InitiateAutomatedTransferPayload;
+import org.wordpress.android.fluxc.store.SiteStore.InitiateAutomatedTransferResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.NewSitePayload;
+import org.wordpress.android.fluxc.store.SiteStore.QuickStartCompletedResponsePayload;
+import org.wordpress.android.fluxc.store.SiteStore.RefreshSitesXMLRPCPayload;
+import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsPayload;
+import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsResponsePayload;
+
+@ActionEnum
+public enum SiteAction implements IAction {
+    // Remote actions
+    @Action(payloadType = SiteModel.class)
+    FETCH_PROFILE_XML_RPC,
+    @Action(payloadType = SiteModel.class)
+    FETCH_SITE,
+    @Action(payloadType = FetchSitesPayload.class)
+    FETCH_SITES,
+    @Action(payloadType = RefreshSitesXMLRPCPayload.class)
+    FETCH_SITES_XML_RPC,
+    @Action(payloadType = FetchWPAPISitePayload.class)
+    FETCH_SITE_WP_API,
+    @Action(payloadType = NewSitePayload.class)
+    CREATE_NEW_SITE,
+    @Action(payloadType = SiteModel.class)
+    FETCH_POST_FORMATS,
+    @Action(payloadType = SiteModel.class)
+    FETCH_SITE_EDITORS,
+    @Action(payloadType = DesignateMobileEditorPayload.class)
+    DESIGNATE_MOBILE_EDITOR,
+    @Action(payloadType = DesignateMobileEditorForAllSitesPayload.class)
+    DESIGNATE_MOBILE_EDITOR_FOR_ALL_SITES,
+    @Action(payloadType = SiteModel.class)
+    FETCH_USER_ROLES,
+    @Action(payloadType = SiteModel.class)
+    DELETE_SITE,
+    @Action(payloadType = SiteModel.class)
+    EXPORT_SITE,
+    @Action(payloadType = String.class)
+    IS_WPCOM_URL,
+    @Action(payloadType = SuggestDomainsPayload.class)
+    SUGGEST_DOMAINS,
+    @Action(payloadType = String.class)
+    FETCH_CONNECT_SITE_INFO,
+    @Action(payloadType = String.class)
+    FETCH_WPCOM_SITE_BY_URL,
+    @Action(payloadType = SiteModel.class)
+    CHECK_AUTOMATED_TRANSFER_ELIGIBILITY,
+    @Action(payloadType = InitiateAutomatedTransferPayload.class)
+    INITIATE_AUTOMATED_TRANSFER,
+    @Action(payloadType = SiteModel.class)
+    CHECK_AUTOMATED_TRANSFER_STATUS,
+    @Action(payloadType = SiteModel.class)
+    FETCH_PLANS,
+    @Action(payloadType = String.class)
+    CHECK_DOMAIN_AVAILABILITY,
+    @Action(payloadType = String.class)
+    FETCH_DOMAIN_SUPPORTED_STATES,
+    @Action
+    FETCH_DOMAIN_SUPPORTED_COUNTRIES,
+    @Action(payloadType = CompleteQuickStartPayload.class)
+    COMPLETE_QUICK_START,
+    @Action(payloadType = DesignatePrimaryDomainPayload.class)
+    DESIGNATE_PRIMARY_DOMAIN,
+    @Action(payloadType = FetchPrivateAtomicCookiePayload.class)
+    FETCH_PRIVATE_ATOMIC_COOKIE,
+    @Action(payloadType = FetchBlockLayoutsPayload.class)
+    FETCH_BLOCK_LAYOUTS,
+
+    // Remote responses
+    @Action(payloadType = SiteModel.class)
+    FETCHED_PROFILE_XML_RPC,
+    @Action(payloadType = FetchedEditorsPayload.class)
+    FETCHED_SITE_EDITORS,
+    @Action(payloadType = DesignateMobileEditorForAllSitesResponsePayload.class)
+    DESIGNATED_MOBILE_EDITOR_FOR_ALL_SITES,
+    @Action(payloadType = FetchedUserRolesPayload.class)
+    FETCHED_USER_ROLES,
+    @Action(payloadType = DeleteSiteResponsePayload.class)
+    DELETED_SITE,
+    @Action(payloadType = ExportSiteResponsePayload.class)
+    EXPORTED_SITE,
+    @Action(payloadType = ConnectSiteInfoPayload.class)
+    FETCHED_CONNECT_SITE_INFO,
+    @Action(payloadType = FetchWPComSiteResponsePayload.class)
+    FETCHED_WPCOM_SITE_BY_URL,
+    @Action(payloadType = AutomatedTransferEligibilityResponsePayload.class)
+    CHECKED_AUTOMATED_TRANSFER_ELIGIBILITY,
+    @Action(payloadType = InitiateAutomatedTransferResponsePayload.class)
+    INITIATED_AUTOMATED_TRANSFER,
+    @Action(payloadType = AutomatedTransferStatusResponsePayload.class)
+    CHECKED_AUTOMATED_TRANSFER_STATUS,
+    @Action(payloadType = FetchedPlansPayload.class)
+    FETCHED_PLANS,
+    @Action(payloadType = DomainAvailabilityResponsePayload.class)
+    CHECKED_DOMAIN_AVAILABILITY,
+    @Action(payloadType = DomainSupportedStatesResponsePayload.class)
+    FETCHED_DOMAIN_SUPPORTED_STATES,
+    @Action(payloadType = DomainSupportedCountriesResponsePayload.class)
+    FETCHED_DOMAIN_SUPPORTED_COUNTRIES,
+    @Action(payloadType = QuickStartCompletedResponsePayload.class)
+    COMPLETED_QUICK_START,
+    @Action(payloadType = DesignatedPrimaryDomainPayload.class)
+    DESIGNATED_PRIMARY_DOMAIN,
+    @Action(payloadType = FetchedPrivateAtomicCookiePayload.class)
+    FETCHED_PRIVATE_ATOMIC_COOKIE,
+    @Action(payloadType = FetchJetpackCapabilitiesPayload.class)
+    FETCH_JETPACK_CAPABILITIES,
+    @Action(payloadType = FetchedJetpackCapabilitiesPayload.class)
+    FETCHED_JETPACK_CAPABILITIES,
+    @Action(payloadType = FetchedBlockLayoutsResponsePayload.class)
+    FETCHED_BLOCK_LAYOUTS,
+
+    // Local actions
+    @Action(payloadType = SiteModel.class)
+    UPDATE_SITE,
+    @Action(payloadType = SitesModel.class)
+    UPDATE_SITES,
+    @Action(payloadType = SiteModel.class)
+    REMOVE_SITE,
+    @Action
+    REMOVE_ALL_SITES,
+    @Action
+    REMOVE_WPCOM_AND_JETPACK_SITES,
+    @Action(payloadType = SitesModel.class)
+    SHOW_SITES,
+    @Action(payloadType = SitesModel.class)
+    HIDE_SITES,
+    @Action(payloadType = IsWPComResponsePayload.class)
+    CHECKED_IS_WPCOM_URL,
+    @Action(payloadType = SuggestDomainsResponsePayload.class)
+    SUGGESTED_DOMAINS,
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/StockMediaAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/StockMediaAction.java
new file mode 100644
index 00000000000..ed4168fffd1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/StockMediaAction.java
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.store.StockMediaStore;
+
+@ActionEnum
+public enum StockMediaAction implements IAction {
+    // Remote actions
+    @Action(payloadType = StockMediaStore.FetchStockMediaListPayload.class)
+    FETCH_STOCK_MEDIA
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TaxonomyAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TaxonomyAction.java
new file mode 100644
index 00000000000..a33d0f1112a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TaxonomyAction.java
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermsPayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermsResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.RemoteTermPayload;
+
+@ActionEnum
+public enum TaxonomyAction implements IAction {
+    // Remote actions
+    @Action(payloadType = SiteModel.class)
+    FETCH_CATEGORIES,
+    @Action(payloadType = SiteModel.class)
+    FETCH_TAGS,
+    @Action(payloadType = FetchTermsPayload.class)
+    FETCH_TERMS,
+    @Action(payloadType = RemoteTermPayload.class)
+    FETCH_TERM,
+    @Action(payloadType = RemoteTermPayload.class)
+    PUSH_TERM,
+    @Action(payloadType = RemoteTermPayload.class)
+    DELETE_TERM,
+
+    // Remote responses
+    @Action(payloadType = FetchTermsResponsePayload.class)
+    FETCHED_TERMS,
+    @Action(payloadType = FetchTermResponsePayload.class)
+    FETCHED_TERM,
+    @Action(payloadType = RemoteTermPayload.class)
+    PUSHED_TERM,
+    @Action(payloadType = RemoteTermPayload.class)
+    DELETED_TERM,
+
+    // Local actions
+    @Action(payloadType = TermModel.class)
+    UPDATE_TERM,
+    @Action(payloadType = TermModel.class)
+    REMOVE_TERM,
+    @Action
+    REMOVE_ALL_TERMS
+}
+
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ThemeAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ThemeAction.java
new file mode 100644
index 00000000000..22265308b8a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/ThemeAction.java
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchStarterDesignsPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchWPComThemesPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedCurrentThemePayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedSiteThemesPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedStarterDesignsPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedWpComThemesPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.SiteThemePayload;
+
+@ActionEnum
+public enum ThemeAction implements IAction {
+    // Remote actions
+    @Action(payloadType = FetchWPComThemesPayload.class)
+    FETCH_WP_COM_THEMES,
+    @Action(payloadType = FetchStarterDesignsPayload.class)
+    FETCH_STARTER_DESIGNS,
+    @Action(payloadType = SiteModel.class)
+    FETCH_INSTALLED_THEMES, // Jetpack only
+    @Action(payloadType = SiteModel.class)
+    FETCH_CURRENT_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    ACTIVATE_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    INSTALL_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    DELETE_THEME,
+
+    // Remote responses
+    @Action(payloadType = FetchedWpComThemesPayload.class)
+    FETCHED_WP_COM_THEMES,
+    @Action(payloadType = FetchedStarterDesignsPayload.class)
+    FETCHED_STARTER_DESIGNS,
+    @Action(payloadType = FetchedSiteThemesPayload.class)
+    FETCHED_INSTALLED_THEMES,
+    @Action(payloadType = FetchedCurrentThemePayload.class)
+    FETCHED_CURRENT_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    ACTIVATED_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    INSTALLED_THEME,
+    @Action(payloadType = SiteThemePayload.class)
+    DELETED_THEME,
+
+    // Local actions
+    @Action(payloadType = SiteModel.class)
+    REMOVE_SITE_THEMES
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TransactionAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TransactionAction.kt
new file mode 100644
index 00000000000..c29d2ae4b1b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/TransactionAction.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.CreateShoppingCartWithDomainAndPlanPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.RedeemShoppingCartPayload
+
+@ActionEnum
+enum class TransactionAction : IAction {
+    // Remote actions
+    FETCH_SUPPORTED_COUNTRIES,
+    @Action(payloadType = CreateShoppingCartPayload::class)
+    CREATE_SHOPPING_CART,
+    @Action(payloadType = CreateShoppingCartWithDomainAndPlanPayload::class)
+    CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN,
+    @Action(payloadType = RedeemShoppingCartPayload::class)
+    REDEEM_CART_WITH_CREDITS
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/UploadAction.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/UploadAction.java
new file mode 100644
index 00000000000..428f6e9aed4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/UploadAction.java
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.action;
+
+import org.wordpress.android.fluxc.annotations.Action;
+import org.wordpress.android.fluxc.annotations.ActionEnum;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload;
+import org.wordpress.android.fluxc.store.PostStore.RemoteAutoSavePostPayload;
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload;
+import org.wordpress.android.fluxc.store.UploadStore.ClearMediaPayload;
+
+@ActionEnum
+public enum UploadAction implements IAction {
+    // Remote responses
+    @Action(payloadType = ProgressPayload.class)
+    UPLOADED_MEDIA, // Proxy for MediaAction.UPLOADED_MEDIA
+    @Action(payloadType = RemotePostPayload.class)
+    PUSHED_POST, // Proxy for PostAction.PUSHED_POST
+    @Action(payloadType = RemoteAutoSavePostPayload.class)
+    REMOTE_AUTO_SAVED_POST, // Proxy for PostAction.REMOTE_AUTO_SAVED_POST
+
+    // Local actions
+    @Action(payloadType = PostModel.class)
+    INCREMENT_NUMBER_OF_AUTO_UPLOAD_ATTEMPTS,
+    @Action(payloadType = PostModel.class)
+    CANCEL_POST,
+    @Action(payloadType = ClearMediaPayload.class)
+    CLEAR_MEDIA_FOR_POST
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/VerticalAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/VerticalAction.kt
new file mode 100644
index 00000000000..46d25cc7b4a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/VerticalAction.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+
+@ActionEnum
+enum class VerticalAction : IAction {
+    @Action
+    FETCH_SEGMENTS,
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/WhatsNewAction.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/WhatsNewAction.kt
new file mode 100644
index 00000000000..eeef52c71d8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/action/WhatsNewAction.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.action
+
+import org.wordpress.android.fluxc.annotations.Action
+import org.wordpress.android.fluxc.annotations.ActionEnum
+import org.wordpress.android.fluxc.annotations.action.IAction
+import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewFetchPayload
+
+@ActionEnum
+enum class WhatsNewAction : IAction {
+    // Remote actions
+    @Action(payloadType = WhatsNewFetchPayload::class)
+    FETCH_REMOTE_ANNOUNCEMENT,
+
+    @Action
+    FETCH_CACHED_ANNOUNCEMENT
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLogger.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLogger.kt
new file mode 100644
index 00000000000..197f80bf5d1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLogger.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.logging
+
+interface FluxCCrashLogger {
+    fun recordEvent(message: String, category: String?)
+
+    fun recordException(exception: Throwable, category: String?)
+
+    fun sendReport(exception: Throwable?, tags: Map<String, String>, message: String?)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLoggerProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLoggerProvider.kt
new file mode 100644
index 00000000000..ad318c4a266
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/logging/FluxCCrashLoggerProvider.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.logging
+
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.MAIN
+
+object FluxCCrashLoggerProvider {
+    @Volatile
+    var crashLogger: FluxCCrashLogger? = null
+        get() {
+            if (field == null) {
+                AppLog.w(T.MAIN, "FluxCCrashLogger is not initialized.")
+            }
+            return field
+        }
+        private set
+
+    fun initLogger(logger: FluxCCrashLogger) {
+        if (crashLogger == null) {
+            synchronized(FluxCCrashLoggerProvider.javaClass) {
+                if (crashLogger == null) {
+                    crashLogger = logger
+                } else {
+                    logAlreadyInitialized()
+                }
+            }
+        } else {
+            logAlreadyInitialized()
+        }
+    }
+
+    private fun logAlreadyInitialized() {
+        AppLog.w(MAIN, "FluxCCrashLoggerProvider already initialized.")
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/AccountModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/AccountModel.java
new file mode 100644
index 00000000000..edaee69af3b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/AccountModel.java
@@ -0,0 +1,314 @@
+package org.wordpress.android.fluxc.model;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.StringUtils;
+
+@Table
+public class AccountModel extends Payload<BaseNetworkError> implements Identifiable {
+    @PrimaryKey(autoincrement = false)
+    @Column private int mId;
+
+    // Account attributes
+    @Column private String mUserName;
+    @Column private long mUserId;
+    @Column private String mDisplayName;
+    @Column private String mProfileUrl; // profile_URL
+    @Column private String mAvatarUrl; // avatar_URL
+    @Column private long mPrimarySiteId;
+    @Column private boolean mEmailVerified;
+    @Column private int mSiteCount;
+    @Column private int mVisibleSiteCount;
+    @Column private String mEmail;
+    @Column private boolean mHasUnseenNotes;
+
+    // Account Settings attributes
+    @Column private String mFirstName;
+    @Column private String mLastName;
+    @Column private String mAboutMe;
+    @Column private String mDate;
+    @Column private String mNewEmail;
+    @Column private boolean mPendingEmailChange;
+    @Column private boolean mTwoStepEnabled;
+    @Column private String mWebAddress; // WPCom rest API: user_URL
+    @Column private boolean mTracksOptOut;
+    @Column private boolean mUsernameCanBeChanged;
+
+    public AccountModel() {
+        init();
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof AccountModel)) return false;
+
+        AccountModel otherAccount = (AccountModel) other;
+
+        return getId() == otherAccount.getId()
+               && StringUtils.equals(getUserName(), otherAccount.getUserName())
+               && getUserId() == otherAccount.getUserId()
+               && StringUtils.equals(getDisplayName(), otherAccount.getDisplayName())
+               && StringUtils.equals(getProfileUrl(), otherAccount.getProfileUrl())
+               && StringUtils.equals(getAvatarUrl(), otherAccount.getAvatarUrl())
+               && getPrimarySiteId() == otherAccount.getPrimarySiteId()
+               && getSiteCount() == otherAccount.getSiteCount()
+               && getEmailVerified() == otherAccount.getEmailVerified()
+               && getVisibleSiteCount() == otherAccount.getVisibleSiteCount()
+               && StringUtils.equals(getFirstName(), otherAccount.getFirstName())
+               && StringUtils.equals(getLastName(), otherAccount.getLastName())
+               && StringUtils.equals(getAboutMe(), otherAccount.getAboutMe())
+               && StringUtils.equals(getDate(), otherAccount.getDate())
+               && StringUtils.equals(getNewEmail(), otherAccount.getNewEmail())
+               && getPendingEmailChange() == otherAccount.getPendingEmailChange()
+               && getTwoStepEnabled() == otherAccount.getTwoStepEnabled()
+               && StringUtils.equals(getWebAddress(), otherAccount.getWebAddress())
+               && getHasUnseenNotes() == otherAccount.getHasUnseenNotes()
+               && getTracksOptOut() == otherAccount.getTracksOptOut()
+               && getUsernameCanBeChanged() == otherAccount.getUsernameCanBeChanged();
+    }
+
+    public void init() {
+        mUserName = "";
+        mUserId = 0;
+        mDisplayName = "";
+        mProfileUrl = "";
+        mAvatarUrl = "";
+        mPrimarySiteId = 0;
+        mSiteCount = 0;
+        mEmailVerified = true;
+        mVisibleSiteCount = 0;
+        mEmail = "";
+        mFirstName = "";
+        mLastName = "";
+        mAboutMe = "";
+        mDate = "";
+        mNewEmail = "";
+        mPendingEmailChange = false;
+        mTwoStepEnabled = false;
+        mWebAddress = "";
+        mTracksOptOut = false;
+        mUsernameCanBeChanged = false;
+    }
+
+    /**
+     * Copies Account attributes from another {@link AccountModel} to this instance.
+     */
+    public void copyAccountAttributes(AccountModel other) {
+        if (other == null) return;
+        setUserName(other.getUserName());
+        setUserId(other.getUserId());
+        setDisplayName(other.getDisplayName());
+        setProfileUrl(other.getProfileUrl());
+        setAvatarUrl(other.getAvatarUrl());
+        setPrimarySiteId(other.getPrimarySiteId());
+        setSiteCount(other.getSiteCount());
+        setVisibleSiteCount(other.getVisibleSiteCount());
+        setEmail(other.getEmail());
+        setHasUnseenNotes(other.getHasUnseenNotes());
+        setEmailVerified(other.getEmailVerified());
+    }
+
+    /**
+     * Copies Account Settings attributes from another {@link AccountModel} to this instance.
+     */
+    public void copyAccountSettingsAttributes(AccountModel other) {
+        if (other == null) return;
+        setUserName(other.getUserName());
+        setPrimarySiteId(other.getPrimarySiteId());
+        setFirstName(other.getFirstName());
+        setLastName(other.getLastName());
+        setAboutMe(other.getAboutMe());
+        setDate(other.getDate());
+        setNewEmail(other.getNewEmail());
+        setPendingEmailChange(other.getPendingEmailChange());
+        setTwoStepEnabled(other.getTwoStepEnabled());
+        setTracksOptOut(other.getTracksOptOut());
+        setWebAddress(other.getWebAddress());
+        setDisplayName(other.getDisplayName());
+        setUsernameCanBeChanged(other.getUsernameCanBeChanged());
+    }
+
+    public long getUserId() {
+        return mUserId;
+    }
+
+    public void setUserId(long userId) {
+        mUserId = userId;
+    }
+
+    public void setPrimarySiteId(long primarySiteId) {
+        mPrimarySiteId = primarySiteId;
+    }
+
+    public long getPrimarySiteId() {
+        return mPrimarySiteId;
+    }
+
+    public String getUserName() {
+        return mUserName;
+    }
+
+    public void setUserName(String userName) {
+        mUserName = userName;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        mDisplayName = displayName;
+    }
+
+    public String getProfileUrl() {
+        return mProfileUrl;
+    }
+
+    public void setProfileUrl(String profileUrl) {
+        mProfileUrl = profileUrl;
+    }
+
+    public String getAvatarUrl() {
+        return mAvatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        mAvatarUrl = avatarUrl;
+    }
+
+    public boolean getEmailVerified() {
+        return mEmailVerified;
+    }
+
+    public void setEmailVerified(boolean emailVerified) {
+        mEmailVerified = emailVerified;
+    }
+
+    public int getSiteCount() {
+        return mSiteCount;
+    }
+
+    public void setSiteCount(int siteCount) {
+        mSiteCount = siteCount;
+    }
+
+    public int getVisibleSiteCount() {
+        return mVisibleSiteCount;
+    }
+
+    public void setVisibleSiteCount(int visibleSiteCount) {
+        mVisibleSiteCount = visibleSiteCount;
+    }
+
+    public void setEmail(String email) {
+        mEmail = email;
+    }
+
+    public String getEmail() {
+        return mEmail;
+    }
+
+    public void setFirstName(String firstName) {
+        mFirstName = firstName;
+    }
+
+    public String getFirstName() {
+        return mFirstName;
+    }
+
+    public void setLastName(String lastName) {
+        mLastName = lastName;
+    }
+
+    public String getLastName() {
+        return mLastName;
+    }
+
+    public void setAboutMe(String aboutMe) {
+        mAboutMe = aboutMe;
+    }
+
+    public String getAboutMe() {
+        return mAboutMe;
+    }
+
+    public void setDate(String date) {
+        mDate = date;
+    }
+
+    public String getDate() {
+        return mDate;
+    }
+
+    public void setNewEmail(String newEmail) {
+        mNewEmail = newEmail;
+    }
+
+    public String getNewEmail() {
+        return mNewEmail;
+    }
+
+    public void setPendingEmailChange(boolean pendingEmailChange) {
+        mPendingEmailChange = pendingEmailChange;
+    }
+
+    public boolean getPendingEmailChange() {
+        return mPendingEmailChange;
+    }
+
+    public void setTwoStepEnabled(boolean twoStepEnabled) {
+        mTwoStepEnabled = twoStepEnabled;
+    }
+
+    public boolean getTwoStepEnabled() {
+        return mTwoStepEnabled;
+    }
+
+    public void setWebAddress(String webAddress) {
+        mWebAddress = webAddress;
+    }
+
+    public String getWebAddress() {
+        return mWebAddress;
+    }
+
+    public boolean getHasUnseenNotes() {
+        return mHasUnseenNotes;
+    }
+
+    public void setHasUnseenNotes(boolean hasUnseenNotes) {
+        mHasUnseenNotes = hasUnseenNotes;
+    }
+
+    public boolean getTracksOptOut() {
+        return mTracksOptOut;
+    }
+
+    public void setTracksOptOut(boolean tracksOptOut) {
+        mTracksOptOut = tracksOptOut;
+    }
+
+    public boolean getUsernameCanBeChanged() {
+        return mUsernameCanBeChanged;
+    }
+
+    public void setUsernameCanBeChanged(boolean usernameCanBeChanged) {
+        mUsernameCanBeChanged = usernameCanBeChanged;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersMapper.kt
new file mode 100644
index 00000000000..d804384cf06
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersMapper.kt
@@ -0,0 +1,54 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.FRIDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.MONDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.SATURDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.SUNDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.THURSDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.TUESDAY
+import org.wordpress.android.fluxc.model.BloggingRemindersModel.Day.WEDNESDAY
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao.BloggingReminders
+import javax.inject.Inject
+
+class BloggingRemindersMapper
+@Inject constructor() {
+    fun toDatabaseModel(domainModel: BloggingRemindersModel): BloggingReminders =
+        with(domainModel) {
+            return BloggingReminders(
+                localSiteId = this.siteId,
+                monday = enabledDays.contains(MONDAY),
+                tuesday = enabledDays.contains(TUESDAY),
+                wednesday = enabledDays.contains(WEDNESDAY),
+                thursday = enabledDays.contains(THURSDAY),
+                friday = enabledDays.contains(FRIDAY),
+                saturday = enabledDays.contains(SATURDAY),
+                sunday = enabledDays.contains(SUNDAY),
+                hour = this.hour,
+                minute = this.minute,
+                isPromptRemindersOptedIn = domainModel.isPromptIncluded,
+                isPromptsCardOptedIn = domainModel.isPromptsCardEnabled,
+            )
+        }
+
+    fun toDomainModel(databaseModel: BloggingReminders): BloggingRemindersModel =
+        with(databaseModel) {
+            return BloggingRemindersModel(
+                siteId = localSiteId,
+                enabledDays = mutableSetOf<Day>().let { list ->
+                    if (monday) list.add(MONDAY)
+                    if (tuesday) list.add(TUESDAY)
+                    if (wednesday) list.add(WEDNESDAY)
+                    if (thursday) list.add(THURSDAY)
+                    if (friday) list.add(FRIDAY)
+                    if (saturday) list.add(SATURDAY)
+                    if (sunday) list.add(SUNDAY)
+                    list
+                },
+                hour = hour,
+                minute = minute,
+                isPromptIncluded = isPromptRemindersOptedIn,
+                isPromptsCardEnabled = isPromptsCardOptedIn,
+            )
+        }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersModel.kt
new file mode 100644
index 00000000000..9cb9db17b19
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/BloggingRemindersModel.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.model
+
+data class BloggingRemindersModel(
+    val siteId: Int,
+    val enabledDays: Set<Day> = setOf(),
+    val hour: Int = 10,
+    val minute: Int = 0,
+    val isPromptIncluded: Boolean = false,
+    val isPromptsCardEnabled: Boolean = true,
+) {
+    enum class Day {
+        MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CauseOfOnPostChanged.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CauseOfOnPostChanged.kt
new file mode 100644
index 00000000000..26369288bc7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CauseOfOnPostChanged.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.store.PostStore.PostDeleteActionType
+
+sealed class CauseOfOnPostChanged {
+    class DeletePost(val localPostId: Int, val remotePostId: Long, val postDeleteActionType: PostDeleteActionType) :
+            CauseOfOnPostChanged()
+    class RestorePost(val localPostId: Int, val remotePostId: Long) : CauseOfOnPostChanged()
+    object FetchPages : CauseOfOnPostChanged()
+    object FetchPosts : CauseOfOnPostChanged()
+    object RemoveAllPosts : CauseOfOnPostChanged()
+    class RemovePost(val localPostId: Int, val remotePostId: Long) : CauseOfOnPostChanged()
+    class UpdatePost(val localPostId: Int, val remotePostId: Long, val isLocalUpdate: Boolean) : CauseOfOnPostChanged()
+    class RemoteAutoSavePost(val localPostId: Int, val remotePostId: Long) : CauseOfOnPostChanged()
+    object FetchPostLikes : CauseOfOnPostChanged()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentModel.java
new file mode 100644
index 00000000000..9d3eac7b128
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentModel.java
@@ -0,0 +1,213 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.io.Serializable;
+
+@Table
+@SuppressWarnings("NotNullFieldNotInitialized")
+public class CommentModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = 3454722213760369852L;
+
+    // Ids
+    @PrimaryKey
+    @Column private int mId;
+    @Column private long mRemoteCommentId;
+    @Column private long mRemotePostId;
+    @Column private int mLocalSiteId;
+    @Column private long mRemoteSiteId;
+
+    // Comment author
+    @Nullable @Column private String mAuthorUrl;
+    @Nullable @Column private String mAuthorName;
+    @Nullable @Column private String mAuthorEmail;
+    @Column private long mAuthorId;
+    @Nullable @Column private String mAuthorProfileImageUrl;
+
+    // Comment data
+    @Nullable @Column private String mPostTitle;
+    @NonNull @Column private String mStatus;
+    @NonNull @Column private String mDatePublished;
+    @Column private long mPublishedTimestamp;
+    @NonNull @Column private String mContent;
+    @NonNull @Column private String mUrl;
+
+    // Parent Comment Data
+    @Column private boolean mHasParent;
+    @Column private long mParentId;
+
+    // WPCOM only
+    @Column private boolean mILike; // current user likes this comment
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public long getRemoteCommentId() {
+        return mRemoteCommentId;
+    }
+
+    public void setRemoteCommentId(long remoteCommentId) {
+        mRemoteCommentId = remoteCommentId;
+    }
+
+    public long getRemotePostId() {
+        return mRemotePostId;
+    }
+
+    public void setRemotePostId(long remotePostId) {
+        mRemotePostId = remotePostId;
+    }
+
+    @Nullable
+    public String getAuthorUrl() {
+        return mAuthorUrl;
+    }
+
+    public void setAuthorUrl(@Nullable String authorUrl) {
+        this.mAuthorUrl = authorUrl;
+    }
+
+    @Nullable
+    public String getAuthorName() {
+        return mAuthorName;
+    }
+
+    public void setAuthorName(@Nullable String authorName) {
+        this.mAuthorName = authorName;
+    }
+
+    @Nullable
+    public String getAuthorEmail() {
+        return mAuthorEmail;
+    }
+
+    public void setAuthorEmail(@Nullable String authorEmail) {
+        this.mAuthorEmail = authorEmail;
+    }
+
+    @Nullable
+    public String getAuthorProfileImageUrl() {
+        return mAuthorProfileImageUrl;
+    }
+
+    public void setAuthorProfileImageUrl(@Nullable String authorProfileImageUrl) {
+        this.mAuthorProfileImageUrl = authorProfileImageUrl;
+    }
+
+    @Nullable
+    public String getPostTitle() {
+        return mPostTitle;
+    }
+
+    public void setPostTitle(@Nullable String postTitle) {
+        this.mPostTitle = postTitle;
+    }
+
+    @NonNull
+    public String getStatus() {
+        return mStatus;
+    }
+
+    public void setStatus(@NonNull String status) {
+        this.mStatus = status;
+    }
+
+    @NonNull
+    public String getDatePublished() {
+        return mDatePublished;
+    }
+
+    public void setDatePublished(@NonNull String datePublished) {
+        this.mDatePublished = datePublished;
+    }
+
+    @NonNull
+    public String getContent() {
+        return mContent;
+    }
+
+    public void setContent(@NonNull String content) {
+        this.mContent = content;
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        mLocalSiteId = localSiteId;
+    }
+
+    public long getRemoteSiteId() {
+        return mRemoteSiteId;
+    }
+
+    public void setRemoteSiteId(long remoteSiteId) {
+        mRemoteSiteId = remoteSiteId;
+    }
+
+    public long getAuthorId() {
+        return mAuthorId;
+    }
+
+    public void setAuthorId(long authorId) {
+        mAuthorId = authorId;
+    }
+
+    public boolean getILike() {
+        return mILike;
+    }
+
+    public void setILike(boolean iLike) {
+        mILike = iLike;
+    }
+
+    @NonNull
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(@NonNull String url) {
+        mUrl = url;
+    }
+
+    public long getPublishedTimestamp() {
+        return mPublishedTimestamp;
+    }
+
+    public void setPublishedTimestamp(long publishedTimestamp) {
+        mPublishedTimestamp = publishedTimestamp;
+    }
+
+    public boolean getHasParent() {
+        return mHasParent;
+    }
+
+    public void setHasParent(boolean hasParent) {
+        mHasParent = hasParent;
+    }
+
+    public long getParentId() {
+        return mParentId;
+    }
+
+    public void setParentId(long parentId) {
+        mParentId = parentId;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentStatus.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentStatus.java
new file mode 100644
index 00000000000..4cee8850a52
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/CommentStatus.java
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Locale;
+
+public enum CommentStatus {
+    // Real status
+    APPROVED,
+    UNAPPROVED,
+    SPAM,
+    TRASH,
+    DELETED,
+
+    // Used for filtering
+    ALL,
+    UNREPLIED,
+
+    // Used for editing
+    UNSPAM,  // Unmark the comment as spam. Will attempt to set it to the previous status.
+    UNTRASH; // Untrash a comment. Only works when the comment is in the trash.
+
+    public String toString() {
+        return this.name().toLowerCase(Locale.US);
+    }
+
+    @NonNull
+    public static CommentStatus fromString(@Nullable String string) {
+        if (string != null) {
+            for (CommentStatus v : CommentStatus.values()) {
+                if (string.equalsIgnoreCase(v.name())) {
+                    return v;
+                }
+            }
+        }
+        return ALL;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainContactModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainContactModel.kt
new file mode 100644
index 00000000000..c5603adbf2d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainContactModel.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.model
+
+import android.annotation.SuppressLint
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+data class DomainContactModel(
+    @SerializedName("first_name")
+    val firstName: String?,
+    @SerializedName("last_name")
+    val lastName: String?,
+    @SerializedName("organization")
+    val organization: String?,
+    @SerializedName("address_1")
+    val addressLine1: String?,
+    @SerializedName("address_2")
+    val addressLine2: String?,
+    @SerializedName("postal_code")
+    val postalCode: String?,
+    @SerializedName("city")
+    val city: String?,
+    @SerializedName("state")
+    val state: String?,
+    @SerializedName("country_code")
+    val countryCode: String?,
+    @SerializedName("email")
+    val email: String?,
+    @SerializedName("phone")
+    val phone: String?,
+    @SerializedName("fax")
+    val fax: String?
+) : Parcelable
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainModel.kt
new file mode 100644
index 00000000000..b11d6d6f5ae
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/DomainModel.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.network.rest.wpcom.site.Domain
+
+/**
+ * Lightweight version of the [Domain] to be stored in the database.
+ */
+data class DomainModel(
+    val domain: String,
+    val primaryDomain: Boolean,
+    val wpcomDomain: Boolean
+)
+
+fun Domain.asDomainModel() = DomainModel(
+    domain = domain.orEmpty(),
+    primaryDomain = primaryDomain,
+    wpcomDomain = wpcomDomain
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/EditorTheme.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/EditorTheme.kt
new file mode 100644
index 00000000000..31755f4a62c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/EditorTheme.kt
@@ -0,0 +1,207 @@
+package org.wordpress.android.fluxc.model
+
+import android.os.Bundle
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonSyntaxException
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.persistence.EditorThemeElementType
+import org.wordpress.android.fluxc.persistence.EditorThemeSqlUtils.EditorThemeBuilder
+import org.wordpress.android.fluxc.persistence.EditorThemeSqlUtils.EditorThemeElementBuilder
+import org.wordpress.android.util.VersionUtils
+import java.lang.reflect.Type
+
+private const val GALLERY_V2_WP_VERSION = "5.9"
+
+const val MAP_KEY_ELEMENT_DISPLAY_NAME: String = "name"
+const val MAP_KEY_ELEMENT_SLUG: String = "slug"
+const val MAP_KEY_ELEMENT_COLORS: String = "colors"
+const val MAP_KEY_ELEMENT_GRADIENTS: String = "gradients"
+const val MAP_KEY_ELEMENT_STYLES: String = "rawStyles"
+const val MAP_KEY_ELEMENT_FEATURES: String = "rawFeatures"
+const val MAP_KEY_IS_BLOCK_BASED_THEME: String = "isBlockBasedTheme"
+const val MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS: String = "galleryWithImageBlocks"
+const val MAP_KEY_QUOTE_BLOCK_V2: String = "quoteBlockV2"
+const val MAP_KEY_LIST_BLOCK_V2: String = "listBlockV2"
+const val MAP_KEY_HAS_BLOCK_TEMPLATES: String = "hasBlockTemplates"
+
+data class EditorTheme(
+    @SerializedName("theme_supports") val themeSupport: EditorThemeSupport,
+    val stylesheet: String?,
+    val version: String?
+) {
+    constructor(blockEditorSettings: BlockEditorSettings) : this(
+            themeSupport = EditorThemeSupport(
+                    blockEditorSettings.colors,
+                    blockEditorSettings.gradients,
+                    null,
+                    blockEditorSettings.styles?.toString(),
+                    blockEditorSettings.featuresFiltered?.toString(),
+                    blockEditorSettings.isBlockBasedTheme,
+                    blockEditorSettings.galleryWithImageBlocks,
+                    blockEditorSettings.quoteBlockV2,
+                    blockEditorSettings.listBlockV2
+            ),
+            stylesheet = null,
+            version = null
+    )
+
+    fun toBuilder(site: SiteModel): EditorThemeBuilder {
+        val element = EditorThemeBuilder()
+        element.localSiteId = site.id
+        element.stylesheet = stylesheet
+        element.version = version
+        element.rawStyles = themeSupport.rawStyles
+        element.rawFeatures = themeSupport.rawFeatures
+        element.isBlockBasedTheme = themeSupport.isBlockBasedTheme
+        element.galleryWithImageBlocks = themeSupport.galleryWithImageBlocks ?: site.coreSupportsGalleryV2
+        element.quoteBlockV2 = themeSupport.quoteBlockV2
+        element.listBlockV2 = themeSupport.listBlockV2
+        element.hasBlockTemplates = themeSupport.hasBlockTemplates ?: false
+
+        return element
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null ||
+                other !is EditorTheme ||
+                themeSupport != other.themeSupport) return false
+
+        return true
+    }
+}
+
+data class BlockEditorSettings(
+    @SerializedName("__unstableIsBlockBasedTheme") val isBlockBasedTheme: Boolean,
+    @SerializedName("__unstableGalleryWithImageBlocks") val galleryWithImageBlocks: Boolean,
+    @SerializedName("__experimentalEnableQuoteBlockV2") val quoteBlockV2: Boolean,
+    @SerializedName("__experimentalEnableListBlockV2") val listBlockV2: Boolean,
+    @SerializedName("__experimentalStyles") val styles: JsonElement?,
+    @SerializedName("__experimentalFeatures") val features: JsonElement?,
+    @JsonAdapter(EditorThemeElementListSerializer::class) val colors: List<EditorThemeElement>?,
+    @JsonAdapter(EditorThemeElementListSerializer::class) val gradients: List<EditorThemeElement>?
+) {
+    val featuresFiltered: JsonElement?
+        get() = features?.removeFontFamilies()
+
+    private fun JsonElement.removeFontFamilies(): JsonElement {
+        if (isJsonObject && asJsonObject.has("typography")) {
+            val featuresObject = asJsonObject
+            val typography = featuresObject.get("typography")
+            if (typography.isJsonObject) {
+                val typographyObject = typography.asJsonObject
+                if (typographyObject.has("fontFamilies")) {
+                    typographyObject.remove("fontFamilies")
+                    return featuresObject
+                }
+            }
+        }
+        return this
+    }
+}
+
+data class EditorThemeSupport(
+    @JsonAdapter(EditorThemeElementListSerializer::class)
+    @SerializedName("editor-color-palette")
+    val colors: List<EditorThemeElement>?,
+    @JsonAdapter(EditorThemeElementListSerializer::class)
+    @SerializedName("editor-gradient-presets")
+    val gradients: List<EditorThemeElement>?,
+    @SerializedName("block-templates")
+    val hasBlockTemplates: Boolean?,
+    val rawStyles: String?,
+    val rawFeatures: String?,
+    val isBlockBasedTheme: Boolean,
+    val galleryWithImageBlocks: Boolean?,
+    val quoteBlockV2: Boolean,
+    val listBlockV2: Boolean
+) {
+    fun toBundle(site: SiteModel): Bundle {
+        val bundle = Bundle()
+
+        colors?.map { it.toBundle() }?.let {
+            bundle.putParcelableArrayList(MAP_KEY_ELEMENT_COLORS, ArrayList<Bundle>(it))
+        }
+
+        gradients?.map { it.toBundle() }?.let {
+            bundle.putParcelableArrayList(MAP_KEY_ELEMENT_GRADIENTS, ArrayList<Bundle>(it))
+        }
+
+        rawStyles?.let {
+            bundle.putString(MAP_KEY_ELEMENT_STYLES, it)
+        }
+
+        rawFeatures?.let {
+            bundle.putString(MAP_KEY_ELEMENT_FEATURES, it)
+        }
+
+        bundle.putBoolean(MAP_KEY_IS_BLOCK_BASED_THEME, isBlockBasedTheme)
+        bundle.putBoolean(MAP_KEY_GALLERY_WITH_IMAGE_BLOCKS, galleryWithImageBlocks ?: site.coreSupportsGalleryV2)
+        bundle.putBoolean(MAP_KEY_QUOTE_BLOCK_V2, quoteBlockV2)
+        bundle.putBoolean(MAP_KEY_LIST_BLOCK_V2, listBlockV2)
+        bundle.putBoolean(MAP_KEY_HAS_BLOCK_TEMPLATES, hasBlockTemplates ?: false)
+
+        return bundle
+    }
+    fun isEditorThemeBlockBased(): Boolean = isBlockBasedTheme || (hasBlockTemplates ?: false)
+}
+
+data class EditorThemeElement(
+    val name: String?,
+    val slug: String?,
+    val color: String?,
+    val gradient: String?
+) {
+    fun toBundle(): Bundle {
+        val bundle = Bundle()
+        bundle.putString(MAP_KEY_ELEMENT_DISPLAY_NAME, name)
+        bundle.putString(MAP_KEY_ELEMENT_SLUG, slug)
+        if (color != null) {
+            bundle.putString(EditorThemeElementType.COLOR.value, color)
+        }
+        if (gradient != null) {
+            bundle.putString(EditorThemeElementType.GRADIENT.value, gradient)
+        }
+        return bundle
+    }
+
+    fun toBuilder(themeId: Int): EditorThemeElementBuilder {
+        val isColor = color != null
+        val element = EditorThemeElementBuilder()
+        element.type = if (isColor) EditorThemeElementType.COLOR.value else EditorThemeElementType.GRADIENT.value
+        element.name = name
+        element.slug = slug
+        element.value = if (isColor) color else gradient
+        element.themeId = themeId
+
+        return element
+    }
+}
+
+class EditorThemeElementListSerializer : JsonDeserializer<List<EditorThemeElement>> {
+    @Suppress("SwallowedException")
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): List<EditorThemeElement>? {
+        if (context != null && json != null && json.isJsonArray()) {
+            val editorThemeElementListType = object : TypeToken<List<EditorThemeElement>>() { }.getType()
+            var result: List<EditorThemeElement>?
+            try {
+                result = context.deserialize(json, editorThemeElementListType)
+            } catch (e: JsonSyntaxException) {
+                result = null
+            }
+            return result
+        } else {
+            return null
+        }
+    }
+}
+
+private val SiteModel.coreSupportsGalleryV2: Boolean
+    get() = VersionUtils.checkMinimalVersion(softwareVersion, GALLERY_V2_WP_VERSION)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JWTToken.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JWTToken.kt
new file mode 100644
index 00000000000..5b1ba89750c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JWTToken.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.model
+
+import android.util.Base64
+import org.json.JSONObject
+
+@JvmInline
+value class JWTToken(
+    val value: String
+) {
+    /**
+     * Returns the token if it is still valid, or null if it is expired.
+     */
+    @Suppress("MagicNumber")
+    fun validateExpiryDate(): JWTToken? {
+        fun JSONObject.getLongOrNull(name: String) = this.optLong(name, Long.MAX_VALUE).takeIf { it != Long.MAX_VALUE }
+
+        val payloadJson = getPayloadJson()
+        val expiration = payloadJson.getLongOrNull("exp")
+            ?: payloadJson.getLongOrNull("expires")
+            ?: return null
+
+        val now = System.currentTimeMillis() / 1000
+
+        return if (expiration > now) this else null
+    }
+
+    fun getPayloadItem(key: String): String? {
+        return getPayloadJson().optString(key)
+    }
+
+    private fun getPayloadJson(): JSONObject {
+        val payloadEncoded = this.value.split(".")[1]
+        return JSONObject(String(Base64.decode(payloadEncoded, Base64.DEFAULT)))
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JetpackCapability.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JetpackCapability.kt
new file mode 100644
index 00000000000..0126541d7b5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/JetpackCapability.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model
+
+enum class JetpackCapability(private val stringValue: String) {
+    BACKUP("backup"),
+    BACKUP_DAILY("backup-daily"),
+    BACKUP_REALTIME("backup-realtime"),
+    SCAN("scan"),
+    ANTISPAM("antispam"),
+    RESTORE("restore"),
+    ALTERNATE_RESTORE("alternate-restore"),
+    UNKNOWN("unknown");
+
+    override fun toString(): String {
+        return stringValue
+    }
+
+    companion object {
+        fun fromString(string: String): JetpackCapability {
+            for (item in values()) {
+                if (item.stringValue == string) {
+                    return item
+                }
+            }
+            return UNKNOWN
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LikeModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LikeModel.kt
new file mode 100644
index 00000000000..8bf2e90fb3e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LikeModel.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.util.StringUtils
+import java.util.Date
+
+@Table
+class LikeModel : Identifiable {
+    enum class LikeType(val typeName: String) {
+        POST_LIKE("post-like"),
+        COMMENT_LIKE("comment-like");
+
+        fun fromTypeName(name: String): LikeType {
+            return values().firstOrNull { it.typeName == name }
+                    ?: throw IllegalArgumentException("LikesType unexpected value $name")
+        }
+    }
+
+    @PrimaryKey
+    @Column private var id = 0
+
+    @Column var type: String = POST_LIKE.typeName
+    @Column var remoteSiteId: Long = 0
+    @Column var remoteItemId: Long = 0 // Either Post remote id or Comment remote id
+    @Column var likerId: Long = 0
+    @Column var likerName: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var likerLogin: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var likerAvatarUrl: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var likerBio: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var likerSiteId: Long = 0
+    @Column var likerSiteUrl: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var preferredBlogId: Long = 0
+    @Column var preferredBlogName: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var preferredBlogUrl: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var preferredBlogBlavatarUrl: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var dateLiked: String? = null
+        get() = StringUtils.notNullStr(field)
+    @Column var timestampFetched: Long = Date().time
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId(): Int {
+        return this.id
+    }
+
+    @Suppress("ComplexMethod")
+    fun isEqual(otherLike: LikeModel): Boolean {
+        return type == otherLike.type &&
+            remoteSiteId == otherLike.remoteSiteId &&
+            remoteItemId == otherLike.remoteItemId &&
+            likerId == otherLike.likerId &&
+            likerName == otherLike.likerName &&
+            likerLogin == otherLike.likerLogin &&
+            likerAvatarUrl == otherLike.likerAvatarUrl &&
+            likerBio == otherLike.likerBio &&
+            likerSiteId == otherLike.likerSiteId &&
+            likerSiteUrl == otherLike.likerSiteUrl &&
+            preferredBlogId == otherLike.preferredBlogId &&
+            preferredBlogName == otherLike.preferredBlogName &&
+            preferredBlogUrl == otherLike.preferredBlogUrl &&
+            preferredBlogBlavatarUrl == otherLike.preferredBlogBlavatarUrl &&
+            dateLiked == otherLike.dateLiked
+    }
+
+    companion object {
+        const val TIMESTAMP_THRESHOLD = 7 * 24 * 60 * 60 * 1000L // 7 days in milliseconds
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LocalOrRemoteId.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LocalOrRemoteId.kt
new file mode 100644
index 00000000000..d0cb377bdc7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/LocalOrRemoteId.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model
+
+sealed class LocalOrRemoteId {
+    data class LocalId(val value: Int) : LocalOrRemoteId()
+    data class RemoteId(val value: Long) : LocalOrRemoteId()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaModel.java
new file mode 100644
index 00000000000..53ae7e3092d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaModel.java
@@ -0,0 +1,663 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+
+@Table
+public class MediaModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -1396457338496002846L;
+
+    public enum MediaUploadState {
+        QUEUED, UPLOADING, DELETING, DELETED, FAILED, UPLOADED;
+
+        @NonNull
+        public static MediaUploadState fromString(@Nullable String stringState) {
+            if (stringState != null) {
+                for (MediaUploadState state : MediaUploadState.values()) {
+                    if (stringState.equalsIgnoreCase(state.toString())) {
+                        return state;
+                    }
+                }
+            }
+            return UPLOADED;
+        }
+    }
+
+    @PrimaryKey
+    @Column private int mId;
+
+    // Associated IDs
+    @Column private int mLocalSiteId;
+    @Column private int mLocalPostId; // The local post the media was uploaded from, for lookup after media uploads
+    @Column private long mMediaId; // The remote ID of the media
+    @Column private long mPostId; // The remote post ID ('parent') of the media
+    @Column private long mAuthorId;
+    @NonNull @Column private String mGuid;
+
+    // Upload date, ISO 8601-formatted date in UTC
+    @Nullable @Column private String mUploadDate;
+
+    // Remote Url's
+    @NonNull @Column private String mUrl;
+    @Nullable @Column private String mThumbnailUrl;
+
+    // File descriptors
+    @Nullable @Column private String mFileName;
+    @Nullable @Column private String mFilePath;
+    @Nullable @Column private String mFileExtension;
+    @Nullable @Column private String mMimeType;
+
+    // Descriptive strings
+    @Nullable @Column private String mTitle;
+    @NonNull @Column private String mCaption;
+    @NonNull @Column private String mDescription;
+    @NonNull @Column private String mAlt;
+
+    // Image and Video files only
+    @Column private int mWidth;
+    @Column private int mHeight;
+
+    // Video and Audio files only
+    @Column private int mLength;
+
+    // Video only
+    @Nullable @Column private String mVideoPressGuid;
+    @Column private boolean mVideoPressProcessingDone;
+
+    // Local only
+    @Nullable @Column private String mUploadState;
+    @Column private boolean mMarkedLocallyAsFeatured;
+
+    // Other Sizes. Only available for images on self-hosted (xmlrpc layer) and Rest WPCOM sites
+    @Nullable @Column private String mFileUrlMediumSize; // Self-hosted and wpcom
+    @Nullable @Column private String mFileUrlMediumLargeSize; // Self-hosted only
+    @Nullable @Column private String mFileUrlLargeSize; // Self-hosted and wpcom
+
+    //
+    // Legacy
+    //
+    @Column private int mHorizontalAlignment;
+    @Column private boolean mVerticalAlignment;
+    @Column private boolean mFeatured;
+    @Column private boolean mFeaturedInPost;
+
+    // Set to true on a successful response to delete via WP.com REST API, not stored locally
+    private boolean mDeleted;
+
+    /**
+     * Enum representing various media fields with their default field names.
+     * The default values can be changed by modifying the string parameter
+     * passed to the enum constructor.
+     */
+    public enum MediaFields {
+        PARENT_ID("parent_id"),
+        TITLE("title"),
+        DESCRIPTION("description"),
+        CAPTION("caption"),
+        ALT("alt");
+
+        @NonNull private final String mFieldName;
+
+        // Constructor
+        MediaFields(@NonNull String fieldName) {
+            this.mFieldName = fieldName;
+        }
+
+        // Getter
+        @NonNull
+        public String getFieldName() {
+            return this.mFieldName;
+        }
+    }
+
+    @NonNull private MediaFields[] mFieldsToUpdate = MediaFields.values();
+
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public MediaModel() {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mLocalPostId = 0;
+        this.mMediaId = 0;
+        this.mPostId = 0;
+        this.mAuthorId = 0;
+        this.mGuid = "";
+        this.mUploadDate = null;
+        this.mUrl = "";
+        this.mThumbnailUrl = null;
+        this.mFileName = null;
+        this.mFilePath = null;
+        this.mFileExtension = null;
+        this.mMimeType = null;
+        this.mTitle = null;
+        this.mCaption = "";
+        this.mDescription = "";
+        this.mAlt = "";
+        this.mWidth = 0;
+        this.mHeight = 0;
+        this.mLength = 0;
+        this.mVideoPressGuid = null;
+        this.mVideoPressProcessingDone = false;
+        this.mUploadState = null;
+        this.mMarkedLocallyAsFeatured = false;
+        this.mFileUrlMediumSize = null;
+        this.mFileUrlMediumLargeSize = null;
+        this.mFileUrlLargeSize = null;
+        this.mHorizontalAlignment = 0;
+        this.mVerticalAlignment = false;
+        this.mFeatured = false;
+        this.mFeaturedInPost = false;
+        this.mDeleted = false;
+    }
+
+    /**
+     * Use when getting an existing media.
+     */
+    public MediaModel(
+            int localSiteId,
+            long mediaId) {
+        this.mLocalSiteId = localSiteId;
+        this.mMediaId = mediaId;
+        this.mGuid = "";
+        this.mUrl = "";
+        this.mCaption = "";
+        this.mDescription = "";
+        this.mAlt = "";
+    }
+
+    /**
+     * Use when converting local uri into a media, and then, to upload a new or update an existing media.
+     */
+    public MediaModel(
+            int localSiteId,
+            @Nullable String uploadDate,
+            @Nullable String fileName,
+            @Nullable String filePath,
+            @Nullable String fileExtension,
+            @Nullable String mimeType,
+            @Nullable String title,
+            @Nullable MediaUploadState uploadState) {
+        this.mLocalSiteId = localSiteId;
+        this.mGuid = "";
+        this.mUploadDate = uploadDate;
+        this.mUrl = "";
+        this.mFileName = fileName;
+        this.mFilePath = filePath;
+        this.mFileExtension = fileExtension;
+        this.mMimeType = mimeType;
+        this.mTitle = title;
+        this.mCaption = "";
+        this.mDescription = "";
+        this.mAlt = "";
+        this.mUploadState = uploadState != null ? uploadState.toString() : null;
+    }
+
+    /**
+     * Use when converting editor image metadata into a media.
+     */
+    public MediaModel(
+            @NonNull String url,
+            @Nullable String fileName,
+            @Nullable String fileExtension,
+            @Nullable String title,
+            @NonNull String caption,
+            @NonNull String alt,
+            int width,
+            int height) {
+        this.mGuid = "";
+        this.mUrl = url;
+        this.mFileName = fileName;
+        this.mFileExtension = fileExtension;
+        this.mTitle = title;
+        this.mCaption = caption;
+        this.mDescription = "";
+        this.mAlt = alt;
+        this.mWidth = width;
+        this.mHeight = height;
+    }
+
+    /**
+     * Use when converting a media file into a media.
+     */
+    public MediaModel(
+            int id,
+            int localSiteId,
+            long mediaId,
+            @NonNull String url,
+            @Nullable String thumbnailUrl,
+            @Nullable String fileName,
+            @Nullable String filePath,
+            @Nullable String fileExtension,
+            @Nullable String mimeType,
+            @Nullable String title,
+            @NonNull String caption,
+            @NonNull String description,
+            @NonNull String alt,
+            @Nullable String videoPressGuid,
+            @NonNull MediaUploadState uploadState) {
+        this.mId = id;
+        this.mLocalSiteId = localSiteId;
+        this.mMediaId = mediaId;
+        this.mGuid = "";
+        this.mUrl = url;
+        this.mThumbnailUrl = thumbnailUrl;
+        this.mFileName = fileName;
+        this.mFilePath = filePath;
+        this.mFileExtension = fileExtension;
+        this.mMimeType = mimeType;
+        this.mTitle = title;
+        this.mCaption = caption;
+        this.mDescription = description;
+        this.mAlt = alt;
+        this.mVideoPressGuid = videoPressGuid;
+        this.mUploadState = uploadState.toString();
+    }
+
+    public MediaModel(
+            int localSiteId,
+            long mediaId,
+            long postId,
+            long authorId,
+            @NonNull String guid,
+            @Nullable String uploadDate,
+            @NonNull String url,
+            @Nullable String thumbnailUrl,
+            @Nullable String fileName,
+            @Nullable String fileExtension,
+            @Nullable String mimeType,
+            @Nullable String title,
+            @NonNull String caption,
+            @NonNull String description,
+            @NonNull String alt,
+            int width,
+            int height,
+            int length,
+            @Nullable String videoPressGuid,
+            boolean videoPressProcessingDone,
+            @NonNull MediaUploadState uploadState,
+            @Nullable String fileUrlMediumSize,
+            @Nullable String fileUrlMediumLargeSize,
+            @Nullable String fileUrlLargeSize,
+            boolean deleted) {
+        this.mLocalSiteId = localSiteId;
+        this.mMediaId = mediaId;
+        this.mPostId = postId;
+        this.mAuthorId = authorId;
+        this.mGuid = guid;
+        this.mUploadDate = uploadDate;
+        this.mUrl = url;
+        this.mThumbnailUrl = thumbnailUrl;
+        this.mFileName = fileName;
+        this.mFileExtension = fileExtension;
+        this.mMimeType = mimeType;
+        this.mTitle = title;
+        this.mCaption = caption;
+        this.mDescription = description;
+        this.mAlt = alt;
+        this.mWidth = width;
+        this.mHeight = height;
+        this.mLength = length;
+        this.mVideoPressGuid = videoPressGuid;
+        this.mVideoPressProcessingDone = videoPressProcessingDone;
+        this.mUploadState = uploadState.toString();
+        this.mFileUrlMediumSize = fileUrlMediumSize;
+        this.mFileUrlMediumLargeSize = fileUrlMediumLargeSize;
+        this.mFileUrlLargeSize = fileUrlLargeSize;
+        this.mDeleted = deleted;
+    }
+
+    @Override
+    @SuppressWarnings("ConditionCoveredByFurtherCondition")
+    public boolean equals(@Nullable Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof MediaModel)) return false;
+
+        MediaModel otherMedia = (MediaModel) other;
+
+        return getId() == otherMedia.getId()
+                && getLocalSiteId() == otherMedia.getLocalSiteId() && getLocalPostId() == otherMedia.getLocalPostId()
+                && getMediaId() == otherMedia.getMediaId() && getPostId() == otherMedia.getPostId()
+                && getAuthorId() == otherMedia.getAuthorId() && getWidth() == otherMedia.getWidth()
+                && getHeight() == otherMedia.getHeight() && getLength() == otherMedia.getLength()
+                && getHorizontalAlignment() == otherMedia.getHorizontalAlignment()
+                && getVerticalAlignment() == otherMedia.getVerticalAlignment()
+                && getVideoPressProcessingDone() == otherMedia.getVideoPressProcessingDone()
+                && getFeatured() == otherMedia.getFeatured()
+                && getFeaturedInPost() == otherMedia.getFeaturedInPost()
+                && getMarkedLocallyAsFeatured() == otherMedia.getMarkedLocallyAsFeatured()
+                && StringUtils.equals(getGuid(), otherMedia.getGuid())
+                && StringUtils.equals(getUploadDate(), otherMedia.getUploadDate())
+                && StringUtils.equals(getUrl(), otherMedia.getUrl())
+                && StringUtils.equals(getThumbnailUrl(), otherMedia.getThumbnailUrl())
+                && StringUtils.equals(getFileName(), otherMedia.getFileName())
+                && StringUtils.equals(getFilePath(), otherMedia.getFilePath())
+                && StringUtils.equals(getFileExtension(), otherMedia.getFileExtension())
+                && StringUtils.equals(getMimeType(), otherMedia.getMimeType())
+                && StringUtils.equals(getTitle(), otherMedia.getTitle())
+                && StringUtils.equals(getDescription(), otherMedia.getDescription())
+                && StringUtils.equals(getCaption(), otherMedia.getCaption())
+                && StringUtils.equals(getAlt(), otherMedia.getAlt())
+                && StringUtils.equals(getVideoPressGuid(), otherMedia.getVideoPressGuid())
+                && StringUtils.equals(getUploadState(), otherMedia.getUploadState())
+                && StringUtils.equals(getFileUrlMediumSize(), otherMedia.getFileUrlMediumSize())
+                && StringUtils.equals(getFileUrlMediumLargeSize(), otherMedia.getFileUrlMediumLargeSize())
+                && StringUtils.equals(getFileUrlLargeSize(), otherMedia.getFileUrlLargeSize());
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        mLocalSiteId = localSiteId;
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalPostId(int localPostId) {
+        mLocalPostId = localPostId;
+    }
+
+    public int getLocalPostId() {
+        return mLocalPostId;
+    }
+
+    public void setMediaId(long mediaId) {
+        mMediaId = mediaId;
+    }
+
+    public long getMediaId() {
+        return mMediaId;
+    }
+
+    public void setPostId(long postId) {
+        mPostId = postId;
+    }
+
+    public long getPostId() {
+        return mPostId;
+    }
+
+    public void setAuthorId(long authorId) {
+        mAuthorId = authorId;
+    }
+
+    public long getAuthorId() {
+        return mAuthorId;
+    }
+
+    public void setGuid(@NonNull String guid) {
+        mGuid = guid;
+    }
+
+    @NonNull
+    public String getGuid() {
+        return mGuid;
+    }
+
+    public void setUploadDate(@Nullable String uploadDate) {
+        mUploadDate = uploadDate;
+    }
+
+    @Nullable
+    public String getUploadDate() {
+        return mUploadDate;
+    }
+
+    public void setUrl(@NonNull String url) {
+        mUrl = url;
+    }
+
+    @NonNull
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setThumbnailUrl(@Nullable String thumbnailUrl) {
+        mThumbnailUrl = thumbnailUrl;
+    }
+
+    @Nullable
+    public String getThumbnailUrl() {
+        return mThumbnailUrl;
+    }
+
+    public void setFileName(@Nullable String fileName) {
+        mFileName = fileName;
+    }
+
+    @Nullable
+    public String getFileName() {
+        return mFileName;
+    }
+
+    public void setFilePath(@Nullable String filePath) {
+        mFilePath = filePath;
+    }
+
+    @Nullable
+    public String getFilePath() {
+        return mFilePath;
+    }
+
+    public void setFileExtension(@Nullable String fileExtension) {
+        mFileExtension = fileExtension;
+    }
+
+    @Nullable
+    public String getFileExtension() {
+        return mFileExtension;
+    }
+
+    public void setMimeType(@Nullable String mimeType) {
+        mMimeType = mimeType;
+    }
+
+    @Nullable
+    public String getMimeType() {
+        return mMimeType;
+    }
+
+    public void setTitle(@Nullable String title) {
+        mTitle = title;
+    }
+
+    @Nullable
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public void setCaption(@NonNull String caption) {
+        mCaption = caption;
+    }
+
+    @NonNull
+    public String getCaption() {
+        return mCaption;
+    }
+
+    public void setDescription(@NonNull String description) {
+        mDescription = description;
+    }
+
+    @NonNull
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setAlt(@NonNull String alt) {
+        mAlt = alt;
+    }
+
+    @NonNull
+    public String getAlt() {
+        return mAlt;
+    }
+
+    public void setWidth(int width) {
+        mWidth = width;
+    }
+
+    public int getWidth() {
+        return mWidth;
+    }
+
+    public void setHeight(int height) {
+        mHeight = height;
+    }
+
+    public int getHeight() {
+        return mHeight;
+    }
+
+    public void setLength(int length) {
+        mLength = length;
+    }
+
+    public int getLength() {
+        return mLength;
+    }
+
+    public void setVideoPressGuid(@Nullable String videoPressGuid) {
+        mVideoPressGuid = videoPressGuid;
+    }
+
+    @Nullable
+    public String getVideoPressGuid() {
+        return mVideoPressGuid;
+    }
+
+    public void setVideoPressProcessingDone(boolean videoPressProcessingDone) {
+        mVideoPressProcessingDone = videoPressProcessingDone;
+    }
+
+    public boolean getVideoPressProcessingDone() {
+        return mVideoPressProcessingDone;
+    }
+
+    public void setUploadState(@Nullable String uploadState) {
+        mUploadState = uploadState;
+    }
+
+    public void setUploadState(@NonNull MediaUploadState uploadState) {
+        mUploadState = uploadState.toString();
+    }
+
+    @Nullable
+    public String getUploadState() {
+        return mUploadState;
+    }
+
+    @NonNull
+    public MediaFields[] getFieldsToUpdate() {
+        return mFieldsToUpdate;
+    }
+
+    @SuppressWarnings("unused")
+    public void setFieldsToUpdate(@NonNull MediaFields[] fieldsToUpdate) {
+        this.mFieldsToUpdate = fieldsToUpdate;
+    }
+
+    //
+    // Legacy methods
+    //
+
+    public boolean isVideo() {
+        return MediaUtils.isVideoMimeType(getMimeType());
+    }
+
+    public void setHorizontalAlignment(int horizontalAlignment) {
+        mHorizontalAlignment = horizontalAlignment;
+    }
+
+    public int getHorizontalAlignment() {
+        return mHorizontalAlignment;
+    }
+
+    public void setVerticalAlignment(boolean verticalAlignment) {
+        mVerticalAlignment = verticalAlignment;
+    }
+
+    public boolean getVerticalAlignment() {
+        return mVerticalAlignment;
+    }
+
+    public void setFeatured(boolean featured) {
+        mFeatured = featured;
+    }
+
+    public boolean getFeatured() {
+        return mFeatured;
+    }
+
+    public void setFeaturedInPost(boolean featuredInPost) {
+        mFeaturedInPost = featuredInPost;
+    }
+
+    public boolean getMarkedLocallyAsFeatured() {
+        return mMarkedLocallyAsFeatured;
+    }
+
+    public void setMarkedLocallyAsFeatured(boolean markedLocallyAsFeatured) {
+        mMarkedLocallyAsFeatured = markedLocallyAsFeatured;
+    }
+
+    public boolean getFeaturedInPost() {
+        return mFeaturedInPost;
+    }
+
+    public void setDeleted(boolean deleted) {
+        mDeleted = deleted;
+    }
+
+    public boolean getDeleted() {
+        return mDeleted;
+    }
+
+    public void setFileUrlMediumSize(@Nullable String file) {
+        mFileUrlMediumSize = file;
+    }
+
+    @Nullable
+    public String getFileUrlMediumSize() {
+        return mFileUrlMediumSize;
+    }
+
+    public void setFileUrlMediumLargeSize(@Nullable String file) {
+        mFileUrlMediumLargeSize = file;
+    }
+
+    @Nullable
+    public String getFileUrlMediumLargeSize() {
+        return mFileUrlMediumLargeSize;
+    }
+
+    public void setFileUrlLargeSize(@Nullable String file) {
+        mFileUrlLargeSize = file;
+    }
+
+    @Nullable
+    public String getFileUrlLargeSize() {
+        return mFileUrlLargeSize;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaUploadModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaUploadModel.java
new file mode 100644
index 00000000000..4184f90ab72
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/MediaUploadModel.java
@@ -0,0 +1,144 @@
+package org.wordpress.android.fluxc.model;
+
+import android.text.TextUtils;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.apache.commons.lang3.StringUtils;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType;
+
+import java.io.Serializable;
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+@Table
+@RawConstraints({"FOREIGN KEY(_id) REFERENCES MediaModel(_id) ON DELETE CASCADE"})
+public class MediaUploadModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -2575578916186403789L;
+
+    @Retention(SOURCE)
+    @IntDef({UPLOADING, COMPLETED, FAILED})
+    public @interface UploadState {}
+    public static final int UPLOADING = 0;
+    public static final int COMPLETED = 1;
+    public static final int FAILED = 2;
+
+    @PrimaryKey(autoincrement = false)
+    @Column private int mId;
+
+    @Column private int mUploadState = UPLOADING;
+
+    @Column private float mProgress;
+
+    // Serialization of a MediaError
+    @Column private String mErrorType;
+    @Column private String mErrorMessage;
+    @Column private String mErrorSubType;
+
+    public MediaUploadModel() {}
+
+    public MediaUploadModel(int id) {
+        mId = id;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    public @UploadState int getUploadState() {
+        return mUploadState;
+    }
+
+    public void setUploadState(@UploadState int uploadState) {
+        mUploadState = uploadState;
+    }
+
+    public void setProgress(float progress) {
+        mProgress = progress;
+    }
+
+    public float getProgress() {
+        return mProgress;
+    }
+
+    public String getErrorType() {
+        return mErrorType;
+    }
+
+    public void setErrorType(String errorType) {
+        mErrorType = errorType;
+    }
+
+    public String getErrorMessage() {
+        return mErrorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        mErrorMessage = errorMessage;
+    }
+
+    public @Nullable String getErrorSubType() {
+        return mErrorSubType;
+    }
+
+    public void setErrorSubType(@Nullable String errorSubType) {
+        mErrorSubType = errorSubType;
+    }
+
+    public @Nullable MediaError getMediaError() {
+        if (TextUtils.isEmpty(getErrorType())) {
+            return null;
+        }
+        return new MediaError(
+                MediaErrorType.fromString(getErrorType()),
+                getErrorMessage(),
+                MediaErrorSubType.deserialize(getErrorSubType())
+        );
+    }
+
+    public void setMediaError(@Nullable MediaError mediaError) {
+        if (mediaError == null) {
+            setErrorType(null);
+            setErrorMessage(null);
+            setErrorSubType(null);
+            return;
+        }
+
+        setErrorType(mediaError.type.toString());
+        setErrorMessage(mediaError.message);
+        setErrorSubType(mediaError.mErrorSubType != null ? mediaError.mErrorSubType.serialize() : null);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof MediaUploadModel)) return false;
+
+        MediaUploadModel otherMedia = (MediaUploadModel) other;
+
+        return getId() == otherMedia.getId()
+                && getUploadState() == otherMedia.getUploadState()
+                && Float.compare(getProgress(), otherMedia.getProgress()) == 0
+                && StringUtils.equals(getErrorType(), otherMedia.getErrorType())
+                && StringUtils.equals(getErrorMessage(), otherMedia.getErrorMessage())
+               && StringUtils.equals(getErrorSubType(), otherMedia.getErrorSubType());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PlanModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PlanModel.kt
new file mode 100644
index 00000000000..e6f83576e3a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PlanModel.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.model
+
+class PlanModel(
+    val productId: Int?,
+    val productSlug: String?,
+    val productName: String?,
+    val isCurrentPlan: Boolean,
+    val hasDomainCredit: Boolean
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostFormatModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostFormatModel.kt
new file mode 100644
index 00000000000..4efc39cb18a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostFormatModel.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table
+data class PostFormatModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    // Associated local site ID (could be refactored to be a FOREIGN KEY)
+    @Column var siteId: Int = 0
+
+    // Post format attributes
+    @Column var slug: String? = null
+    @Column var displayName: String? = null
+
+    override fun getId(): Int = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostImmutableModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostImmutableModel.kt
new file mode 100644
index 00000000000..0661262c83d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostImmutableModel.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.fluxc.model
+
+import org.json.JSONObject
+import org.wordpress.android.fluxc.model.post.PostLocation
+
+interface PostImmutableModel {
+    val id: Int
+    val localSiteId: Int
+    val remoteSiteId: Long
+    val remotePostId: Long
+    val title: String
+    val content: String
+    val dateCreated: String
+    val lastModified: String
+    val remoteLastModified: String
+    val categoryIds: String
+    val categoryIdList: List<Long>
+    val customFields: String
+    val link: String
+    val excerpt: String
+    val tagNames: String
+    val tagNameList: List<String>
+    val status: String
+    val sticky: Boolean
+    val password: String
+    val featuredImageId: Long
+    val postFormat: String
+    val slug: String
+    val longitude: Double
+    val latitude: Double
+    val location: PostLocation
+    val authorId: Long
+    val authorDisplayName: String?
+    val changesConfirmedContentHashcode: Int
+    val isPage: Boolean
+    val parentId: Long
+    val parentTitle: String
+    val isLocalDraft: Boolean
+    val isLocallyChanged: Boolean
+    val autoSaveRevisionId: Long
+    val autoSaveModified: String?
+    val remoteAutoSaveModified: String?
+    val autoSavePreviewUrl: String?
+    val autoSaveTitle: String?
+    val autoSaveContent: String?
+    val autoSaveExcerpt: String?
+    val hasCapabilityPublishPost: Boolean
+    val hasCapabilityEditPost: Boolean
+    val hasCapabilityDeletePost: Boolean
+    val dateLocallyChanged: String
+    val autoShareMessage: String
+    val autoShareId: Long
+    val publicizeSkipConnectionsJson: String
+    val publicizeSkipConnectionsList: List<PublicizeSkipConnection>
+    val dbTimestamp: Long
+
+    fun hasFeaturedImage(): Boolean
+
+    fun hasUnpublishedRevision(): Boolean
+
+    fun contentHashcode(): Int
+
+    fun getCustomField(key: String): JSONObject?
+
+    fun supportsLocation(): Boolean
+
+    fun hasLocation(): Boolean
+
+    fun shouldDeleteLatitude(): Boolean
+
+    fun shouldDeleteLongitude(): Boolean
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostModel.java
new file mode 100644
index 00000000000..201c266d082
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostModel.java
@@ -0,0 +1,807 @@
+package org.wordpress.android.fluxc.model;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.model.post.PostLocation;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Table
+public class PostModel extends Payload<BaseNetworkError> implements Cloneable, Identifiable, Serializable,
+        PostImmutableModel {
+    private static final long serialVersionUID = 4524418637508876144L;
+
+    private static final long LATITUDE_REMOVED_VALUE = 8888;
+    private static final long LONGITUDE_REMOVED_VALUE = 8888;
+
+    @PrimaryKey
+    @Column private int mId;
+    @Column private int mLocalSiteId;
+    @Column private long mRemoteSiteId; // .COM REST API
+    @Column private long mRemotePostId;
+    @Column private String mTitle;
+    @Column private String mContent;
+    @Column private String mDateCreated; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column private String mLastModified; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column private String mRemoteLastModified; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column private String mCategoryIds;
+    @Column private String mCustomFields;
+    @Column private String mLink;
+    @Column private String mExcerpt;
+    @Column private String mTagNames;
+    @Column private String mStatus;
+    @Column private boolean mSticky;
+    @Column private String mPassword;
+    @Column private long mFeaturedImageId;
+    @Column private String mPostFormat;
+    @Column private String mSlug;
+    @Column private double mLatitude = PostLocation.INVALID_LATITUDE;
+    @Column private double mLongitude = PostLocation.INVALID_LONGITUDE;
+
+    @Column private long mAuthorId;
+    @Column private String mAuthorDisplayName;
+
+    /**
+     * This field stores a hashcode value of the post content when the user confirmed making the changes visible to
+     * the users (Publish/Submit/Update/Schedule/Sync).
+     * <p>
+     * It is used to determine if the user actually confirmed the changes and if the post was edited since then.
+     */
+    @Column private int mChangesConfirmedContentHashcode;
+
+    // Page specific
+    @Column private boolean mIsPage;
+    @Column private long mParentId;
+    @Column private String mParentTitle;
+
+    // Unpublished revision data
+    @Column private long mAutoSaveRevisionId;
+    @Column private String mAutoSaveModified; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column private String mRemoteAutoSaveModified; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column private String mAutoSavePreviewUrl;
+    @Column private String mAutoSaveTitle;
+    @Column private String mAutoSaveContent;
+    @Column private String mAutoSaveExcerpt;
+
+    // Local only
+    @Column private boolean mIsLocalDraft;
+    @Column private boolean mIsLocallyChanged;
+    @Column private String mDateLocallyChanged; // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+
+    // XML-RPC only, needed to work around a bug with the API:
+    // https://github.com/wordpress-mobile/WordPress-Android/pull/3425
+    // We may be able to drop this if we switch to wp.editPost (and it doesn't have the same bug as metaWeblog.editPost)
+    @Column private long mLastKnownRemoteFeaturedImageId;
+
+    // WPCom capabilities
+    @Column private boolean mHasCapabilityPublishPost;
+    @Column private boolean mHasCapabilityEditPost;
+    @Column private boolean mHasCapabilityDeletePost;
+
+    @Column private int mAnsweredPromptId;
+
+    // Auto-share message
+    @Column private String mAutoShareMessage;
+    @Column private long mAutoShareId;
+
+    // JSON - an array of PublicizeSkipConnection objects representing publicize skip connections
+    @Column private String mPublicizeSkipConnectionsJson;
+
+    // keeps a timestamp that represents when this post was added in the db
+    @Column private long mDbTimestamp;
+
+    public PostModel() {}
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localTableSiteId) {
+        mLocalSiteId = localTableSiteId;
+    }
+
+    @Override
+    public long getRemoteSiteId() {
+        return mRemoteSiteId;
+    }
+
+    public void setRemoteSiteId(long siteId) {
+        mRemoteSiteId = siteId;
+    }
+
+    @Override
+    public long getRemotePostId() {
+        return mRemotePostId;
+    }
+
+    public void setRemotePostId(long postId) {
+        mRemotePostId = postId;
+    }
+
+    @Override
+    public @NonNull String getTitle() {
+        return StringUtils.notNullStr(mTitle);
+    }
+
+    public void setTitle(String title) {
+        mTitle = title;
+    }
+
+    @Override
+    public @NonNull String getContent() {
+        return StringUtils.notNullStr(mContent);
+    }
+
+    public void setContent(String content) {
+        mContent = content;
+    }
+
+    @Override
+    public @NonNull String getDateCreated() {
+        return StringUtils.notNullStr(mDateCreated);
+    }
+
+    public void setDateCreated(String dateCreated) {
+        mDateCreated = dateCreated;
+    }
+
+    @Override
+    public @NonNull String getLastModified() {
+        return StringUtils.notNullStr(mLastModified);
+    }
+
+    public void setLastModified(String lastModified) {
+        mLastModified = lastModified;
+    }
+
+    @Override
+    public @NonNull String getRemoteLastModified() {
+        return StringUtils.notNullStr(mRemoteLastModified);
+    }
+
+    public void setRemoteLastModified(String remoteLastModified) {
+        mRemoteLastModified = remoteLastModified;
+    }
+
+    @Override
+    public @NonNull String getCategoryIds() {
+        return StringUtils.notNullStr(mCategoryIds);
+    }
+
+    public void setCategoryIds(String categoryIds) {
+        mCategoryIds = categoryIds;
+    }
+
+    @Override
+    public @NonNull List<Long> getCategoryIdList() {
+        return termIdStringToList(mCategoryIds);
+    }
+
+    public void setCategoryIdList(List<Long> categories) {
+        mCategoryIds = termIdListToString(categories);
+    }
+
+    @Override
+    public @NonNull String getCustomFields() {
+        return StringUtils.notNullStr(mCustomFields);
+    }
+
+    public void setCustomFields(String customFields) {
+        mCustomFields = customFields;
+    }
+
+    @Override
+    public @NonNull String getLink() {
+        return StringUtils.notNullStr(mLink);
+    }
+
+    public void setLink(String link) {
+        mLink = link;
+    }
+
+    @Override
+    public @NonNull String getExcerpt() {
+        return StringUtils.notNullStr(mExcerpt);
+    }
+
+    public void setExcerpt(String excerpt) {
+        mExcerpt = excerpt;
+    }
+
+    @Override
+    public @NonNull String getTagNames() {
+        return StringUtils.notNullStr(mTagNames);
+    }
+
+    public void setTagNames(String tags) {
+        mTagNames = tags;
+    }
+
+    @Override
+    public @NonNull List<String> getTagNameList() {
+        return termNameStringToList(mTagNames);
+    }
+
+    public void setTagNameList(List<String> tags) {
+        mTagNames = termNameListToString(tags);
+    }
+
+    @Override
+    public @NonNull String getStatus() {
+        return StringUtils.notNullStr(mStatus);
+    }
+
+    public void setStatus(String status) {
+        mStatus = status;
+    }
+
+    @Override public boolean getSticky() {
+        return mSticky;
+    }
+
+    public void setSticky(boolean sticky) {
+        mSticky = sticky;
+    }
+
+    @Override
+    public @NonNull String getPassword() {
+        return StringUtils.notNullStr(mPassword);
+    }
+
+    public void setPassword(String password) {
+        mPassword = password;
+    }
+
+    @Override
+    public boolean hasFeaturedImage() {
+        return mFeaturedImageId > 0;
+    }
+
+    @Override
+    public long getFeaturedImageId() {
+        return mFeaturedImageId;
+    }
+
+    public void setFeaturedImageId(long featuredImageId) {
+        mFeaturedImageId = featuredImageId;
+    }
+
+    @Override
+    public @NonNull String getPostFormat() {
+        return StringUtils.notNullStr(mPostFormat);
+    }
+
+    public void setPostFormat(String postFormat) {
+        mPostFormat = postFormat;
+    }
+
+    @Override
+    public @NonNull String getSlug() {
+        return StringUtils.notNullStr(mSlug);
+    }
+
+    public void setSlug(String slug) {
+        mSlug = slug;
+    }
+
+    @Override
+    public double getLongitude() {
+        return mLongitude;
+    }
+
+    public void setLongitude(double longitude) {
+        mLongitude = longitude;
+    }
+
+    @Override
+    public double getLatitude() {
+        return mLatitude;
+    }
+
+    public void setLatitude(double latitude) {
+        mLatitude = latitude;
+    }
+
+    @Override
+    public @NonNull PostLocation getLocation() {
+        return new PostLocation(mLatitude, mLongitude);
+    }
+
+    public void setLocation(@NonNull PostLocation postLocation) {
+        mLatitude = postLocation.getLatitude();
+        mLongitude = postLocation.getLongitude();
+    }
+
+    public void setLocation(double latitude, double longitude) {
+        mLatitude = latitude;
+        mLongitude = longitude;
+    }
+
+    @Override
+    public long getAuthorId() {
+        return mAuthorId;
+    }
+
+    public void setAuthorId(long authorId) {
+        this.mAuthorId = authorId;
+    }
+
+    @Override
+    public String getAuthorDisplayName() {
+        return mAuthorDisplayName;
+    }
+
+    public void setAuthorDisplayName(String authorDisplayName) {
+        mAuthorDisplayName = authorDisplayName;
+    }
+
+    @Override
+    public int getChangesConfirmedContentHashcode() {
+        return mChangesConfirmedContentHashcode;
+    }
+
+    public void setChangesConfirmedContentHashcode(int changesConfirmedContentHashcode) {
+        mChangesConfirmedContentHashcode = changesConfirmedContentHashcode;
+    }
+
+    @Override
+    public boolean isPage() {
+        return mIsPage;
+    }
+
+    public void setIsPage(boolean isPage) {
+        mIsPage = isPage;
+    }
+
+    @Override
+    public long getParentId() {
+        return mParentId;
+    }
+
+    public void setParentId(long parentId) {
+        mParentId = parentId;
+    }
+
+    @Override
+    public @NonNull String getParentTitle() {
+        return StringUtils.notNullStr(mParentTitle);
+    }
+
+    public void setParentTitle(String parentTitle) {
+        mParentTitle = parentTitle;
+    }
+
+    @Override
+    public boolean isLocalDraft() {
+        return mIsLocalDraft;
+    }
+
+    public void setIsLocalDraft(boolean isLocalDraft) {
+        mIsLocalDraft = isLocalDraft;
+    }
+
+    @Override
+    public boolean isLocallyChanged() {
+        return mIsLocallyChanged;
+    }
+
+    public void setIsLocallyChanged(boolean isLocallyChanged) {
+        mIsLocallyChanged = isLocallyChanged;
+    }
+
+    @Override
+    public boolean hasUnpublishedRevision() {
+        return mAutoSaveRevisionId > 0;
+    }
+
+    @Override
+    public long getAutoSaveRevisionId() {
+        return mAutoSaveRevisionId;
+    }
+
+    public void setAutoSaveRevisionId(long autoSaveRevisionId) {
+        mAutoSaveRevisionId = autoSaveRevisionId;
+    }
+
+    @Override
+    public String getAutoSaveModified() {
+        return mAutoSaveModified;
+    }
+
+    public void setAutoSaveModified(String autoSaveModified) {
+        mAutoSaveModified = autoSaveModified;
+    }
+
+    @Override
+    public String getRemoteAutoSaveModified() {
+        return mRemoteAutoSaveModified;
+    }
+
+    public void setRemoteAutoSaveModified(String remoteAutoSaveModified) {
+        mRemoteAutoSaveModified = remoteAutoSaveModified;
+    }
+
+    @Override
+    public String getAutoSavePreviewUrl() {
+        return mAutoSavePreviewUrl;
+    }
+
+    public void setAutoSavePreviewUrl(String autoSavePreviewUrl) {
+        mAutoSavePreviewUrl = autoSavePreviewUrl;
+    }
+
+    @Override
+    public String getAutoSaveTitle() {
+        return mAutoSaveTitle;
+    }
+
+    public void setAutoSaveTitle(String autoSaveTitle) {
+        mAutoSaveTitle = autoSaveTitle;
+    }
+
+    @Override
+    public String getAutoSaveContent() {
+        return mAutoSaveContent;
+    }
+
+    public void setAutoSaveContent(String autoSaveContent) {
+        mAutoSaveContent = autoSaveContent;
+    }
+
+    @Override
+    public String getAutoSaveExcerpt() {
+        return mAutoSaveExcerpt;
+    }
+
+    public void setAutoSaveExcerpt(String autoSaveExcerpt) {
+        mAutoSaveExcerpt = autoSaveExcerpt;
+    }
+
+    @Deprecated
+    public long getLastKnownRemoteFeaturedImageId() {
+        return mLastKnownRemoteFeaturedImageId;
+    }
+
+    @Deprecated
+    public void setLastKnownRemoteFeaturedImageId(long lastKnownRemoteFeaturedImageId) {
+        mLastKnownRemoteFeaturedImageId = lastKnownRemoteFeaturedImageId;
+    }
+
+    @Override
+    public boolean getHasCapabilityPublishPost() {
+        return mHasCapabilityPublishPost;
+    }
+
+    public void setHasCapabilityPublishPost(boolean hasCapabilityPublishPost) {
+        mHasCapabilityPublishPost = hasCapabilityPublishPost;
+    }
+
+    @Override
+    public boolean getHasCapabilityEditPost() {
+        return mHasCapabilityEditPost;
+    }
+
+    public void setHasCapabilityEditPost(boolean hasCapabilityEditPost) {
+        mHasCapabilityEditPost = hasCapabilityEditPost;
+    }
+
+    @Override
+    public boolean getHasCapabilityDeletePost() {
+        return mHasCapabilityDeletePost;
+    }
+
+    public void setHasCapabilityDeletePost(boolean hasCapabilityDeletePost) {
+        mHasCapabilityDeletePost = hasCapabilityDeletePost;
+    }
+
+    @Override
+    public @NonNull String getDateLocallyChanged() {
+        return StringUtils.notNullStr(mDateLocallyChanged);
+    }
+
+    public void setDateLocallyChanged(String dateLocallyChanged) {
+        mDateLocallyChanged = dateLocallyChanged;
+    }
+
+    public int getAnsweredPromptId() {
+        return mAnsweredPromptId;
+    }
+
+    public void setAnsweredPromptId(int answeredPromptId) {
+        mAnsweredPromptId = answeredPromptId;
+    }
+
+    public void setAutoShareMessage(String autoShareMessage) {
+        mAutoShareMessage = autoShareMessage;
+    }
+
+    public void setDbTimestamp(long timestamp) {
+        mDbTimestamp = timestamp;
+    }
+    @Override
+    public long getDbTimestamp() {
+        return mDbTimestamp;
+    }
+
+    @Override
+    @NonNull
+    public String getAutoShareMessage() {
+        return StringUtils.notNullStr(mAutoShareMessage);
+    }
+
+    public void setPublicizeSkipConnectionsJson(final String publicizeSkipConnectionsJson) {
+        mPublicizeSkipConnectionsJson = publicizeSkipConnectionsJson;
+    }
+
+    @Override
+    @NonNull public String getPublicizeSkipConnectionsJson() {
+        return StringUtils.notNullStr(mPublicizeSkipConnectionsJson);
+    }
+
+    /**
+     * @return the publicize skip connections JSON deserialized into a list of PublicizeSkipConnection objects
+     */
+    @NonNull
+    @Override
+    public List<PublicizeSkipConnection> getPublicizeSkipConnectionsList() {
+        try {
+            if (mPublicizeSkipConnectionsJson != null) {
+                final Type publicizeSkipConnectionsType = new TypeToken<List<PublicizeSkipConnection>>() {}.getType();
+                final List<PublicizeSkipConnection> list =
+                        new Gson().fromJson(mPublicizeSkipConnectionsJson, publicizeSkipConnectionsType);
+                if (list != null) {
+                    return list;
+                } else {
+                    return Collections.emptyList();
+                }
+            }
+            return Collections.emptyList();
+        } catch (final Exception exception) {
+            AppLog.e(T.POSTS, exception);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public long getAutoShareId() {
+        return mAutoShareId;
+    }
+
+    public void setAutoShareId(long autoShareId) {
+        mAutoShareId = autoShareId;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof PostModel)) return false;
+
+        PostModel otherPost = (PostModel) other;
+
+        return getId() == otherPost.getId() && getLocalSiteId() == otherPost.getLocalSiteId()
+                && getRemoteSiteId() == otherPost.getRemoteSiteId() && getRemotePostId() == otherPost.getRemotePostId()
+                && getFeaturedImageId() == otherPost.getFeaturedImageId()
+                && getAuthorId() == otherPost.getAuthorId()
+                && Double.compare(otherPost.getLatitude(), getLatitude()) == 0
+                && Double.compare(otherPost.getLongitude(), getLongitude()) == 0
+                && isPage() == otherPost.isPage()
+                && getSticky() == otherPost.getSticky()
+                && isLocalDraft() == otherPost.isLocalDraft() && isLocallyChanged() == otherPost.isLocallyChanged()
+                && getHasCapabilityPublishPost() == otherPost.getHasCapabilityPublishPost()
+                && getHasCapabilityEditPost() == otherPost.getHasCapabilityEditPost()
+                && getHasCapabilityDeletePost() == otherPost.getHasCapabilityDeletePost()
+                && getParentId() == otherPost.getParentId()
+                && getAutoSaveRevisionId() == otherPost.getAutoSaveRevisionId()
+                && StringUtils.equals(getTitle(), otherPost.getTitle())
+                && StringUtils.equals(getContent(), otherPost.getContent())
+                && StringUtils.equals(getDateCreated(), otherPost.getDateCreated())
+                && StringUtils.equals(getCategoryIds(), otherPost.getCategoryIds())
+                && StringUtils.equals(getCustomFields(), otherPost.getCustomFields())
+                && StringUtils.equals(getLink(), otherPost.getLink())
+                && StringUtils.equals(getExcerpt(), otherPost.getExcerpt())
+                && StringUtils.equals(getTagNames(), otherPost.getTagNames())
+                && StringUtils.equals(getStatus(), otherPost.getStatus())
+                && StringUtils.equals(getPassword(), otherPost.getPassword())
+                && StringUtils.equals(getPostFormat(), otherPost.getPostFormat())
+                && StringUtils.equals(getSlug(), otherPost.getSlug())
+                && StringUtils.equals(getParentTitle(), otherPost.getParentTitle())
+                && StringUtils.equals(getAuthorDisplayName(), otherPost.getAuthorDisplayName())
+                && StringUtils.equals(getDateLocallyChanged(), otherPost.getDateLocallyChanged())
+                && StringUtils.equals(getAutoSaveModified(), otherPost.getAutoSaveModified())
+                && StringUtils.equals(getAutoSavePreviewUrl(), otherPost.getAutoSavePreviewUrl())
+                && StringUtils.equals(getAutoShareMessage(), otherPost.getAutoShareMessage())
+                && getAutoShareId() == otherPost.getAutoShareId()
+                && StringUtils.equals(getPublicizeSkipConnectionsJson(), otherPost.getPublicizeSkipConnectionsJson());
+    }
+
+    /**
+     * This method is used along with `mChangesConfirmedContentHashcode`. We store the contentHashcode of
+     * the post when the user explicitly confirms that the changes to the post can be published. Beware, that when
+     * you modify this method all users will need to re-confirm all the local changes. The changes wouldn't get
+     * published otherwise.
+     *
+     * This is a method generated using Android Studio. When you need to add a new field it's safer to use the
+     * generator again. (We can't use Objects.hash() since the current minSdkVersion is lower than 19.
+     */
+    @Override
+    public int contentHashcode() {
+        int result;
+        long temp;
+        result = mId;
+        result = 31 * result + mLocalSiteId;
+        result = 31 * result + (int) (mRemoteSiteId ^ (mRemoteSiteId >>> 32));
+        result = 31 * result + (int) (mRemotePostId ^ (mRemotePostId >>> 32));
+        result = 31 * result + (mTitle != null ? mTitle.hashCode() : 0);
+        result = 31 * result + (mContent != null ? mContent.hashCode() : 0);
+        result = 31 * result + (mDateCreated != null ? mDateCreated.hashCode() : 0);
+        result = 31 * result + (mCategoryIds != null ? mCategoryIds.hashCode() : 0);
+        result = 31 * result + (mCustomFields != null ? mCustomFields.hashCode() : 0);
+        result = 31 * result + (mLink != null ? mLink.hashCode() : 0);
+        result = 31 * result + (mExcerpt != null ? mExcerpt.hashCode() : 0);
+        result = 31 * result + (mTagNames != null ? mTagNames.hashCode() : 0);
+        result = 31 * result + (mStatus != null ? mStatus.hashCode() : 0);
+        result = 31 * result + (mSticky ? 1 : 0);
+        result = 31 * result + (mPassword != null ? mPassword.hashCode() : 0);
+        result = 31 * result + (int) (mAuthorId ^ (mAuthorId >>> 32));
+        result = 31 * result + (mAuthorDisplayName != null ? mAuthorDisplayName.hashCode() : 0);
+        result = 31 * result + (int) (mFeaturedImageId ^ (mFeaturedImageId >>> 32));
+        result = 31 * result + (mPostFormat != null ? mPostFormat.hashCode() : 0);
+        result = 31 * result + (mSlug != null ? mSlug.hashCode() : 0);
+        temp = Double.doubleToLongBits(mLatitude);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(mLongitude);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + (mIsPage ? 1 : 0);
+        result = 31 * result + (int) (mParentId ^ (mParentId >>> 32));
+        result = 31 * result + (mParentTitle != null ? mParentTitle.hashCode() : 0);
+        result = 31 * result + (mAutoShareMessage != null ? mAutoShareMessage.hashCode() : 0);
+        result = 31 * result + (mPublicizeSkipConnectionsJson != null ? mPublicizeSkipConnectionsJson.hashCode() : 0);
+        return result;
+    }
+
+    public @Nullable JSONArray getJsonCustomFields() {
+        if (mCustomFields == null) {
+            return null;
+        }
+        JSONArray jArray = null;
+        try {
+            jArray = new JSONArray(mCustomFields);
+        } catch (JSONException e) {
+            AppLog.e(AppLog.T.POSTS, "No custom fields found for post.");
+        }
+        return jArray;
+    }
+
+    @Override
+    public @Nullable JSONObject getCustomField(String key) {
+        JSONArray customFieldsJson = getJsonCustomFields();
+        if (customFieldsJson == null) {
+            return null;
+        }
+
+        for (int i = 0; i < customFieldsJson.length(); i++) {
+            try {
+                JSONObject jsonObject = new JSONObject(customFieldsJson.getString(i));
+                String curentKey = jsonObject.getString("key");
+                if (key.equals(curentKey)) {
+                    return jsonObject;
+                }
+            } catch (JSONException e) {
+                AppLog.e(AppLog.T.POSTS, e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean supportsLocation() {
+        // Right now, we only disable for pages.
+        return !isPage();
+    }
+
+    @Override
+    public boolean hasLocation() {
+        return getLocation().isValid();
+    }
+
+    @Override
+    public boolean shouldDeleteLatitude() {
+        return mLatitude == LATITUDE_REMOVED_VALUE;
+    }
+
+    @Override
+    public boolean shouldDeleteLongitude() {
+        return mLongitude == LONGITUDE_REMOVED_VALUE;
+    }
+
+    public void clearLocation() {
+        mLatitude = LATITUDE_REMOVED_VALUE;
+        mLongitude = LONGITUDE_REMOVED_VALUE;
+    }
+
+    public void clearFeaturedImage() {
+        setFeaturedImageId(0);
+    }
+
+    private static List<Long> termIdStringToList(String ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptyList();
+        }
+        String[] stringArray = ids.split(",");
+        List<Long> longList = new ArrayList<>();
+        for (String categoryString : stringArray) {
+            longList.add(Long.parseLong(categoryString));
+        }
+        return longList;
+    }
+
+    private static String termIdListToString(List<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return "";
+        }
+        return TextUtils.join(",", ids);
+    }
+
+    private static List<String> termNameStringToList(String terms) {
+        if (terms == null || terms.isEmpty()) {
+            return Collections.emptyList();
+        }
+        String[] stringArray = terms.split(",");
+        List<String> stringList = new ArrayList<>();
+        for (String s : stringArray) {
+            if (s != null && !s.trim().isEmpty()) {
+                stringList.add(s.trim());
+            }
+        }
+        return stringList;
+    }
+
+    private static String termNameListToString(List<String> termNames) {
+        if (termNames == null || termNames.isEmpty()) {
+            return "";
+        }
+        return TextUtils.join(",", termNames);
+    }
+
+    @Override
+    public PostModel clone() {
+        try {
+            return (PostModel) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError(); // Can't happen
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostUploadModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostUploadModel.java
new file mode 100644
index 00000000000..299518c8128
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostUploadModel.java
@@ -0,0 +1,199 @@
+package org.wordpress.android.fluxc.model;
+
+import android.text.TextUtils;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+import java.lang.annotation.Retention;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+@Table
+@RawConstraints({"FOREIGN KEY(_id) REFERENCES PostModel(_id) ON DELETE CASCADE"})
+public class PostUploadModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -4561927559051499557L;
+
+    @Retention(SOURCE)
+    @IntDef({PENDING, FAILED, CANCELLED})
+    public @interface UploadState {}
+    public static final int PENDING = 0;
+    public static final int FAILED = 1;
+    public static final int CANCELLED = 2;
+
+    @PrimaryKey(autoincrement = false)
+    @Column private int mId;
+
+    @Column private int mUploadState = PENDING;
+
+    @Column private String mAssociatedMediaIds;
+
+    // Serialization of a PostError
+    @Column private String mErrorType;
+    @Column private String mErrorMessage;
+    /**
+     * @deprecated This is kept just so we don't need to drop the whole table since SQLite
+     * doesn't support rename/drop column in the current version.
+     */
+    @Deprecated
+    @Column private int mNumberOfUploadErrorsOrCancellations;
+    @Column private int mNumberOfAutoUploadAttempts;
+
+    public PostUploadModel() {}
+
+    public PostUploadModel(int id) {
+        mId = id;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    public @UploadState int getUploadState() {
+        return mUploadState;
+    }
+
+    public void setUploadState(@UploadState int uploadState) {
+        mUploadState = uploadState;
+    }
+
+    public String getAssociatedMediaIds() {
+        return mAssociatedMediaIds;
+    }
+
+    public void setAssociatedMediaIds(String associatedMediaIds) {
+        mAssociatedMediaIds = associatedMediaIds;
+    }
+
+    public @NonNull Set<Integer> getAssociatedMediaIdSet() {
+        return mediaIdStringToSet(mAssociatedMediaIds);
+    }
+
+    public void setAssociatedMediaIdSet(Set<Integer> mediaIdSet) {
+        mAssociatedMediaIds = mediaIdSetToString(mediaIdSet);
+    }
+
+    public String getErrorType() {
+        return mErrorType;
+    }
+
+    public void setErrorType(String errorType) {
+        mErrorType = errorType;
+    }
+
+    public String getErrorMessage() {
+        return mErrorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        mErrorMessage = errorMessage;
+    }
+
+    public @Nullable PostError getPostError() {
+        if (TextUtils.isEmpty(getErrorType())) {
+            return null;
+        }
+        return new PostError(PostErrorType.fromString(getErrorType()), getErrorMessage());
+    }
+
+    public void setPostError(@Nullable PostError postError) {
+        if (postError == null) {
+            setErrorType(null);
+            setErrorMessage(null);
+            return;
+        }
+
+        setErrorType(postError.type.toString());
+        setErrorMessage(postError.message);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof PostUploadModel)) return false;
+
+        PostUploadModel otherPost = (PostUploadModel) other;
+
+        return getId() == otherPost.getId()
+                && getUploadState() == otherPost.getUploadState()
+                && StringUtils.equals(getAssociatedMediaIds(), otherPost.getAssociatedMediaIds())
+                && StringUtils.equals(getErrorType(), otherPost.getErrorType())
+                && StringUtils.equals(getErrorMessage(), otherPost.getErrorMessage());
+    }
+
+    private static Set<Integer> mediaIdStringToSet(String ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Collections.emptySet();
+        }
+        String[] stringArray = ids.split(",");
+        Set<Integer> integerSet = new HashSet<>();
+        for (String mediaIdStrong : stringArray) {
+            integerSet.add(Integer.parseInt(mediaIdStrong));
+        }
+        return integerSet;
+    }
+
+    private static String mediaIdSetToString(Set<Integer> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return "";
+        }
+        List<Integer> idList = new ArrayList<>(ids);
+        Collections.sort(idList);
+        return TextUtils.join(",", idList);
+    }
+
+    /**
+     * @deprecated This is kept just so we don't need to drop the whole table since SQLite
+     * doesn't support rename/drop column in the current version.
+     */
+    @Deprecated
+    public int getNumberOfUploadErrorsOrCancellations() {
+        return mNumberOfUploadErrorsOrCancellations;
+    }
+
+    /**
+     * @deprecated This is kept just so we don't need to drop the whole table since SQLite
+     * doesn't support rename/drop column in the current version.
+     */
+    @Deprecated
+    public void setNumberOfUploadErrorsOrCancellations(int numberOfUploadErrorsOrCancellations) {
+        mNumberOfUploadErrorsOrCancellations = numberOfUploadErrorsOrCancellations;
+    }
+
+    public int getNumberOfAutoUploadAttempts() {
+        return mNumberOfAutoUploadAttempts;
+    }
+
+    public void setNumberOfAutoUploadAttempts(int numberOfAutoUploadAttempts) {
+        mNumberOfAutoUploadAttempts = numberOfAutoUploadAttempts;
+    }
+
+    public void incNumberOfAutoUploadAttempts() {
+        mNumberOfAutoUploadAttempts += 1;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostsModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostsModel.java
new file mode 100644
index 00000000000..27a05abd73c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PostsModel.java
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PostsModel extends Payload<BaseNetworkError> {
+    private List<PostModel> mPosts;
+
+    public PostsModel() {
+        mPosts = new ArrayList<>();
+    }
+
+    public PostsModel(@NonNull List<PostModel> posts) {
+        mPosts = posts;
+    }
+
+    public List<PostModel> getPosts() {
+        return mPosts;
+    }
+
+    public void setSites(List<PostModel> posts) {
+        this.mPosts = posts;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PublicizeSkipConnection.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PublicizeSkipConnection.kt
new file mode 100644
index 00000000000..b2414a06c1b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/PublicizeSkipConnection.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.annotations.SerializedName
+
+class PublicizeSkipConnection(
+    @SerializedName("id") val id: String = "0",
+    // e.g. "_wpas_skip_publicize_12345"
+    @SerializedName("key") val key: String? = null,
+    @SerializedName("value") var value: String? = null
+) {
+    fun connectionId(): String =
+        key?.replace(METADATA_SKIP_PUBLICIZE_PREFIX, "") ?: ""
+
+    fun isConnectionEnabled(): Boolean = value == VALUE_CONNECTION_ENABLED
+
+    fun updateValue(enabled: Boolean) {
+        value = if (enabled) VALUE_CONNECTION_ENABLED else VALUE_CONNECTION_DISABLED
+    }
+
+    companion object {
+        const val METADATA_SKIP_PUBLICIZE_PREFIX = "_wpas_skip_publicize_"
+
+        fun createNew(connectionId: String, enabled: Boolean) =
+            PublicizeSkipConnection(
+                key = "${METADATA_SKIP_PUBLICIZE_PREFIX}$connectionId",
+            ).apply {
+                updateValue(enabled)
+            }
+    }
+}
+
+private const val VALUE_CONNECTION_ENABLED = "0"
+private const val VALUE_CONNECTION_DISABLED = "1"
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartStatusModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartStatusModel.kt
new file mode 100644
index 00000000000..72a338ef889
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartStatusModel.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table
+class QuickStartStatusModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var siteId: Long = 0
+    @Column var isCompleted: Boolean = false
+        @JvmName("setIsCompleted")
+        set
+    @Column var isNotificationReceived: Boolean = false
+        @JvmName("setIsNotificationReceived")
+        set
+
+    override fun getId(): Int {
+        return this.id
+    }
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartTaskModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartTaskModel.kt
new file mode 100644
index 00000000000..115fa108553
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/QuickStartTaskModel.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table
+class QuickStartTaskModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var siteId: Long = 0
+    @Column var taskName: String? = null
+    @Column var taskType: String? = null
+    @Column var isDone: Boolean = false
+        @JvmName("setIsDone")
+        set
+    @Column var isShown: Boolean = false
+        @JvmName("setIsShown")
+        set
+
+    override fun getId(): Int {
+        return this.id
+    }
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ReaderSiteModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ReaderSiteModel.java
new file mode 100644
index 00000000000..b05603916c9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ReaderSiteModel.java
@@ -0,0 +1,88 @@
+package org.wordpress.android.fluxc.model;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+public class ReaderSiteModel extends Payload<BaseNetworkError> {
+    private long mSiteId;
+    private long mFeedId;
+    private int mSubscriberCount;
+    private boolean mIsFollowing;
+    private String mSubscribeUrl;
+    private String mTitle;
+    private String mDescription;
+    private String mUrl;
+    private String mIconUrl;
+
+    public long getSiteId() {
+        return mSiteId;
+    }
+
+    public void setSiteId(long siteId) {
+        mSiteId = siteId;
+    }
+
+    public long getFeedId() {
+        return mFeedId;
+    }
+
+    public void setFeedId(long feedId) {
+        mFeedId = feedId;
+    }
+
+    public int getSubscriberCount() {
+        return mSubscriberCount;
+    }
+
+    public void setSubscriberCount(int subscriberCount) {
+        mSubscriberCount = subscriberCount;
+    }
+
+    public String getSubscribeUrl() {
+        return mSubscribeUrl;
+    }
+
+    public void setSubscribeUrl(String subscribeUrl) {
+        mSubscribeUrl = subscribeUrl;
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public void setTitle(String title) {
+        mTitle = title;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(String url) {
+        this.mUrl = url;
+    }
+
+    public boolean isFollowing() {
+        return mIsFollowing;
+    }
+
+    public void setFollowing(boolean following) {
+        mIsFollowing = following;
+    }
+
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(String description) {
+        mDescription = description;
+    }
+
+    public String getIconUrl() {
+        return mIconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        mIconUrl = iconUrl;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/RoleModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/RoleModel.java
new file mode 100644
index 00000000000..31f5ee2b5e4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/RoleModel.java
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.model;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+
+@Table
+public class RoleModel implements Identifiable, Serializable {
+    private static final long serialVersionUID = 5154356410357986144L;
+
+    @PrimaryKey @Column private int mId;
+
+    // Site Id Foreign Key
+    @Column private int mSiteId;
+
+    // Role attributes
+    @Column private String mName;
+    @Column private String mDisplayName;
+
+    public int getId() {
+        return mId;
+    }
+
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public int getSiteId() {
+        return mSiteId;
+    }
+
+    public void setSiteId(int siteId) {
+        mSiteId = siteId;
+    }
+
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(String name) {
+        mName = name;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        mDisplayName = displayName;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof RoleModel)) return false;
+
+        RoleModel otherRole = (RoleModel) other;
+        return getId() == otherRole.getId()
+                && getSiteId() == otherRole.getSiteId()
+                && StringUtils.equals(getName(), otherRole.getName())
+                && StringUtils.equals(getDisplayName(), otherRole.getDisplayName());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettings.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettings.kt
new file mode 100644
index 00000000000..f8864075791
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettings.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront.PAGE
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront.POSTS
+
+sealed class SiteHomepageSettings(val showOnFront: ShowOnFront) {
+    data class StaticPage(val pageForPostsId: Long, val pageOnFrontId: Long) : SiteHomepageSettings(PAGE)
+    object Posts : SiteHomepageSettings(POSTS)
+
+    enum class ShowOnFront(val value: String) {
+        PAGE("page"), POSTS("posts")
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapper.kt
new file mode 100644
index 00000000000..9033d4ba87a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteHomepageSettingsMapper.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.model
+
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.Posts
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront.PAGE
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront.POSTS
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient.UpdateHomepageResponse
+import javax.inject.Inject
+
+class SiteHomepageSettingsMapper
+@Inject constructor() {
+    fun map(site: SiteModel): SiteHomepageSettings? {
+        val showOnFront = when (site.showOnFront) {
+            PAGE.value -> PAGE
+            POSTS.value -> POSTS
+            else -> null
+        }
+        return showOnFront?.let {
+            when (showOnFront) {
+                PAGE -> StaticPage(site.pageForPosts, site.pageOnFront)
+                POSTS -> Posts
+            }
+        }
+    }
+
+    fun map(data: UpdateHomepageResponse): SiteHomepageSettings {
+        return if (data.isPageOnFront) {
+            val pageForPostsId = data.pageForPostsId ?: -1
+            val pageOnFrontId = data.pageOnFrontId ?: -1
+            StaticPage(pageForPostsId, pageOnFrontId)
+        } else {
+            Posts
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java
new file mode 100644
index 00000000000..cf0b5614923
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java
@@ -0,0 +1,1124 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.io.Serializable;
+import java.lang.annotation.Retention;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+@Table
+@RawConstraints({"UNIQUE (SITE_ID, URL)"})
+public class SiteModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -7641813766771796252L;
+
+    @Retention(SOURCE)
+    @IntDef({ORIGIN_UNKNOWN, ORIGIN_WPCOM_REST, ORIGIN_XMLRPC, ORIGIN_WPAPI})
+    public @interface SiteOrigin {
+    }
+
+    public static final int ORIGIN_UNKNOWN = 0;
+    public static final int ORIGIN_WPCOM_REST = 1;
+    public static final int ORIGIN_XMLRPC = 2;
+    public static final int ORIGIN_WPAPI = 3;
+
+    public static final long VIP_PLAN_ID = 31337;
+
+    public static final String ACTIVE_MODULES_KEY_PUBLICIZE = "publicize";
+    public static final String ACTIVE_MODULES_KEY_SHARING_BUTTONS = "sharedaddy";
+
+    @PrimaryKey
+    @Column
+    private int mId;
+    // Only given a value for wpcom and Jetpack sites - self-hosted sites use mSelfHostedSiteId
+    @Column
+    private long mSiteId;
+    @Column
+    private String mUrl;
+    @Column
+    private String mAdminUrl;
+    @Column
+    private String mLoginUrl;
+    @Column
+    private String mName;
+    @Column
+    private String mDescription;
+    @Column
+    private boolean mIsWPCom;
+    @Column
+    private boolean mIsWPComAtomic;
+    @Column
+    private int mPublishedStatus = -1;
+    @Column
+    private boolean mIsFeaturedImageSupported;
+    @Column
+    private boolean mIsWpForTeamsSite;
+    @Column
+    private String mDefaultCommentStatus = "open";
+    @Column
+    private String mTimezone; // Expressed as an offset relative to GMT (e.g. '-8')
+    @Column
+    private String mFrameNonce; // only wpcom and Jetpack sites
+    @Column
+    private long mMaxUploadSize; // only set for Jetpack sites
+    @Column
+    private long mMemoryLimit; // only set for Jetpack sites
+    @Column
+    private int mOrigin = ORIGIN_UNKNOWN; // Does this site come from a WPCOM REST or XMLRPC fetch_sites call?
+    @Column
+    private int mOrganizationId = -1;
+
+    @Column
+    private String mShowOnFront;
+    @Column
+    private long mPageOnFront = -1;
+    @Column
+    private long mPageForPosts = -1;
+
+    // Self hosted specifics
+    // The siteId for self hosted sites. Jetpack sites will also have a mSiteId, which is their id on wpcom
+    @Column
+    private long mSelfHostedSiteId;
+    @Column
+    private String mUsername;
+    @Column
+    private String mPassword;
+    @Column(name = "XMLRPC_URL")
+    private String mXmlRpcUrl;
+    @Column
+    private String mWpApiRestUrl;
+    @Column
+    private String mSoftwareVersion;
+    @Column
+    private boolean mIsSelfHostedAdmin;
+
+    // Self hosted user's profile data
+    @Column
+    private String mEmail;
+    @Column
+    private String mDisplayName;
+
+    // mIsJetpackInstalled is true if Jetpack is installed and activated on the self hosted site, but Jetpack can
+    // be disconnected.
+    @Column
+    private boolean mIsJetpackInstalled;
+    // mIsJetpackConnected is true if Jetpack is installed, activated and connected to a WordPress.com account.
+    @Column
+    private boolean mIsJetpackConnected;
+    // mIsJetpackCPConnected is true for self hosted sites that use Jetpack Connection Package,
+    // but don't have full jetpack plugin
+    @Column(name = "IS_JETPACK_CP_CONNECTED")
+    private boolean mIsJetpackCPConnected;
+    @Column
+    private String mJetpackVersion;
+    @Column
+    private String mJetpackUserEmail;
+    @Column
+    private boolean mIsAutomatedTransfer;
+    @Column
+    private boolean mIsWpComStore;
+    @Column
+    private boolean mHasWooCommerce;
+
+    // WPCom specifics
+    @Column
+    private boolean mIsVisible = true;
+    @Column
+    private boolean mIsPrivate;
+    @Column
+    private boolean mIsComingSoon;
+    @Column
+    private boolean mIsVideoPressSupported;
+    @Column
+    private long mPlanId;
+    @Column
+    private String mPlanShortName;
+    @Column
+    private String mPlanProductSlug;
+    @Column
+    private String mIconUrl;
+    @Column
+    private boolean mHasFreePlan;
+    @Column
+    private String mUnmappedUrl;
+    @Column
+    private String mWebEditor;
+    @Column
+    private String mMobileEditor;
+
+    // WPCom capabilities
+    @Column
+    private boolean mHasCapabilityEditPages;
+    @Column
+    private boolean mHasCapabilityEditPosts;
+    @Column
+    private boolean mHasCapabilityEditOthersPosts;
+    @Column
+    private boolean mHasCapabilityEditOthersPages;
+    @Column
+    private boolean mHasCapabilityDeletePosts;
+    @Column
+    private boolean mHasCapabilityDeleteOthersPosts;
+    @Column
+    private boolean mHasCapabilityEditThemeOptions;
+    @Column
+    private boolean mHasCapabilityEditUsers;
+    @Column
+    private boolean mHasCapabilityListUsers;
+    @Column
+    private boolean mHasCapabilityManageCategories;
+    @Column
+    private boolean mHasCapabilityManageOptions;
+    @Column
+    private boolean mHasCapabilityActivateWordads;
+    @Column
+    private boolean mHasCapabilityPromoteUsers;
+    @Column
+    private boolean mHasCapabilityPublishPosts;
+    @Column
+    private boolean mHasCapabilityUploadFiles;
+    @Column
+    private boolean mHasCapabilityDeleteUser;
+    @Column
+    private boolean mHasCapabilityRemoveUsers;
+    @Column
+    private boolean mHasCapabilityViewStats;
+
+    // WPCOM and Jetpack Disk Quota information
+    @Column
+    private long mSpaceAvailable;
+    @Column
+    private long mSpaceAllowed;
+    @Column
+    private long mSpaceUsed;
+    @Column
+    private double mSpacePercentUsed;
+
+    @Column
+    private String mActiveModules;
+    @Column
+    private boolean mIsPublicizePermanentlyDisabled;
+    @Column
+    private String mActiveJetpackConnectionPlugins;
+
+    // Zendesk meta
+    @Column
+    private String mZendeskPlan;
+    @Column
+    private String mZendeskAddOns;
+
+    // Blogging Reminder options
+    @Column
+    private boolean mIsBloggingPromptsOptedIn;
+    @Column
+    private boolean mIsBloggingPromptsCardOptedIn;
+    @Column
+    private boolean mIsPotentialBloggingSite;
+    @Column
+    private boolean mIsBloggingReminderOnMonday;
+    @Column
+    private boolean mIsBloggingReminderOnTuesday;
+    @Column
+    private boolean mIsBloggingReminderOnWednesday;
+    @Column
+    private boolean mIsBloggingReminderOnThursday;
+    @Column
+    private boolean mIsBloggingReminderOnFriday;
+    @Column
+    private boolean mIsBloggingReminderOnSaturday;
+    @Column
+    private boolean mIsBloggingReminderOnSunday;
+    @Column
+    private int mBloggingReminderHour;
+    @Column
+    private int mBloggingReminderMinute;
+    @Column
+    private String mApplicationPasswordsAuthorizeUrl;
+    @Column
+    private Boolean mCanBlaze;
+    // Comma-separated list of active features in the site's plan
+    @Column
+    private String mPlanActiveFeatures;
+    @Column
+    private Boolean mWasEcommerceTrial;
+    @Column
+    private Boolean mIsSingleUserSite;
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public LocalId localId() {
+        return new LocalOrRemoteId.LocalId(mId);
+    }
+
+    public RemoteId remoteId() {
+        if (mSiteId != 0L) {
+            return new RemoteId(mSiteId);
+        } else {
+            return new RemoteId(mSelfHostedSiteId);
+        }
+    }
+
+    public SiteModel() {
+    }
+
+    public long getSiteId() {
+        return mSiteId;
+    }
+
+    public void setSiteId(long siteId) {
+        mSiteId = siteId;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(@NonNull String url) {
+        try {
+            // Normalize the URL, because it can be used as an identifier.
+            mUrl = (new URI(url)).normalize().toString();
+        } catch (URISyntaxException e) {
+            // Don't set the URL
+            AppLog.e(T.API, "Trying to set an invalid url: " + url);
+        }
+    }
+
+    public String getLoginUrl() {
+        return mLoginUrl;
+    }
+
+    public void setLoginUrl(String loginUrl) {
+        mLoginUrl = loginUrl;
+    }
+
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(String name) {
+        mName = name;
+    }
+
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(String description) {
+        mDescription = description;
+    }
+
+    public boolean isWPCom() {
+        return mIsWPCom;
+    }
+
+    public void setIsWPCom(boolean wpCom) {
+        mIsWPCom = wpCom;
+    }
+
+    public String getUsername() {
+        return mUsername;
+    }
+
+    public void setUsername(String username) {
+        mUsername = username;
+    }
+
+    public String getPassword() {
+        return mPassword;
+    }
+
+    public void setPassword(String password) {
+        mPassword = password;
+    }
+
+    public String getXmlRpcUrl() {
+        return mXmlRpcUrl;
+    }
+
+    public void setXmlRpcUrl(String xmlRpcUrl) {
+        mXmlRpcUrl = xmlRpcUrl;
+    }
+
+    public String getWpApiRestUrl() {
+        return mWpApiRestUrl;
+    }
+
+    public void setWpApiRestUrl(String wpApiRestEndpoint) {
+        mWpApiRestUrl = wpApiRestEndpoint;
+    }
+
+    public long getSelfHostedSiteId() {
+        return mSelfHostedSiteId;
+    }
+
+    public void setSelfHostedSiteId(long selfHostedSiteId) {
+        mSelfHostedSiteId = selfHostedSiteId;
+    }
+
+    public boolean isSelfHostedAdmin() {
+        return mIsSelfHostedAdmin;
+    }
+
+    public void setIsSelfHostedAdmin(boolean selfHostedAdmin) {
+        mIsSelfHostedAdmin = selfHostedAdmin;
+    }
+
+    public String getEmail() {
+        return mEmail;
+    }
+
+    public void setEmail(String email) {
+        mEmail = email;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        mDisplayName = displayName;
+    }
+
+    public boolean isVisible() {
+        return mIsVisible;
+    }
+
+    public void setIsVisible(boolean visible) {
+        mIsVisible = visible;
+    }
+
+    public boolean isPrivate() {
+        return mIsPrivate;
+    }
+
+    public void setIsPrivate(boolean isPrivate) {
+        mIsPrivate = isPrivate;
+    }
+
+    public boolean isFeaturedImageSupported() {
+        return mIsFeaturedImageSupported;
+    }
+
+    public void setIsFeaturedImageSupported(boolean featuredImageSupported) {
+        mIsFeaturedImageSupported = featuredImageSupported;
+    }
+
+    public String getDefaultCommentStatus() {
+        return mDefaultCommentStatus;
+    }
+
+    public void setDefaultCommentStatus(String defaultCommentStatus) {
+        mDefaultCommentStatus = defaultCommentStatus;
+    }
+
+    public String getSoftwareVersion() {
+        return mSoftwareVersion;
+    }
+
+    public void setSoftwareVersion(String softwareVersion) {
+        mSoftwareVersion = softwareVersion;
+    }
+
+    public String getAdminUrl() {
+        return mAdminUrl;
+    }
+
+    public void setAdminUrl(String adminUrl) {
+        mAdminUrl = adminUrl;
+    }
+
+    public boolean isVideoPressSupported() {
+        return mIsVideoPressSupported;
+    }
+
+    public void setIsVideoPressSupported(boolean videoPressSupported) {
+        mIsVideoPressSupported = videoPressSupported;
+    }
+
+    public boolean getHasCapabilityEditPages() {
+        return mHasCapabilityEditPages;
+    }
+
+    public void setHasCapabilityEditPages(boolean hasCapabilityEditPages) {
+        mHasCapabilityEditPages = hasCapabilityEditPages;
+    }
+
+    public boolean getHasCapabilityEditPosts() {
+        return mHasCapabilityEditPosts;
+    }
+
+    public void setHasCapabilityEditPosts(boolean capabilityEditPosts) {
+        mHasCapabilityEditPosts = capabilityEditPosts;
+    }
+
+    public boolean getHasCapabilityEditOthersPosts() {
+        return mHasCapabilityEditOthersPosts;
+    }
+
+    public void setHasCapabilityEditOthersPosts(boolean capabilityEditOthersPosts) {
+        mHasCapabilityEditOthersPosts = capabilityEditOthersPosts;
+    }
+
+    public boolean getHasCapabilityEditOthersPages() {
+        return mHasCapabilityEditOthersPages;
+    }
+
+    public void setHasCapabilityEditOthersPages(boolean capabilityEditOthersPages) {
+        mHasCapabilityEditOthersPages = capabilityEditOthersPages;
+    }
+
+    public boolean getHasCapabilityDeletePosts() {
+        return mHasCapabilityDeletePosts;
+    }
+
+    public void setHasCapabilityDeletePosts(boolean capabilityDeletePosts) {
+        mHasCapabilityDeletePosts = capabilityDeletePosts;
+    }
+
+    public boolean getHasCapabilityDeleteOthersPosts() {
+        return mHasCapabilityDeleteOthersPosts;
+    }
+
+    public void setHasCapabilityDeleteOthersPosts(boolean capabilityDeleteOthersPosts) {
+        mHasCapabilityDeleteOthersPosts = capabilityDeleteOthersPosts;
+    }
+
+    public boolean getHasCapabilityEditThemeOptions() {
+        return mHasCapabilityEditThemeOptions;
+    }
+
+    public void setHasCapabilityEditThemeOptions(boolean capabilityEditThemeOptions) {
+        mHasCapabilityEditThemeOptions = capabilityEditThemeOptions;
+    }
+
+    public boolean getHasCapabilityEditUsers() {
+        return mHasCapabilityEditUsers;
+    }
+
+    public void setHasCapabilityEditUsers(boolean capabilityEditUsers) {
+        mHasCapabilityEditUsers = capabilityEditUsers;
+    }
+
+    public boolean getHasCapabilityListUsers() {
+        return mHasCapabilityListUsers;
+    }
+
+    public void setHasCapabilityListUsers(boolean capabilityListUsers) {
+        mHasCapabilityListUsers = capabilityListUsers;
+    }
+
+    public boolean getHasCapabilityManageCategories() {
+        return mHasCapabilityManageCategories;
+    }
+
+    public void setHasCapabilityManageCategories(boolean capabilityManageCategories) {
+        mHasCapabilityManageCategories = capabilityManageCategories;
+    }
+
+    public boolean getHasCapabilityManageOptions() {
+        return mHasCapabilityManageOptions;
+    }
+
+    public void setHasCapabilityManageOptions(boolean capabilityManageOptions) {
+        mHasCapabilityManageOptions = capabilityManageOptions;
+    }
+
+    public boolean getHasCapabilityActivateWordads() {
+        return mHasCapabilityActivateWordads;
+    }
+
+    public void setHasCapabilityActivateWordads(boolean capabilityActivateWordads) {
+        mHasCapabilityActivateWordads = capabilityActivateWordads;
+    }
+
+    public boolean getHasCapabilityPromoteUsers() {
+        return mHasCapabilityPromoteUsers;
+    }
+
+    public void setHasCapabilityPromoteUsers(boolean capabilityPromoteUsers) {
+        mHasCapabilityPromoteUsers = capabilityPromoteUsers;
+    }
+
+    public boolean getHasCapabilityPublishPosts() {
+        return mHasCapabilityPublishPosts;
+    }
+
+    public void setHasCapabilityPublishPosts(boolean capabilityPublishPosts) {
+        mHasCapabilityPublishPosts = capabilityPublishPosts;
+    }
+
+    public boolean getHasCapabilityUploadFiles() {
+        return mHasCapabilityUploadFiles;
+    }
+
+    public void setHasCapabilityUploadFiles(boolean capabilityUploadFiles) {
+        mHasCapabilityUploadFiles = capabilityUploadFiles;
+    }
+
+    public boolean getHasCapabilityDeleteUser() {
+        return mHasCapabilityDeleteUser;
+    }
+
+    public void setHasCapabilityDeleteUser(boolean capabilityDeleteUser) {
+        mHasCapabilityDeleteUser = capabilityDeleteUser;
+    }
+
+    public boolean getHasCapabilityRemoveUsers() {
+        return mHasCapabilityRemoveUsers;
+    }
+
+    public void setHasCapabilityRemoveUsers(boolean capabilityRemoveUsers) {
+        mHasCapabilityRemoveUsers = capabilityRemoveUsers;
+    }
+
+    public boolean getHasCapabilityViewStats() {
+        return mHasCapabilityViewStats;
+    }
+
+    public void setHasCapabilityViewStats(boolean capabilityViewStats) {
+        mHasCapabilityViewStats = capabilityViewStats;
+    }
+
+    public String getTimezone() {
+        return mTimezone;
+    }
+
+    public void setTimezone(String timezone) {
+        mTimezone = timezone;
+    }
+
+    public String getFrameNonce() {
+        return mFrameNonce;
+    }
+
+    public void setFrameNonce(String frameNonce) {
+        mFrameNonce = frameNonce;
+    }
+
+    public long getMaxUploadSize() {
+        return mMaxUploadSize;
+    }
+
+    public void setMaxUploadSize(long maxUploadSize) {
+        mMaxUploadSize = maxUploadSize;
+    }
+
+    public boolean hasMaxUploadSize() {
+        return mMaxUploadSize > 0;
+    }
+
+    public long getMemoryLimit() {
+        return mMemoryLimit;
+    }
+
+    public void setMemoryLimit(long memoryLimit) {
+        mMemoryLimit = memoryLimit;
+    }
+
+    public boolean hasMemoryLimit() {
+        return mMemoryLimit > 0;
+    }
+
+    public String getPlanShortName() {
+        return mPlanShortName;
+    }
+
+    public void setPlanShortName(String planShortName) {
+        mPlanShortName = planShortName;
+    }
+
+    public String getPlanProductSlug() {
+        return mPlanProductSlug;
+    }
+
+    public void setPlanProductSlug(String planProductSlug) {
+        mPlanProductSlug = planProductSlug;
+    }
+
+    public long getPlanId() {
+        return mPlanId;
+    }
+
+    public void setPlanId(long planId) {
+        mPlanId = planId;
+    }
+
+    public String getIconUrl() {
+        return mIconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        mIconUrl = iconUrl;
+    }
+
+    public boolean getHasFreePlan() {
+        return mHasFreePlan;
+    }
+
+    public void setHasFreePlan(boolean hasFreePlan) {
+        mHasFreePlan = hasFreePlan;
+    }
+
+    public String getUnmappedUrl() {
+        return mUnmappedUrl;
+    }
+
+    public void setUnmappedUrl(String unMappedUrl) {
+        mUnmappedUrl = unMappedUrl;
+    }
+
+    public String getWebEditor() {
+        return mWebEditor;
+    }
+
+    public void setWebEditor(String webEditor) {
+        mWebEditor = webEditor;
+    }
+
+    public String getMobileEditor() {
+        return mMobileEditor;
+    }
+
+    public void setMobileEditor(String mobileEditor) {
+        mMobileEditor = mobileEditor;
+    }
+
+    public boolean isJetpackInstalled() {
+        return mIsJetpackInstalled;
+    }
+
+    public void setIsJetpackInstalled(boolean jetpackInstalled) {
+        mIsJetpackInstalled = jetpackInstalled;
+    }
+
+    public boolean isJetpackConnected() {
+        return mIsJetpackConnected;
+    }
+
+    public void setIsJetpackConnected(boolean jetpackConnected) {
+        mIsJetpackConnected = jetpackConnected;
+    }
+
+    public boolean isJetpackCPConnected() {
+        return mIsJetpackCPConnected;
+    }
+
+    public void setIsJetpackCPConnected(boolean isJetpackCPConnected) {
+        this.mIsJetpackCPConnected = isJetpackCPConnected;
+    }
+
+    public String getJetpackVersion() {
+        return mJetpackVersion;
+    }
+
+    public void setJetpackVersion(String jetpackVersion) {
+        mJetpackVersion = jetpackVersion;
+    }
+
+    public String getJetpackUserEmail() {
+        return mJetpackUserEmail;
+    }
+
+    public void setJetpackUserEmail(String jetpackUserEmail) {
+        mJetpackUserEmail = jetpackUserEmail;
+    }
+
+    public boolean isAutomatedTransfer() {
+        return mIsAutomatedTransfer;
+    }
+
+    public void setIsAutomatedTransfer(boolean automatedTransfer) {
+        mIsAutomatedTransfer = automatedTransfer;
+    }
+
+    public boolean isWpComStore() {
+        return mIsWpComStore;
+    }
+
+    public void setIsWpComStore(boolean isWpComStore) {
+        mIsWpComStore = isWpComStore;
+    }
+
+    public boolean getHasWooCommerce() {
+        return mHasWooCommerce;
+    }
+
+    public void setHasWooCommerce(boolean hasWooCommerce) {
+        mHasWooCommerce = hasWooCommerce;
+    }
+
+    @SiteOrigin
+    public int getOrigin() {
+        return mOrigin;
+    }
+
+    public void setOrigin(@SiteOrigin int origin) {
+        mOrigin = origin;
+    }
+
+    public boolean isUsingWpComRestApi() {
+        return isWPCom() || (isJetpackConnected() && getOrigin() == ORIGIN_WPCOM_REST);
+    }
+
+    public void setSpaceAvailable(long spaceAvailable) {
+        mSpaceAvailable = spaceAvailable;
+    }
+
+    public long getSpaceAvailable() {
+        return mSpaceAvailable;
+    }
+
+    public void setSpaceAllowed(long spaceAllowed) {
+        mSpaceAllowed = spaceAllowed;
+    }
+
+    public long getSpaceAllowed() {
+        return mSpaceAllowed;
+    }
+
+    public void setSpaceUsed(long spaceUsed) {
+        mSpaceUsed = spaceUsed;
+    }
+
+    public long getSpaceUsed() {
+        return mSpaceUsed;
+    }
+
+    public void setSpacePercentUsed(double spacePercentUsed) {
+        mSpacePercentUsed = spacePercentUsed;
+    }
+
+    public double getSpacePercentUsed() {
+        return mSpacePercentUsed;
+    }
+
+    public boolean hasDiskSpaceQuotaInformation() {
+        return mSpaceAllowed > 0;
+    }
+
+    public boolean isWPComAtomic() {
+        return mIsWPComAtomic;
+    }
+
+    public void setIsWPComAtomic(boolean isWPComAtomic) {
+        mIsWPComAtomic = isWPComAtomic;
+    }
+
+    public boolean isWpForTeamsSite() {
+        return mIsWpForTeamsSite;
+    }
+
+    public void setIsWpForTeamsSite(boolean wpForTeamsSite) {
+        mIsWpForTeamsSite = wpForTeamsSite;
+    }
+
+    public boolean isComingSoon() {
+        return mIsComingSoon;
+    }
+
+    public void setIsComingSoon(boolean isComingSoon) {
+        mIsComingSoon = isComingSoon;
+    }
+
+    public boolean isPrivateWPComAtomic() {
+        return isWPComAtomic() && (isPrivate() || isComingSoon());
+    }
+
+    public String getShowOnFront() {
+        return mShowOnFront;
+    }
+
+    public void setShowOnFront(String showOnFront) {
+        mShowOnFront = showOnFront;
+    }
+
+    public long getPageOnFront() {
+        return mPageOnFront;
+    }
+
+    public void setPageOnFront(long pageOnFront) {
+        mPageOnFront = pageOnFront;
+    }
+
+    public long getPageForPosts() {
+        return mPageForPosts;
+    }
+
+    public void setPageForPosts(long pageForPosts) {
+        mPageForPosts = pageForPosts;
+    }
+
+    public boolean isPublicizePermanentlyDisabled() {
+        return mIsPublicizePermanentlyDisabled;
+    }
+
+    public void setIsPublicizePermanentlyDisabled(boolean publicizePermanentlyDisabled) {
+        mIsPublicizePermanentlyDisabled = publicizePermanentlyDisabled;
+    }
+
+    public String getActiveModules() {
+        return mActiveModules;
+    }
+
+    public void setActiveModules(String activeModules) {
+        mActiveModules = activeModules;
+    }
+
+    public String getActiveJetpackConnectionPlugins() {
+        return mActiveJetpackConnectionPlugins;
+    }
+
+    public void setActiveJetpackConnectionPlugins(String activeJetpackConnectionPlugins) {
+        mActiveJetpackConnectionPlugins = activeJetpackConnectionPlugins;
+    }
+
+    public boolean isActiveModuleEnabled(String moduleName) {
+        if (mActiveModules != null) {
+            String[] activeModules = mActiveModules.split(",");
+            return Arrays.asList(activeModules).contains(moduleName);
+        }
+        return false;
+    }
+
+    public boolean isAdmin() {
+        return mHasCapabilityManageOptions;
+    }
+
+    public boolean supportsSharing() {
+        return supportsPublicize() || supportsShareButtons();
+    }
+
+    public boolean supportsPublicize() {
+        // Publicize is only supported via REST
+        if (getOrigin() != ORIGIN_WPCOM_REST) {
+            return false;
+        }
+
+        if (!getHasCapabilityPublishPosts()) {
+            return false;
+        }
+
+        if (isJetpackConnected()) {
+            // For Jetpack, check if the module is enabled
+            return isActiveModuleEnabled(ACTIVE_MODULES_KEY_PUBLICIZE);
+        } else {
+            // For WordPress.com, check if it is not disabled
+            return !isPublicizePermanentlyDisabled();
+        }
+    }
+
+    public boolean supportsShareButtons() {
+        // Share Button settings are only supported via REST, and for admins
+        if (!isAdmin() || getOrigin() != ORIGIN_WPCOM_REST) {
+            return false;
+        }
+
+        if (isJetpackConnected()) {
+            // For Jetpack, check if the module is enabled
+            return isActiveModuleEnabled(ACTIVE_MODULES_KEY_SHARING_BUTTONS);
+        } else {
+            return true;
+        }
+    }
+
+    public String getZendeskPlan() {
+        return mZendeskPlan;
+    }
+
+    public void setZendeskPlan(String zendeskPlan) {
+        mZendeskPlan = zendeskPlan;
+    }
+
+    public String getZendeskAddOns() {
+        return mZendeskAddOns;
+    }
+
+    public void setZendeskAddOns(String zendeskAddOns) {
+        mZendeskAddOns = zendeskAddOns;
+    }
+
+    public int getOrganizationId() {
+        return mOrganizationId;
+    }
+
+    public void setOrganizationId(int organizationId) {
+        mOrganizationId = organizationId;
+    }
+
+    public boolean isBloggingPromptsOptedIn() {
+        return mIsBloggingPromptsOptedIn;
+    }
+
+    public void setIsBloggingPromptsOptedIn(boolean bloggingPromptsOptedIn) {
+        mIsBloggingPromptsOptedIn = bloggingPromptsOptedIn;
+    }
+
+    public boolean isBloggingPromptsCardOptedIn() {
+        return mIsBloggingPromptsCardOptedIn;
+    }
+
+    public void setIsBloggingPromptsCardOptedIn(boolean bloggingPromptsCardOptedIn) {
+        mIsBloggingPromptsCardOptedIn = bloggingPromptsCardOptedIn;
+    }
+
+    public boolean isPotentialBloggingSite() {
+        return mIsPotentialBloggingSite;
+    }
+
+    public void setIsPotentialBloggingSite(boolean potentialBloggingSite) {
+        mIsPotentialBloggingSite = potentialBloggingSite;
+    }
+
+    public boolean isBloggingReminderOnMonday() {
+        return mIsBloggingReminderOnMonday;
+    }
+
+    public void setIsBloggingReminderOnMonday(boolean bloggingReminderOnMonday) {
+        mIsBloggingReminderOnMonday = bloggingReminderOnMonday;
+    }
+
+    public boolean isBloggingReminderOnTuesday() {
+        return mIsBloggingReminderOnTuesday;
+    }
+
+    public void setIsBloggingReminderOnTuesday(boolean bloggingReminderOnTuesday) {
+        mIsBloggingReminderOnTuesday = bloggingReminderOnTuesday;
+    }
+
+    public boolean isBloggingReminderOnWednesday() {
+        return mIsBloggingReminderOnWednesday;
+    }
+
+    public void setIsBloggingReminderOnWednesday(boolean bloggingReminderOnWednesday) {
+        mIsBloggingReminderOnWednesday = bloggingReminderOnWednesday;
+    }
+
+    public boolean isBloggingReminderOnThursday() {
+        return mIsBloggingReminderOnThursday;
+    }
+
+    public void setIsBloggingReminderOnThursday(boolean bloggingReminderOnThursday) {
+        mIsBloggingReminderOnThursday = bloggingReminderOnThursday;
+    }
+
+    public boolean isBloggingReminderOnFriday() {
+        return mIsBloggingReminderOnFriday;
+    }
+
+    public void setIsBloggingReminderOnFriday(boolean bloggingReminderOnFriday) {
+        mIsBloggingReminderOnFriday = bloggingReminderOnFriday;
+    }
+
+    public boolean isBloggingReminderOnSaturday() {
+        return mIsBloggingReminderOnSaturday;
+    }
+
+    public void setIsBloggingReminderOnSaturday(boolean bloggingReminderOnSaturday) {
+        mIsBloggingReminderOnSaturday = bloggingReminderOnSaturday;
+    }
+
+    public boolean isBloggingReminderOnSunday() {
+        return mIsBloggingReminderOnSunday;
+    }
+
+    public void setIsBloggingReminderOnSunday(boolean bloggingReminderOnSunday) {
+        mIsBloggingReminderOnSunday = bloggingReminderOnSunday;
+    }
+
+    public int getBloggingReminderHour() {
+        return mBloggingReminderHour;
+    }
+
+    public void setBloggingReminderHour(int bloggingReminderHour) {
+        mBloggingReminderHour = bloggingReminderHour;
+    }
+
+    public int getBloggingReminderMinute() {
+        return mBloggingReminderMinute;
+    }
+
+    public void setBloggingReminderMinute(int bloggingReminderMinute) {
+        mBloggingReminderMinute = bloggingReminderMinute;
+    }
+
+    public String getApplicationPasswordsAuthorizeUrl() {
+        return mApplicationPasswordsAuthorizeUrl;
+    }
+
+    public void setApplicationPasswordsAuthorizeUrl(String applicationPasswordsAuthorizeUrl) {
+        mApplicationPasswordsAuthorizeUrl = applicationPasswordsAuthorizeUrl;
+    }
+
+    public boolean isApplicationPasswordsSupported() {
+        return mApplicationPasswordsAuthorizeUrl != null && !mApplicationPasswordsAuthorizeUrl.isEmpty();
+    }
+
+    public int getPublishedStatus() {
+        return mPublishedStatus;
+    }
+
+    public void setPublishedStatus(int publishedStatus) {
+        this.mPublishedStatus = publishedStatus;
+    }
+
+    public Boolean getCanBlaze() {
+        return mCanBlaze;
+    }
+
+    public void setCanBlaze(Boolean canBlaze) {
+        this.mCanBlaze = canBlaze;
+    }
+
+    public Boolean getWasEcommerceTrial() {
+        return mWasEcommerceTrial;
+    }
+
+    public void setWasEcommerceTrial(Boolean wasEcommerceTrial) {
+        mWasEcommerceTrial = wasEcommerceTrial;
+    }
+
+    public boolean isHostedAtWPCom() {
+        return !isJetpackInstalled();
+    }
+
+    public String getPlanActiveFeatures() {
+        return mPlanActiveFeatures;
+    }
+
+    public void setPlanActiveFeatures(final String planActiveFeatures) {
+        this.mPlanActiveFeatures = planActiveFeatures;
+    }
+
+    public Boolean isSingleUserSite() {
+        return mIsSingleUserSite;
+    }
+
+    public void setIsSingleUserSite(Boolean isSingleUserSite) {
+        mIsSingleUserSite = isSingleUserSite;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SitesModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SitesModel.java
new file mode 100644
index 00000000000..be90054e40e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SitesModel.java
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SitesModel extends Payload<BaseNetworkError> {
+    private List<SiteModel> mSites;
+
+    private List<SiteModel> mJetpackCPSites;
+
+    public SitesModel() {
+        mSites = new ArrayList<>();
+        mJetpackCPSites = new ArrayList<>();
+    }
+
+    public SitesModel(@NonNull List<SiteModel> sites) {
+        mSites = sites;
+        mJetpackCPSites = new ArrayList<>();
+    }
+
+    public SitesModel(@NonNull List<SiteModel> sites, @NonNull List<SiteModel> jetpackCPSites) {
+        mSites = sites;
+        mJetpackCPSites = jetpackCPSites;
+    }
+
+    public List<SiteModel> getSites() {
+        return mSites;
+    }
+
+    public List<SiteModel> getJetpackCPSites() {
+        return mJetpackCPSites;
+    }
+
+    public void setSites(List<SiteModel> sites) {
+        mSites = sites;
+    }
+
+    public void setJetpackCPSites(List<SiteModel> jetpackCPSites) {
+        mJetpackCPSites = jetpackCPSites;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/StockMediaModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/StockMediaModel.java
new file mode 100644
index 00000000000..b63d1e13a85
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/StockMediaModel.java
@@ -0,0 +1,155 @@
+package org.wordpress.android.fluxc.model;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.StringUtils;
+
+public class StockMediaModel extends Payload<BaseNetworkError> {
+    private String mId;
+    private String mExtension;
+    private String mFile;
+    private String mGuid;
+    private String mName;
+    private String mTitle;
+    private String mType;
+    private String mUrl;
+    private String mDate;
+
+    private String mLargeThumbnail;
+    private String mMediumThumbnail;
+    private String mPostThumbnail;
+    private String mThumbnail;
+
+    private int mHeight;
+    private int mWidth;
+
+    public String getId() {
+        return mId;
+    }
+
+    public void setId(String id) {
+        this.mId = id;
+    }
+
+    public String getExtension() {
+        return mExtension;
+    }
+
+    public void setExtension(String extension) {
+        this.mExtension = extension;
+    }
+
+    public String getFile() {
+        return mFile;
+    }
+
+    public void setFile(String file) {
+        this.mFile = file;
+    }
+
+    public String getGuid() {
+        return mGuid;
+    }
+
+    public void setGuid(String guid) {
+        this.mGuid = guid;
+    }
+
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(String name) {
+        this.mName = name;
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public void setTitle(String title) {
+        this.mTitle = title;
+    }
+
+    public String getType() {
+        return mType;
+    }
+
+    public void setType(String type) {
+        this.mType = type;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(String url) {
+        this.mUrl = url;
+    }
+
+    public String getDate() {
+        return mDate;
+    }
+
+    public void setDate(String date) {
+        this.mDate = date;
+    }
+
+    public String getLargeThumbnail() {
+        return mLargeThumbnail;
+    }
+
+    public void setLargeThumbnail(String largeThumbnail) {
+        this.mLargeThumbnail = largeThumbnail;
+    }
+
+    public String getMediumThumbnail() {
+        return mMediumThumbnail;
+    }
+
+    public void setMediumThumbnail(String mediumThumbnail) {
+        this.mMediumThumbnail = mediumThumbnail;
+    }
+
+    public String getPostThumbnail() {
+        return mPostThumbnail;
+    }
+
+    public void setPostThumbnail(String postThumbnail) {
+        this.mPostThumbnail = postThumbnail;
+    }
+
+    public String getThumbnail() {
+        return mThumbnail;
+    }
+
+    public void setThumbnail(String thumbnail) {
+        this.mThumbnail = thumbnail;
+    }
+
+    public int getHeight() {
+        return mHeight;
+    }
+
+    public void setHeight(int height) {
+        this.mHeight = height;
+    }
+
+    public int getWidth() {
+        return mWidth;
+    }
+
+    public void setWidth(int width) {
+        this.mWidth = width;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof StockMediaModel)) return false;
+
+        StockMediaModel otherMedia = (StockMediaModel) other;
+
+        return StringUtils.equals(this.getId(), otherMedia.getId());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionModel.java
new file mode 100644
index 00000000000..31dc850cdc1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionModel.java
@@ -0,0 +1,126 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@Table
+@RawConstraints({"UNIQUE (FEED_ID, URL)"})
+public class SubscriptionModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -3258001887519449586L;
+
+    @PrimaryKey
+    @Column private int mId;
+    @Column private String mSubscriptionId;
+    @Column private String mBlogId;
+    @Column private String mBlogName;
+    @Column private String mFeedId;
+    @Column private String mUrl;
+
+    // Delivery Methods
+    @Column private boolean mShouldNotifyPosts;
+    @Column private boolean mShouldEmailPosts;
+    @Column private String mEmailPostsFrequency;
+    @Column private boolean mShouldEmailComments;
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public String getSubscriptionId() {
+        return mSubscriptionId;
+    }
+
+    public void setSubscriptionId(String subscriptionId) {
+        mSubscriptionId = subscriptionId;
+    }
+
+    public String getBlogId() {
+        return mBlogId;
+    }
+
+    public void setBlogId(String blogId) {
+        mBlogId = blogId;
+    }
+
+    public String getBlogName() {
+        return mBlogName;
+    }
+
+    public void setBlogName(String blogName) {
+        mBlogName = blogName;
+    }
+
+    public String getFeedId() {
+        return mFeedId;
+    }
+
+    public void setFeedId(String feedId) {
+        mFeedId = feedId;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public void setUrl(@NonNull String url) {
+        try {
+            // Normalize the URL, because it can be used as an identifier.
+            mUrl = (new URI(url)).normalize().toString();
+        } catch (URISyntaxException exception) {
+            // Don't set the URL.
+            AppLog.e(T.API, "Trying to set an invalid url: " + url);
+        }
+    }
+
+    public boolean getShouldNotifyPosts() {
+        return mShouldNotifyPosts;
+    }
+
+    public void setShouldNotifyPosts(boolean shouldNotifyPosts) {
+        mShouldNotifyPosts = shouldNotifyPosts;
+    }
+
+    public boolean getShouldEmailPosts() {
+        return mShouldEmailPosts;
+    }
+
+    public void setShouldEmailPosts(boolean shouldEmailPosts) {
+        mShouldEmailPosts = shouldEmailPosts;
+    }
+
+    public String getEmailPostsFrequency() {
+        return mEmailPostsFrequency;
+    }
+
+    public void setEmailPostsFrequency(String emailPostsFrequency) {
+        mEmailPostsFrequency = emailPostsFrequency;
+    }
+
+    public boolean getShouldEmailComments() {
+        return mShouldEmailComments;
+    }
+
+    public void setShouldEmailComments(boolean shouldEmailComments) {
+        mShouldEmailComments = shouldEmailComments;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionsModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionsModel.java
new file mode 100644
index 00000000000..be012b1dd0d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SubscriptionsModel.java
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SubscriptionsModel extends Payload<BaseNetworkError> {
+    private List<SubscriptionModel> mSubscriptions;
+
+    public SubscriptionsModel() {
+        mSubscriptions = new ArrayList<>();
+    }
+
+    public SubscriptionsModel(@NonNull List<SubscriptionModel> subscriptions) {
+        mSubscriptions = subscriptions;
+    }
+
+    public List<SubscriptionModel> getSubscriptions() {
+        return mSubscriptions;
+    }
+
+    public void setSubscriptions(List<SubscriptionModel> subscriptions) {
+        this.mSubscriptions = subscriptions;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TaxonomyModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TaxonomyModel.java
new file mode 100644
index 00000000000..7f48144f5d8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TaxonomyModel.java
@@ -0,0 +1,149 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+
+@Table
+public class TaxonomyModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = 8855881690971305398L;
+
+    @PrimaryKey
+    @Column private int mId;
+    @Column private int mLocalSiteId;
+    @NonNull @Column private String mName;
+    @Nullable @Column private String mLabel;
+    @Nullable @Column private String mDescription;
+    @Column private boolean mIsHierarchical;
+    @Column private boolean mIsPublic;
+
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public TaxonomyModel() {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mName = "";
+        this.mLabel = null;
+        this.mDescription = null;
+        this.mIsHierarchical = false;
+        this.mIsPublic = false;
+    }
+
+    /**
+     * Use when adding a new taxonomy.
+     */
+    public TaxonomyModel(@NonNull String name) {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mName = name;
+        this.mLabel = null;
+        this.mDescription = null;
+        this.mIsHierarchical = false;
+        this.mIsPublic = false;
+    }
+
+    public TaxonomyModel(
+            int id,
+            int localSiteId,
+            @NonNull String name,
+            @Nullable String label,
+            @Nullable String description,
+            boolean isHierarchical,
+            boolean isPublic) {
+        this.mId = id;
+        this.mLocalSiteId = localSiteId;
+        this.mName = name;
+        this.mLabel = label;
+        this.mDescription = description;
+        this.mIsHierarchical = isHierarchical;
+        this.mIsPublic = isPublic;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        mLocalSiteId = localSiteId;
+    }
+
+    @NonNull
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(@NonNull String name) {
+        mName = name;
+    }
+
+    @Nullable
+    public String getLabel() {
+        return mLabel;
+    }
+
+    public void setLabel(@Nullable String label) {
+        mLabel = label;
+    }
+
+    @Nullable
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(@Nullable String description) {
+        mDescription = description;
+    }
+
+    public boolean isHierarchical() {
+        return mIsHierarchical;
+    }
+
+    public void setIsHierarchical(boolean isHierarchical) {
+        mIsHierarchical = isHierarchical;
+    }
+
+    public boolean isPublic() {
+        return mIsPublic;
+    }
+
+    public void setIsPublic(boolean isPublic) {
+        mIsPublic = isPublic;
+    }
+
+    @Override
+    @SuppressWarnings("ConditionCoveredByFurtherCondition")
+    public boolean equals(@Nullable Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof TaxonomyModel)) return false;
+
+        TaxonomyModel otherTaxonomy = (TaxonomyModel) other;
+
+        return getId() == otherTaxonomy.getId()
+                && getLocalSiteId() == otherTaxonomy.getLocalSiteId()
+                && isHierarchical() == otherTaxonomy.isHierarchical()
+                && isPublic() == otherTaxonomy.isPublic()
+                && StringUtils.equals(getName(), otherTaxonomy.getName())
+                && StringUtils.equals(getLabel(), otherTaxonomy.getLabel())
+                && StringUtils.equals(getDescription(), otherTaxonomy.getDescription());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermModel.java
new file mode 100644
index 00000000000..a18283d533d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermModel.java
@@ -0,0 +1,197 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+
+@Table
+public class TermModel extends Payload<BaseNetworkError> implements Identifiable, Serializable {
+    private static final long serialVersionUID = -1484257248446576276L;
+
+    @PrimaryKey
+    @Column private int mId;
+    @Column private int mLocalSiteId;
+    @Column private long mRemoteTermId;
+    @NonNull @Column private String mTaxonomy;
+    @NonNull @Column private String mName;
+    @Nullable @Column private String mSlug;
+    @Nullable @Column private String mDescription;
+    @Column private long mParentRemoteId;
+    @Column private int mPostCount;
+
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public TermModel() {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mRemoteTermId = 0;
+        this.mTaxonomy = "";
+        this.mName = "";
+        this.mSlug = null;
+        this.mDescription = null;
+        this.mParentRemoteId = 0;
+        this.mPostCount = 0;
+    }
+
+    /**
+     * Use when starting with an empty term.
+     */
+    public TermModel(@NonNull String taxonomy) {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mRemoteTermId = 0;
+        this.mTaxonomy = taxonomy;
+        this.mName = "";
+        this.mSlug = null;
+        this.mDescription = null;
+        this.mParentRemoteId = 0;
+        this.mPostCount = 0;
+    }
+
+    /**
+     * Use when adding a new term.
+     */
+    public TermModel(
+            @NonNull String taxonomy,
+            @NonNull String name,
+            long parentRemoteId
+    ) {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mRemoteTermId = 0;
+        this.mTaxonomy = taxonomy;
+        this.mName = name;
+        this.mSlug = null;
+        this.mDescription = null;
+        this.mParentRemoteId = parentRemoteId;
+        this.mPostCount = 0;
+    }
+
+    public TermModel(
+            int id,
+            int localSiteId,
+            long remoteTermId,
+            @NonNull String taxonomy,
+            @NonNull String name,
+            @Nullable String slug,
+            @Nullable String description,
+            long parentRemoteId,
+            int postCount) {
+        this.mId = id;
+        this.mLocalSiteId = localSiteId;
+        this.mRemoteTermId = remoteTermId;
+        this.mTaxonomy = taxonomy;
+        this.mName = name;
+        this.mSlug = slug;
+        this.mDescription = description;
+        this.mParentRemoteId = parentRemoteId;
+        this.mPostCount = postCount;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        mLocalSiteId = localSiteId;
+    }
+
+    public long getRemoteTermId() {
+        return mRemoteTermId;
+    }
+
+    public void setRemoteTermId(long remoteTermId) {
+        mRemoteTermId = remoteTermId;
+    }
+
+    @NonNull
+    public String getTaxonomy() {
+        return mTaxonomy;
+    }
+
+    public void setTaxonomy(@NonNull String taxonomy) {
+        mTaxonomy = taxonomy;
+    }
+
+    @NonNull
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(@NonNull String name) {
+        mName = name;
+    }
+
+    @Nullable
+    public String getSlug() {
+        return mSlug;
+    }
+
+    public void setSlug(@Nullable String slug) {
+        mSlug = slug;
+    }
+
+    @Nullable
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(@Nullable String description) {
+        mDescription = description;
+    }
+
+    public long getParentRemoteId() {
+        return mParentRemoteId;
+    }
+
+    public void setParentRemoteId(long parentRemoteId) {
+        mParentRemoteId = parentRemoteId;
+    }
+
+    public int getPostCount() {
+        return mPostCount;
+    }
+
+    public void setPostCount(int count) {
+        mPostCount = count;
+    }
+
+    @Override
+    @SuppressWarnings("ConditionCoveredByFurtherCondition")
+    public boolean equals(@Nullable Object other) {
+        if (this == other) return true;
+        if (other == null || !(other instanceof TermModel)) return false;
+
+        TermModel otherTerm = (TermModel) other;
+
+        return getId() == otherTerm.getId()
+                && getLocalSiteId() == otherTerm.getLocalSiteId()
+                && getRemoteTermId() == otherTerm.getRemoteTermId()
+                && getParentRemoteId() == otherTerm.getParentRemoteId()
+                && getPostCount() == otherTerm.getPostCount()
+                && StringUtils.equals(getSlug(), otherTerm.getSlug())
+                && StringUtils.equals(getName(), otherTerm.getName())
+                && StringUtils.equals(getTaxonomy(), otherTerm.getTaxonomy())
+                && StringUtils.equals(getDescription(), otherTerm.getDescription());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermsModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermsModel.java
new file mode 100644
index 00000000000..1f62a50d684
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/TermsModel.java
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TermsModel extends Payload<BaseNetworkError> {
+    @NonNull private List<TermModel> mTerms;
+
+    public TermsModel() {
+        mTerms = new ArrayList<>();
+    }
+
+    public TermsModel(@NonNull List<TermModel> terms) {
+        mTerms = terms;
+    }
+
+    @NonNull
+    public List<TermModel> getTerms() {
+        return mTerms;
+    }
+
+    public void setTerms(@NonNull List<TermModel> terms) {
+        this.mTerms = terms;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ThemeModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ThemeModel.java
new file mode 100644
index 00000000000..94e1890b482
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ThemeModel.java
@@ -0,0 +1,376 @@
+package org.wordpress.android.fluxc.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import org.wordpress.android.util.StringUtils;
+
+import java.io.Serializable;
+
+@Table
+public class ThemeModel implements Identifiable, Serializable {
+    private static final long serialVersionUID = 5966516212440517166L;
+
+    @PrimaryKey @Column private int mId;
+
+    @Column private int mLocalSiteId;
+    @NonNull @Column private String mThemeId;
+    @NonNull @Column private String mName;
+    @NonNull @Column private String mDescription;
+    @Nullable @Column private String mSlug;
+    @Nullable @Column private String mVersion;
+    @Nullable @Column private String mAuthorName;
+    @Nullable @Column private String mAuthorUrl;
+    @Nullable @Column private String mThemeUrl;
+    @Nullable @Column private String mThemeType;
+    @NonNull @Column private String mScreenshotUrl;
+    @Nullable @Column private String mDemoUrl;
+    @Nullable @Column private String mDownloadUrl;
+    @Nullable @Column private String mStylesheet;
+    @Nullable @Column private String mPriceText;
+    @Column private boolean mFree;
+    @Nullable @Column private String mMobileFriendlyCategorySlug;
+    @Column private boolean mActive;
+    @Column private boolean mAutoUpdate;
+    @Column private boolean mAutoUpdateTranslation;
+
+    // local use only
+    @Column private boolean mIsExternalTheme;
+    @Column private boolean mIsWpComTheme;
+
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public ThemeModel() {
+        this.mId = 0;
+        this.mLocalSiteId = 0;
+        this.mThemeId = "";
+        this.mName = "";
+        this.mDescription = "";
+        this.mSlug = null;
+        this.mVersion = null;
+        this.mAuthorName = null;
+        this.mAuthorUrl = null;
+        this.mThemeUrl = null;
+        this.mThemeType = null;
+        this.mScreenshotUrl = "";
+        this.mDemoUrl = null;
+        this.mDownloadUrl = null;
+        this.mStylesheet = null;
+        this.mPriceText = null;
+        this.mFree = true;
+        this.mMobileFriendlyCategorySlug = null;
+        this.mActive = false;
+        this.mAutoUpdate = false;
+        this.mAutoUpdateTranslation = false;
+        this.mIsExternalTheme = false;
+        this.mIsWpComTheme = false;
+    }
+
+    /**
+     * Use when creating a WP.com theme.
+     */
+    public ThemeModel(
+            @NonNull String themeId,
+            @NonNull String name,
+            @NonNull String description,
+            @Nullable String slug,
+            @Nullable String version,
+            @Nullable String authorName,
+            @Nullable String authorUrl,
+            @Nullable String themeUrl,
+            @Nullable String themeType,
+            @NonNull String screenshotUrl,
+            @Nullable String demoUrl,
+            @Nullable String downloadUrl,
+            @Nullable String stylesheet,
+            @Nullable String priceText,
+            boolean isExternalTheme,
+            boolean free,
+            @Nullable String mobileFriendlyCategorySlug) {
+        this.mThemeId = themeId;
+        this.mName = name;
+        this.mDescription = description;
+        this.mSlug = slug;
+        this.mVersion = version;
+        this.mAuthorName = authorName;
+        this.mAuthorUrl = authorUrl;
+        this.mThemeUrl = themeUrl;
+        this.mThemeType = themeType;
+        this.mScreenshotUrl = screenshotUrl;
+        this.mDemoUrl = demoUrl;
+        this.mDownloadUrl = downloadUrl;
+        this.mStylesheet = stylesheet;
+        this.mPriceText = priceText;
+        this.mIsExternalTheme = isExternalTheme;
+        this.mFree = free;
+        this.mMobileFriendlyCategorySlug = mobileFriendlyCategorySlug;
+    }
+
+    /**
+     * Use when creating a Jetpack theme.
+     */
+    public ThemeModel(
+            @NonNull String themeId,
+            @NonNull String name,
+            @NonNull String description,
+            @Nullable String version,
+            @Nullable String authorName,
+            @Nullable String authorUrl,
+            @Nullable String themeUrl,
+            @NonNull String screenshotUrl,
+            boolean active,
+            boolean autoUpdate,
+            boolean autoUpdateTranslation) {
+        this.mThemeId = themeId;
+        this.mName = name;
+        this.mDescription = description;
+        this.mVersion = version;
+        this.mAuthorName = authorName;
+        this.mAuthorUrl = authorUrl;
+        this.mThemeUrl = themeUrl;
+        this.mScreenshotUrl = screenshotUrl;
+        this.mActive = active;
+        this.mAutoUpdate = autoUpdate;
+        this.mAutoUpdateTranslation = autoUpdateTranslation;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    @SuppressWarnings("ConditionCoveredByFurtherCondition")
+    public boolean equals(@Nullable Object other) {
+        if (other == null || !(other instanceof ThemeModel)) {
+            return false;
+        }
+        ThemeModel otherTheme = (ThemeModel) other;
+        return getId() == otherTheme.getId()
+                && getLocalSiteId() == otherTheme.getLocalSiteId()
+                && StringUtils.equals(getThemeId(), otherTheme.getThemeId())
+                && StringUtils.equals(getName(), otherTheme.getName())
+                && StringUtils.equals(getDescription(), otherTheme.getDescription())
+                && StringUtils.equals(getVersion(), otherTheme.getVersion())
+                && StringUtils.equals(getAuthorName(), otherTheme.getAuthorName())
+                && StringUtils.equals(getAuthorUrl(), otherTheme.getAuthorUrl())
+                && StringUtils.equals(getThemeUrl(), otherTheme.getThemeUrl())
+                && StringUtils.equals(getScreenshotUrl(), otherTheme.getScreenshotUrl())
+                && StringUtils.equals(getDemoUrl(), otherTheme.getDemoUrl())
+                && StringUtils.equals(getSlug(), otherTheme.getSlug())
+                && StringUtils.equals(getDownloadUrl(), otherTheme.getDownloadUrl())
+                && StringUtils.equals(getStylesheet(), otherTheme.getStylesheet())
+                && StringUtils.equals(getPriceText(), otherTheme.getPriceText())
+                && getFree() == otherTheme.getFree()
+                && StringUtils.equals(getMobileFriendlyCategorySlug(), otherTheme.getMobileFriendlyCategorySlug())
+                && getActive() == otherTheme.getActive()
+                && getAutoUpdate() == otherTheme.getAutoUpdate()
+                && getAutoUpdateTranslation() == otherTheme.getAutoUpdateTranslation()
+                && isWpComTheme() == otherTheme.isWpComTheme();
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        this.mLocalSiteId = localSiteId;
+    }
+
+    @NonNull
+    public String getThemeId() {
+        return mThemeId;
+    }
+
+    public void setThemeId(@NonNull String themeId) {
+        mThemeId = themeId;
+    }
+
+    @NonNull
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(@NonNull String name) {
+        mName = name;
+    }
+
+    @NonNull
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(@NonNull String description) {
+        mDescription = description;
+    }
+
+    @Nullable
+    public String getSlug() {
+        return mSlug;
+    }
+
+    public void setSlug(@Nullable String slug) {
+        mSlug = slug;
+    }
+
+    @Nullable
+    public String getVersion() {
+        return mVersion;
+    }
+
+    public void setVersion(@Nullable String version) {
+        mVersion = version;
+    }
+
+    @Nullable
+    public String getAuthorName() {
+        return mAuthorName;
+    }
+
+    public void setAuthorName(@Nullable String authorName) {
+        mAuthorName = authorName;
+    }
+
+    @Nullable
+    public String getAuthorUrl() {
+        return mAuthorUrl;
+    }
+
+    public void setAuthorUrl(@Nullable String authorUrl) {
+        mAuthorUrl = authorUrl;
+    }
+
+    @Nullable
+    public String getThemeUrl() {
+        return mThemeUrl;
+    }
+
+    public void setThemeUrl(@Nullable String themeUrl) {
+        mThemeUrl = themeUrl;
+    }
+
+    @NonNull
+    public String getScreenshotUrl() {
+        return mScreenshotUrl;
+    }
+
+    public void setScreenshotUrl(@NonNull String screenshotUrl) {
+        mScreenshotUrl = screenshotUrl;
+    }
+
+    @Nullable
+    public String getThemeType() {
+        return mThemeType;
+    }
+
+    public void setThemeType(@Nullable String themeType) {
+        mThemeType = themeType;
+    }
+
+    @Nullable
+    public String getDemoUrl() {
+        return mDemoUrl;
+    }
+
+    public void setDemoUrl(@Nullable String demoUrl) {
+        mDemoUrl = demoUrl;
+    }
+
+    @Nullable
+    public String getDownloadUrl() {
+        return mDownloadUrl;
+    }
+
+    public void setDownloadUrl(@Nullable String downloadUrl) {
+        mDownloadUrl = downloadUrl;
+    }
+
+    @Nullable
+    public String getStylesheet() {
+        return mStylesheet;
+    }
+
+    public void setStylesheet(@Nullable String stylesheet) {
+        mStylesheet = stylesheet;
+    }
+
+    @Nullable
+    public String getPriceText() {
+        return mPriceText;
+    }
+
+    public void setPriceText(@Nullable String priceText) {
+        mPriceText = priceText;
+    }
+
+    public boolean getFree() {
+        return mFree;
+    }
+
+    @Nullable
+    public String getMobileFriendlyCategorySlug() {
+        return mMobileFriendlyCategorySlug;
+    }
+
+    public void setMobileFriendlyCategorySlug(@Nullable String mobileFriendlyCategorySlug) {
+        mMobileFriendlyCategorySlug = mobileFriendlyCategorySlug;
+    }
+
+    public boolean isFree() {
+        return getFree();
+    }
+
+    public void setFree(boolean free) {
+        mFree = free;
+    }
+
+    public boolean getActive() {
+        return mActive;
+    }
+
+    public void setActive(boolean active) {
+        mActive = active;
+    }
+
+    public boolean getAutoUpdate() {
+        return mAutoUpdate;
+    }
+
+    public void setAutoUpdate(boolean autoUpdate) {
+        mAutoUpdate = autoUpdate;
+    }
+
+    public boolean getAutoUpdateTranslation() {
+        return mAutoUpdateTranslation;
+    }
+
+    public void setAutoUpdateTranslation(boolean autoUpdateTranslation) {
+        mAutoUpdateTranslation = autoUpdateTranslation;
+    }
+
+    public boolean isExternalTheme() {
+        return mIsExternalTheme;
+    }
+
+    public void setIsExternalTheme(boolean isExternalTheme) {
+        mIsExternalTheme = isExternalTheme;
+    }
+
+    public boolean isWpComTheme() {
+        return mIsWpComTheme;
+    }
+
+    public void setIsWpComTheme(boolean isWpComTheme) {
+        mIsWpComTheme = isWpComTheme;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostModel.kt
new file mode 100644
index 00000000000..0ce5296f6bd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostModel.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.model
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+
+/**
+ * Rows of this table represent that a valid xpost referencing [targetSiteId]
+ * may be added to [sourceSiteId].
+ */
+@Table(name = "XPosts")
+@RawConstraints(
+        "FOREIGN KEY(SOURCE_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE",
+        "FOREIGN KEY(TARGET_SITE_ID) REFERENCES XPostSites(BLOG_ID)",
+        "UNIQUE (SOURCE_SITE_ID, TARGET_SITE_ID) ON CONFLICT IGNORE"
+)
+data class XPostModel(
+    @PrimaryKey @Column private var id: Int,
+    @Column var sourceSiteId: Int,
+    @Column var targetSiteId: Int?
+) : Identifiable {
+    constructor() : this(0, 0, 0)
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId(): Int = id
+
+    companion object {
+        /**
+         * To persist a site with no xposts, there should be a only one row with a [sourceSiteId] matching the
+         * site's id, and that row should have a [targetSiteId] of null.
+         */
+        fun noXPostModel(site: SiteModel) = XPostModel().apply {
+            sourceSiteId = site.id
+            targetSiteId = null
+        }
+
+        fun isNoXPostsEntry(xPost: XPostModel) = xPost.targetSiteId == null
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostSiteModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostSiteModel.kt
new file mode 100644
index 00000000000..d75bb487504
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/XPostSiteModel.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.model
+
+import com.google.gson.annotations.SerializedName
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table(name = "XPostSites")
+@RawConstraints("UNIQUE (BLOG_ID) ON CONFLICT REPLACE")
+data class XPostSiteModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @SerializedName("blog_id") @Column var blogId: Int = 0,
+    @Column var title: String = "",
+    @SerializedName("siteurl") @Column var siteUrl: String = "",
+    @Column var subdomain: String = "",
+    @Column var blavatar: String = ""
+) : Identifiable {
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    override fun getId(): Int = id
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityLogModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityLogModel.kt
new file mode 100644
index 00000000000..afb6d71a06e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityLogModel.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.activity
+
+import org.wordpress.android.fluxc.tools.FormattableContent
+import java.util.Date
+
+data class ActivityLogModel(
+    val activityID: String,
+    val summary: String,
+    val content: FormattableContent?,
+    val name: String?,
+    val type: String?,
+    val gridicon: String?,
+    val status: String?,
+    val rewindable: Boolean?,
+    val rewindID: String?,
+    val published: Date,
+    val actor: ActivityActor? = null
+) {
+    data class ActivityActor(
+        val displayName: String?,
+        val type: String?,
+        val wpcomUserID: Long?,
+        val avatarURL: String?,
+        val role: String?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityTypeModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityTypeModel.kt
new file mode 100644
index 00000000000..d29d7fa4049
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/ActivityTypeModel.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.model.activity
+
+data class ActivityTypeModel(
+    val key: String,
+    val name: String,
+    val count: Int
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/BackupDownloadStatusModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/BackupDownloadStatusModel.kt
new file mode 100644
index 00000000000..85016cdabf2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/BackupDownloadStatusModel.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.model.activity
+
+import java.util.Date
+
+data class BackupDownloadStatusModel(
+    val downloadId: Long,
+    val rewindId: String,
+    val backupPoint: Date,
+    val startedAt: Date,
+    val progress: Int?,
+    val downloadCount: Int?,
+    val validUntil: Date?,
+    val url: String?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/RewindStatusModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/RewindStatusModel.kt
new file mode 100644
index 00000000000..a1843db830a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/activity/RewindStatusModel.kt
@@ -0,0 +1,87 @@
+package org.wordpress.android.fluxc.model.activity
+
+import java.util.Date
+
+data class RewindStatusModel(
+    val state: State,
+    val reason: Reason,
+    val lastUpdated: Date,
+    val canAutoconfigure: Boolean?,
+    val credentials: List<Credentials>?,
+    val rewind: Rewind?
+) {
+    @Suppress("unused")
+    enum class State(val value: String) {
+        ACTIVE("active"),
+        INACTIVE("inactive"),
+        UNAVAILABLE("unavailable"),
+        AWAITING_CREDENTIALS("awaiting_credentials"),
+        PROVISIONING("provisioning"),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String): State? {
+                return values().firstOrNull { it.value == value }
+            }
+        }
+    }
+
+    enum class Reason(val value: String?) {
+        MULTISITE_NOT_SUPPORTED("multisite_not_supported"),
+        NO_REASON(null),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String?): Reason {
+                return values().firstOrNull { it.value == value } ?: UNKNOWN
+            }
+        }
+    }
+
+    data class Credentials(
+        val type: String,
+        val role: String,
+        val host: String?,
+        val port: Int?,
+        val stillValid: Boolean
+    )
+
+    data class Rewind(
+        val rewindId: String?,
+        val restoreId: Long,
+        val status: Status,
+        val progress: Int?,
+        val reason: String?,
+        val message: String?,
+        val currentEntry: String?
+    ) {
+        enum class Status(val value: String) {
+            RUNNING("running"), FINISHED("finished"), FAILED("failed"), QUEUED("queued");
+
+            companion object {
+                fun fromValue(value: String?): Status? {
+                    return value?.let { values().firstOrNull { it.value == value } }
+                }
+            }
+        }
+
+        companion object {
+            @Suppress("LongParameterList")
+            fun build(
+                rewindId: String?,
+                restoreId: Long?,
+                stringStatus: String?,
+                progress: Int?,
+                reason: String?,
+                message: String?,
+                currentEntry: String?
+            ): Rewind? {
+                val status = stringStatus?.let { Status.fromValue(it) }
+                if (status != null && restoreId != null) {
+                    return Rewind(rewindId, restoreId, status, progress, reason, message, currentEntry)
+                }
+                return null
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdForecast.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdForecast.kt
new file mode 100644
index 00000000000..bd167075956
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdForecast.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeAdForecast(
+    val minImpressions: Long,
+    val maxImpressions: Long,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt
new file mode 100644
index 00000000000..28e9b423fa3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeAdSuggestion(
+    val tagLine: String,
+    val description: String,
+    val ctaText: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt
new file mode 100644
index 00000000000..e98cf974dab
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.fluxc.model.blaze
+
+import org.wordpress.android.fluxc.model.MediaModel
+import java.util.Date
+import java.util.TimeZone
+
+data class BlazeCampaignCreationRequest(
+    val origin: String,
+    val originVersion: String,
+    val targetResourceId: Long,
+    val type: BlazeCampaignType,
+    val paymentMethodId: String,
+    val tagLine: String,
+    val description: String,
+    val ctaText: String,
+    val startDate: Date,
+    val endDate: Date,
+    val budget: BlazeCampaignCreationRequestBudget,
+    val targetUrl: String,
+    val urlParams: Map<String, String>,
+    val mainImage: MediaModel,
+    val targetingParameters: BlazeTargetingParameters?,
+    val timeZoneId: String = TimeZone.getDefault().id,
+    val isEndlessCampaign: Boolean,
+    val objectiveId: String?
+)
+
+data class BlazeCampaignCreationRequestBudget(
+    val mode: String,
+    val amount: Double,
+    val currency: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignObjective.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignObjective.kt
new file mode 100644
index 00000000000..ed9dca9ffdc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignObjective.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeCampaignObjective(
+    val id: String,
+    val title: String,
+    val description: String,
+    val suitableForDescription: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignType.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignType.kt
new file mode 100644
index 00000000000..2d1db2f0e78
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignType.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.model.blaze
+
+enum class BlazeCampaignType(val value: String) {
+    POST("post"),
+    PAGE("page"),
+    PRODUCT("product"),
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignsModel.kt
new file mode 100644
index 00000000000..c0a952bdfcb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignsModel.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.model.blaze
+
+import java.util.Date
+
+data class BlazeCampaignsModel(
+    val campaigns: List<BlazeCampaignModel> = emptyList(),
+    val skipped: Int,
+    val totalItems: Int,
+)
+
+data class BlazeCampaignModel(
+    val campaignId: String,
+    val title: String,
+    val imageUrl: String?,
+    val startTime: Date,
+    val durationInDays: Int,
+    val uiStatus: String,
+    val impressions: Long,
+    val clicks: Long,
+    val targetUrn: String?,
+    val totalBudget: Double,
+    val spentBudget: Double,
+    val isEndlessCampaign: Boolean
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazePaymentMethods.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazePaymentMethods.kt
new file mode 100644
index 00000000000..e6103f573bc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazePaymentMethods.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazePaymentMethods(
+    val savedPaymentMethods: List<BlazePaymentMethod>,
+    val addPaymentMethodUrls: BlazePaymentMethodUrls? // TODO make this non nullable when API returns URLs
+)
+
+data class BlazePaymentMethod(
+    val id: String,
+    val name: String,
+    val info: PaymentMethodInfo
+) {
+    sealed interface PaymentMethodInfo {
+        data class CreditCardInfo(
+            val lastDigits: String,
+            val expMonth: Int,
+            val expYear: Int,
+            val type: String,
+            val nickname: String,
+            val cardHolderName: String
+        ) : PaymentMethodInfo
+
+        object Unknown : PaymentMethodInfo
+    }
+}
+
+data class BlazePaymentMethodUrls(
+    val formUrl: String,
+    val successUrl: String,
+    val idUrlParameter: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingDevice.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingDevice.kt
new file mode 100644
index 00000000000..624c3c8b40d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingDevice.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.blaze
+
+class BlazeTargetingDevice(
+    val id: String,
+    val name: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLanguage.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLanguage.kt
new file mode 100644
index 00000000000..80de6c5b9e8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLanguage.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeTargetingLanguage(
+    val id: String,
+    val name: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLocation.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLocation.kt
new file mode 100644
index 00000000000..f09e72c4201
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingLocation.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeTargetingLocation(
+    val id: Long,
+    val name: String,
+    val type: String,
+    val parent: BlazeTargetingLocation?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingParameters.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingParameters.kt
new file mode 100644
index 00000000000..f03b651bb68
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingParameters.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model.blaze
+
+data class BlazeTargetingParameters(
+    val locations: List<Long>? = null,
+    val languages: List<String>? = null,
+    val devices: List<String>? = null,
+    val topics: List<String>? = null
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingTopic.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingTopic.kt
new file mode 100644
index 00000000000..4788d82cfe7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeTargetingTopic.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.blaze
+
+class BlazeTargetingTopic(
+    val id: String,
+    val description: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/bloggingprompts/BloggingPromptModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/bloggingprompts/BloggingPromptModel.kt
new file mode 100644
index 00000000000..4c0c6cf0d9c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/bloggingprompts/BloggingPromptModel.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.model.bloggingprompts
+
+import java.util.Date
+
+data class BloggingPromptModel(
+    val id: Int,
+    val text: String,
+    val date: Date,
+    val isAnswered: Boolean,
+    val attribution: String,
+    val respondentsCount: Int,
+    val respondentsAvatarUrls: List<String>,
+    val answeredLink: String,
+    val bloganuaryId: String? = null,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/comments/CommentsMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/comments/CommentsMapper.kt
new file mode 100644
index 00000000000..1a1cd4b8b3f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/comments/CommentsMapper.kt
@@ -0,0 +1,171 @@
+package org.wordpress.android.fluxc.model.comments
+
+import dagger.Reusable
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.CommentStatus.SPAM
+import org.wordpress.android.fluxc.model.CommentStatus.TRASH
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCUtils
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.utils.DateTimeUtilsWrapper
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class CommentsMapper @Inject constructor(
+    private val dateTimeUtilsWrapper: DateTimeUtilsWrapper
+) {
+    fun commentDtoToEntity(commentDto: CommentWPComRestResponse, site: SiteModel): CommentEntity {
+        return CommentEntity(
+            remoteCommentId = commentDto.ID,
+            localSiteId = site.id,
+            remoteSiteId = site.siteId,
+            authorUrl = commentDto.author?.URL,
+            authorName = commentDto.author?.name?.let {
+                StringEscapeUtils.unescapeHtml4(it)
+            },
+            authorEmail = commentDto.author?.email?.let {
+                if ("false".equals(it)) {
+                    ""
+                } else {
+                    it
+                }
+            },
+            authorProfileImageUrl = commentDto.author?.avatar_URL,
+            remotePostId = commentDto.post?.ID ?: 0L,
+            postTitle = StringEscapeUtils.unescapeHtml4(commentDto.post?.title),
+            status = commentDto.status,
+            datePublished = commentDto.date,
+            publishedTimestamp = dateTimeUtilsWrapper.timestampFromIso8601(commentDto.date),
+            content = commentDto.content,
+            url = commentDto.URL,
+            authorId = commentDto.author?.ID ?: 0L,
+            hasParent = commentDto.parent != null,
+            parentId = commentDto.parent?.ID ?: 0L,
+            iLike = commentDto.i_like
+        )
+    }
+
+    fun commentEntityToLegacyModel(entity: CommentEntity): CommentModel {
+        return CommentModel().apply {
+            this.id = entity.id.toInt()
+            this.remoteCommentId = entity.remoteCommentId
+            this.remotePostId = entity.remotePostId
+            this.authorId = entity.authorId
+            this.localSiteId = entity.localSiteId
+            this.remoteSiteId = entity.remoteSiteId
+            this.authorUrl = entity.authorUrl
+            this.authorName = entity.authorName
+            this.authorEmail = entity.authorEmail
+            this.authorProfileImageUrl = entity.authorProfileImageUrl
+            this.postTitle = entity.postTitle
+            this.status = entity.status ?: ""
+            this.datePublished = entity.datePublished ?: ""
+            this.publishedTimestamp = entity.publishedTimestamp
+            this.content = entity.content ?: ""
+            this.url = entity.url ?: ""
+            this.hasParent = entity.hasParent
+            this.parentId = entity.parentId
+            this.iLike = entity.iLike
+        }
+    }
+
+    fun commentLegacyModelToEntity(commentModel: CommentModel): CommentEntity {
+        return CommentEntity(
+                id = commentModel.id.toLong(),
+                remoteCommentId = commentModel.remoteCommentId,
+                remotePostId = commentModel.remotePostId,
+                authorId = commentModel.authorId,
+                localSiteId = commentModel.localSiteId,
+                remoteSiteId = commentModel.remoteSiteId,
+                authorUrl = commentModel.authorUrl,
+                authorName = commentModel.authorName,
+                authorEmail = commentModel.authorEmail,
+                authorProfileImageUrl = commentModel.authorProfileImageUrl,
+                postTitle = commentModel.postTitle,
+                status = commentModel.status,
+                datePublished = commentModel.datePublished,
+                publishedTimestamp = commentModel.publishedTimestamp,
+                content = commentModel.content,
+                url = commentModel.url,
+                hasParent = commentModel.hasParent,
+                parentId = commentModel.parentId,
+                iLike = commentModel.iLike
+        )
+    }
+
+    @Suppress("ForbiddenComment")
+    fun commentXmlRpcDTOToEntity(commentObject: Any?, site: SiteModel): CommentEntity? {
+        if (commentObject !is HashMap<*, *>) {
+            return null
+        }
+        val commentMap: HashMap<*, *> = commentObject
+
+        val datePublished = dateTimeUtilsWrapper.iso8601UTCFromDate(
+                XMLRPCUtils.safeGetMapValue(commentMap, "date_created_gmt", Date())
+        )
+
+        val remoteParentCommentId = XMLRPCUtils.safeGetMapValue(commentMap, "parent", 0L)
+
+        return CommentEntity(
+                remoteCommentId = XMLRPCUtils.safeGetMapValue(commentMap, "comment_id", 0L),
+                remotePostId = XMLRPCUtils.safeGetMapValue(commentMap, "post_id", 0L),
+                authorId = XMLRPCUtils.safeGetMapValue(commentMap, "user_id", 0L),
+                localSiteId = site.id,
+                remoteSiteId = site.selfHostedSiteId,
+                authorUrl = XMLRPCUtils.safeGetMapValue(commentMap, "author_url", ""),
+                authorName = StringEscapeUtils.unescapeHtml4(
+                        XMLRPCUtils.safeGetMapValue(commentMap, "author", "")
+                ),
+                authorEmail = XMLRPCUtils.safeGetMapValue(commentMap, "author_email", ""),
+                // TODO: set authorProfileImageUrl - get the hash from the email address?
+                authorProfileImageUrl = null,
+                postTitle = StringEscapeUtils.unescapeHtml4(
+                        XMLRPCUtils.safeGetMapValue(
+                                commentMap,
+                                "post_title", ""
+                        )
+                ),
+                status = getCommentStatusFromXMLRPCStatusString(
+                        XMLRPCUtils.safeGetMapValue(commentMap, "status", "approve")
+                ).toString(),
+                datePublished = datePublished,
+                publishedTimestamp = dateTimeUtilsWrapper.timestampFromIso8601(datePublished),
+                content = XMLRPCUtils.safeGetMapValue(commentMap, "content", ""),
+                url = XMLRPCUtils.safeGetMapValue(commentMap, "link", ""),
+                hasParent = remoteParentCommentId > 0,
+                parentId = if (remoteParentCommentId > 0) remoteParentCommentId else 0L,
+                iLike = false
+        )
+    }
+
+    fun commentXmlRpcDTOToEntityList(response: Any?, site: SiteModel): List<CommentEntity> {
+        val comments: MutableList<CommentEntity> = ArrayList()
+        if (response !is Array<*>) {
+            return comments
+        }
+
+        response.forEach { commentObject ->
+            commentXmlRpcDTOToEntity(commentObject, site)?.let {
+                comments.add(it)
+            }
+        }
+
+        return comments
+    }
+
+    private fun getCommentStatusFromXMLRPCStatusString(stringStatus: String): CommentStatus {
+        return when (stringStatus) {
+            "approve" -> APPROVED
+            "hold" -> UNAPPROVED
+            "spam" -> SPAM
+            "trash" -> TRASH
+            else -> APPROVED
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/dashboard/CardModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/dashboard/CardModel.kt
new file mode 100644
index 00000000000..62dd8154bda
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/dashboard/CardModel.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.fluxc.model.dashboard
+
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardError
+import java.util.Date
+
+sealed class CardModel(
+    val type: Type
+) {
+    enum class Type(
+        val classOf: Class<*>,
+        val label: String
+    ) {
+        TODAYS_STATS(TodaysStatsCardModel::class.java, "todays_stats"),
+        POSTS(PostsCardModel::class.java, "posts"),
+        PAGES(PagesCardModel::class.java, "pages"),
+        ACTIVITY(ActivityCardModel::class.java, "activity"),
+        DYNAMIC(DynamicCardsModel::class.java, "dynamic"),
+    }
+
+    data class ActivityCardModel(
+        val activities: List<ActivityLogModel> = emptyList(),
+        val error: ActivityCardError? = null
+    )  : CardModel(Type.ACTIVITY)
+
+    data class PagesCardModel(
+        val pages: List<PageCardModel> = emptyList(),
+    ) : CardModel(Type.PAGES) {
+        data class PageCardModel(
+            val id: Int,
+            val title: String,
+            val content: String,
+            val lastModifiedOrScheduledOn: Date,
+            val status: String,
+            val date: Date
+        )
+    }
+
+    data class TodaysStatsCardModel(
+        val views: Int = 0,
+        val visitors: Int = 0,
+        val likes: Int = 0,
+        val comments: Int = 0,
+        val error: TodaysStatsCardError? = null
+    ) : CardModel(Type.TODAYS_STATS)
+
+    data class PostsCardModel(
+        val hasPublished: Boolean = false,
+        val draft: List<PostCardModel> = emptyList(),
+        val scheduled: List<PostCardModel> = emptyList(),
+        val error: PostCardError? = null
+    ) : CardModel(Type.POSTS) {
+        data class PostCardModel(
+            val id: Int,
+            val title: String,
+            val content: String,
+            val featuredImage: String?,
+            val date: Date
+        )
+    }
+
+    data class DynamicCardsModel(
+        val dynamicCards: List<DynamicCardModel> = emptyList(),
+    ) : CardModel(Type.DYNAMIC) {
+        data class DynamicCardModel(
+            val id: String,
+            val title: String?,
+            val featuredImage: String?,
+            val url: String?,
+            val action: String?,
+            val order: CardOrder,
+            val rows: List<DynamicCardRowModel>,
+        )
+
+        data class DynamicCardRowModel(
+            val icon: String?,
+            val title: String?,
+            val description: String?,
+        )
+
+        enum class CardOrder(val order: String) {
+            TOP("top"),
+            BOTTOM("bottom");
+
+            companion object {
+                fun fromString(order: String?): CardOrder {
+                    return values().firstOrNull { it.order.equals(order, ignoreCase = true) } ?: BOTTOM // default
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedLog.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedLog.kt
new file mode 100644
index 00000000000..da82141f2d2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedLog.kt
@@ -0,0 +1,78 @@
+package org.wordpress.android.fluxc.model.encryptedlogging
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.QUEUED
+import org.wordpress.android.util.DateTimeUtils
+import java.io.File
+import java.util.Date
+
+/**
+ * [EncryptedLog] and [EncryptedLogModel] are tied to each other, any change in one should be reflected in the other.
+ * [EncryptedLog] should be used within the app, [EncryptedLogModel] should be used for DB interactions.
+ */
+data class EncryptedLog(
+    val uuid: String,
+    val file: File,
+    val dateCreated: Date = Date(),
+    val uploadState: EncryptedLogUploadState = QUEUED,
+    val failedCount: Int = 0
+) {
+    companion object {
+        fun fromEncryptedLogModel(encryptedLogModel: EncryptedLogModel) =
+                EncryptedLog(
+                        dateCreated = DateTimeUtils.dateUTCFromIso8601(encryptedLogModel.dateCreated),
+                        // Crash if values are missing which shouldn't happen if there are no logic errors
+                        uuid = encryptedLogModel.uuid!!,
+                        file = File(encryptedLogModel.filePath),
+                        uploadState = encryptedLogModel.uploadState,
+                        failedCount = encryptedLogModel.failedCount
+                )
+    }
+}
+
+@Table
+@RawConstraints("UNIQUE(UUID) ON CONFLICT REPLACE")
+class EncryptedLogModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var uuid: String? = null
+    @Column var filePath: String? = null
+    @Column var dateCreated: String? = null // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+    @Column var uploadStateDbValue: Int = QUEUED.value
+    @Column var failedCount: Int = 0
+
+    override fun getId(): Int = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    val uploadState: EncryptedLogUploadState
+        get() =
+            requireNotNull(
+                    EncryptedLogUploadState.values()
+                            .firstOrNull { it.value == uploadStateDbValue }) {
+                "The stateDbValue of the EncryptedLogUploadState didn't match any of the `EncryptedLogUploadState`s. " +
+                        "This likely happened because the EncryptedLogUploadState values " +
+                        "were altered without a DB migration."
+            }
+
+    companion object {
+        fun fromEncryptedLog(encryptedLog: EncryptedLog) = EncryptedLogModel()
+                .also {
+            it.uuid = encryptedLog.uuid
+            it.filePath = encryptedLog.file.path
+            it.dateCreated = DateTimeUtils.iso8601UTCFromDate(encryptedLog.dateCreated)
+            it.uploadStateDbValue = encryptedLog.uploadState.value
+            it.failedCount = encryptedLog.failedCount
+        }
+    }
+}
+
+enum class EncryptedLogUploadState(val value: Int) {
+    QUEUED(1),
+    UPLOADING(2),
+    FAILED(3)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedSecretStreamKey.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedSecretStreamKey.kt
new file mode 100644
index 00000000000..95b16d3e062
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptedSecretStreamKey.kt
@@ -0,0 +1,54 @@
+package org.wordpress.android.fluxc.model.encryptedlogging
+
+import com.goterl.lazysodium.interfaces.Box
+import com.goterl.lazysodium.interfaces.SecretStream
+import com.goterl.lazysodium.utils.KeyPair
+
+/**
+ * A class representing an Encrypted Secret Stream Key.
+ *
+ * It can be decrypted to provide an SecretStreamKey, which is used to
+ * decrypted the messages within an Encrypted Log File
+ *
+ * @see SecretStreamKey
+ */
+class EncryptedSecretStreamKey(val bytes: ByteArray) {
+    companion object {
+        /**
+         * The expected size (in bytes) of an Encrypted Secret Stream Key.
+         */
+        const val size: Int = SecretStream.KEYBYTES + Box.SEALBYTES
+    }
+
+    init {
+        require(bytes.size == size) {
+            "An Encrypted Secret Stream Key must be exactly $size bytes"
+        }
+    }
+
+    /**
+     * Decrypt the key using the assocaited KeyPair (the `publicKey` originally used to encrypt it, and its
+     * corresponding `secretKey`).
+     */
+    fun decrypt(keyPair: KeyPair): SecretStreamKey {
+        val sodium = EncryptionUtils.sodium
+
+        val publicKeyBytes = keyPair.publicKey.asBytes
+        val secretKeyBytes = keyPair.secretKey.asBytes
+
+        require(Box.Checker.checkPublicKey(publicKeyBytes.size)) {
+            "The public key size is incorrect (should be ${Box.PUBLICKEYBYTES} bytes)"
+        }
+
+        require(Box.Checker.checkSecretKey(secretKeyBytes.size)) {
+            "The secret key size is incorrect (should be ${Box.SECRETKEYBYTES} bytes)"
+        }
+
+        val decryptedBytes = ByteArray(SecretStream.KEYBYTES) // Stores the decrypted bytes
+        check(sodium.cryptoBoxSealOpen(decryptedBytes, bytes, bytes.size.toLong(), publicKeyBytes, secretKeyBytes)) {
+            "The message key couldn't be decrypted – it's likely the wrong key pair is being used for decryption"
+        }
+
+        return SecretStreamKey(decryptedBytes)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptionUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptionUtils.kt
new file mode 100644
index 00000000000..96dca853ab1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/EncryptionUtils.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.encryptedlogging
+
+import com.goterl.lazysodium.LazySodiumAndroid
+import com.goterl.lazysodium.SodiumAndroid
+
+/**
+ * Convenience helpers for Encrypted Logging
+ */
+object EncryptionUtils {
+    /**
+     * Use a single shared instance of the Sodium library.
+     *
+     * The initialization is inexpensive, but verbose, so this is just syntactic sugar.
+     */
+    @JvmStatic
+    val sodium = LazySodiumAndroid(SodiumAndroid())
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/LogEncrypter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/LogEncrypter.kt
new file mode 100644
index 00000000000..b49709855f1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/LogEncrypter.kt
@@ -0,0 +1,128 @@
+package org.wordpress.android.fluxc.model.encryptedlogging
+
+import android.util.Base64
+import com.goterl.lazysodium.interfaces.SecretStream
+import com.goterl.lazysodium.interfaces.SecretStream.State
+import com.goterl.lazysodium.utils.Key
+import dagger.Reusable
+import javax.inject.Inject
+
+private const val ENCODED_ENCRYPTED_KEY_LENGTH = 108
+private const val ENCODED_HEADER_LENGTH = 32
+
+data class EncryptedLoggingKey(val publicKey: Key)
+
+/**
+ * [LogEncrypter] encrypts the logs for the given text.
+ **
+ * @param encryptedLoggingKey The public key used to encrypt the log
+ *
+ */
+@Reusable
+class LogEncrypter @Inject constructor(private val encryptedLoggingKey: EncryptedLoggingKey) {
+    /**
+     * Encrypts the given [text]. It also adds the given [uuid] to its headers.
+     *
+     * @param text Text contents to be encrypted
+     * @param uuid Uuid for the encrypted log
+     */
+    fun encrypt(text: String, uuid: String): String = buildString {
+        val state = State.ByReference()
+        append(buildHeader(uuid, state))
+        val lines = text.lines()
+        lines.asSequence().mapIndexed { index, line ->
+            if (index + 1 >= lines.size) {
+                // If it's the last element
+                line
+            } else {
+                "$line\n"
+            }
+        }.forEach { line ->
+            append(buildMessage(line, state))
+        }
+        append(buildFooter(state))
+    }
+
+    /**
+     * Encrypt and write the provided string to the encrypted log file.
+     * @param string: The string to be written to the file.
+     */
+    private fun buildMessage(string: String, state: State): String {
+        val encryptedString = encryptMessage(string, SecretStream.TAG_MESSAGE, state)
+        return "\t\t\"$encryptedString\",\n"
+    }
+
+    /**
+     * An internal convenience function to extract the header building process.
+     */
+    private fun buildHeader(uuid: String, state: State): String {
+        val header = ByteArray(SecretStream.HEADERBYTES)
+        val key = SecretStreamKey.generate().let {
+            check(EncryptionUtils.sodium.cryptoSecretStreamInitPush(state, header, it.bytes))
+            it.encrypt(encryptedLoggingKey.publicKey)
+        }
+
+        require(SecretStream.Checker.headerCheck(header.size)) {
+            "The secret stream header must be the correct length"
+        }
+
+        val encodedEncryptedKey = base64Encode(key.bytes)
+        check(encodedEncryptedKey.length == ENCODED_ENCRYPTED_KEY_LENGTH) {
+            "The encoded, encrypted key must always be $ENCODED_ENCRYPTED_KEY_LENGTH bytes long"
+        }
+
+        val encodedHeader = base64Encode(header)
+        check(encodedHeader.length == ENCODED_HEADER_LENGTH) {
+            "The encoded header must always be $ENCODED_HEADER_LENGTH bytes long"
+        }
+
+        return buildString {
+            append("{")
+            append("\t\"keyedWith\": \"v1\",\n")
+            append("\t\"encryptedKey\": \"$encodedEncryptedKey\",\n")
+            append("\t\"header\": \"$encodedHeader\",\n")
+            append("\t\"uuid\": \"$uuid\",\n")
+            append("\t\"messages\": [\n")
+        }
+    }
+
+    /**
+     * Add the closing file tag
+     */
+    private fun buildFooter(state: State): String {
+        val encryptedClosingTag = encryptMessage("", SecretStream.TAG_FINAL, state)
+        return buildString {
+            append("\t\t\"$encryptedClosingTag\"\n")
+            append("\t]\n")
+            append("}")
+        }
+    }
+
+    /**
+     * An internal convenience function to push more data into the sodium secret stream.
+     */
+    private fun encryptMessage(string: String, tag: Byte, state: State): String {
+        val plainBytes = string.toByteArray()
+
+        val encryptedBytes = ByteArray(SecretStream.ABYTES + plainBytes.size) // Stores the encrypted bytes
+        check(
+                EncryptionUtils.sodium.cryptoSecretStreamPush(
+                        state,
+                        encryptedBytes,
+                        plainBytes,
+                        plainBytes.size.toLong(),
+                        tag
+                )
+        ) {
+            "Unable to encrypt message: $string"
+        }
+
+        return base64Encode(encryptedBytes)
+    }
+}
+
+// On Android base64 has lots of options, so define a helper to make it easier to
+// avoid encoding issues.
+private fun base64Encode(byteArray: ByteArray): String {
+    return Base64.encodeToString(byteArray, Base64.NO_WRAP)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/SecretStreamKey.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/SecretStreamKey.kt
new file mode 100644
index 00000000000..d418aee7bce
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/encryptedlogging/SecretStreamKey.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.model.encryptedlogging
+
+import com.goterl.lazysodium.interfaces.Box
+import com.goterl.lazysodium.interfaces.SecretStream
+import com.goterl.lazysodium.utils.Key
+
+/**
+ * A class representing an unencrypted Secret Stream Key.
+ *
+ * It can be encrypted to provide an EncryptedSecretStreamKey, which is used to secure
+ * an Encrypted Log file.
+ *
+ * @see EncryptedSecretStreamKey
+ */
+class SecretStreamKey(val bytes: ByteArray) {
+    companion object {
+        /**
+         * Generate a new (and securely random) secret stream key
+         */
+        fun generate(): SecretStreamKey {
+            return SecretStreamKey(EncryptionUtils.sodium.cryptoSecretStreamKeygen().asBytes)
+        }
+    }
+
+    init {
+        require(bytes.size == SecretStream.KEYBYTES) {
+            "A Secret Stream Key must be exactly ${SecretStream.KEYBYTES} bytes"
+        }
+    }
+
+    val size: Long = bytes.size.toLong()
+
+    fun encrypt(publicKey: Key): EncryptedSecretStreamKey {
+        val sodium = EncryptionUtils.sodium
+
+        require(Box.Checker.checkPublicKey(publicKey.asBytes.size)) {
+            "The public key must be the right length"
+        }
+
+        val encryptedBytes = ByteArray(EncryptedSecretStreamKey.size) // Stores the encrypted bytes
+        check(sodium.cryptoBoxSeal(encryptedBytes, bytes, size, publicKey.asBytes)) {
+            "Encrypting the message key must not fail"
+        }
+
+        return EncryptedSecretStreamKey(encryptedBytes)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/experiments/AssignmentsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/experiments/AssignmentsModel.kt
new file mode 100644
index 00000000000..91565a4dd7b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/experiments/AssignmentsModel.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.model.experiments
+
+import org.wordpress.android.fluxc.model.experiments.Variation.Control
+import java.lang.System.currentTimeMillis
+import java.util.Date
+
+data class AssignmentsModel(
+    val variations: Map<String, String?> = emptyMap(),
+    val ttl: Int = 0,
+    val fetchedAt: Long = currentTimeMillis()
+)
+
+data class Assignments(
+    val variations: Map<String, Variation> = emptyMap(),
+    val ttl: Int = 0,
+    val fetchedAt: Date = Date()
+) {
+    val expiresAt = Date(fetchedAt.time + (ttl * 1000))
+
+    fun isStale(now: Date = Date()) = !now.before(expiresAt)
+
+    fun getVariationForExperiment(experiment: String) = variations[experiment] ?: Control
+
+    companion object {
+        fun fromModel(model: AssignmentsModel) = Assignments(
+                model.variations.mapValues { Variation.fromName(it.value) },
+                model.ttl,
+                Date(model.fetchedAt)
+        )
+    }
+}
+
+sealed class Variation(open val name: String) {
+    object Control : Variation(CONTROL)
+    data class Treatment(override val name: String) : Variation(name)
+    companion object {
+        private const val CONTROL = "control"
+        fun fromName(name: String?) = when (name) {
+            CONTROL, null -> Control
+            else -> Treatment(name)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpack/JetpackUser.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpack/JetpackUser.kt
new file mode 100644
index 00000000000..cb6a820da75
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpack/JetpackUser.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.model.jetpack
+
+data class JetpackUser(
+    val isConnected: Boolean,
+    val isMaster: Boolean,
+    val username: String,
+    val wpcomId: Long,
+    val wpcomUsername: String,
+    val wpcomEmail: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpackai/JetpackAIAssistantFeature.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpackai/JetpackAIAssistantFeature.kt
new file mode 100644
index 00000000000..6a54d944287
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpackai/JetpackAIAssistantFeature.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.model.jetpackai
+
+data class UsagePeriod(
+    val currentStart: String,
+    val nextStart: String,
+    val requestsCount: Int,
+)
+
+data class Tier(
+    val slug: String,
+    val limit: Int,
+    val value: Int,
+    val readableLimit: String?
+)
+
+data class JetpackAiLogoGenerator(
+    val logo: Int
+)
+
+data class FeaturedPostImage(
+    val image: Int
+)
+
+data class Costs(
+    val jetpackAiLogoGenerator: JetpackAiLogoGenerator,
+    val featuredPostImage: FeaturedPostImage
+)
+
+data class JetpackAIAssistantFeature(
+    val hasFeature: Boolean,
+    val isOverLimit: Boolean,
+    val requestsCount: Int,
+    val requestsLimit: Int,
+    val usagePeriod: UsagePeriod?,
+    val siteRequireUpgrade: Boolean,
+    val upgradeType: String,
+    val upgradeUrl: String?,
+    val currentTier: Tier?,
+    val nextTier: Tier?,
+    val tierPlans: List<Tier>,
+    val tierPlansEnabled: Boolean,
+    val costs: Costs?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocial.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocial.kt
new file mode 100644
index 00000000000..224efaf81ae
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocial.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model.jetpacksocial
+
+data class JetpackSocial(
+    val isShareLimitEnabled: Boolean,
+    val toBePublicizedCount: Int,
+    val shareLimit: Int,
+    val publicizedCount: Int,
+    val sharedPostsCount: Int,
+    val sharesRemaining: Int,
+    val isEnhancedPublishingEnabled: Boolean,
+    val isSocialImageGeneratorEnabled: Boolean,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapper.kt
new file mode 100644
index 00000000000..2ba9edac903
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpacksocial/JetpackSocialMapper.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.model.jetpacksocial
+
+import org.wordpress.android.fluxc.network.rest.wpcom.site.JetpackSocialResponse
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao.JetpackSocialEntity
+import javax.inject.Inject
+
+class JetpackSocialMapper @Inject constructor() {
+    fun mapEntity(response: JetpackSocialResponse, siteLocalId: Int): JetpackSocialEntity =
+        with(response) {
+            JetpackSocialEntity(
+                siteLocalId = siteLocalId,
+                isShareLimitEnabled = isShareLimitEnabled ?: false,
+                toBePublicizedCount = toBePublicizedCount ?: -1,
+                shareLimit = shareLimit ?: -1,
+                publicizedCount = publicizedCount ?: -1,
+                sharedPostsCount = sharedPostsCount ?: -1,
+                sharesRemaining = sharesRemaining ?: -1,
+                isEnhancedPublishingEnabled = isEnhancedPublishingEnabled ?: false,
+                isSocialImageGeneratorEnabled = isSocialImageGeneratorEnabled ?: false,
+            )
+        }
+
+    fun mapDomain(entity: JetpackSocialEntity): JetpackSocial =
+        with(entity) {
+            JetpackSocial(
+                isShareLimitEnabled = isShareLimitEnabled,
+                toBePublicizedCount = toBePublicizedCount,
+                shareLimit = shareLimit,
+                publicizedCount = publicizedCount,
+                sharedPostsCount = sharedPostsCount,
+                sharesRemaining = sharesRemaining,
+                isEnhancedPublishingEnabled = isEnhancedPublishingEnabled,
+                isSocialImageGeneratorEnabled = isSocialImageGeneratorEnabled,
+            )
+        }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoriesModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoriesModel.kt
new file mode 100644
index 00000000000..cf7e25efdf6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoriesModel.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.model.layouts
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
+
+@Table
+class GutenbergLayoutCategoriesModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @Column var layoutId: Int = 0, // Foreign key
+    @Column var categoryId: Int = 0, // Foreign key
+    @Column var siteId: Int = 0 // Foreign key
+) : Identifiable {
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
+
+@Suppress("NestedBlockDepth")
+fun List<GutenbergLayout>.connections(site: SiteModel): List<GutenbergLayoutCategoriesModel> {
+    val connections = arrayListOf<GutenbergLayoutCategoriesModel>()
+    forEach { layout ->
+        getLayoutId(site.id, layout.slug)?.let { layoutId ->
+            layout.categories.forEach { category ->
+                getCategoryId(site.id, category.slug)?.let { categoryId ->
+                    connections.add(
+                            GutenbergLayoutCategoriesModel(
+                                    layoutId = layoutId,
+                                    categoryId = categoryId,
+                                    siteId = site.id
+                            )
+                    )
+                }
+            }
+        }
+    }
+    return connections
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoryModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoryModel.kt
new file mode 100644
index 00000000000..b0fb4c9a67d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutCategoryModel.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.model.layouts
+
+import com.wellsql.generated.GutenbergLayoutCategoryModelTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
+
+@Table
+class GutenbergLayoutCategoryModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @Column var slug: String = "",
+    @Column var siteId: Int = 0, // Foreign key
+    @Column var title: String = "",
+    @Column var description: String = "",
+    @Column var emoji: String = ""
+) : Identifiable {
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
+
+fun GutenbergLayoutCategory.transform(site: SiteModel) = GutenbergLayoutCategoryModel(
+        slug = slug,
+        siteId = site.id,
+        title = title,
+        description = description,
+        emoji = emoji ?: ""
+)
+
+fun GutenbergLayoutCategoryModel.transform() = GutenbergLayoutCategory(
+        slug = slug,
+        title = title,
+        description = description,
+        emoji = emoji
+)
+
+fun List<GutenbergLayoutCategoryModel>.transform() = map { it.transform() }
+
+fun List<GutenbergLayoutCategory>.transform(site: SiteModel) = map { it.transform(site) }
+
+fun getCategoryId(siteId: Int, categorySlug: String): Int? = WellSql.select(GutenbergLayoutCategoryModel::class.java)
+        .where()
+        .equals(GutenbergLayoutCategoryModelTable.SITE_ID, siteId)
+        .equals(GutenbergLayoutCategoryModelTable.SLUG, categorySlug)
+        .endWhere().asModel.firstOrNull()?.id
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutModel.kt
new file mode 100644
index 00000000000..7db1028aff0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/layouts/GutenbergLayoutModel.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.model.layouts
+
+import com.wellsql.generated.GutenbergLayoutModelTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
+
+@Table
+class GutenbergLayoutModel(
+    @PrimaryKey @Column private var id: Int = 0,
+    @Column var slug: String = "",
+    @Column var siteId: Int = 0, // Foreign key
+    @Column var title: String = "",
+    @Column var preview: String = "",
+    @Column(name = "PREVIEW_TABLET") var previewTablet: String = "",
+    @Column(name = "PREVIEW_MOBILE") var previewMobile: String = "",
+    @Column var content: String = "",
+    @Column(name = "DEMO_URL") var demoUrl: String = ""
+) : Identifiable {
+    override fun getId() = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
+
+fun GutenbergLayout.transform(site: SiteModel) = GutenbergLayoutModel(
+        slug = slug,
+        siteId = site.id,
+        title = title,
+        preview = preview,
+        previewMobile = previewMobile,
+        previewTablet = previewTablet,
+        content = content,
+        demoUrl = demoUrl
+)
+
+fun GutenbergLayoutModel.transform(categories: List<GutenbergLayoutCategoryModel>) = GutenbergLayout(
+        slug = slug,
+        title = title,
+        preview = preview,
+        previewTablet = previewTablet,
+        previewMobile = previewMobile,
+        content = content,
+        demoUrl = demoUrl,
+        categories = categories.transform()
+)
+
+fun List<GutenbergLayout>.transform(site: SiteModel) = map { it.transform(site) }
+
+fun getLayoutId(siteId: Int, layoutSlug: String): Int? = WellSql.select(GutenbergLayoutModel::class.java)
+        .where()
+        .equals(GutenbergLayoutModelTable.SITE_ID, siteId)
+        .equals(GutenbergLayoutModelTable.SLUG, layoutSlug)
+        .endWhere().asModel.firstOrNull()?.id
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/AuthorFilter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/AuthorFilter.kt
new file mode 100644
index 00000000000..4be956ad17e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/AuthorFilter.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.model.list
+
+sealed class AuthorFilter {
+    object Everyone : AuthorFilter()
+    data class SpecificAuthor(val authorId: Long) : AuthorFilter()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListConfig.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListConfig.kt
new file mode 100644
index 00000000000..fc584f8ce1b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListConfig.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.model.list
+
+import androidx.paging.PagedList.Config.Builder
+import org.wordpress.android.fluxc.store.ListStore
+
+private const val DB_PAGE_SIZE = 10
+private const val INITIAL_LOAD_SIZE = 20
+private const val NETWORK_PAGE_SIZE = 60
+private const val PRE_FETCH_DISTANCE = DB_PAGE_SIZE * 3
+
+/**
+ * Configures how the [ListStore] loads content from its DataSource.
+ *
+ * @param networkPageSize The number of items to request when fetching a page of data from the API.
+ * @param initialLoadSize How many items to load when first load occurs. Typically larger than [networkPageSize] so
+ * a large enough range of content is loaded to cover small scrolls.
+ * See [Builder.setInitialLoadSizeHint] for more information.
+ * @param dbPageSize The number of items loaded at once from the DataSource (should be several times the number
+ * of visible items onscreen). Smaller page sizes improve memory usage, latency, and avoid GC churn. Larger pages
+ * generally improve loading throughput, to a point.
+ * See [Builder.setPageSize] for more information.
+ * @param prefetchDistance ?
+ */
+class ListConfig(val networkPageSize: Int, val initialLoadSize: Int, val dbPageSize: Int, val prefetchDistance: Int) {
+    companion object {
+        val default = ListConfig(
+                networkPageSize = NETWORK_PAGE_SIZE,
+                initialLoadSize = INITIAL_LOAD_SIZE,
+                dbPageSize = DB_PAGE_SIZE,
+                prefetchDistance = PRE_FETCH_DISTANCE
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListDescriptor.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListDescriptor.kt
new file mode 100644
index 00000000000..e608ae9694c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListDescriptor.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc.model.list
+
+data class ListDescriptorTypeIdentifier(val value: Int)
+data class ListDescriptorUniqueIdentifier(val value: Int)
+
+/**
+ * This is the interface every list descriptor needs to implement for it to work with `ListStore`. It can be used to
+ * describe which site a list belongs to, which filters it has, how to order it or anything and everything else a
+ * feature might need.
+ *
+ * This presents an interesting challenge because if every list can be different, how do we use a generic interface
+ * to save it in the DB and more importantly how do we query it back from it. In a traditional solution, one approach
+ * would be to separate each list descriptor and save them in the DB in separate tables, and another approach would be
+ * to add common fields in one table and try to work off of it. Neither approach is very flexible.
+ *
+ * `ListStore` takes a completely different approach to this problem by shying away from using lists directly and
+ * tying everything to [ListDescriptor]s. For example, there is no way to access a list by its id, `ListSqlUtils`
+ * ensures this. That means, we don't necessarily need to save every bit of information about a list in the DB,
+ * as long as there is a way to identify it. That's where the [uniqueIdentifier] property comes in.
+ * By using a unique identifier, we can save them in the DB and then retrieve them from it as long as we can calculate
+ * the exact same identifier. This also means that we erase the information about a list, and we can no longer access it
+ * even if we queried the list in some other way. However, as previously stated, all the components in `ListStore` is
+ * designed in a way to work with that constraint.
+ *
+ * There is another interesting challenge this decision brings. What if we want to be able to identify lists that
+ * has a certain "type". For example, let's say we are dealing with several post lists all belonging to the same site.
+ * If a post in that site is updated, we'd expect all the post lists for that site to be notified of this change.
+ * That's where the [typeIdentifier] comes in. It gives the class that's implementing this interface a way to group
+ * them so the changes for the items in them notifies all of them together.
+ *
+ * TODO: Please note that "type" is not the correct term for this and should be renamed.
+ *
+ * @property uniqueIdentifier is a globally unique value for the described list. The responsibility of calculating a
+ * unique value for the described list relies on the developer implementing this interface. If there is ever a collision
+ * between two identifiers, incorrect items could be shown.
+ *
+ * @property typeIdentifier is an identifier used to describe lists belonging to the same "type". For example, post
+ * lists belonging to the same site, would have the same [typeIdentifier]. Whereas, comments for that site, or posts
+ * of another site would have a different identifier.
+ */
+@Suppress("ForbiddenComment")
+interface ListDescriptor {
+    val uniqueIdentifier: ListDescriptorUniqueIdentifier
+    val typeIdentifier: ListDescriptorTypeIdentifier
+    val config: ListConfig
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListItemModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListItemModel.kt
new file mode 100644
index 00000000000..a9dc45006cb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListItemModel.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.model.list
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.RawConstraints
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table
+@RawConstraints(
+        "FOREIGN KEY(LIST_ID) REFERENCES ListModel(_id) ON DELETE CASCADE",
+        "UNIQUE(LIST_ID, REMOTE_ITEM_ID) ON CONFLICT IGNORE"
+)
+class ListItemModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    constructor(listId: Int, remoteItemId: Long) : this() {
+        this.listId = listId
+        this.remoteItemId = remoteItemId
+    }
+
+    @Column var listId: Int = 0
+    @Column var remoteItemId: Long = 0
+
+    override fun getId(): Int = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListModel.kt
new file mode 100644
index 00000000000..e22011ebf9d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListModel.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.model.list
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+
+const val LIST_STATE_TIMEOUT = 60 * 1000 // 1 minute
+
+@Table
+class ListModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var lastModified: String? = null // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
+
+    // These fields shouldn't be used directly.
+    @Column var descriptorUniqueIdentifierDbValue: Int? = null
+    @Column var descriptorTypeIdentifierDbValue: Int? = null
+    @Column var stateDbValue: Int = ListState.defaultState.value
+
+    override fun getId(): Int = id
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt
new file mode 100644
index 00000000000..ec8061f6b9c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model.list
+
+import java.util.Locale
+
+enum class ListOrder(val value: String) {
+    ASC("ASC"),
+    DESC("DESC");
+    companion object {
+        fun fromValue(value: String): ListOrder? {
+            return values().firstOrNull { it.value.toLowerCase(Locale.ROOT) == value.toLowerCase(Locale.ROOT) }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListState.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListState.kt
new file mode 100644
index 00000000000..10c5710164d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListState.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model.list
+
+/**
+ * This is an enum used by `ListStore` to manage the state of a [ListModel]. It'll be saved to `ListModelTable`.
+ *
+ * IMPORTANT: Because the values are stored in the DB, in case of a change to the enum values a migration needs to
+ * be added!
+ */
+enum class ListState(val value: Int) {
+    NEEDS_REFRESH(0),
+    CAN_LOAD_MORE(1),
+    FETCHED(2),
+    FETCHING_FIRST_PAGE(3),
+    LOADING_MORE(4),
+    ERROR(5);
+
+    fun canLoadMore() = this == CAN_LOAD_MORE
+
+    fun isFetchingFirstPage() = this == FETCHING_FIRST_PAGE
+
+    fun isLoadingMore() = this == LOADING_MORE
+
+    companion object {
+        val defaultState = NEEDS_REFRESH
+        val notExpiredStates = setOf(CAN_LOAD_MORE, FETCHED)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
new file mode 100644
index 00000000000..cc4062de807
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListFactory.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.model.list
+
+import androidx.paging.DataSource
+import androidx.paging.PositionalDataSource
+import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSource
+
+/**
+ * A [DataSource.Factory] instance for `ListStore` lists.
+ *
+ * @param createDataSource A function that creates an instance of [InternalPagedListDataSource].
+ */
+class PagedListFactory<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
+    private val createDataSource: () -> InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
+) : DataSource.Factory<Int, LIST_ITEM>() {
+    private var currentSource: PagedListPositionalDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>? = null
+
+    override fun create(): DataSource<Int, LIST_ITEM> {
+        val source = PagedListPositionalDataSource(dataSource = createDataSource.invoke())
+        currentSource = source
+        return source
+    }
+
+    fun invalidate() {
+        currentSource?.invalidate()
+    }
+}
+
+/**
+ * A positional data source for [LIST_ITEM].
+ *
+ * @param dataSource Describes how to take certain actions such as fetching list for the item type [LIST_ITEM].
+ */
+private class PagedListPositionalDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
+    private val dataSource: InternalPagedListDataSource<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
+) : PositionalDataSource<LIST_ITEM>() {
+    override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<LIST_ITEM>) {
+        val totalSize = dataSource.totalSize
+        val startPosition = computeInitialLoadPosition(params, totalSize)
+        val loadSize = computeInitialLoadSize(params, startPosition, totalSize)
+        val items = loadRangeInternal(startPosition, loadSize)
+        if (params.placeholdersEnabled) {
+            callback.onResult(items, startPosition, totalSize)
+        } else {
+            callback.onResult(items, startPosition)
+        }
+    }
+
+    override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<LIST_ITEM>) {
+        val items = loadRangeInternal(params.startPosition, params.loadSize)
+        callback.onResult(items)
+    }
+
+    private fun loadRangeInternal(startPosition: Int, loadSize: Int): List<LIST_ITEM> {
+        val endPosition = startPosition + loadSize
+        if (startPosition == endPosition) {
+            return emptyList()
+        }
+        return dataSource.getItemsInRange(startPosition, endPosition)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
new file mode 100644
index 00000000000..e4a173b4618
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PagedListWrapper.kt
@@ -0,0 +1,162 @@
+package org.wordpress.android.fluxc.model.list
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.paging.PagedList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.store.ListStore.ListError
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged
+import org.wordpress.android.fluxc.store.ListStore.OnListDataFailure
+import org.wordpress.android.fluxc.store.ListStore.OnListDataInvalidated
+import org.wordpress.android.fluxc.store.ListStore.OnListRequiresRefresh
+import org.wordpress.android.fluxc.store.ListStore.OnListStateChanged
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * This is a wrapper class to consume lists from `ListStore`.
+ *
+ * @property data A [LiveData] instance that provides the [PagedList] for the given item type [T].
+ * @property isFetchingFirstPage A [LiveData] instance that tells the client whether the first page is currently being
+ * fetched. It can be directly used in the UI.
+ * @property isLoadingMore A [LiveData] instance that tells the client whether more data is currently being fetched. It
+ * can be directly used in the UI.
+ * @property listError A [LiveData] instance that tells whether the last fetch resulted in an error. It can be used
+ * to either let the user know of each error or present the error in the empty view when it's visible.
+ */
+@Suppress("LongParameterList")
+class PagedListWrapper<T>(
+    val data: LiveData<PagedList<T>>,
+    private val dispatcher: Dispatcher,
+    private val listDescriptor: ListDescriptor,
+    private val lifecycle: Lifecycle,
+    private val refresh: () -> Unit,
+    private val invalidate: () -> Unit,
+    private val parentCoroutineContext: CoroutineContext
+) : LifecycleObserver, CoroutineScope {
+    private var job: Job = Job()
+
+    override val coroutineContext: CoroutineContext
+        get() = parentCoroutineContext + job
+
+    private val _isFetchingFirstPage = MutableLiveData<Boolean>()
+    val isFetchingFirstPage: LiveData<Boolean> = _isFetchingFirstPage
+
+    private val _isLoadingMore = MutableLiveData<Boolean>()
+    val isLoadingMore: LiveData<Boolean> = _isLoadingMore
+
+    private val _listError = MutableLiveData<ListError?>()
+    val listError: LiveData<ListError?> = _listError
+
+    private val _isEmpty = MediatorLiveData<Boolean>()
+    val isEmpty: LiveData<Boolean> = _isEmpty
+
+    /**
+     * Register the dispatcher so we can handle `ListStore` events and add an observer for the lifecycle so we can
+     * cleanup properly in `onDestroy`.
+     */
+    init {
+        _isEmpty.addSource(data) {
+            _isEmpty.value = it?.isEmpty()
+        }
+        dispatcher.register(this)
+        lifecycle.addObserver(this)
+    }
+
+    /**
+     * Handles the [Lifecycle.Event.ON_DESTROY] event to cleanup the registration for dispatcher and removing the
+     * observer for lifecycle.
+     */
+    @Suppress("unused")
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    private fun onDestroy() {
+        lifecycle.removeObserver(this)
+        dispatcher.unregister(this)
+        job.cancel()
+    }
+
+    /**
+     * A method to be used by clients to refresh the first page of a list from network.
+     */
+    fun fetchFirstPage() {
+        launch {
+            refresh()
+        }
+    }
+
+    /**
+     * A method to be used by clients to tell the data needs to be reloaded and recalculated since there was a change
+     * to at least one of the objects in the list. In most cases this should be used for changes where the depending
+     * data of an object changes, such as a change to the upload status of a post. Changes to the actual data
+     * should be managed through `ListStore` and shouldn't be necessary to be handled by clients.
+     */
+    fun invalidateData() {
+        invalidate()
+    }
+
+    /**
+     * Handles the [OnListStateChanged] `ListStore` event. It'll update the state information related [LiveData]
+     * instances.
+     */
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @Suppress("unused")
+    fun onListStateChanged(event: OnListStateChanged) {
+        if (event.listDescriptor != listDescriptor) {
+            return
+        }
+        _isFetchingFirstPage.postValue(event.newState.isFetchingFirstPage())
+        _isLoadingMore.postValue(event.newState.isLoadingMore())
+        _listError.postValue(event.error)
+    }
+
+    /**
+     * Handles the [OnListChanged] `ListStore` event. It'll invalidate the data, so it can be reloaded. It'll also
+     * updates whether the list is empty or not.
+     */
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @Suppress("unused")
+    fun onListChanged(event: OnListChanged) {
+        if (!event.listDescriptors.contains(listDescriptor)) {
+            return
+        }
+        invalidateData()
+    }
+
+    /**
+     * Handles the [OnListRequiresRefresh] `ListStore` event. It'll refresh the list if the type of this list matches
+     * the type of list that requires a refresh.
+     */
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @Suppress("unused")
+    fun onListRequiresRefresh(event: OnListRequiresRefresh) {
+        if (listDescriptor.typeIdentifier == event.type) {
+            fetchFirstPage()
+        }
+    }
+
+    /**
+     * Handles the [OnListDataInvalidated] `ListStore` event. It'll invalidate the list if the type of this list matches
+     * the type of list that is invalidated.
+     */
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @Suppress("unused")
+    fun onListDataInvalidated(event: OnListDataInvalidated) {
+        if (listDescriptor.typeIdentifier == event.type) {
+            invalidateData()
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @Suppress("unused")
+    fun onListDataFailure(event: OnListDataFailure) {
+        _listError.postValue(event.error)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt
new file mode 100644
index 00000000000..5f8296f62f2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.model.list
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.list.AuthorFilter.Everyone
+import org.wordpress.android.fluxc.model.list.AuthorFilter.SpecificAuthor
+import org.wordpress.android.fluxc.model.list.ListOrder.DESC
+import org.wordpress.android.fluxc.model.list.PostListOrderBy.DATE
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.store.PostStore.DEFAULT_POST_STATUS_LIST
+import java.util.Locale
+
+sealed class PostListDescriptor(
+    val site: SiteModel,
+    val statusList: List<PostStatus>,
+    val order: ListOrder,
+    val orderBy: PostListOrderBy,
+    listConfig: ListConfig
+) : ListDescriptor {
+    override val config: ListConfig = listConfig
+
+    @Suppress("ForbiddenComment")
+    override val uniqueIdentifier: ListDescriptorUniqueIdentifier by lazy {
+        // TODO: need a better hashing algorithm, preferably a perfect hash
+        val statusStr = statusList.asSequence().map { it.name }.joinToString(separator = ",")
+        when (this) {
+            is PostListDescriptorForRestSite -> {
+                val authorFilter: String = when (author) {
+                    Everyone -> "Everyone"
+                    is SpecificAuthor -> author.authorId.toString()
+                }
+
+                ListDescriptorUniqueIdentifier(
+                        ("rest-site" +
+                                "-post-list" +
+                                "-${site.id}" +
+                                "-st$statusStr" +
+                                "-a$authorFilter" +
+                                "-o${order.value}" +
+                                "-ob${orderBy.value}" +
+                                "-sq$searchQuery").hashCode()
+                )
+            }
+            is PostListDescriptorForXmlRpcSite -> {
+                ListDescriptorUniqueIdentifier(
+                        ("xml-rpc-site" +
+                                "-post-list" +
+                                "-${site.id}" +
+                                "-st$statusStr" +
+                                "-o${order.value}" +
+                                "-ob${orderBy.value}" +
+                                "-sq$searchQuery").hashCode()
+                )
+            }
+        }
+    }
+
+    override val typeIdentifier: ListDescriptorTypeIdentifier by lazy { calculateTypeIdentifier(site.id) }
+
+    override fun hashCode(): Int {
+        return uniqueIdentifier.value
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || javaClass != other.javaClass) return false
+        val that = other as PostListDescriptor
+        return uniqueIdentifier == that.uniqueIdentifier
+    }
+
+    companion object {
+        @JvmStatic
+        @Suppress("ForbiddenComment")
+        fun calculateTypeIdentifier(localSiteId: Int): ListDescriptorTypeIdentifier {
+            // TODO: need a better hashing algorithm, preferably a perfect hash
+            return ListDescriptorTypeIdentifier("site-post-list-$localSiteId".hashCode())
+        }
+    }
+
+    class PostListDescriptorForRestSite(
+        site: SiteModel,
+        statusList: List<PostStatus> = DEFAULT_POST_STATUS_LIST,
+        val author: AuthorFilter = Everyone,
+        order: ListOrder = DESC,
+        orderBy: PostListOrderBy = DATE,
+        val searchQuery: String? = null,
+        config: ListConfig = ListConfig.default
+    ) : PostListDescriptor(site, statusList, order, orderBy, config)
+
+    class PostListDescriptorForXmlRpcSite(
+        site: SiteModel,
+        statusList: List<PostStatus> = DEFAULT_POST_STATUS_LIST,
+        order: ListOrder = DESC,
+        orderBy: PostListOrderBy = DATE,
+        val searchQuery: String? = null,
+        config: ListConfig = ListConfig.default
+    ) : PostListDescriptor(site, statusList, order, orderBy, config)
+}
+
+enum class PostListOrderBy(val value: String) {
+    DATE("date"),
+    LAST_MODIFIED("modified"),
+    TITLE("title"),
+    COMMENT_COUNT("comment_count"),
+    ID("ID");
+
+    companion object {
+        fun fromValue(value: String): PostListOrderBy? {
+            return values().firstOrNull { it.value.toLowerCase(Locale.ROOT) == value.toLowerCase(Locale.ROOT) }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/InternalPagedListDataSource.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/InternalPagedListDataSource.kt
new file mode 100644
index 00000000000..d4075d7c4c0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/InternalPagedListDataSource.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.model.list.datasource
+
+import androidx.paging.PositionalDataSource
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+
+/**
+ * This component plays the middle man between the [PositionalDataSource] and [ListItemDataSourceInterface]
+ * implementation. Whenever a list is invalidated, meaning it needs to be refreshed, a new instance will be created
+ * just like [PositionalDataSource].
+ *
+ * We first ask the [ListItemDataSourceInterface] for the identifiers of each row and cache them in memory as soon as
+ * a new instance is created. This is necessary because [PositionalDataSource] works with immutable values and does the
+ * heavy lifting by caching the items in memory as they are loaded, however it still needs a consistent list of
+ * identifiers for each index to represent.
+ *
+ * After the identifiers are cached, whenever [PositionalDataSource] asks for a range of items, they'll be converted
+ * to identifiers and propagated to [ListItemDataSourceInterface].
+ *
+ * Most importantly, by separating this component, we are able to keep a single instance of
+ * [ListItemDataSourceInterface] and hide the requirement for identifiers needing to be cached from it.
+ */
+class InternalPagedListDataSource<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM>(
+    private val listDescriptor: LIST_DESCRIPTOR,
+    remoteItemIds: List<RemoteId>,
+    isListFullyFetched: Boolean,
+    private val itemDataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
+) {
+    /*
+     * PagedList library needs a snapshot of the data. It does the heavy lifting by caching the items provided to it,
+     * but it still needs a consistent list of identifiers to work with. In order to do that, we take a snapshot of the
+     * current identifiers and work with those until a new instance is created by PagedList.
+     */
+    private val itemIdentifiers = itemDataSource.getItemIdentifiers(listDescriptor, remoteItemIds, isListFullyFetched)
+
+    /**
+     * Number of items the list contains.
+     *
+     * Since [InternalPagedListDataSource] takes a snapshot of the identifiers for the list when it's created, this
+     * value will be valid and unchanged during the lifecycle of this instance.
+     */
+    val totalSize: Int
+        get() = itemIdentifiers.size
+
+    /**
+     * Returns the list of items [LIST_ITEM] by propagating the call to [ListItemDataSourceInterface]
+     *
+     * @param startPosition Start position that's inclusive
+     * @param endPosition End position that's exclusive
+     */
+    fun getItemsInRange(startPosition: Int, endPosition: Int): List<LIST_ITEM> =
+            itemDataSource.getItemsAndFetchIfNecessary(listDescriptor, getItemIds(startPosition, endPosition))
+
+    /**
+     * Helper function that returns the list [ITEM_IDENTIFIER]s for the given start and end positions using the
+     * internal [itemIdentifiers].
+     *
+     * @param startPosition Start position that's inclusive
+     * @param endPosition End position that's exclusive
+     */
+    private fun getItemIds(startPosition: Int, endPosition: Int): List<ITEM_IDENTIFIER> {
+        require(startPosition in 0 until endPosition && endPosition <= totalSize) {
+            "Illegal start($startPosition) or end($endPosition) position for totalSize($totalSize)"
+        }
+
+        return itemIdentifiers.subList(startPosition, endPosition)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/ListItemDataSourceInterface.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/ListItemDataSourceInterface.kt
new file mode 100644
index 00000000000..a2ba896e995
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/datasource/ListItemDataSourceInterface.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.fluxc.model.list.datasource
+
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+
+/**
+ * An interface used to tell how to take certain actions to manage a `PagedList`.
+ */
+interface ListItemDataSourceInterface<LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM> {
+    /**
+     * Should return a list [LIST_ITEM]s for the given [LIST_DESCRIPTOR] and the list [ITEM_IDENTIFIER]s that will be
+     * provided by [getItemIdentifiers].
+     *
+     * It should also fetch the missing items if necessary.
+     */
+    fun getItemsAndFetchIfNecessary(
+        listDescriptor: LIST_DESCRIPTOR,
+        itemIdentifiers: List<ITEM_IDENTIFIER>
+    ): List<LIST_ITEM>
+
+    /**
+     * Should transform a list of remote ids for the given [LIST_DESCRIPTOR] to a list [ITEM_IDENTIFIER]s to be used by
+     * [getItemsAndFetchIfNecessary]. This method allows the implementation of this interface to make the modifications
+     * to the list as necessary. For example, a list could be transformed to:
+     *
+     * * Add a header
+     * * Add an end list indicator
+     * * Hide certain items
+     * * Add section headers
+     */
+    fun getItemIdentifiers(
+        listDescriptor: LIST_DESCRIPTOR,
+        remoteItemIds: List<RemoteId>,
+        isListFullyFetched: Boolean
+    ): List<ITEM_IDENTIFIER>
+
+    /**
+     * Should fetch the list for the given [LIST_DESCRIPTOR] and an offset.
+     */
+    fun fetchList(listDescriptor: LIST_DESCRIPTOR, offset: Long)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NoteIdSet.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NoteIdSet.kt
new file mode 100644
index 00000000000..3f5da5f7b7a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NoteIdSet.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.model.notification
+
+data class NoteIdSet(val id: Int, val remoteNoteId: Long, val remoteSiteId: Long)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt
new file mode 100644
index 00000000000..210d9d3bd39
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt
@@ -0,0 +1,75 @@
+package org.wordpress.android.fluxc.model.notification
+
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.FormattableMeta
+import java.util.Locale
+
+data class NotificationModel(
+    val noteId: Int = 0,
+    val remoteNoteId: Long = 0L,
+
+    // Note: this could be 0 in the db if the notification is not for one of the users sites
+    val remoteSiteId: Long = 0L,
+
+    val noteHash: Long = 0L,
+    val type: Kind = Kind.UNKNOWN,
+    val subtype: Subkind? = Subkind.NONE,
+    val read: Boolean = false,
+    val icon: String? = null,
+    val noticon: String? = null,
+    val timestamp: String? = null,
+    val url: String? = null,
+    val title: String? = null,
+    val body: List<FormattableContent>? = null,
+    val subject: List<FormattableContent>? = null,
+    val meta: FormattableMeta? = null
+) {
+    enum class Kind {
+        AUTOMATTCHER,
+        COMMENT,
+        COMMENT_LIKE,
+        FOLLOW,
+        LIKE,
+        NEW_POST,
+        POST,
+        STORE_ORDER,
+        USER,
+        REWIND_BACKUP_INITIAL,
+        PLAN_SETUP_NUDGE,
+        BLAZE_APPROVED_NOTE,
+        BLAZE_REJECTED_NOTE,
+        BLAZE_CANCELLED_NOTE,
+        BLAZE_PERFORMED_NOTE,
+        UNKNOWN;
+
+        companion object {
+            private val reverseMap = values().associateBy(
+                    Kind::name)
+            fun fromString(type: String) = reverseMap[type.uppercase(Locale.US)] ?: UNKNOWN
+        }
+    }
+
+    enum class Subkind {
+        STORE_REVIEW,
+        REWIND_BACKUP_INITIAL,
+        UNKNOWN,
+        NONE;
+
+        companion object {
+            private val reverseMap = values().associateBy(
+                    Subkind::name)
+            fun fromString(type: String): Subkind {
+                return if (type.isEmpty()) {
+                    NONE
+                } else {
+                    reverseMap[type.toUpperCase(Locale.US)] ?: UNKNOWN
+                }
+            }
+        }
+    }
+
+    fun toLogString(): String {
+        return "[id=$noteId, remoteNoteId=$remoteNoteId, read=$read, " +
+                "siteId=$remoteSiteId, type=${type.name}, subtype=${subtype?.name}, title=$title]"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageModel.kt
new file mode 100644
index 00000000000..0c2e2eca51a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageModel.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.model.page
+
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+
+data class PageModel(
+    val post: PostModel,
+    val site: SiteModel,
+    val pageId: Int,
+    val title: String,
+    val status: PageStatus,
+    val date: Date,
+    val hasLocalChanges: Boolean,
+    val remoteId: Long,
+    val parent: PageModel?,
+    val featuredImageId: Long
+) {
+    constructor(post: PostModel, site: SiteModel, parent: PageModel? = null) : this(post, site, post.id, post.title,
+            PageStatus.fromPost(post), Date(DateTimeUtils.timestampFromIso8601Millis(post.dateCreated)),
+            post.isLocalDraft || post.isLocallyChanged, post.remotePostId, parent, post.featuredImageId)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageStatus.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageStatus.kt
new file mode 100644
index 00000000000..c63c83b69e0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/page/PageStatus.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.model.page
+
+import org.wordpress.android.fluxc.model.PostImmutableModel
+import org.wordpress.android.fluxc.model.post.PostStatus
+
+enum class PageStatus {
+    PUBLISHED,
+    PRIVATE,
+    DRAFT,
+    PENDING,
+    SCHEDULED,
+    TRASHED;
+
+    companion object {
+        fun fromPost(post: PostImmutableModel): PageStatus {
+            return fromPostStatus(PostStatus.fromPost(post))
+        }
+
+        fun fromPostStatus(status: PostStatus): PageStatus {
+            return when (status) {
+                PostStatus.PUBLISHED -> PUBLISHED
+                PostStatus.DRAFT -> DRAFT
+                PostStatus.TRASHED -> TRASHED
+                PostStatus.SCHEDULED -> SCHEDULED
+                PostStatus.PRIVATE -> PRIVATE
+                PostStatus.PENDING -> PENDING
+                else -> throw IllegalArgumentException("Unexpected page status: ${status.name}")
+            }
+        }
+    }
+
+    fun toPostStatus(): PostStatus {
+        return when (this) {
+            PUBLISHED -> PostStatus.PUBLISHED
+            DRAFT -> PostStatus.DRAFT
+            TRASHED -> PostStatus.TRASHED
+            SCHEDULED -> PostStatus.SCHEDULED
+            PRIVATE -> PostStatus.PRIVATE
+            PENDING -> PostStatus.PENDING
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersMapper.kt
new file mode 100644
index 00000000000..58d1484530e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersMapper.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.model.plans
+
+import dagger.Reusable
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel.Feature
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOffer
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferFeature
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferId
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferWithDetails
+import javax.inject.Inject
+
+@Reusable
+class PlanOffersMapper @Inject constructor() {
+    fun toDatabaseModel(
+        internalPlanId: Int,
+        domainModel: PlanOffersModel
+    ): PlanOfferWithDetails = with(domainModel) {
+        return PlanOfferWithDetails(
+                planOffer = PlanOffer(
+                        internalPlanId = internalPlanId,
+                        name = this.name,
+                        shortName = this.shortName,
+                        tagline = this.tagline,
+                        description = this.description,
+                        icon = this.iconUrl
+                ),
+                planIds = this.planIds?.map {
+                    PlanOfferId(
+                            productId = it,
+                            internalPlanId = internalPlanId
+                    )
+                } ?: emptyList(),
+                planFeatures = this.features?.map {
+                    PlanOfferFeature(
+                            internalPlanId = internalPlanId,
+                            stringId = it.id,
+                            name = it.name,
+                            description = it.description
+                    )
+                } ?: emptyList()
+        )
+    }
+
+    fun toDomainModel(
+        databaseModel: PlanOfferWithDetails
+    ): PlanOffersModel = with(databaseModel) {
+        return PlanOffersModel(
+                planIds = this.planIds.map {
+                    it.productId
+                },
+                features = this.planFeatures.map {
+                    Feature(id = it.stringId, name = it.name, description = it.description)
+                },
+                name = this.planOffer.name,
+                shortName = this.planOffer.shortName,
+                tagline = this.planOffer.tagline,
+                description = this.planOffer.description,
+                iconUrl = this.planOffer.icon
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersModel.kt
new file mode 100644
index 00000000000..4eee78219e1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/PlanOffersModel.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.model.plans
+
+import android.annotation.SuppressLint
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+data class PlanOffersModel(
+    val planIds: List<Int>?,
+    val features: List<Feature>?,
+    val name: String?,
+    val shortName: String?,
+    val tagline: String?,
+    val description: String?,
+    val iconUrl: String?
+) : Parcelable {
+    @Parcelize
+    @SuppressLint("ParcelCreator")
+    data class Feature(
+        val id: String?,
+        val name: String?,
+        val description: String?
+    ) : Parcelable {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) {
+                return true
+            }
+
+            if (other == null || other !is Feature) {
+                return false
+            }
+
+            return id == other.id && name == other.name &&
+                    description == other.description
+        }
+
+        override fun hashCode(): Int {
+            var result = id?.hashCode() ?: 0
+            result = 31 * result + (name?.hashCode() ?: 0)
+            result = 31 * result + (description?.hashCode() ?: 0)
+            return result
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+
+        if (other == null || other !is PlanOffersModel) {
+            return false
+        }
+
+        return name == other.name && shortName == other.shortName &&
+                tagline == other.tagline && description == other.description &&
+                iconUrl == other.iconUrl && planIds == other.planIds && features == other.features
+    }
+
+    override fun hashCode(): Int {
+        var result = planIds?.hashCode() ?: 0
+        result = 31 * result + (features?.hashCode() ?: 0)
+        result = 31 * result + (name?.hashCode() ?: 0)
+        result = 31 * result + (shortName?.hashCode() ?: 0)
+        result = 31 * result + (tagline?.hashCode() ?: 0)
+        result = 31 * result + (description?.hashCode() ?: 0)
+        result = 31 * result + (iconUrl?.hashCode() ?: 0)
+        return result
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/full/Plan.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/full/Plan.kt
new file mode 100644
index 00000000000..279df84bb7b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plans/full/Plan.kt
@@ -0,0 +1,49 @@
+package org.wordpress.android.fluxc.model.plans.full
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+import java.math.BigDecimal
+
+@Parcelize
+data class Plan(
+    @SerializedName("product_id") val productId: Int? = null,
+    @SerializedName("product_name") val productName: String? = null,
+    @SerializedName("bd_slug") val bdSlug: String? = null,
+    @SerializedName("bd_variation_slug") val bdVariationSlug: String? = null,
+    @SerializedName("sale_coupon_applied") val saleCouponApplied: Boolean = false,
+    @SerializedName("sale_coupon") val saleCoupon: SaleCoupon? = null,
+    @SerializedName("multi") val multi: Int? = null,
+    @SerializedName("cost") val cost: BigDecimal? = null,
+    @SerializedName("orig_cost") val originalCost: String? = null,
+    @SerializedName("is_cost_from_introductory_offer") val isCostFromIntroductoryOffer: Boolean = false,
+    @SerializedName("product_slug") val productSlug: String? = null,
+    @SerializedName("path_slug") val pathSlug: String? = null,
+    @SerializedName("description") val description: String? = null,
+    @SerializedName("bill_period") val billPeriod: Int? = null,
+    @SerializedName("product_type") val productType: String? = null,
+    @SerializedName("available") val available: String? = null,
+    @SerializedName("outer_slug") val outerSlug: String? = null,
+    @SerializedName("capability") val capability: String? = null,
+    @SerializedName("product_name_short") val productShortName: String? = null,
+    @SerializedName("icon") val iconUrl: String? = null,
+    @SerializedName("icon_active") val iconActiveUrl: String? = null,
+    @SerializedName("bill_period_label") val billPeriodLabel: String? = null,
+    @SerializedName("price") val price: String? = null,
+    @SerializedName("formatted_price") val formattedPrice: String? = null,
+    @SerializedName("raw_price") val rawPrice: BigDecimal? = null,
+    @SerializedName("product_display_price") val productDisplayPrice: String? = null,
+    @SerializedName("tagline") val tagline: String? = null,
+    @SerializedName("currency_code") val currencyCode: String? = null
+) : Parcelable {
+    @Parcelize
+    data class SaleCoupon(
+        @SerializedName("expires") val expires: String? = null,
+        @SerializedName("code") val code: String? = null,
+        @SerializedName("discount") val discount: BigDecimal? = null,
+        @SerializedName("single_use") val isSingleUse: Boolean? = null,
+        @SerializedName("start_date") val startDate: String? = null,
+        @SerializedName("created_by") val createdBy: String? = null,
+        @SerializedName("note") val note: String? = null
+    ) : Parcelable
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/ImmutablePluginModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/ImmutablePluginModel.java
new file mode 100644
index 00000000000..78493b49c5d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/ImmutablePluginModel.java
@@ -0,0 +1,247 @@
+package org.wordpress.android.fluxc.model.plugin;
+
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.util.StringUtils;
+
+@SuppressWarnings("unused")
+public class ImmutablePluginModel {
+    private final SitePluginModel mSitePlugin;
+    private final WPOrgPluginModel mWPOrgPlugin;
+
+    public static @Nullable ImmutablePluginModel newInstance(@Nullable SitePluginModel sitePlugin,
+                                                             @Nullable WPOrgPluginModel wpOrgPlugin) {
+        if (sitePlugin == null && wpOrgPlugin == null) {
+            return null;
+        }
+        return new ImmutablePluginModel(sitePlugin, wpOrgPlugin);
+    }
+
+    private ImmutablePluginModel(@Nullable SitePluginModel sitePlugin, @Nullable WPOrgPluginModel wpOrgPlugin) {
+        mSitePlugin = sitePlugin;
+        mWPOrgPlugin = wpOrgPlugin;
+    }
+
+    public boolean isInstalled() {
+        return mSitePlugin != null;
+    }
+
+    public boolean doesHaveWPOrgPluginDetails() {
+        return mWPOrgPlugin != null;
+    }
+
+    public @Nullable String getSlug() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getSlug();
+        }
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getSlug();
+        }
+        return null;
+    }
+
+    public int getAverageStarRating() {
+        if (mWPOrgPlugin == null) {
+            return 0;
+        }
+        int rating = StringUtils.stringToInt(mWPOrgPlugin.getRating(), 1);
+        return Math.round(rating / 20f);
+    }
+
+    public @Nullable String getAuthorAsHtml() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getAuthorAsHtml();
+        }
+        return null;
+    }
+
+    public @Nullable String getAuthorName() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getAuthorName();
+        }
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getAuthorName();
+        }
+        return null;
+    }
+
+    public @Nullable String getAuthorUrl() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getAuthorUrl();
+        }
+        return null;
+    }
+
+    public @Nullable String getBanner() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getBanner();
+        }
+        return null;
+    }
+
+    public @Nullable String getDescription() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getDescription();
+        }
+        return null;
+    }
+
+    public @Nullable String getDescriptionAsHtml() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getDescriptionAsHtml();
+        }
+        return null;
+    }
+
+    public @Nullable String getDisplayName() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getDisplayName();
+        } else if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getDisplayName();
+        }
+        return null;
+    }
+
+    public @Nullable String getFaqAsHtml() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getFaqAsHtml();
+        }
+        return null;
+    }
+
+    public @Nullable String getHomepageUrl() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getPluginUrl();
+        } else if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getHomepageUrl();
+        }
+        return null;
+    }
+
+    public @Nullable String getIcon() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getIcon();
+        }
+        return null;
+    }
+
+    public @Nullable String getInstallationInstructionsAsHtml() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getInstallationInstructionsAsHtml();
+        }
+        return null;
+    }
+
+    public @Nullable String getInstalledVersion() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getVersion();
+        }
+        return null;
+    }
+
+    public @Nullable String getLastUpdatedForWPOrgPlugin() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getLastUpdated();
+        }
+        return null;
+    }
+
+    public @Nullable String getName() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getName();
+        }
+        return null;
+    }
+
+    public @Nullable String getRating() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getRating();
+        }
+        return null;
+    }
+
+    public @Nullable String getRequiredWordPressVersion() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getRequiredWordPressVersion();
+        }
+        return null;
+    }
+
+    public @Nullable String getSettingsUrl() {
+        if (mSitePlugin != null) {
+            return mSitePlugin.getSettingsUrl();
+        }
+        return null;
+    }
+
+    public @Nullable String getWhatsNewAsHtml() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getWhatsNewAsHtml();
+        }
+        return null;
+    }
+
+    public @Nullable String getWPOrgPluginVersion() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getVersion();
+        }
+        return null;
+    }
+
+    public int getDownloadCount() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getDownloadCount();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatings() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatings();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatingsOfOne() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatingsOfOne();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatingsOfTwo() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatingsOfTwo();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatingsOfThree() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatingsOfThree();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatingsOfFour() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatingsOfFour();
+        }
+        return 0;
+    }
+
+    public int getNumberOfRatingsOfFive() {
+        if (mWPOrgPlugin != null) {
+            return mWPOrgPlugin.getNumberOfRatingsOfFive();
+        }
+        return 0;
+    }
+
+    public boolean isActive() {
+        return mSitePlugin != null && mSitePlugin.isActive();
+    }
+
+    public boolean isAutoUpdateEnabled() {
+        return mSitePlugin != null && mSitePlugin.isAutoUpdateEnabled();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryModel.java
new file mode 100644
index 00000000000..dfd3a4e4311
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryModel.java
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.model.plugin;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+@Table
+public class PluginDirectoryModel implements Identifiable {
+    @PrimaryKey @Column private int mId;
+    @Column private String mSlug;
+    @Column private String mDirectoryType;
+    @Column private int mPage;
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public String getSlug() {
+        return mSlug;
+    }
+
+    public void setSlug(String slug) {
+        mSlug = slug;
+    }
+
+    public String getDirectoryType() {
+        return mDirectoryType;
+    }
+
+    public void setDirectoryType(String directoryType) {
+        mDirectoryType = directoryType;
+    }
+
+    public int getPage() {
+        return mPage;
+    }
+
+    public void setPage(int page) {
+        mPage = page;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryType.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryType.java
new file mode 100644
index 00000000000..a5102cee86b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/PluginDirectoryType.java
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.plugin;
+
+import java.util.Locale;
+
+public enum PluginDirectoryType {
+    FEATURED,
+    NEW,
+    POPULAR,
+    SITE;
+
+    @Override
+    public String toString() {
+        return this.name().toLowerCase(Locale.US);
+    }
+
+    public static PluginDirectoryType fromString(String string) {
+        if (string != null) {
+            for (PluginDirectoryType type : PluginDirectoryType.values()) {
+                if (string.equalsIgnoreCase(type.name())) {
+                    return type;
+                }
+            }
+        }
+        return NEW;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/SitePluginModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/SitePluginModel.java
new file mode 100644
index 00000000000..f80d063e136
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/SitePluginModel.java
@@ -0,0 +1,135 @@
+package org.wordpress.android.fluxc.model.plugin;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import java.io.Serializable;
+
+@Table
+@RawConstraints({"UNIQUE (SLUG, LOCAL_SITE_ID)"})
+public class SitePluginModel implements Identifiable, Serializable {
+    private static final long serialVersionUID = -7687371389928982877L;
+
+    @PrimaryKey @Column private int mId;
+    @Column private int mLocalSiteId;
+    @Column private String mName;
+    @Column private String mDisplayName;
+    @Column private String mPluginUrl;
+    @Column private String mVersion;
+    @Column private String mSlug;
+    @Column private String mDescription;
+    @Column private String mAuthorName;
+    @Column private String mAuthorUrl;
+    @Column private String mSettingsUrl;
+    @Column private boolean mIsActive;
+    @Column private boolean mIsAutoUpdateEnabled;
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public int getLocalSiteId() {
+        return mLocalSiteId;
+    }
+
+    public void setLocalSiteId(int localSiteId) {
+        mLocalSiteId = localSiteId;
+    }
+
+    public String getName() {
+        return mName;
+    }
+
+    public void setName(String name) {
+        mName = name;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        mDisplayName = displayName;
+    }
+
+    public String getPluginUrl() {
+        return mPluginUrl;
+    }
+
+    public void setPluginUrl(String pluginUrl) {
+        mPluginUrl = pluginUrl;
+    }
+
+    public String getVersion() {
+        return mVersion;
+    }
+
+    public void setVersion(String version) {
+        mVersion = version;
+    }
+
+    public String getSlug() {
+        return mSlug;
+    }
+
+    public void setSlug(String slug) {
+        mSlug = slug;
+    }
+
+    public String getDescription() {
+        return mDescription;
+    }
+
+    public void setDescription(String description) {
+        mDescription = description;
+    }
+
+    public String getAuthorName() {
+        return mAuthorName;
+    }
+
+    public void setAuthorName(String authorName) {
+        mAuthorName = authorName;
+    }
+
+    public String getAuthorUrl() {
+        return mAuthorUrl;
+    }
+
+    public void setAuthorUrl(String authorUrl) {
+        mAuthorUrl = authorUrl;
+    }
+
+    public String getSettingsUrl() {
+        return mSettingsUrl;
+    }
+
+    public void setSettingsUrl(String settingsUrl) {
+        mSettingsUrl = settingsUrl;
+    }
+
+    public boolean isActive() {
+        return mIsActive;
+    }
+
+    public void setIsActive(boolean isActive) {
+        mIsActive = isActive;
+    }
+
+    public boolean isAutoUpdateEnabled() {
+        return mIsAutoUpdateEnabled;
+    }
+
+    public void setIsAutoUpdateEnabled(boolean isAutoUpdateEnabled) {
+        mIsAutoUpdateEnabled = isAutoUpdateEnabled;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/WPOrgPluginModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/WPOrgPluginModel.java
new file mode 100644
index 00000000000..7968c67425e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/plugin/WPOrgPluginModel.java
@@ -0,0 +1,225 @@
+package org.wordpress.android.fluxc.model.plugin;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+import java.io.Serializable;
+
+@Table
+@RawConstraints({"UNIQUE (SLUG)"})
+public class WPOrgPluginModel implements Identifiable, Serializable {
+    private static final long serialVersionUID = 207979865991034152L;
+
+    @PrimaryKey @Column private int mId;
+    @Column private String mAuthorAsHtml;
+    @Column private String mAuthorName;
+    @Column private String mBanner;
+    @Column private String mDescriptionAsHtml;
+    @Column private String mDisplayName;
+    @Column private String mFaqAsHtml;
+    @Column private String mHomepageUrl;
+    @Column private String mIcon;
+    @Column private String mInstallationInstructionsAsHtml;
+    @Column private String mLastUpdated;
+    @Column private String mRating;
+    @Column private String mRequiredWordPressVersion;
+    @Column private String mSlug;
+    @Column private String mVersion;
+    @Column private String mWhatsNewAsHtml;
+    @Column private int mDownloadCount;
+    @Column private int mNumberOfRatings;
+    @Column private int mNumberOfRatingsOfOne;
+    @Column private int mNumberOfRatingsOfTwo;
+    @Column private int mNumberOfRatingsOfThree;
+    @Column private int mNumberOfRatingsOfFour;
+    @Column private int mNumberOfRatingsOfFive;
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    public String getAuthorAsHtml() {
+        return mAuthorAsHtml;
+    }
+
+    public void setAuthorAsHtml(String authorAsHtml) {
+        mAuthorAsHtml = authorAsHtml;
+    }
+
+    public String getAuthorName() {
+        return mAuthorName;
+    }
+
+    public void setAuthorName(String authorName) {
+        mAuthorName = authorName;
+    }
+
+    public String getBanner() {
+        return mBanner;
+    }
+
+    public void setBanner(String banner) {
+        mBanner = banner;
+    }
+
+    public String getDescriptionAsHtml() {
+        return mDescriptionAsHtml;
+    }
+
+    public void setDescriptionAsHtml(String descriptionAsHtml) {
+        mDescriptionAsHtml = descriptionAsHtml;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        mDisplayName = displayName;
+    }
+
+    public String getFaqAsHtml() {
+        return mFaqAsHtml;
+    }
+
+    public void setFaqAsHtml(String faqAsHtml) {
+        mFaqAsHtml = faqAsHtml;
+    }
+
+    public String getHomepageUrl() {
+        return mHomepageUrl;
+    }
+
+    public void setHomepageUrl(String homepageUrl) {
+        mHomepageUrl = homepageUrl;
+    }
+
+    public String getIcon() {
+        return mIcon;
+    }
+
+    public void setIcon(String icon) {
+        mIcon = icon;
+    }
+
+    public String getInstallationInstructionsAsHtml() {
+        return mInstallationInstructionsAsHtml;
+    }
+
+    public void setInstallationInstructionsAsHtml(String installationInstructionsAsHtml) {
+        mInstallationInstructionsAsHtml = installationInstructionsAsHtml;
+    }
+
+    public String getLastUpdated() {
+        return mLastUpdated;
+    }
+
+    public void setLastUpdated(String lastUpdated) {
+        mLastUpdated = lastUpdated;
+    }
+
+    public String getRating() {
+        return mRating;
+    }
+
+    public void setRating(String rating) {
+        mRating = rating;
+    }
+
+    public String getRequiredWordPressVersion() {
+        return mRequiredWordPressVersion;
+    }
+
+    public void setRequiredWordPressVersion(String requiredWordPressVersion) {
+        mRequiredWordPressVersion = requiredWordPressVersion;
+    }
+
+    public String getSlug() {
+        return mSlug;
+    }
+
+    public void setSlug(String slug) {
+        mSlug = slug;
+    }
+
+    public String getVersion() {
+        return mVersion;
+    }
+
+    public void setVersion(String version) {
+        mVersion = version;
+    }
+
+    public String getWhatsNewAsHtml() {
+        return mWhatsNewAsHtml;
+    }
+
+    public void setWhatsNewAsHtml(String whatsNewAsHtml) {
+        mWhatsNewAsHtml = whatsNewAsHtml;
+    }
+
+    public int getDownloadCount() {
+        return mDownloadCount;
+    }
+
+    public void setDownloadCount(int downloadCount) {
+        mDownloadCount = downloadCount;
+    }
+
+    public int getNumberOfRatings() {
+        return mNumberOfRatings;
+    }
+
+    public void setNumberOfRatings(int numberOfRatings) {
+        mNumberOfRatings = numberOfRatings;
+    }
+
+    public int getNumberOfRatingsOfOne() {
+        return mNumberOfRatingsOfOne;
+    }
+
+    public void setNumberOfRatingsOfOne(int numberOfRatingsOfOne) {
+        mNumberOfRatingsOfOne = numberOfRatingsOfOne;
+    }
+
+    public int getNumberOfRatingsOfTwo() {
+        return mNumberOfRatingsOfTwo;
+    }
+
+    public void setNumberOfRatingsOfTwo(int numberOfRatingsOfTwo) {
+        mNumberOfRatingsOfTwo = numberOfRatingsOfTwo;
+    }
+
+    public int getNumberOfRatingsOfThree() {
+        return mNumberOfRatingsOfThree;
+    }
+
+    public void setNumberOfRatingsOfThree(int numberOfRatingsOfThree) {
+        mNumberOfRatingsOfThree = numberOfRatingsOfThree;
+    }
+
+    public int getNumberOfRatingsOfFour() {
+        return mNumberOfRatingsOfFour;
+    }
+
+    public void setNumberOfRatingsOfFour(int numberOfRatingsOfFour) {
+        mNumberOfRatingsOfFour = numberOfRatingsOfFour;
+    }
+
+    public int getNumberOfRatingsOfFive() {
+        return mNumberOfRatingsOfFive;
+    }
+
+    public void setNumberOfRatingsOfFive(int numberOfRatingsOfFive) {
+        mNumberOfRatingsOfFive = numberOfRatingsOfFive;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostLocation.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostLocation.kt
new file mode 100644
index 00000000000..cf077075494
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostLocation.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.model.post
+
+import java.io.Serializable
+
+data class PostLocation(
+    val latitude: Double = INVALID_LATITUDE,
+    val longitude: Double = INVALID_LONGITUDE
+) : Serializable {
+    val isValid: Boolean
+        get() = isValidLatitude(latitude) && isValidLongitude(longitude)
+
+    private fun isValidLatitude(latitude: Double): Boolean {
+        return latitude in MIN_LATITUDE..MAX_LATITUDE
+    }
+
+    private fun isValidLongitude(longitude: Double): Boolean {
+        return longitude in MIN_LONGITUDE..MAX_LONGITUDE
+    }
+
+    companion object {
+        private const val serialVersionUID: Long = 771468329640601473L
+        const val INVALID_LATITUDE = 9999.0
+        const val INVALID_LONGITUDE = 9999.0
+        private const val MIN_LATITUDE = -90.0
+        private const val MAX_LATITUDE = 90.0
+        private const val MIN_LONGITUDE = -180.0
+        private const val MAX_LONGITUDE = 180.0
+
+        fun equals(a: Any?, b: Any?): Boolean {
+            return if (a === b) {
+                true
+            } else if (a == null || b == null) {
+                false
+            } else {
+                a == b
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostStatus.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostStatus.java
new file mode 100644
index 00000000000..b0210f3af14
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/post/PostStatus.java
@@ -0,0 +1,90 @@
+package org.wordpress.android.fluxc.model.post;
+
+import org.wordpress.android.fluxc.model.PostImmutableModel;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.Date;
+import java.util.List;
+
+public enum PostStatus {
+    UNKNOWN,
+    PUBLISHED,
+    DRAFT,
+    PRIVATE,
+    PENDING,
+    TRASHED,
+    SCHEDULED; // NOTE: Only recognized for .com REST posts - XML-RPC returns scheduled posts with status 'publish'
+
+    public String toString() {
+        switch (this) {
+            case PUBLISHED:
+                return "publish";
+            case DRAFT:
+                return "draft";
+            case PRIVATE:
+                return "private";
+            case PENDING:
+                return "pending";
+            case TRASHED:
+                return "trash";
+            case SCHEDULED:
+                return "future";
+            default:
+                return "";
+        }
+    }
+
+    private static synchronized PostStatus fromStringAndDateGMT(String value, long dateCreatedGMT) {
+        if (value == null) {
+            return UNKNOWN;
+        } else if (value.equals("publish")) {
+            // Check if post is scheduled
+            Date d = new Date();
+            // Subtract 10 seconds from the server GMT date, in case server and device time slightly differ
+            if (dateCreatedGMT - 10000 > d.getTime()) {
+                return SCHEDULED;
+            }
+            return PUBLISHED;
+        } else if (value.equals("draft")) {
+            return DRAFT;
+        } else if (value.equals("private")) {
+            return PRIVATE;
+        } else if (value.equals("pending")) {
+            return PENDING;
+        } else if (value.equals("trash")) {
+            return TRASHED;
+        } else if (value.equals("future")) {
+            return SCHEDULED;
+        } else {
+            return UNKNOWN;
+        }
+    }
+
+    public static synchronized PostStatus fromPost(PostImmutableModel post) {
+        String value = post.getStatus();
+        long dateCreatedGMT = 0;
+
+        Date dateCreated = DateTimeUtils.dateUTCFromIso8601(post.getDateCreated());
+        if (dateCreated != null) {
+            dateCreatedGMT = dateCreated.getTime();
+        }
+
+        return fromStringAndDateGMT(value, dateCreatedGMT);
+    }
+
+    public static String postStatusListToString(List<PostStatus> statusList) {
+        String statusString = "";
+        boolean firstTime = true;
+
+        for (PostStatus postStatus : statusList) {
+            if (firstTime) {
+                firstTime = false;
+            } else {
+                statusString += ",";
+            }
+            statusString += postStatus.toString();
+        }
+
+        return statusString;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/Product.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/Product.kt
new file mode 100644
index 00000000000..3e3d802dfae
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/Product.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.model.products
+
+import com.google.gson.annotations.SerializedName
+
+data class Product(
+    @SerializedName("available")
+    val available: Boolean? = false,
+    @SerializedName("cost")
+    val cost: Double? = 0.0,
+    @SerializedName("sale_cost")
+    val saleCost: Double? = 0.0,
+    @SerializedName("combined_sale_cost_display")
+    val combinedSaleCostDisplay: String? = "",
+    @SerializedName("cost_display")
+    val costDisplay: String? = "",
+    @SerializedName("currency_code")
+    val currencyCode: String? = "",
+    @SerializedName("description")
+    val description: String? = "",
+    @SerializedName("is_domain_registration")
+    val isDomainRegistration: Boolean? = false,
+    @SerializedName("price_tier_list")
+    val priceTierList: List<Any>? = listOf(),
+    @SerializedName("price_tier_slug")
+    val priceTierSlug: String? = "",
+    @SerializedName("price_tier_usage_quantity")
+    val priceTierUsageQuantity: Any? = Any(),
+    @SerializedName("price_tiers")
+    val priceTiers: List<Any>? = listOf(),
+    @SerializedName("product_id")
+    val productId: Int? = 0,
+    @SerializedName("product_name")
+    val productName: String? = "",
+    @SerializedName("product_slug")
+    val productSlug: String? = "",
+    @SerializedName("product_type")
+    val productType: String? = ""
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/ProductsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/ProductsResponse.kt
new file mode 100644
index 00000000000..279894d4e81
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/products/ProductsResponse.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.products
+
+import com.google.gson.Gson
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+
+@JsonAdapter(ProductsDeserializer::class)
+class ProductsResponse(val products: List<Product>)
+
+class ProductsDeserializer : JsonDeserializer<ProductsResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): ProductsResponse {
+        val productType: Type = object : TypeToken<HashMap<String?, Product?>?>() {}.type
+        val productsMap: HashMap<String, Product> = Gson().fromJson(json, productType)
+        return ProductsResponse(productsMap.values.toList())
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/Diff.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/Diff.kt
new file mode 100644
index 00000000000..a72a01b1fae
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/Diff.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.model.revisions
+
+import android.annotation.SuppressLint
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+class Diff(val operation: DiffOperations, val value: String?) : Parcelable {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+
+        if (other == null || other !is Diff) {
+            return false
+        }
+
+        return operation == other.operation && value == other.value
+    }
+
+    override fun hashCode(): Int {
+        var result = operation.hashCode()
+        result = 31 * result + (value?.hashCode() ?: 0)
+        return result
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/DiffOperations.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/DiffOperations.kt
new file mode 100644
index 00000000000..4532ad1ff80
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/DiffOperations.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.model.revisions
+
+enum class DiffOperations constructor(private val string: String) {
+    COPY("copy"),
+    ADD("add"),
+    DELETE("del"),
+    UNKNOWN("unknown");
+
+    override fun toString(): String {
+        return string
+    }
+
+    companion object {
+        @JvmStatic
+        fun fromString(string: String?): DiffOperations {
+            return when (string) {
+                "copy" -> COPY
+                "add" -> ADD
+                "del" -> DELETE
+                else -> {
+                    UNKNOWN
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffModel.kt
new file mode 100644
index 00000000000..a90bad95cb3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffModel.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.model.revisions
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+
+@Table
+class LocalDiffModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var revisionId: Long = 0
+    @Column var postId: Long = 0
+    @Column var siteId: Long = 0
+
+    @Column var operation: String? = null
+    @Column var value: String? = null
+
+    @Column var diffType: String? = null
+
+    override fun getId(): Int {
+        return this.id
+    }
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    companion object {
+        @JvmStatic
+        fun fromDiffAndLocalRevision(
+            diff: Diff,
+            diffType: LocalDiffType,
+            localRevisionModel: LocalRevisionModel
+        ): LocalDiffModel {
+            val localDiff = LocalDiffModel()
+
+            localDiff.revisionId = localRevisionModel.revisionId
+            localDiff.postId = localRevisionModel.postId
+            localDiff.siteId = localRevisionModel.siteId
+
+            localDiff.operation = diff.operation.toString()
+            localDiff.value = diff.value
+
+            localDiff.diffType = diffType.toString()
+            return localDiff
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffType.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffType.kt
new file mode 100644
index 00000000000..4c54a7e36b5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalDiffType.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.model.revisions
+
+enum class LocalDiffType constructor(private val string: String) {
+    TITLE("title"),
+    CONTENT("post"),
+    UNKNOWN("unknown");
+
+    override fun toString(): String {
+        return string
+    }
+
+    companion object {
+        @JvmStatic
+        fun fromString(string: String?): LocalDiffType {
+            return when (string) {
+                "title" -> TITLE
+                "post" -> CONTENT
+                else -> {
+                    UNKNOWN
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalRevisionModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalRevisionModel.kt
new file mode 100644
index 00000000000..623f92374ae
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/LocalRevisionModel.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.fluxc.model.revisions
+
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+
+@Table
+class LocalRevisionModel(@PrimaryKey @Column private var id: Int = 0) : Identifiable {
+    @Column var revisionId: Long = 0
+    @Column var postId: Long = 0
+    @Column var siteId: Long = 0
+
+    @Column var diffFromVersion: Long = 0
+
+    @Column var totalAdditions: Int = 0
+    @Column var totalDeletions: Int = 0
+
+    @Column var postContent: String? = null
+    @Column var postExcerpt: String? = null
+    @Column var postTitle: String? = null
+
+    @Column var postDateGmt: String? = null
+    @Column var postModifiedGmt: String? = null
+    @Column var postAuthorId: String? = null
+
+    override fun getId(): Int {
+        return this.id
+    }
+
+    override fun setId(id: Int) {
+        this.id = id
+    }
+
+    companion object {
+        @JvmStatic
+        fun fromRevisionModel(revisionModel: RevisionModel, site: SiteModel, post: PostModel): LocalRevisionModel {
+            val localRevisionModel = LocalRevisionModel()
+            localRevisionModel.revisionId = revisionModel.revisionId
+            localRevisionModel.postId = post.remotePostId
+            localRevisionModel.siteId = site.siteId
+
+            localRevisionModel.diffFromVersion = revisionModel.diffFromVersion
+
+            localRevisionModel.totalAdditions = revisionModel.totalAdditions
+            localRevisionModel.totalDeletions = revisionModel.totalDeletions
+
+            localRevisionModel.postContent = revisionModel.postContent
+            localRevisionModel.postExcerpt = revisionModel.postExcerpt
+            localRevisionModel.postTitle = revisionModel.postTitle
+
+            localRevisionModel.postDateGmt = revisionModel.postDateGmt
+            localRevisionModel.postModifiedGmt = revisionModel.postModifiedGmt
+            localRevisionModel.postAuthorId = revisionModel.postAuthorId
+
+            return localRevisionModel
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionModel.kt
new file mode 100644
index 00000000000..ab0e7c473f3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionModel.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.fluxc.model.revisions
+
+import java.util.ArrayList
+import java.util.Arrays
+
+@Suppress("LongParameterList")
+class RevisionModel(
+    var revisionId: Long,
+
+    var diffFromVersion: Long,
+
+    var totalAdditions: Int,
+    var totalDeletions: Int,
+
+    var postContent: String?,
+    var postExcerpt: String?,
+    var postTitle: String?,
+
+    var postDateGmt: String?,
+    var postModifiedGmt: String?,
+    var postAuthorId: String?,
+
+    val titleDiffs: ArrayList<Diff>,
+    val contentDiffs: ArrayList<Diff>
+) {
+    companion object {
+        @JvmStatic
+        fun fromLocalRevisionAndDiffs(
+            localRevision: LocalRevisionModel,
+            localDiffs: List<LocalDiffModel>
+        ): RevisionModel {
+            val titleDiffs = ArrayList<Diff>()
+            val contentDiffs = ArrayList<Diff>()
+
+            for (localDiff in localDiffs) {
+                if (LocalDiffType.TITLE === LocalDiffType.fromString(localDiff.diffType)) {
+                    titleDiffs.add(Diff(DiffOperations.fromString(localDiff.operation), localDiff.value))
+                } else if (LocalDiffType.CONTENT === LocalDiffType.fromString(localDiff.diffType)) {
+                    contentDiffs.add(Diff(DiffOperations.fromString(localDiff.operation), localDiff.value))
+                }
+            }
+
+            return RevisionModel(
+                    localRevision.revisionId,
+                    localRevision.diffFromVersion,
+                    localRevision.totalAdditions,
+                    localRevision.totalDeletions,
+                    localRevision.postContent,
+                    localRevision.postExcerpt,
+                    localRevision.postTitle,
+                    localRevision.postDateGmt,
+                    localRevision.postModifiedGmt,
+                    localRevision.postAuthorId,
+                    titleDiffs,
+                    contentDiffs
+            )
+        }
+    }
+
+    @Suppress("ComplexMethod")
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+
+        if (other == null || other !is RevisionModel) {
+            return false
+        }
+
+        return revisionId == other.revisionId && diffFromVersion == other.diffFromVersion &&
+                totalAdditions == other.totalAdditions && totalDeletions == other.totalDeletions &&
+                postContent == other.postContent && postExcerpt == other.postExcerpt &&
+                postTitle == other.postTitle && postAuthorId == other.postAuthorId &&
+                postDateGmt == other.postDateGmt && postModifiedGmt == other.postModifiedGmt &&
+                titleDiffs.toArray() contentDeepEquals other.titleDiffs.toArray() &&
+                contentDiffs.toArray() contentDeepEquals other.contentDiffs.toArray()
+    }
+
+    override fun hashCode(): Int {
+        var result = revisionId.hashCode()
+        result = 31 * result + diffFromVersion.hashCode()
+        result = 31 * result + totalAdditions
+        result = 31 * result + totalDeletions
+        result = 31 * result + (postContent?.hashCode() ?: 0)
+        result = 31 * result + (postExcerpt?.hashCode() ?: 0)
+        result = 31 * result + (postTitle?.hashCode() ?: 0)
+        result = 31 * result + (postDateGmt?.hashCode() ?: 0)
+        result = 31 * result + (postModifiedGmt?.hashCode() ?: 0)
+        result = 31 * result + (postAuthorId?.hashCode() ?: 0)
+        result = 31 * result + (Arrays.hashCode(contentDiffs.toArray()))
+        result = 31 * result + (Arrays.hashCode(titleDiffs.toArray()))
+        return result
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionsModel.kt
new file mode 100644
index 00000000000..08e65eb7a60
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/revisions/RevisionsModel.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.model.revisions
+
+class RevisionsModel(var revisions: List<RevisionModel>)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/ScanStateModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/ScanStateModel.kt
new file mode 100644
index 00000000000..da015c4cdf4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/ScanStateModel.kt
@@ -0,0 +1,60 @@
+package org.wordpress.android.fluxc.model.scan
+
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import java.util.Date
+
+data class ScanStateModel(
+    val state: State,
+    val reason: Reason,
+    val threats: List<ThreatModel>? = null,
+    val credentials: List<Credentials>? = null,
+    val hasCloud: Boolean = false,
+    val mostRecentStatus: ScanProgressStatus? = null,
+    val currentStatus: ScanProgressStatus? = null,
+    val hasValidCredentials: Boolean = false
+) {
+    enum class State(val value: String) {
+        IDLE("idle"),
+        SCANNING("scanning"),
+        PROVISIONING("provisioning"),
+        UNAVAILABLE("unavailable"),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String): State? {
+                return values().firstOrNull { it.value == value }
+            }
+        }
+    }
+
+    data class Credentials(
+        val type: String,
+        val role: String,
+        val host: String?,
+        val port: Int?,
+        val user: String?,
+        val path: String?,
+        val stillValid: Boolean
+    )
+
+    data class ScanProgressStatus(
+        val startDate: Date?,
+        val duration: Int = 0,
+        val progress: Int = 0,
+        val error: Boolean = false,
+        val isInitial: Boolean = false
+    )
+
+    enum class Reason(val value: String?) {
+        MULTISITE_NOT_SUPPORTED("multisite_not_supported"),
+        VP_ACTIVE_ON_SITE("vp_active_on_site"),
+        NO_REASON(null),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String?): Reason {
+                return values().firstOrNull { it.value == value } ?: UNKNOWN
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/FixThreatStatusModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/FixThreatStatusModel.kt
new file mode 100644
index 00000000000..3b73c27ea49
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/FixThreatStatusModel.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.model.scan.threat
+
+data class FixThreatStatusModel(
+    val id: Long,
+    val status: FixStatus,
+    val error: String? = null
+) {
+    enum class FixStatus(val value: String) {
+        NOT_STARTED("not_started"),
+        IN_PROGRESS("in_progress"),
+        NOT_FIXED("not_fixed"),
+        FIXED("fixed"),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String?): FixStatus {
+                return values().firstOrNull { it.value == value } ?: UNKNOWN
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatMapper.kt
new file mode 100644
index 00000000000..92adf53e545
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatMapper.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.model.scan.threat
+
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable.FixType
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension.ExtensionType
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import java.util.Date
+import javax.inject.Inject
+
+class ThreatMapper @Inject constructor() {
+    fun map(response: Threat): ThreatModel {
+        val baseThreatModel = getBaseThreatModelFromResponse(response)
+
+        return when {
+            response.fileName != null && response.diff != null -> {
+                CoreFileModificationThreatModel(
+                    baseThreatModel = baseThreatModel,
+                    fileName = response.fileName,
+                    diff = response.diff
+                )
+            }
+            response.context != null -> {
+                FileThreatModel(
+                    baseThreatModel = baseThreatModel,
+                    fileName = response.fileName,
+                    context = requireNotNull(response.context)
+                )
+            }
+            response.rows != null || response.signature?.contains(DATABASE_SIGNATURE) == true -> {
+                DatabaseThreatModel(
+                    baseThreatModel = baseThreatModel,
+                    rows = response.rows
+                )
+            }
+            response.extension != null && ExtensionType.fromValue(response.extension.type) != ExtensionType.UNKNOWN -> {
+                VulnerableExtensionThreatModel(
+                    baseThreatModel = baseThreatModel,
+                    extension = Extension(
+                        type = ExtensionType.fromValue(response.extension.type),
+                        slug = response.extension.slug,
+                        name = response.extension.name,
+                        version = response.extension.version,
+                        isPremium = response.extension.isPremium ?: false
+                    )
+                )
+            }
+            else -> {
+                GenericThreatModel(
+                    baseThreatModel = baseThreatModel
+                )
+            }
+        }
+    }
+
+    private fun getBaseThreatModelFromResponse(response: Threat): BaseThreatModel {
+        val id = response.id ?: 0L
+        val signature = response.signature ?: ""
+        val firstDetected = response.firstDetected ?: Date(0)
+
+        val status = ThreatStatus.fromValue(response.status)
+        val description = response.description ?: ""
+
+        val fixable = response.fixable?.let {
+            val fixType = FixType.fromValue(it.fixer)
+            Fixable(file = it.file, fixer = fixType, target = it.target)
+        }
+
+        return BaseThreatModel(
+            id = id,
+            signature = signature,
+            description = description,
+            status = status,
+            firstDetected = firstDetected,
+            fixable = fixable,
+            fixedOn = response.fixedOn
+        )
+    }
+
+    companion object {
+        private const val DATABASE_SIGNATURE = "Suspicious.Links"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatModel.kt
new file mode 100644
index 00000000000..322e255a354
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/scan/threat/ThreatModel.kt
@@ -0,0 +1,116 @@
+package org.wordpress.android.fluxc.model.scan.threat
+
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import java.util.Date
+
+data class BaseThreatModel(
+    val id: Long,
+    val signature: String,
+    val description: String,
+    val status: ThreatStatus,
+    val firstDetected: Date,
+    val fixable: Fixable? = null,
+    val fixedOn: Date? = null
+)
+
+sealed class ThreatModel {
+    abstract val baseThreatModel: BaseThreatModel
+
+    data class GenericThreatModel(
+        override val baseThreatModel: BaseThreatModel
+    ) : ThreatModel()
+
+    data class CoreFileModificationThreatModel(
+        override val baseThreatModel: BaseThreatModel,
+        val fileName: String,
+        val diff: String
+    ) : ThreatModel()
+
+    data class VulnerableExtensionThreatModel(
+        override val baseThreatModel: BaseThreatModel,
+        val extension: Extension
+    ) : ThreatModel() {
+        data class Extension(
+            val type: ExtensionType,
+            val slug: String?,
+            val name: String?,
+            val version: String?,
+            val isPremium: Boolean
+        ) {
+            enum class ExtensionType(val value: String?) {
+                PLUGIN("plugin"),
+                THEME("theme"),
+                UNKNOWN("unknown");
+
+                companion object {
+                    fun fromValue(value: String?): ExtensionType {
+                        return values().firstOrNull { it.value == value } ?: UNKNOWN
+                    }
+                }
+            }
+        }
+    }
+
+    data class DatabaseThreatModel(
+        override val baseThreatModel: BaseThreatModel,
+        val rows: List<Row>? = null
+    ) : ThreatModel() {
+        data class Row(
+            val id: Int,
+            val rowNumber: Int,
+            val description: String? = null,
+            val code: String? = null,
+            val url: String? = null
+        )
+    }
+
+    data class FileThreatModel(
+        override val baseThreatModel: BaseThreatModel,
+        val fileName: String? = null,
+        val context: ThreatContext
+    ) : ThreatModel() {
+        data class ThreatContext(
+            val lines: List<ContextLine>
+        ) {
+            data class ContextLine(
+                val lineNumber: Int,
+                val contents: String,
+                val highlights: List<Pair<Int, Int>>? = null
+            )
+        }
+    }
+
+    enum class ThreatStatus(val value: String) {
+        FIXED("fixed"),
+        IGNORED("ignored"),
+        CURRENT("current"),
+        UNKNOWN("unknown");
+
+        companion object {
+            fun fromValue(value: String?): ThreatStatus {
+                return values().firstOrNull { it.value == value } ?: UNKNOWN
+            }
+        }
+    }
+
+    data class Fixable(
+        val file: String?,
+        val fixer: FixType,
+        val target: String?
+    ) {
+        enum class FixType(val value: String) {
+            REPLACE("replace"),
+            DELETE("delete"),
+            UPDATE("update"),
+            EDIT("edit"),
+            UNKNOWN("unknown");
+
+            companion object {
+                fun fromValue(value: String?): FixType {
+                    return values().firstOrNull { it.value == value } ?: UNKNOWN
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/CommentsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/CommentsModel.kt
new file mode 100644
index 00000000000..9ddfad7b8a9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/CommentsModel.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class CommentsModel(
+    val posts: List<Post>,
+    val authors: List<Author>,
+    val hasMorePosts: Boolean,
+    val hasMoreAuthors: Boolean
+) {
+    data class Post(val id: Long, val name: String, val comments: Int, val link: String)
+    data class Author(val name: String, val comments: Int, val link: String, val gravatar: String)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/FollowersModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/FollowersModel.kt
new file mode 100644
index 00000000000..51326aa592f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/FollowersModel.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model.stats
+
+import java.util.Date
+
+data class FollowersModel(
+    val totalCount: Int,
+    val followers: List<FollowerModel>,
+    val hasMore: Boolean
+) {
+    data class FollowerModel(
+        val avatar: String,
+        val label: String,
+        val url: String?,
+        val dateSubscribed: Date
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeDataModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeDataModel.kt
new file mode 100644
index 00000000000..00c5c3b742c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeDataModel.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.model.stats
+
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
+
+data class InsightTypeDataModel(val type: InsightType, val status: Status, val position: Int?) {
+    enum class Status {
+        ADDED, REMOVED, NEW
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeModel.kt
new file mode 100644
index 00000000000..59558fb3370
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightTypeModel.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.model.stats
+
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
+
+data class InsightTypeModel(val addedTypes: List<InsightType>, val removedTypes: List<InsightType>)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsAllTimeModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsAllTimeModel.kt
new file mode 100644
index 00000000000..fd8a528da2d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsAllTimeModel.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model.stats
+
+import java.util.Date
+
+data class InsightsAllTimeModel(
+    val siteId: Long,
+    val date: Date? = null,
+    val visitors: Int,
+    val views: Int,
+    val posts: Int,
+    val viewsBestDay: String,
+    val viewsBestDayTotal: Int
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsLatestPostModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsLatestPostModel.kt
new file mode 100644
index 00000000000..cf4399b97e0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsLatestPostModel.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model.stats
+
+import java.util.Date
+
+data class InsightsLatestPostModel(
+    val siteId: Long,
+    val postTitle: String,
+    val postURL: String,
+    val postDate: Date,
+    val postId: Long,
+    val postViewsCount: Int = 0,
+    val postCommentCount: Int = 0,
+    val postLikeCount: Int,
+    val dayViews: List<Pair<String, Int>>,
+    val featuredImageUrl: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMapper.kt
new file mode 100644
index 00000000000..b377c3e5cca
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMapper.kt
@@ -0,0 +1,369 @@
+package org.wordpress.android.fluxc.model.stats
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.FollowersModel.FollowerModel
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.TagsModel.TagModel
+import org.wordpress.android.fluxc.model.stats.YearsInsightsModel.YearInsights
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Month
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.StreakModel
+import org.wordpress.android.fluxc.model.stats.subscribers.PostsModel
+import org.wordpress.android.fluxc.model.stats.subscribers.PostsModel.PostModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient.CommentsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.ALL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.EMAIL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.WP_COM
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient.SummaryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse.TagsGroup.TagResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.EmailsRestClient.EmailsSummaryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.EmailsRestClient.SortField
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
+
+private const val PERIOD = "period"
+private const val VIEWS = "views"
+private const val VISITORS = "visitors"
+private const val LIKES = "likes"
+private const val REBLOGS = "reblogs"
+private const val COMMENTS = "comments"
+private const val POSTS = "posts"
+
+private const val MILLIS = 1000
+
+class InsightsMapper @Inject constructor(val statsUtils: StatsUtils) {
+    fun map(response: AllTimeResponse, site: SiteModel): InsightsAllTimeModel {
+        val stats = response.stats
+        return InsightsAllTimeModel(
+                site.siteId,
+                response.date,
+                stats?.visitors ?: 0,
+                stats?.views ?: 0,
+                stats?.posts ?: 0,
+                stats?.viewsBestDay ?: "",
+                stats?.viewsBestDayTotal ?: 0
+        )
+    }
+
+    fun map(response: MostPopularResponse, site: SiteModel): InsightsMostPopularModel {
+        return InsightsMostPopularModel(
+                site.siteId,
+                response.highestDayOfWeek ?: 0,
+                response.highestHour ?: 0,
+                response.highestDayPercent ?: 0.0,
+                response.highestHourPercent ?: 0.0
+        )
+    }
+
+    fun map(response: MostPopularResponse): YearsInsightsModel? {
+        val yearInsightsResponse = response.yearInsightResponses?.map { YearInsights(
+                it.avgComments,
+                it.avgImages,
+                it.avgLikes,
+                it.avgWords,
+                it.totalComments,
+                it.totalImages,
+                it.totalLikes,
+                it.totalPosts,
+                it.totalWords,
+                it.year
+        ) }
+        return yearInsightsResponse?.let { YearsInsightsModel(it) }
+    }
+
+    @Suppress("ComplexCondition")
+    fun map(
+        postResponse: PostResponse,
+        postStatsResponse: PostStatsResponse,
+        site: SiteModel
+    ): InsightsLatestPostModel {
+        val daysViews = if (
+            postStatsResponse.fields != null &&
+            postStatsResponse.data != null &&
+            postStatsResponse.fields.size > 1 &&
+            postStatsResponse.fields[0] == "period" &&
+            postStatsResponse.fields[1] == "views"
+        ) {
+            postStatsResponse.data.map { list -> list[0] to list[1].toInt() }
+        } else {
+            listOf()
+        }
+        val viewsCount = postStatsResponse.views
+        val commentCount = postResponse.discussion?.commentCount ?: 0
+        return InsightsLatestPostModel(
+            site.siteId,
+            postResponse.title ?: "",
+            postResponse.url ?: "",
+            postResponse.date ?: Date(0),
+            postResponse.id,
+            viewsCount ?: 0,
+            commentCount,
+            postResponse.likeCount ?: 0,
+            daysViews,
+            postResponse.featuredImage ?: ""
+        )
+    }
+
+    fun map(response: VisitResponse): VisitsModel {
+        val result: Map<String, String> = response.fields.mapIndexedNotNull { index, value ->
+            if (response.data.isNotEmpty() && response.data[0].size > index) {
+                value to response.data[0][index]
+            } else {
+                null
+            }
+        }.toMap()
+        return VisitsModel(
+                result[PERIOD] ?: "",
+                result[VIEWS]?.toInt() ?: 0,
+                result[VISITORS]?.toInt() ?: 0,
+                result[LIKES]?.toInt() ?: 0,
+                result[REBLOGS]?.toInt() ?: 0,
+                result[COMMENTS]?.toInt() ?: 0,
+                result[POSTS]?.toInt() ?: 0
+        )
+    }
+
+    fun map(response: FollowersResponse, followerType: FollowerType): FollowersModel {
+        val followers = response.subscribers.mapNotNull {
+            if (it.avatar != null && it.label != null && it.dateSubscribed != null) {
+                FollowerModel(
+                        it.avatar,
+                        it.label,
+                        it.url,
+                        it.dateSubscribed
+                )
+            } else {
+                AppLog.e(STATS, "CommentsResponse.posts: Non-null field is coming as null from API")
+                null
+            }
+        }
+        val total = when (followerType) {
+            ALL -> response.total
+            WP_COM -> response.totalWpCom
+            EMAIL -> response.totalEmail
+        }
+        val hasMore = if (response.page != null && response.pages != null) {
+            response.page < response.pages
+        } else {
+            false
+        }
+        return FollowersModel(total ?: 0, followers, hasMore)
+    }
+
+    fun mapAndMergeFollowersModels(
+        followerResponses: List<FollowersResponse>,
+        followerType: FollowerType,
+        cacheMode: LimitMode
+    ): FollowersModel {
+        return followerResponses.fold(FollowersModel(0, emptyList(), false)) { accumulator, next ->
+                val nextModel = map(next, followerType)
+                accumulator.copy(
+                        totalCount = nextModel.totalCount,
+                        followers = accumulator.followers + nextModel.followers,
+                        hasMore = nextModel.hasMore
+                )
+            }
+            .let {
+                if (cacheMode is LimitMode.Top) {
+                    return@let it.copy(followers = it.followers.take(cacheMode.limit))
+                } else {
+                    return@let it
+                }
+            }
+    }
+
+    @Suppress("ComplexMethod", "ComplexCondition")
+    fun map(response: CommentsResponse, cacheMode: LimitMode): CommentsModel {
+        val authors = response.authors?.let {
+            if (cacheMode is LimitMode.Top) {
+                return@let it.take(cacheMode.limit)
+            } else {
+                return@let it
+            }
+        }
+        ?.mapNotNull {
+            if (
+                it.name != null &&
+                it.comments != null &&
+                it.link != null &&
+                it.gravatar != null
+            ) {
+                CommentsModel.Author(it.name, it.comments, it.link, it.gravatar)
+            } else {
+                AppLog.e(STATS, "CommentsResponse.authors: Non-null field is coming as null from API")
+                null
+            }
+        }
+        val posts = response.posts?.let {
+            if (cacheMode is LimitMode.Top) {
+                return@let it.take(cacheMode.limit)
+            } else {
+                return@let it
+            }
+        }
+        ?.mapNotNull {
+            if (
+                it.id != null &&
+                it.name != null &&
+                it.comments != null &&
+                it.link != null
+            ) {
+                CommentsModel.Post(it.id, it.name, it.comments, it.link)
+            } else {
+                AppLog.e(STATS, "CommentsResponse.posts: Non-null field is coming as null from API")
+                null
+            }
+        }
+        val hasMoreAuthors = (response.authors != null && cacheMode is Top && response.authors.size > cacheMode.limit)
+        val hasMorePosts = (response.posts != null && cacheMode is Top && response.posts.size > cacheMode.limit)
+        return CommentsModel(posts ?: listOf(), authors ?: listOf(), hasMorePosts, hasMoreAuthors)
+    }
+
+    fun map(response: SummaryResponse) = SummaryModel(
+        response.likes ?: 0,
+        response.comments ?: 0,
+        response.followers ?: 0
+    )
+
+    fun map(response: TagsResponse, cacheMode: LimitMode): TagsModel {
+        return TagsModel(response.tags.let {
+            if (cacheMode is LimitMode.Top) {
+                return@let it.take(cacheMode.limit)
+            } else {
+                return@let it
+            }
+        }.map { tag ->
+            TagModel(tag.tags.mapNotNull { it.toItem() }.let {
+                if (cacheMode is LimitMode.Top) {
+                    return@let it.take(cacheMode.limit)
+                } else {
+                    return@let it
+                }
+            }, tag.views ?: 0)
+        }, cacheMode is LimitMode.Top && response.tags.size > cacheMode.limit)
+    }
+
+    private fun TagResponse.toItem(): TagModel.Item? {
+        return if (this.name != null && this.type != null && this.link != null) {
+            TagModel.Item(this.name, this.type, this.link)
+        } else {
+            AppLog.e(STATS, "TagResponse: Mandatory fields are null so the Tag can't be mapped to Model")
+            null
+        }
+    }
+
+    fun map(response: PublicizeResponse, limitMode: LimitMode): PublicizeModel {
+        return PublicizeModel(
+                response.services.sortedBy { it.followers }.let {
+                    if (limitMode is LimitMode.Top) {
+                        return@let it.take(limitMode.limit)
+                    } else {
+                        return@let it
+                    }
+                }.map { PublicizeModel.Service(it.service, it.followers) },
+                limitMode is LimitMode.Top && response.services.size > limitMode.limit
+        )
+    }
+
+    @Suppress("LongMethod")
+    fun map(response: PostingActivityResponse, startDay: Day, endDay: Day): PostingActivityModel {
+        if (response.streak == null) {
+            AppLog.e(STATS, "PostingActivityResponse: Mandatory field streak is null")
+        }
+        val currentStreakStart = response.streak?.currentStreak?.start?.let { statsUtils.fromFormattedDate(it) }
+        val currentStreakEnd = response.streak?.currentStreak?.end?.let { statsUtils.fromFormattedDate(it) }
+        val currentStreakLength = response.streak?.currentStreak?.length
+        val longStreakStart = response.streak?.longStreak?.start?.let { statsUtils.fromFormattedDate(it) }
+        val longStreakEnd = response.streak?.longStreak?.end?.let { statsUtils.fromFormattedDate(it) }
+        val longStreakLength = response.streak?.longStreak?.length
+        val streak = StreakModel(
+                currentStreakStart = currentStreakStart,
+                currentStreakEnd = currentStreakEnd,
+                currentStreakLength = currentStreakLength,
+                longestStreakStart = longStreakStart,
+                longestStreakEnd = longStreakEnd,
+                longestStreakLength = longStreakLength
+        )
+        val nonNullData = response.data ?: mapOf()
+        val days = mutableMapOf<Day, Int>()
+        nonNullData.toList().forEach { (timeStamp, value) ->
+            val day = toDay(timeStamp)
+            days[day] = (days[day] ?: 0) + value
+        }
+        val startCalendar = Calendar.getInstance()
+        startCalendar.set(startDay.year, startDay.month, startDay.day, 0, 0)
+        val endCalendar = Calendar.getInstance()
+        endCalendar.set(
+                endDay.year,
+                endDay.month,
+                endDay.day,
+                endCalendar.getActualMaximum(Calendar.HOUR_OF_DAY),
+                endCalendar.getActualMaximum(Calendar.MINUTE)
+        )
+        var currentYear = startDay.year
+        var currentMonth = startDay.month
+        var currentMonthDays = mutableMapOf<Int, Int>()
+        val result = mutableListOf<Month>()
+        var count = 0
+        var max = 0
+        while (!startCalendar.after(endCalendar)) {
+            if (currentYear != startCalendar.get(Calendar.YEAR) || currentMonth != startCalendar.get(Calendar.MONTH)) {
+                result.add(Month(currentYear, currentMonth, currentMonthDays))
+                currentYear = startCalendar.get(Calendar.YEAR)
+                currentMonth = startCalendar.get(Calendar.MONTH)
+                currentMonthDays = mutableMapOf()
+            }
+            val currentDay = days[Day(
+                    startCalendar.get(Calendar.YEAR),
+                    startCalendar.get(Calendar.MONTH),
+                    startCalendar.get(Calendar.DAY_OF_MONTH)
+            )]
+            val currentDayPostCount = currentDay ?: 0
+            if (currentDayPostCount > max) {
+                max = currentDayPostCount
+            }
+            currentMonthDays[startCalendar.get(Calendar.DAY_OF_MONTH)] = currentDayPostCount
+            count++
+            startCalendar.add(Calendar.DAY_OF_MONTH, 1)
+        }
+        result.add(Month(currentYear, currentMonth, currentMonthDays))
+        return PostingActivityModel(streak, result, max, count < nonNullData.count())
+    }
+
+    fun map(response: EmailsSummaryResponse, cacheMode: LimitMode, sortField: SortField) = PostsModel(
+        response.posts.let {
+            if (cacheMode is Top) {
+                return@let it.take(cacheMode.limit)
+            } else {
+                return@let it
+            }
+        }.map { post -> PostModel(post.id ?: 0, post.href ?: "", post.title ?: "", post.opens ?: 0, post.clicks ?: 0) }
+            .sortedByDescending {
+                when (sortField) {
+                    SortField.POST_ID -> it.id
+                    SortField.OPENS -> it.opens.toLong()
+                }
+            }
+    )
+
+    private fun toDay(timeStamp: Long): Day {
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = timeStamp * MILLIS
+        return Day(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH))
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMostPopularModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMostPopularModel.kt
new file mode 100644
index 00000000000..6b0922b6cd0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/InsightsMostPopularModel.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class InsightsMostPopularModel(
+    val siteId: Long,
+    val highestDayOfWeek: Int,
+    val highestHour: Int,
+    val highestDayPercent: Double,
+    val highestHourPercent: Double
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/LoadMode.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/LoadMode.kt
new file mode 100644
index 00000000000..c1474c33da0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/LoadMode.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model.stats
+
+sealed class LimitMode {
+    data class Top(val limit: Int) : LimitMode()
+    object All : LimitMode()
+}
+
+data class PagedMode(val pageSize: Int, val loadMore: Boolean = false)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsMapper.kt
new file mode 100644
index 00000000000..fcbf012c303
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsMapper.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.model.stats
+
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import javax.inject.Inject
+
+class PostDetailStatsMapper @Inject constructor() {
+    @Suppress("ComplexCondition")
+    fun map(postStatsResponse: PostStatsResponse): PostDetailStatsModel {
+        val daysViews = if (
+            postStatsResponse.fields != null &&
+            postStatsResponse.data != null &&
+            postStatsResponse.fields.size > 1 &&
+            postStatsResponse.fields[0] == "period" &&
+            postStatsResponse.fields[1] == "views"
+        ) {
+            postStatsResponse.data.map { list -> PostDetailStatsModel.Day(list[0], list[1].toInt()) }
+        } else {
+            listOf()
+        }
+        val weekViews = postStatsResponse.weeks.map { week ->
+            PostDetailStatsModel.Week(
+                week.days.map { day ->
+                    PostDetailStatsModel.Day(
+                        day.day,
+                        day.count ?: 0
+                    )
+                },
+                week.average ?: 0,
+                week.total ?: 0
+            )
+        }
+        val yearTotals = postStatsResponse.years.map { (year, model) ->
+            PostDetailStatsModel.Year(
+                year,
+                model.months.map { (month, value) -> PostDetailStatsModel.Month(month, value) },
+                model.total ?: 0
+            )
+        }
+        val yearAverages = postStatsResponse.averages.map { (year, model) ->
+            PostDetailStatsModel.Year(
+                year,
+                model.months.map { (month, value) -> PostDetailStatsModel.Month(month, value) },
+                model.overall ?: 0
+            )
+        }
+        return PostDetailStatsModel(postStatsResponse.views ?: 0, daysViews, weekViews, yearTotals, yearAverages)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsModel.kt
new file mode 100644
index 00000000000..05ce779805d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PostDetailStatsModel.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class PostDetailStatsModel(
+    val views: Int = 0,
+    val dayViews: List<Day>,
+    val weekViews: List<Week>,
+    val yearsTotal: List<Year>,
+    val yearsAverage: List<Year>
+) {
+    data class Year(val year: Int, val months: List<Month>, val value: Int)
+    data class Month(val month: Int, val count: Int)
+    data class Week(val days: List<Day>, val average: Int, val total: Int)
+    data class Day(val period: String, val count: Int)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PublicizeModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PublicizeModel.kt
new file mode 100644
index 00000000000..839cdf3feed
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/PublicizeModel.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class PublicizeModel(val services: List<Service>, val hasMore: Boolean) {
+    data class Service(val name: String, val followers: Int)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/SummaryModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/SummaryModel.kt
new file mode 100644
index 00000000000..08df7d9451b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/SummaryModel.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class SummaryModel(val likes: Int, val comments: Int, val followers: Int)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/TagsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/TagsModel.kt
new file mode 100644
index 00000000000..7e9710523ce
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/TagsModel.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class TagsModel(val tags: List<TagModel>, val hasMore: Boolean) {
+    class TagModel(val items: List<Item>, val views: Long) {
+        data class Item(val name: String, val type: String, val link: String)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/VisitsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/VisitsModel.kt
new file mode 100644
index 00000000000..73095ca619d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/VisitsModel.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class VisitsModel(
+    val period: String,
+    val views: Int,
+    val visitors: Int,
+    val likes: Int,
+    val reblogs: Int,
+    val comments: Int,
+    val posts: Int
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/YearsInsightsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/YearsInsightsModel.kt
new file mode 100644
index 00000000000..950d3789879
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/YearsInsightsModel.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model.stats
+
+data class YearsInsightsModel(val years: List<YearInsights>) {
+    data class YearInsights(
+        val avgComments: Double?,
+        val avgImages: Double?,
+        val avgLikes: Double?,
+        val avgWords: Double?,
+        val totalComments: Int,
+        val totalImages: Int,
+        val totalLikes: Int,
+        val totalPosts: Int,
+        val totalWords: Int,
+        val year: String
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/insights/PostingActivityModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/insights/PostingActivityModel.kt
new file mode 100644
index 00000000000..74b132324e1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/insights/PostingActivityModel.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.model.stats.insights
+
+import java.util.Date
+
+data class PostingActivityModel(val streak: StreakModel, val months: List<Month>, val max: Int, val hasMore: Boolean) {
+    data class StreakModel(
+        val currentStreakStart: Date?,
+        val currentStreakEnd: Date?,
+        val currentStreakLength: Int?,
+        val longestStreakStart: Date?,
+        val longestStreakEnd: Date?,
+        val longestStreakLength: Int?
+    )
+
+    data class Month(val year: Int, val month: Int, val days: Map<Int, Int>)
+    data class Day(val year: Int, val month: Int, val day: Int)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/PostsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/PostsModel.kt
new file mode 100644
index 00000000000..fe4ee1167d3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/PostsModel.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.model.stats.subscribers
+
+data class PostsModel(val posts: List<PostModel>) {
+    data class PostModel(val id: Long, val href: String, val title: String, val opens: Int, val clicks: Int)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersMapper.kt
new file mode 100644
index 00000000000..3b311a6e356
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersMapper.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.model.stats.subscribers
+
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+
+class SubscribersMapper @Inject constructor() {
+    fun map(response: SubscribersRestClient.SubscribersResponse, cacheMode: LimitMode): SubscribersModel {
+        val periodIndex = response.fields?.indexOf("period")
+        val subscribersIndex = response.fields?.indexOf("subscribers")
+        val dataPerPeriod = response.data?.mapNotNull { periodData ->
+            periodData?.let {
+                val period = periodIndex?.let { periodData[it] as String }
+                if (!period.isNullOrBlank()) {
+                    val subscribers = subscribersIndex?.let { periodData[it] as? Double } ?: 0
+                    SubscribersModel.PeriodData(period, subscribers.toLong())
+                } else {
+                    null
+                }
+            }
+        }?.let {
+            if (cacheMode is LimitMode.Top) {
+                it.take(cacheMode.limit)
+            } else {
+                it
+            }
+        }
+        if (response.data == null || response.date == null || dataPerPeriod == null) {
+            AppLog.e(AppLog.T.STATS, "SubscribersResponse: data, date & dataPerPeriod fields should never be null")
+        }
+        return SubscribersModel(response.date ?: "", dataPerPeriod ?: listOf())
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersModel.kt
new file mode 100644
index 00000000000..3ff03fd1bbb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/subscribers/SubscribersModel.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.model.stats.subscribers
+
+data class SubscribersModel(val period: String, val dates: List<PeriodData>) {
+    data class PeriodData(val period: String, val subscribers: Long)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/AuthorsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/AuthorsModel.kt
new file mode 100644
index 00000000000..f483d62afa6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/AuthorsModel.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class AuthorsModel(val otherViews: Int, val authors: List<Author>, val hasMore: Boolean) {
+    data class Author(
+        val name: String,
+        val views: Int,
+        val avatarUrl: String?,
+        val posts: List<Post>
+    )
+    data class Post(val id: String, val title: String, val views: Int, val url: String?)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ClicksModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ClicksModel.kt
new file mode 100644
index 00000000000..3b8141e6352
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ClicksModel.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class ClicksModel(val otherClicks: Int, val totalClicks: Int, val groups: List<Group>, val hasMore: Boolean) {
+    data class Group(
+        val groupId: String?,
+        val name: String?,
+        val icon: String?,
+        val url: String?,
+        val views: Int?,
+        val clicks: List<Click>
+    )
+    data class Click(val name: String, val views: Int, val icon: String?, val url: String?)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/CountryViewsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/CountryViewsModel.kt
new file mode 100644
index 00000000000..da1b9527a17
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/CountryViewsModel.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class CountryViewsModel(
+    val otherViews: Int,
+    val totalViews: Int,
+    val countries: List<Country>,
+    val hasMore: Boolean
+) {
+    data class Country(
+        val countryCode: String,
+        val fullName: String,
+        val views: Int,
+        val flagIconUrl: String?,
+        val flatFlagIconUrl: String?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/FileDownloadsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/FileDownloadsModel.kt
new file mode 100644
index 00000000000..a9dd0754edc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/FileDownloadsModel.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class FileDownloadsModel(val fileDownloads: List<FileDownloads>, val hasMore: Boolean) {
+    data class FileDownloads(
+        val filename: String,
+        val downloads: Int
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/PostAndPageViewsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/PostAndPageViewsModel.kt
new file mode 100644
index 00000000000..75fcb220434
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/PostAndPageViewsModel.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class PostAndPageViewsModel(val views: List<ViewsModel>, val hasMore: Boolean) {
+    data class ViewsModel(
+        val id: Long,
+        val title: String,
+        val views: Int,
+        val type: ViewsType,
+        val url: String
+    )
+
+    enum class ViewsType {
+        POST,
+        PAGE,
+        HOMEPAGE,
+        OTHER,
+        ATTACHMENT
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ReferrersModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ReferrersModel.kt
new file mode 100644
index 00000000000..9c307dd5957
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/ReferrersModel.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class ReferrersModel(val otherViews: Int, val totalViews: Int, val groups: List<Group>, val hasMore: Boolean) {
+    data class Group(
+        val groupId: String?,
+        val name: String?,
+        val icon: String?,
+        val url: String?,
+        val total: Int?,
+        val referrers: List<Referrer>,
+        val markedAsSpam: Boolean = false
+    )
+    data class Referrer(
+        val name: String,
+        val views: Int,
+        val icon: String?,
+        val url: String?,
+        val markedAsSpam: Boolean = false
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/SearchTermsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/SearchTermsModel.kt
new file mode 100644
index 00000000000..11a05f61f01
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/SearchTermsModel.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class SearchTermsModel(
+    val otherSearchTerms: Int,
+    val totalSearchTerms: Int,
+    val unknownSearchCount: Int,
+    val searchTerms: List<SearchTerm>,
+    val hasMore: Boolean
+) {
+    data class SearchTerm(val text: String, val views: Int)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/TimeStatsMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/TimeStatsMapper.kt
new file mode 100644
index 00000000000..d28d7fd0aa9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/TimeStatsMapper.kt
@@ -0,0 +1,306 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+import com.google.gson.Gson
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.AuthorsModel.Post
+import org.wordpress.android.fluxc.model.stats.time.ClicksModel.Click
+import org.wordpress.android.fluxc.model.stats.time.FileDownloadsModel.FileDownloads
+import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsModel
+import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType
+import org.wordpress.android.fluxc.model.stats.time.ReferrersModel.Referrer
+import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel.PeriodData
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+
+class TimeStatsMapper @Inject constructor(val gson: Gson) {
+    @Suppress("ComplexMethod")
+    fun map(response: PostAndPageViewsResponse, cacheMode: LimitMode): PostAndPageViewsModel {
+        val postViews = response.days.entries.firstOrNull()?.value?.postViews ?: listOf()
+        val stats = postViews.let {
+            if (cacheMode is LimitMode.Top) {
+                return@let it.take(cacheMode.limit)
+            } else {
+                return@let it
+            }
+        }.map { item ->
+            val type = when (item.type) {
+                "post" -> ViewsType.POST
+                "page" -> ViewsType.PAGE
+                "homepage" -> ViewsType.HOMEPAGE
+                "attachment" -> ViewsType.ATTACHMENT
+                else -> ViewsType.OTHER
+            }
+            type.let {
+                if (item.id == null || item.title == null || item.href == null) {
+                    AppLog.e(STATS, "PostAndPageViewsResponse.type: Non-nullable fields are null - $item")
+                }
+                ViewsModel(item.id ?: 0, item.title ?: "", item.views ?: 0, type, item.href ?: "")
+            }
+        }
+        return PostAndPageViewsModel(stats, cacheMode is LimitMode.Top && postViews.size > cacheMode.limit)
+    }
+
+    fun map(response: ReferrersResponse, cacheMode: LimitMode): ReferrersModel {
+        val groups =
+                response.referrerGroups.let {
+                    if (cacheMode is LimitMode.Top) {
+                        it.take(cacheMode.limit)
+                    } else {
+                        it
+                    }
+                }.map { group ->
+                    val children = group.referrers?.mapNotNull { result ->
+                        if (result.name != null && result.views != null) {
+                            val firstChildUrl = result.children?.firstOrNull()?.url
+                            Referrer(
+                                    result.name,
+                                    result.views,
+                                    result.icon,
+                                    firstChildUrl ?: result.url,
+                                    result.markedAsSpam
+                            )
+                        } else {
+                            AppLog.e(STATS, "ReferrersResponse: Missing fields on a referrer")
+                            null
+                        }
+                    }
+                    ReferrersModel.Group(
+                            group.group,
+                            group.name,
+                            group.icon,
+                            group.url,
+                            group.total,
+                            children ?: listOf(),
+                            group.markedAsSpam
+                    )
+                }
+        val hasMore = response.referrerGroups.size > groups.size
+        return ReferrersModel(response.otherViews ?: 0, response.totalViews ?: 0, groups, hasMore)
+    }
+
+    fun map(response: ClicksResponse, cacheMode: LimitMode): ClicksModel {
+        val first = response.groups.values.firstOrNull()
+        val groups = first?.let {
+            first.clicks.let {
+                if (cacheMode is LimitMode.Top) {
+                    it.take(cacheMode.limit)
+                } else {
+                    it
+                }
+            }.map { group ->
+                val children = group.clicks?.mapNotNull { result ->
+                    if (result.name != null && result.views != null) {
+                        Click(result.name, result.views, result.icon, result.url)
+                    } else {
+                        AppLog.e(STATS, "ClicksResponse.type: Missing fields on a Click object")
+                        null
+                    }
+                }
+                ClicksModel.Group(group.groupId, group.name, group.icon, group.url, group.views, children ?: listOf())
+            }
+        }
+        val hasMore = if (first != null && groups != null) first.clicks.size > groups.size else false
+        return ClicksModel(
+                first?.otherClicks ?: 0,
+                first?.totalClicks ?: 0,
+                groups ?: listOf(),
+                hasMore
+        )
+    }
+
+    fun map(response: VisitsAndViewsResponse, cacheMode: LimitMode): VisitsAndViewsModel {
+        val periodIndex = response.fields?.indexOf("period")
+        val viewsIndex = response.fields?.indexOf("views")
+        val visitorsIndex = response.fields?.indexOf("visitors")
+        val likesIndex = response.fields?.indexOf("likes")
+        val reblogsIndex = response.fields?.indexOf("reblogs")
+        val commentsIndex = response.fields?.indexOf("comments")
+        val postsIndex = response.fields?.indexOf("posts")
+        val dataPerPeriod = response.data?.mapNotNull { periodData ->
+            periodData?.let {
+                val period = periodIndex?.let { periodData[it] }
+                if (period != null && period.isNotBlank()) {
+                    PeriodData(
+                            period,
+                            periodData.getLongOrZero(viewsIndex),
+                            periodData.getLongOrZero(visitorsIndex),
+                            periodData.getLongOrZero(likesIndex),
+                            periodData.getLongOrZero(reblogsIndex),
+                            periodData.getLongOrZero(commentsIndex),
+                            periodData.getLongOrZero(postsIndex)
+                    )
+                } else {
+                    null
+                }
+            }
+        }?.let {
+            if (cacheMode is LimitMode.Top) {
+                it.take(cacheMode.limit)
+            } else {
+                it
+            }
+        }
+        if (response.data == null || response.date == null || dataPerPeriod == null) {
+            AppLog.e(STATS, "VisitsAndViewsResponse: data, date & dataPerPeriod fields should never be null")
+        }
+        return VisitsAndViewsModel(response.date ?: "", dataPerPeriod ?: listOf())
+    }
+
+    private fun List<String?>.getLongOrZero(itemIndex: Int?): Long {
+        return itemIndex?.let {
+            val stringValue = this[it]
+            stringValue?.toLong()
+        } ?: 0
+    }
+
+    fun map(response: CountryViewsResponse, cacheMode: LimitMode): CountryViewsModel {
+        val first = response.days.values.firstOrNull()
+        val countriesInfo = response.countryInfo
+        val groups = first?.let {
+            first.views.let {
+                if (cacheMode is LimitMode.Top) {
+                    it.take(cacheMode.limit)
+                } else {
+                    it
+                }
+            }.mapNotNull { countryViews ->
+                val countryInfo = countriesInfo[countryViews.countryCode]
+                if (countryViews.countryCode != null && countryInfo != null && countryInfo.countryFull != null) {
+                    CountryViewsModel.Country(
+                            countryViews.countryCode,
+                            countryInfo.countryFull,
+                            countryViews.views ?: 0,
+                            countryInfo.flagIcon,
+                            countryInfo.flatFlagIcon
+                    )
+                } else {
+                    AppLog.e(STATS, "CountryViewsResponse: Missing fields on a CountryViews object")
+                    null
+                }
+            }
+        }
+        val hasMore = if (first != null && groups != null) first.views.size > groups.size else false
+        return CountryViewsModel(
+                first?.otherViews ?: 0,
+                first?.totalViews ?: 0,
+                groups ?: listOf(),
+                hasMore
+        )
+    }
+
+    @Suppress("ComplexMethod")
+    fun map(response: AuthorsResponse, cacheMode: LimitMode): AuthorsModel {
+        val first = response.groups.values.firstOrNull()
+        val authors = first?.let {
+            first.authors.let {
+                if (cacheMode is LimitMode.Top) {
+                    it.take(cacheMode.limit)
+                } else {
+                    it
+                }
+            }.map { author ->
+                val posts = author.mappedPosts?.mapNotNull { result ->
+                    if (result.postId != null && result.title != null) {
+                        Post(result.postId, result.title, result.views ?: 0, result.url)
+                    } else {
+                        AppLog.e(STATS, "AuthorsResponse: Missing fields on a post")
+                        null
+                    }
+                }
+                if (author.name == null || author.views == null || author.avatarUrl == null) {
+                    AppLog.e(STATS, "AuthorsResponse: Missing fields on an author")
+                }
+                AuthorsModel.Author(
+                        StringEscapeUtils.unescapeHtml4(author.name) ?: "",
+                        author.views ?: 0, author.avatarUrl, posts ?: listOf()
+                )
+            }
+        }
+        val hasMore = if (first != null && authors != null) first.authors.size > authors.size else false
+        return AuthorsModel(first?.otherViews ?: 0, authors ?: listOf(), hasMore)
+    }
+
+    fun map(response: SearchTermsResponse, cacheMode: LimitMode): SearchTermsModel {
+        val first = response.days.values.firstOrNull()
+        val groups = first?.let {
+            first.searchTerms.let {
+                if (cacheMode is LimitMode.Top) {
+                    it.take(cacheMode.limit)
+                } else {
+                    it
+                }
+            }.mapNotNull { searchTerm ->
+                if (searchTerm.term != null) {
+                    SearchTermsModel.SearchTerm(searchTerm.term, searchTerm.views ?: 0)
+                } else {
+                    AppLog.e(STATS, "SearchTermsResponse: Missing term field on a Search terms object")
+                    null
+                }
+            }
+        }
+        val hasMore = if (first != null && groups != null) first.searchTerms.size > groups.size else false
+        return SearchTermsModel(
+                first?.otherSearchTerms ?: 0,
+                first?.totalSearchTimes ?: 0,
+                first?.encryptedSearchTerms ?: 0,
+                groups ?: listOf(),
+                hasMore
+        )
+    }
+
+    fun map(response: VideoPlaysResponse, cacheMode: LimitMode): VideoPlaysModel {
+        val first = response.days.values.firstOrNull()
+        val groups = first?.let {
+            first.plays.let {
+                if (cacheMode is LimitMode.Top) {
+                    it.take(cacheMode.limit)
+                } else {
+                    it
+                }
+            }.mapNotNull { result ->
+                if (result.postId != null && result.title != null) {
+                    VideoPlaysModel.VideoPlays(result.postId, result.title, result.url, result.plays ?: 0)
+                } else {
+                    AppLog.e(STATS, "VideoPlaysResponse: Missing fields on a Video plays object")
+                    null
+                }
+            }
+        }
+        val hasMore = if (first != null && groups != null) first.plays.size > groups.size else false
+        return VideoPlaysModel(
+                first?.otherPlays ?: 0,
+                first?.totalPlays ?: 0,
+                groups ?: listOf(),
+                hasMore
+        )
+    }
+
+    fun map(response: FileDownloadsResponse, cacheMode: LimitMode): FileDownloadsModel {
+        val first = response.groups.values.firstOrNull()
+        val downloads = first?.files?.let {
+            if (cacheMode is LimitMode.Top) {
+                it.take(cacheMode.limit)
+            } else {
+                it
+            }
+        }?.mapNotNull {
+            if (it.filename != null) {
+                FileDownloads(it.filename, it.downloads ?: 0)
+            } else {
+                null
+            }
+        } ?: listOf()
+        return FileDownloadsModel(downloads, downloads.size < first?.files?.size ?: 0)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VideoPlaysModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VideoPlaysModel.kt
new file mode 100644
index 00000000000..d5a122f24f2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VideoPlaysModel.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class VideoPlaysModel(
+    val otherPlays: Int,
+    val totalPlays: Int,
+    val plays: List<VideoPlays>,
+    val hasMore: Boolean
+) {
+    data class VideoPlays(
+        val postId: String,
+        val title: String,
+        val url: String?,
+        val plays: Int
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VisitsAndViewsModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VisitsAndViewsModel.kt
new file mode 100644
index 00000000000..d93ae4a4a71
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/stats/time/VisitsAndViewsModel.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.model.stats.time
+
+data class VisitsAndViewsModel(val period: String, val dates: List<PeriodData>) {
+    data class PeriodData(
+        val period: String,
+        val views: Long,
+        val visitors: Long,
+        val likes: Long,
+        val reblogs: Long,
+        val comments: Long,
+        val posts: Long
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/vertical/VerticalSegmentModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/vertical/VerticalSegmentModel.kt
new file mode 100644
index 00000000000..27cde6c991d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/vertical/VerticalSegmentModel.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.model.vertical
+
+import com.google.gson.annotations.SerializedName
+
+data class VerticalSegmentModel(
+    @SerializedName("segment_type_title") val title: String,
+    @SerializedName("segment_type_subtitle") val subtitle: String,
+    @SerializedName("icon_URL") val iconUrl: String,
+    @SerializedName("icon_color") val iconColor: String,
+    @SerializedName("id") val segmentId: Long,
+    @SerializedName("mobile") val isMobileSegment: Boolean
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/whatsnew/WhatsNewAnnouncementModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/whatsnew/WhatsNewAnnouncementModel.kt
new file mode 100644
index 00000000000..b22274bb194
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/whatsnew/WhatsNewAnnouncementModel.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.model.whatsnew
+
+import android.annotation.SuppressLint
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+data class WhatsNewAnnouncementModel(
+    val appVersionName: String,
+    val announcementVersion: Int,
+    val minimumAppVersion: String,
+    val maximumAppVersion: String,
+    val appVersionTargets: List<String>,
+    val detailsUrl: String?,
+    val isLocalized: Boolean,
+    val responseLocale: String,
+    val features: List<WhatsNewAnnouncementFeature>
+) : Parcelable {
+    @Parcelize
+    @SuppressLint("ParcelCreator")
+    data class WhatsNewAnnouncementFeature(
+        val title: String?,
+        val subtitle: String?,
+        val iconBase64: String?,
+        val iconUrl: String?
+    ) : Parcelable
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/AppContextModule.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/AppContextModule.java
new file mode 100644
index 00000000000..cda861f4d27
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/AppContextModule.java
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.module;
+
+import android.content.Context;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class AppContextModule {
+    private final Context mAppContext;
+
+    public AppContextModule(Context appContext) {
+        mAppContext = appContext;
+    }
+
+    @Singleton
+    @Provides
+    Context providesContext() {
+        return mAppContext;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsClientId.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsClientId.kt
new file mode 100644
index 00000000000..c1ac54e31ab
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsClientId.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.module
+
+import javax.inject.Qualifier
+import kotlin.annotation.AnnotationRetention.RUNTIME
+
+/**
+ * Defines the name to use for naming the WordPress "application passwords" that the app
+ * will create.
+ */
+@Qualifier
+@MustBeDocumented
+@Retention(RUNTIME)
+annotation class ApplicationPasswordsClientId
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsModule.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsModule.kt
new file mode 100644
index 00000000000..31137c3b456
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ApplicationPasswordsModule.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.module
+
+import dagger.BindsOptionalOf
+import dagger.Module
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsListener
+
+@Module
+interface ApplicationPasswordsModule {
+    @BindsOptionalOf
+    fun bindOptionalApplicationPasswordsListener(): ApplicationPasswordsListener
+    @BindsOptionalOf
+    @ApplicationPasswordsClientId
+    fun bindOptionalApplicationPasswordsClientId(): String
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/DatabaseModule.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/DatabaseModule.kt
new file mode 100644
index 00000000000..4a6181a0428
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/DatabaseModule.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.module
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao
+import org.wordpress.android.fluxc.persistence.PlanOffersDao
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao
+import org.wordpress.android.fluxc.persistence.WPAndroidDatabase
+import org.wordpress.android.fluxc.persistence.WPAndroidDatabase.Companion.buildDb
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDao
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao
+import org.wordpress.android.fluxc.persistence.domains.DomainDao
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao
+import javax.inject.Singleton
+
+@Module
+class DatabaseModule {
+    @Singleton
+    @Provides
+    fun provideDatabase(context: Context): WPAndroidDatabase {
+        return buildDb(context)
+    }
+
+    @Singleton
+    @Provides
+    fun provideBloggingRemindersDao(wpAndroidDatabase: WPAndroidDatabase): BloggingRemindersDao {
+        return wpAndroidDatabase.bloggingRemindersDao()
+    }
+
+    @Singleton
+    @Provides
+    fun providePlanOffersDao(wpAndroidDatabase: WPAndroidDatabase): PlanOffersDao {
+        return wpAndroidDatabase.planOffersDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideCommentsDao(wpAndroidDatabase: WPAndroidDatabase): CommentsDao {
+        return wpAndroidDatabase.commentsDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideDashboardCardsDao(wpAndroidDatabase: WPAndroidDatabase): CardsDao {
+        return wpAndroidDatabase.dashboardCardsDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideBloggingPromptsDao(wpAndroidDatabase: WPAndroidDatabase): BloggingPromptsDao {
+        return wpAndroidDatabase.bloggingPromptsDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideFeatureFlagConfigDao(wpAndroidDatabase: WPAndroidDatabase): FeatureFlagConfigDao {
+        return wpAndroidDatabase.featureFlagConfigDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideRemoteConfigDao(wpAndroidDatabase: WPAndroidDatabase): RemoteConfigDao {
+        return wpAndroidDatabase.remoteConfigDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideDomainsDao(wpAndroidDatabase: WPAndroidDatabase): DomainDao {
+        return wpAndroidDatabase.domainDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideJetpackConnectedSitesDao(
+        wpAndroidDatabase: WPAndroidDatabase
+    ): JetpackCPConnectedSitesDao {
+        return wpAndroidDatabase.jetpackCPConnectedSitesDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideBlazeCampaignsDao(wpAndroidDatabase: WPAndroidDatabase): BlazeCampaignsDao {
+        return wpAndroidDatabase.blazeCampaignsDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideBlazeTargetingDao(wpAndroidDatabase: WPAndroidDatabase): BlazeTargetingDao {
+        return wpAndroidDatabase.blazeTargetingDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideBlazeObjectivesDao(wpAndroidDatabase: WPAndroidDatabase): BlazeObjectivesDao {
+        return wpAndroidDatabase.blazeObjectivesDao()
+    }
+
+    @Singleton
+    @Provides
+    fun provideJetpackSocialDao(wpAndroidDatabase: WPAndroidDatabase): JetpackSocialDao {
+        return wpAndroidDatabase.jetpackSocialDao()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/OkHttpClientModule.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/OkHttpClientModule.java
new file mode 100644
index 00000000000..7f3ee1e3171
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/OkHttpClientModule.java
@@ -0,0 +1,106 @@
+package org.wordpress.android.fluxc.module;
+
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.CustomRedirectInterceptor;
+import org.wordpress.android.fluxc.network.MemorizingTrustManager;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.Multibinds;
+import okhttp3.CookieJar;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.internal.tls.OkHostnameVerifier;
+
+@Module
+public abstract class OkHttpClientModule {
+    @Singleton
+    @Provides
+    @Named("no-cookies")
+    public static OkHttpClient provideNoCookiesOkHttpClientBuilder(
+            @Named("regular") final OkHttpClient okHttpRegularClient) {
+        return okHttpRegularClient.newBuilder()
+                                  .cookieJar(CookieJar.NO_COOKIES)
+                                  .build();
+    }
+
+    @Provides
+    @Named("no-redirects")
+    public static OkHttpClient provideNoRedirectsOkHttpClientBuilder(
+            @Named("custom-ssl") final OkHttpClient okHttpRegularClient) {
+        return okHttpRegularClient.newBuilder()
+                                  .followRedirects(false)
+                                  .build();
+    }
+
+    @Provides
+    @Named("custom-ssl-custom-redirects")
+    public static OkHttpClient provideCustomRedirectsOkHttpClientBuilder(
+            @Named("custom-ssl") final OkHttpClient okHttpRegularClient) {
+        OkHttpClient.Builder builder = okHttpRegularClient.newBuilder().followRedirects(false);
+        CustomRedirectInterceptor customRedirectInterceptor = new CustomRedirectInterceptor();
+        builder.addInterceptor(customRedirectInterceptor);
+        return builder.build();
+    }
+
+    @Singleton
+    @Provides
+    @Named("custom-ssl")
+    public static OkHttpClient provideMediaOkHttpClientInstanceCustomSSL(
+            @Named("regular") final OkHttpClient okHttpClient,
+            final MemorizingTrustManager memorizingTrustManager) {
+        final OkHttpClient.Builder builder = okHttpClient.newBuilder();
+        try {
+            final SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, new TrustManager[]{memorizingTrustManager}, new SecureRandom());
+            final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+            builder.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(OkHostnameVerifier.INSTANCE));
+            builder.sslSocketFactory(sslSocketFactory, memorizingTrustManager);
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            AppLog.e(T.API, e);
+        }
+        return builder.build();
+    }
+
+    @Multibinds abstract @Named("interceptors") Set<Interceptor> interceptorSet();
+
+    @Multibinds abstract @Named("network-interceptors") Set<Interceptor> networkInterceptorSet();
+
+    @Singleton
+    @Provides
+    @Named("regular")
+    public static OkHttpClient provideMediaOkHttpClientInstance(
+            final CookieJar cookieJar,
+            @Named("interceptors") Set<Interceptor> interceptors,
+            @Named("network-interceptors") Set<Interceptor> networkInterceptors) {
+        final OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+        for (Interceptor interceptor : interceptors) {
+            builder.addInterceptor(interceptor);
+        }
+
+        for (Interceptor networkInterceptor : networkInterceptors) {
+            builder.addNetworkInterceptor(networkInterceptor);
+        }
+
+        return builder.cookieJar(cookieJar)
+                      .connectTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+                      .readTimeout(BaseRequest.UPLOAD_REQUEST_READ_TIMEOUT, TimeUnit.MILLISECONDS)
+                      .writeTimeout(BaseRequest.DEFAULT_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+                      .build();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseNetworkModule.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseNetworkModule.java
new file mode 100644
index 00000000000..111a69b5ba7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseNetworkModule.java
@@ -0,0 +1,139 @@
+package org.wordpress.android.fluxc.module;
+
+import android.content.Context;
+
+import com.android.volley.Network;
+import com.android.volley.RequestQueue;
+import com.android.volley.toolbox.BasicNetwork;
+import com.android.volley.toolbox.DiskBasedCache;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import org.wordpress.android.fluxc.network.MemorizingTrustManager;
+import org.wordpress.android.fluxc.network.OkHttpStack;
+import org.wordpress.android.fluxc.network.OpenJdkCookieManager;
+import org.wordpress.android.fluxc.network.RetryOnRedirectBasicNetwork;
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrEmptyArray;
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrEmptyArrayDeserializer;
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalse;
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalseDeserializer;
+
+import java.io.File;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import kotlin.coroutines.CoroutineContext;
+import kotlinx.coroutines.Dispatchers;
+import okhttp3.CookieJar;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+
+@Module(includes = ApplicationPasswordsModule.class)
+public class ReleaseNetworkModule {
+    private static final String DEFAULT_CACHE_DIR = "volley-fluxc";
+    private static final int NETWORK_THREAD_POOL_SIZE = 10;
+
+    private RequestQueue newRetryOnRedirectRequestQueue(OkHttpClient okHttpClient, Context appContext) {
+        Network network = new RetryOnRedirectBasicNetwork(new OkHttpStack(okHttpClient));
+        return createRequestQueue(network, appContext);
+    }
+
+    private RequestQueue newRequestQueue(OkHttpClient okHttpClient, Context appContext) {
+        Network network = new BasicNetwork(new OkHttpStack(okHttpClient));
+        return createRequestQueue(network, appContext);
+    }
+
+    private RequestQueue createRequestQueue(Network network, Context appContext) {
+        File cacheDir = new File(appContext.getCacheDir(), DEFAULT_CACHE_DIR);
+        RequestQueue queue = new RequestQueue(new DiskBasedCache(cacheDir), network, NETWORK_THREAD_POOL_SIZE);
+        queue.start();
+        return queue;
+    }
+
+    @Singleton
+    @Named("regular")
+    @Provides
+    public RequestQueue provideRequestQueue(@Named("regular") OkHttpClient okHttpClient,
+                                            Context appContext) {
+        return newRequestQueue(okHttpClient, appContext);
+    }
+
+    @Singleton
+    @Named("no-redirects")
+    @Provides
+    public RequestQueue provideNoRedirectsRequestQueue(@Named("no-redirects") OkHttpClient okHttpClient,
+                                                       Context appContext) {
+        return newRetryOnRedirectRequestQueue(okHttpClient, appContext);
+    }
+
+    @Singleton
+    @Named("custom-ssl")
+    @Provides
+    public RequestQueue provideRequestQueueCustomSSL(@Named("custom-ssl") OkHttpClient okHttpClient,
+                                                     Context appContext) {
+        return newRequestQueue(okHttpClient, appContext);
+    }
+
+    @Singleton
+    @Named("custom-ssl-custom-redirects")
+    @Provides
+    public RequestQueue provideRequestQueueCustomSSLWithRedirects(
+            @Named("custom-ssl-custom-redirects") OkHttpClient okHttpClient,
+            Context appContext) {
+        return newRequestQueue(okHttpClient, appContext);
+    }
+
+    @Singleton
+    @Named("no-cookies")
+    @Provides
+    public RequestQueue provideRequestQueueNoCookies(@Named("no-cookies") OkHttpClient okHttpClient,
+                                                     Context appContext) {
+        return newRequestQueue(okHttpClient, appContext);
+    }
+
+    @Singleton
+    @Provides
+    public MemorizingTrustManager provideMemorizingTrustManager() {
+        return new MemorizingTrustManager();
+    }
+
+    /**
+     * This sets a {@link CookieManager} as the system-wide {@link CookieHandler} and exposes it to the Dagger graph,
+     * allowing it to be shared with {@link OkHttpClient} via its {@link CookieJar}.
+     */
+    @Provides
+    @Singleton
+    public CookieManager provideCookieManager() {
+        CookieManager cookieManager = new OpenJdkCookieManager();
+        CookieHandler.setDefault(cookieManager);
+        return cookieManager;
+    }
+
+    @Provides
+    @Singleton
+    public CookieJar provideCookieJar(CookieManager cookieManager) {
+        return new JavaNetCookieJar(cookieManager);
+    }
+
+    @Singleton
+    @Provides
+    public CoroutineContext provideCoroutineContext() {
+        return Dispatchers.getDefault();
+    }
+
+    @Singleton
+    @Provides
+    public Gson provideGson() {
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        gsonBuilder.setLenient();
+        gsonBuilder.registerTypeHierarchyAdapter(JsonObjectOrFalse.class, new JsonObjectOrFalseDeserializer());
+        gsonBuilder.registerTypeHierarchyAdapter(JsonObjectOrEmptyArray.class,
+                new JsonObjectOrEmptyArrayDeserializer());
+        return gsonBuilder.create();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseToolsModule.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseToolsModule.java
new file mode 100644
index 00000000000..c1e2787698d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseToolsModule.java
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.module;
+
+import java.util.Locale;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class ReleaseToolsModule {
+    @Singleton
+    @Provides
+    public Locale provideLocale() {
+        return Locale.getDefault();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/AcceptHeaderStrategy.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/AcceptHeaderStrategy.kt
new file mode 100644
index 00000000000..6ca37058484
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/AcceptHeaderStrategy.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network
+
+import javax.inject.Inject
+
+sealed class AcceptHeaderStrategy(val header: String = ACCEPT_HEADER, open val value: String) {
+    class JsonAcceptHeader @Inject constructor() : AcceptHeaderStrategy(value = APPLICATION_JSON_VALUE)
+
+    companion object {
+        private const val ACCEPT_HEADER = "Accept"
+        private const val APPLICATION_JSON_VALUE = "application/json"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java
new file mode 100644
index 00000000000..e7847dd1223
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java
@@ -0,0 +1,407 @@
+package org.wordpress.android.fluxc.network;
+
+import android.net.Uri;
+import android.net.Uri.Builder;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.Cache;
+import com.android.volley.DefaultRetryPolicy;
+import com.android.volley.NetworkError;
+import com.android.volley.NetworkResponse;
+import com.android.volley.NoConnectionError;
+import com.android.volley.ParseError;
+import com.android.volley.Request;
+import com.android.volley.TimeoutError;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.HttpHeaderParser;
+
+import org.wordpress.android.fluxc.FluxCError;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError;
+import org.wordpress.android.util.AppLog;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import static org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType.METHOD_NOT_ALLOWED;
+import static org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType.NOT_SET;
+
+public abstract class BaseRequest<T> extends Request<T> {
+    public static final int DEFAULT_REQUEST_TIMEOUT = 30000;
+    public static final int DEFAULT_MAX_RETRIES = DefaultRetryPolicy.DEFAULT_MAX_RETRIES;
+    public static final int UPLOAD_REQUEST_READ_TIMEOUT = 60000;
+
+    // Only used when enabledCaching is called - caching is off by default for all requests
+    public static final int DEFAULT_CACHE_LIFETIME = 10 * 60 * 1000;
+
+    public Uri mUri;
+
+    public interface OnAuthFailedListener {
+        void onAuthFailed(AuthenticateErrorPayload errorType);
+    }
+
+    public interface BaseErrorListener {
+        void onErrorResponse(@NonNull BaseNetworkError error);
+    }
+
+    public interface OnParseErrorListener {
+        void onParseError(OnUnexpectedError event);
+    }
+
+    private static final String USER_AGENT_HEADER = "User-Agent";
+
+    protected OnAuthFailedListener mOnAuthFailedListener;
+    protected OnParseErrorListener mOnParseErrorListener;
+    protected final Map<String, String> mHeaders = new HashMap<>(2);
+    private BaseErrorListener mErrorListener;
+
+    private boolean mResetCache;
+    private int mCacheTtl;
+    private int mCacheSoftTtl;
+
+    public static class BaseNetworkError implements FluxCError {
+        public GenericErrorType type;
+        public String message;
+        public VolleyError volleyError;
+        public XmlRpcErrorType xmlRpcErrorType = NOT_SET;
+
+        public BaseNetworkError(@NonNull BaseNetworkError error) {
+            this.message = error.message;
+            this.type = error.type;
+            this.volleyError = error.volleyError;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error, @NonNull String message,
+                                @NonNull VolleyError volleyError) {
+            this.message = message;
+            this.type = error;
+            this.volleyError = volleyError;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error, @NonNull VolleyError volleyError) {
+            this.message = "";
+            this.type = error;
+            this.volleyError = volleyError;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error,
+                                @NonNull VolleyError volleyError,
+                                @NonNull XmlRpcErrorType xmlRpcErrorType) {
+            this.message = "";
+            this.type = error;
+            this.volleyError = volleyError;
+            this.xmlRpcErrorType = xmlRpcErrorType;
+        }
+
+        public BaseNetworkError(@NonNull VolleyError volleyError) {
+            this.type = GenericErrorType.UNKNOWN;
+            this.message = "";
+            this.volleyError = volleyError;
+        }
+
+        public BaseNetworkError(@NonNull VolleyError volleyError, @NonNull XmlRpcErrorType xmlRpcErrorType) {
+            this.type = GenericErrorType.UNKNOWN;
+            this.message = "";
+            this.volleyError = volleyError;
+            this.xmlRpcErrorType = xmlRpcErrorType;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error) {
+            this.type = error;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error, @NonNull String message) {
+            this.type = error;
+            this.message = message;
+        }
+
+        public BaseNetworkError(@NonNull GenericErrorType error, @NonNull XmlRpcErrorType xmlRpcErrorType) {
+            this.type = error;
+            this.xmlRpcErrorType = xmlRpcErrorType;
+        }
+
+        public boolean isGeneric() {
+            return type != null;
+        }
+
+        public boolean hasVolleyError() {
+            return volleyError != null;
+        }
+
+        public String getCombinedErrorMessage() {
+            if (volleyError == null) {
+                return message != null ? message : "";
+            }
+            String volleyErrorMessage = volleyError.getMessage();
+            if (volleyErrorMessage == null || volleyErrorMessage.isEmpty()) {
+                return message != null ? message : "";
+            } else {
+                if (message == null || message.isEmpty()) {
+                    return volleyErrorMessage;
+                } else {
+                    return message + " • " + volleyErrorMessage;
+                }
+            }
+        }
+    }
+
+    public enum GenericErrorType {
+        // Network Layer
+        TIMEOUT,
+        NO_CONNECTION,
+        NETWORK_ERROR,
+
+        // HTTP Layer
+        NOT_FOUND,
+        CENSORED,
+        SERVER_ERROR,
+        INVALID_SSL_CERTIFICATE,
+        HTTP_AUTH_ERROR,
+
+        // Web Application Layer
+        INVALID_RESPONSE,
+        AUTHORIZATION_REQUIRED,
+        NOT_AUTHENTICATED,
+        PARSE_ERROR,
+
+        // Other
+        UNKNOWN,
+    }
+
+    public BaseRequest(int method, @NonNull String url, BaseErrorListener errorListener) {
+        super(method, url, null);
+        if (url != null) {
+            mUri = Uri.parse(url);
+        } else {
+            mUri = Uri.EMPTY;
+        }
+        mErrorListener = errorListener;
+        // Make sure all our custom Requests are never cached.
+        setShouldCache(false);
+        setRetryPolicy(new DefaultRetryPolicy(DEFAULT_REQUEST_TIMEOUT,
+                DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
+    }
+
+    @Override
+    public String getUrl() {
+        return mUri.toString();
+    }
+
+    public void addQueryParameter(String key, String value) {
+        mUri = mUri.buildUpon().appendQueryParameter(key, value).build();
+    }
+
+    public void addQueryParameters(Map<String, String> parameters) {
+        if (parameters == null) {
+            return;
+        }
+        Builder builder = mUri.buildUpon();
+        for (String key : parameters.keySet()) {
+            builder.appendQueryParameter(key, parameters.get(key));
+        }
+        mUri = builder.build();
+    }
+
+    /**
+     * Enable caching for this request. The {@code timeToLive} param corresponds to the
+     * {@code ttl} field in {@link Cache}.
+     * <p>
+     * Disables soft expiry, which is when the cached result is returned, but a network request is also dispatched
+     * to update the cache.
+     *
+     * @param timeToLive the amount of time before the cache expires
+     */
+    public void enableCaching(int timeToLive) {
+        enableCaching(timeToLive, timeToLive);
+    }
+
+    /**
+     * Enable caching for this request. The {@code timeToLive} and {@code softTimeToLive} params correspond to the
+     * {@code ttl} and {@code softTtl} fields in {@link Cache}.
+     *
+     * @param timeToLive     the amount of time before the cache expires
+     * @param softTimeToLive the amount of time before the cache soft expires (the cached result is returned,
+     *                       but a network request is also dispatched to update the cache)
+     */
+    public void enableCaching(int timeToLive, int softTimeToLive) {
+        setShouldCache(true);
+        mCacheTtl = timeToLive;
+        mCacheSoftTtl = softTimeToLive;
+    }
+
+    /**
+     * Reset the cache for this request, to force an update over the network.
+     */
+    public void setShouldForceUpdate() {
+        mResetCache = true;
+    }
+
+    /**
+     * Returns true if this request should ignore the cache and force a fresh update over the network.
+     */
+    public boolean shouldForceUpdate() {
+        return mResetCache;
+    }
+
+    @Override
+    public Map<String, String> getHeaders() {
+        return mHeaders;
+    }
+
+    public void setHTTPAuthHeaderOnMatchingURL(HTTPAuthManager httpAuthManager) {
+        HTTPAuthModel httpAuthModel = httpAuthManager.getHTTPAuthModel(getUrl());
+        if (httpAuthModel != null) {
+            String creds = String.format("%s:%s", httpAuthModel.getUsername(), httpAuthModel.getPassword());
+            String auth = "Basic " + Base64.encodeToString(creds.getBytes(), Base64.NO_WRAP);
+            mHeaders.put("Authorization", auth);
+        }
+    }
+
+    public void setOnAuthFailedListener(OnAuthFailedListener onAuthFailedListener) {
+        mOnAuthFailedListener = onAuthFailedListener;
+    }
+
+    public void setOnParseErrorListener(OnParseErrorListener onParseErrorListener) {
+        mOnParseErrorListener = onParseErrorListener;
+    }
+
+    public void setUserAgent(String userAgent) {
+        mHeaders.put(USER_AGENT_HEADER, userAgent);
+    }
+
+    public void addHeader(String header, String value) {
+        mHeaders.put(header, value);
+    }
+
+    /**
+     * Convenience method for setting a {@link com.android.volley.RetryPolicy} with no retries.
+     */
+    public void disableRetries() {
+        setRetryPolicy(new DefaultRetryPolicy(DEFAULT_REQUEST_TIMEOUT, 0, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
+    }
+
+    /**
+     * Generate a cache entry for this request.
+     * <p>
+     * If caching has been enabled through {@link BaseRequest#enableCaching(int, int)}, the expiry parameters that were
+     * given are used to configure the cache entry.
+     * <p>
+     * Otherwise, just generate a cache entry from the response's cache headers (default behaviour).
+     */
+    protected Cache.Entry createCacheEntry(NetworkResponse response) {
+        Cache.Entry cacheEntry = HttpHeaderParser.parseCacheHeaders(response);
+
+        if (!shouldCache()) {
+            return cacheEntry;
+        }
+
+        if (cacheEntry == null) {
+            cacheEntry = new Cache.Entry();
+
+            String headerValue = response.headers.get("Date");
+            if (headerValue != null) {
+                cacheEntry.serverDate = HttpHeaderParser.parseDateAsEpoch(headerValue);
+            }
+
+            headerValue = response.headers.get("Last-Modified");
+            if (headerValue != null) {
+                cacheEntry.lastModified = HttpHeaderParser.parseDateAsEpoch(headerValue);
+            }
+
+            cacheEntry.data = response.data;
+            cacheEntry.responseHeaders = response.headers;
+        }
+
+        long now = System.currentTimeMillis();
+        cacheEntry.ttl = now + mCacheTtl;
+        cacheEntry.softTtl = now + mCacheSoftTtl;
+
+        return cacheEntry;
+    }
+
+    @NonNull
+    private BaseNetworkError getBaseNetworkError(VolleyError volleyError) {
+        // No connection
+        if (volleyError.getCause() instanceof NoConnectionError) {
+            return new BaseNetworkError(GenericErrorType.NO_CONNECTION, volleyError);
+        }
+
+        // Network error
+        if (volleyError.getCause() instanceof NetworkError) {
+            return new BaseNetworkError(GenericErrorType.NETWORK_ERROR, volleyError);
+        }
+
+        // Invalid SSL Handshake
+        if (volleyError.getCause() instanceof SSLHandshakeException) {
+            return new BaseNetworkError(GenericErrorType.INVALID_SSL_CERTIFICATE, volleyError);
+        }
+
+        // Invalid HTTP Auth
+        if (volleyError instanceof AuthFailureError) {
+            return new BaseNetworkError(GenericErrorType.HTTP_AUTH_ERROR, volleyError);
+        }
+
+        // Timeout
+        if (volleyError instanceof TimeoutError) {
+            return new BaseNetworkError(GenericErrorType.TIMEOUT, volleyError);
+        }
+
+        // Parse Error
+        if (volleyError instanceof ParseError) {
+            return new BaseNetworkError(GenericErrorType.PARSE_ERROR, volleyError);
+        }
+
+        // Null networkResponse? Can't get more infos
+        if (volleyError.networkResponse == null) {
+            return new BaseNetworkError(volleyError);
+        }
+
+        // Get Error by HTTP response code
+        String errorMessage = "";
+        if (volleyError.getMessage() != null) {
+            errorMessage = volleyError.getMessage();
+        }
+        switch (volleyError.networkResponse.statusCode) {
+            case 404:
+                return new BaseNetworkError(GenericErrorType.NOT_FOUND, errorMessage, volleyError);
+            case 405:
+                return this instanceof XMLRPCRequest
+                        ? new BaseNetworkError(volleyError, METHOD_NOT_ALLOWED)
+                        : new BaseNetworkError(volleyError);
+            case 451:
+                return new BaseNetworkError(GenericErrorType.CENSORED, errorMessage, volleyError);
+            case 500:
+                return new BaseNetworkError(GenericErrorType.SERVER_ERROR, errorMessage, volleyError);
+            default:
+                break;
+        }
+
+        // Nothing found
+        return new BaseNetworkError(volleyError);
+    }
+
+    public abstract BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error);
+
+    @Override
+    public final void deliverError(VolleyError volleyError) {
+        Integer statusCode = volleyError.networkResponse != null ? volleyError.networkResponse.statusCode : null;
+        AppLog.e(AppLog.T.API,
+                "Volley error on " + getUrl() + (statusCode != null ? " Status Code: " + statusCode : ""),
+                volleyError);
+        if (volleyError instanceof ParseError && mOnParseErrorListener != null) {
+            OnUnexpectedError error = new OnUnexpectedError(volleyError, "API response parse error");
+            error.addExtra(OnUnexpectedError.KEY_URL, getUrl());
+            mOnParseErrorListener.onParseError(error);
+        }
+        BaseNetworkError baseNetworkError = getBaseNetworkError(volleyError);
+        BaseNetworkError modifiedBaseNetworkError = deliverBaseNetworkError(baseNetworkError);
+        mErrorListener.onErrorResponse(modifiedBaseNetworkError);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequestFuture.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequestFuture.java
new file mode 100644
index 00000000000..2102c0f4d00
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequestFuture.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// NOTE: this was forked from com.android.volley.toolbox.RequestFuture
+
+package org.wordpress.android.fluxc.network;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Request;
+import com.android.volley.Response.Listener;
+import com.android.volley.VolleyError;
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseErrorListener;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * A Future that represents a Volley request.
+ *
+ * Used by providing as your response and error listeners. For example:
+ * <pre>
+ * RequestFuture&lt;JSONObject&gt; future = RequestFuture.newFuture();
+ * MyRequest request = new MyRequest(URL, future, future);
+ *
+ * // If you want to be able to cancel the request:
+ * future.setRequest(requestQueue.add(request));
+ *
+ * // Otherwise:
+ * requestQueue.add(request);
+ *
+ * try {
+ *   JSONObject response = future.get();
+ *   // do something with response
+ * } catch (InterruptedException e) {
+ *   // handle the error
+ * } catch (ExecutionException e) {
+ *   // handle the error
+ * }
+ * </pre>
+ *
+ * @param <T> The type of parsed response this future expects.
+ */
+public class BaseRequestFuture<T> implements Future<T>, Listener<T>, BaseErrorListener {
+    private Request<?> mRequest;
+    private boolean mResultReceived = false;
+    private T mResult;
+    private VolleyError mException;
+
+    public static <E> BaseRequestFuture<E> newFuture() {
+        return new BaseRequestFuture<>();
+    }
+
+    private BaseRequestFuture() {}
+
+    public void setRequest(Request<?> request) {
+        mRequest = request;
+    }
+
+    @Override
+    public synchronized boolean cancel(boolean mayInterruptIfRunning) {
+        if (mRequest == null) {
+            return false;
+        }
+
+        if (!isDone()) {
+            mRequest.cancel();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public T get() throws InterruptedException, ExecutionException {
+        try {
+            return doGet(null);
+        } catch (TimeoutException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    @Override
+    public T get(long timeout, @NonNull TimeUnit unit)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        return doGet(TimeUnit.MILLISECONDS.convert(timeout, unit));
+    }
+
+    private synchronized T doGet(Long timeoutMs)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        if (mException != null) {
+            throw new ExecutionException(mException);
+        }
+
+        if (mResultReceived) {
+            return mResult;
+        }
+
+        if (timeoutMs == null) {
+            wait(0);
+        } else if (timeoutMs > 0) {
+            wait(timeoutMs);
+        }
+
+        if (mException != null) {
+            throw new ExecutionException(mException);
+        }
+
+        if (!mResultReceived) {
+            throw new TimeoutException();
+        }
+
+        return mResult;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return mRequest != null && mRequest.isCanceled();
+    }
+
+    @Override
+    public synchronized boolean isDone() {
+        return mResultReceived || mException != null || isCancelled();
+    }
+
+    @Override
+    public synchronized void onResponse(T response) {
+        mResultReceived = true;
+        mResult = response;
+        notifyAll();
+    }
+
+    @Override
+    public synchronized void onErrorResponse(@NonNull BaseNetworkError error) {
+        mException = error.volleyError;
+        notifyAll();
+    }
+}
+
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseUploadRequestBody.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseUploadRequestBody.java
new file mode 100644
index 00000000000..f0e1f49f7e6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseUploadRequestBody.java
@@ -0,0 +1,117 @@
+package org.wordpress.android.fluxc.network;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+import okhttp3.RequestBody;
+import okio.Buffer;
+import okio.ForwardingSink;
+import okio.Sink;
+
+/**
+ * Wrapper for {@link okhttp3.MultipartBody} that reports upload progress as body data is written.
+ * <p>
+ * A {@link ProgressListener} is required, use {@link okhttp3.MultipartBody} if progress is not needed.
+ * <p>
+ * @see <a href="http://stackoverflow.com/questions/35528751/okhttp-3-tracking-multipart-upload-progress">doc</a>
+ */
+public abstract class BaseUploadRequestBody extends RequestBody {
+    /**
+     * Callback to report upload progress as body data is written to the sink for network delivery.
+     */
+    public interface ProgressListener {
+        void onProgress(@NonNull MediaModel media, float progress);
+    }
+
+    /**
+     * Determines if media data is sufficient for upload. Valid media must:
+     * <ul>
+     *     <li>be non-null</li>
+     *     <li>define a recognized MIME type</li>
+     *     <li>define a file path to a valid local file</li>
+     * </ul>
+     *
+     * @return a string describing why {@code media} is invalid
+     */
+    @NonNull
+    public static String hasRequiredData(@NonNull MediaModel media) {
+        return checkMediaArg(media).getType().getErrorLogDescription();
+    }
+
+    @NonNull
+    public static MalformedMediaArgSubType checkMediaArg(@NonNull MediaModel media) {
+        // validate MIME type is recognized
+        String mimeType = media.getMimeType();
+        if (!MediaUtils.isSupportedMimeType(mimeType)) {
+            return new MalformedMediaArgSubType(Type.UNSUPPORTED_MIME_TYPE);
+        }
+
+        // verify file path is defined
+        String filePath = media.getFilePath();
+        if (TextUtils.isEmpty(filePath)) {
+            return new MalformedMediaArgSubType(Type.NOT_VALID_LOCAL_FILE_PATH);
+        }
+
+        // verify file exists and is not a directory
+        File file = new File(filePath);
+        if (!file.exists()) {
+            return new MalformedMediaArgSubType(Type.MEDIA_FILE_NOT_FOUND_LOCALLY);
+        } else if (file.isDirectory()) {
+            return new MalformedMediaArgSubType(Type.DIRECTORY_PATH_SUPPLIED_FILE_NEEDED);
+        }
+
+        return new MalformedMediaArgSubType(Type.NO_ERROR);
+    }
+
+    @NonNull private final MediaModel mMedia;
+    @NonNull private final ProgressListener mListener;
+
+    public BaseUploadRequestBody(
+            @NonNull MediaModel media,
+            @NonNull ProgressListener listener) {
+        mMedia = media;
+        mListener = listener;
+    }
+
+    protected abstract float getProgress(long bytesWritten);
+
+    @NonNull
+    public MediaModel getMedia() {
+        return mMedia;
+    }
+
+    /**
+     * Custom Sink that reports progress to listener as bytes are written.
+     */
+    protected final class CountingSink extends ForwardingSink {
+        private static final int ON_PROGRESS_THROTTLE_RATE = 100;
+        private long mBytesWritten = 0;
+        private long mLastTimeOnProgressCalled = 0;
+
+        public CountingSink(@NonNull Sink delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public void write(@NonNull Buffer source, long byteCount) throws IOException {
+            super.write(source, byteCount);
+            mBytesWritten += byteCount;
+            long currentTimeMillis = System.currentTimeMillis();
+            // Call the mListener.onProgress callback at maximum every 100ms.
+            if ((currentTimeMillis - mLastTimeOnProgressCalled) > ON_PROGRESS_THROTTLE_RATE
+                || mLastTimeOnProgressCalled == 0) {
+                mLastTimeOnProgressCalled = currentTimeMillis;
+                mListener.onProgress(mMedia, getProgress(mBytesWritten));
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptor.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptor.kt
new file mode 100644
index 00000000000..b5476faf5d6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptor.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.network
+
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Request
+import okhttp3.Response
+
+class CustomRedirectInterceptor : Interceptor {
+    override fun intercept(chain: Chain): Response {
+        val originalRequest = chain.request()
+        val response = chain.proceed(originalRequest)
+        if (response.isRedirect) {
+            val newRequest = getRedirectRequest(originalRequest, response)
+            if (newRequest != null) {
+                return chain.proceed(newRequest)
+            }
+        }
+        return response
+    }
+
+    fun getRedirectRequest(originalRequest: Request, redirectResponse: Response): Request? {
+        val location = redirectResponse.header("Location")
+        if (!location.isNullOrEmpty()) {
+            val newBuilder: Request.Builder = originalRequest.newBuilder().url(location)
+
+            // Remove the authorization header if the hosts' TLD and SLD are not the same
+            val originalHost = originalRequest.url.host
+            val redirectHttpUrl = location.toHttpUrlOrNull()
+            val redirectHost = redirectHttpUrl?.host ?: ""
+            if (!tldAndSldAreEqual(originalHost, redirectHost)) {
+                newBuilder.removeHeader("Authorization")
+            }
+
+            return newBuilder.build()
+        }
+        return null
+    }
+
+    private fun tldAndSldAreEqual(domain1: String, domain2: String): Boolean {
+        val parts1 = domain1.split("\\.".toRegex())
+        val parts2 = domain2.split("\\.".toRegex())
+        return if (parts1.size < 2 || parts2.size < 2) {
+            false
+        } else {
+            parts1[parts1.size - 1] == parts2[parts2.size - 1]
+                && parts1[parts1.size - 2] == parts2[parts2.size - 2]
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/EncryptedLogUploadRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/EncryptedLogUploadRequest.kt
new file mode 100644
index 00000000000..c1a45376f5e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/EncryptedLogUploadRequest.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.network
+
+import com.android.volley.NetworkResponse
+import com.android.volley.ParseError
+import com.android.volley.Request
+import com.android.volley.Response
+import com.android.volley.Response.ErrorListener
+import com.android.volley.VolleyError
+import com.android.volley.toolbox.HttpHeaderParser
+import org.json.JSONObject
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+
+private const val AUTHORIZATION_HEADER = "Authorization"
+private const val CONTENT_TYPE_HEADER = "Content-Type"
+private const val CONTENT_TYPE_JSON = "application/json"
+private const val UUID_HEADER = "log-uuid"
+
+class EncryptedLogUploadRequest(
+    private val logUuid: String,
+    private val contents: String,
+    private val clientSecret: String,
+    private val successListener: Response.Listener<NetworkResponse>,
+    errorListener: ErrorListener
+) : Request<NetworkResponse>(Method.POST, WPCOMREST.encrypted_logging.urlV1_1, errorListener) {
+    override fun getHeaders(): Map<String, String> {
+        return mapOf(
+                CONTENT_TYPE_HEADER to CONTENT_TYPE_JSON,
+                AUTHORIZATION_HEADER to clientSecret,
+                UUID_HEADER to logUuid
+        )
+    }
+
+    @Suppress("ForbiddenComment")
+    override fun getBody(): ByteArray {
+        // TODO: Max file size is 10MB - maybe we should just handle that in the error callback?
+        return contents.toByteArray()
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    override fun parseNetworkResponse(response: NetworkResponse?): Response<NetworkResponse> {
+        return try {
+            Response.success(response, HttpHeaderParser.parseCacheHeaders(response))
+        } catch (e: Exception) {
+            try {
+                val json = JSONObject(response.toString())
+                val errorMessage = json.getString("message")
+                Response.error(VolleyError(errorMessage))
+            } catch (jsonParsingError: Throwable) {
+                Response.error(ParseError(jsonParsingError))
+            }
+        }
+    }
+
+    override fun deliverResponse(response: NetworkResponse) {
+        successListener.onResponse(response)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthManager.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthManager.java
new file mode 100644
index 00000000000..1b50b46a46a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthManager.java
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.persistence.HTTPAuthSqlUtils;
+
+import java.net.URI;
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class HTTPAuthManager {
+    @Inject public HTTPAuthManager() {}
+
+    /**
+     * Get an HTTPAuthModel containing username and password for the url parameter
+     * TODO: Use an in memory model (or caching) - because this SQL query is executed every time a request is sent
+     *
+     * @param url to test
+     * @return null if url is not matching any known HTTP auth credentials
+     */
+    @Nullable
+    public HTTPAuthModel getHTTPAuthModel(String url) {
+        List<HTTPAuthModel> authModels = WellSql.select(HTTPAuthModel.class).getAsModel();
+        if (authModels.isEmpty()) {
+            return null;
+        }
+        for (HTTPAuthModel authModel : authModels) {
+            if (url.startsWith(authModel.getRootUrl())) {
+                return authModel;
+            }
+
+            // Also compare against the stored URL with the ending 'xmlrpc.php' (or other name) stripped
+            String xmlrpcStripped = authModel.getRootUrl().replaceFirst("/[^/]*?.php$", "");
+            if (url.startsWith(xmlrpcStripped)) {
+                return authModel;
+            }
+        }
+        return null;
+    }
+
+    public void addHTTPAuthCredentials(@NonNull String username, @NonNull String password,
+                                       @NonNull String url, @Nullable String realm) {
+        HTTPAuthModel httpAuthModel = new HTTPAuthModel();
+        httpAuthModel.setUsername(username);
+        httpAuthModel.setPassword(password);
+        httpAuthModel.setRootUrl(normalizeURL(url));
+        httpAuthModel.setRealm(realm);
+        // Replace old username / password / realm - URL used as key
+        HTTPAuthSqlUtils.insertOrUpdateModel(httpAuthModel);
+    }
+
+    private String normalizeURL(String url) {
+        try {
+            URI uri = URI.create(url);
+            return uri.normalize().toString();
+        } catch (IllegalArgumentException e) {
+            return url;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthModel.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthModel.java
new file mode 100644
index 00000000000..2a637406c12
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HTTPAuthModel.java
@@ -0,0 +1,63 @@
+package org.wordpress.android.fluxc.network;
+
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
+@Table
+@RawConstraints({"UNIQUE (ROOT_URL)"})
+public class HTTPAuthModel implements Identifiable {
+    @PrimaryKey
+    @Column private int mId;
+    @Column private String mRootUrl;
+    @Column private String mRealm;
+    @Column private String mUsername;
+    @Column private String mPassword;
+
+    @Override
+    public int getId() {
+        return mId;
+    }
+
+    @Override
+    public void setId(int id) {
+        mId = id;
+    }
+
+    public HTTPAuthModel() {
+    }
+
+    public String getRealm() {
+        return mRealm;
+    }
+
+    public void setRealm(String realm) {
+        mRealm = realm;
+    }
+
+    public String getUsername() {
+        return mUsername;
+    }
+
+    public void setUsername(String username) {
+        mUsername = username;
+    }
+
+    public String getPassword() {
+        return mPassword;
+    }
+
+    public void setPassword(String password) {
+        mPassword = password;
+    }
+
+    public String getRootUrl() {
+        return mRootUrl;
+    }
+
+    public void setRootUrl(String rootUrl) {
+        mRootUrl = rootUrl;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HttpMethod.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HttpMethod.kt
new file mode 100644
index 00000000000..9b9373e7065
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/HttpMethod.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network
+
+import com.android.volley.Request.Method as VolleyMethod
+
+enum class HttpMethod {
+    GET, POST, DELETE, PUT, HEAD, OPTIONS, TRACE, PATCH
+}
+
+fun HttpMethod.toVolleyMethod(): Int = when (this) {
+    HttpMethod.GET -> VolleyMethod.GET
+    HttpMethod.POST -> VolleyMethod.POST
+    HttpMethod.DELETE -> VolleyMethod.DELETE
+    HttpMethod.PUT -> VolleyMethod.PUT
+    HttpMethod.HEAD -> VolleyMethod.HEAD
+    HttpMethod.OPTIONS -> VolleyMethod.OPTIONS
+    HttpMethod.TRACE -> VolleyMethod.TRACE
+    HttpMethod.PATCH -> VolleyMethod.PATCH
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/MemorizingTrustManager.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/MemorizingTrustManager.java
new file mode 100644
index 00000000000..6b880876474
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/MemorizingTrustManager.java
@@ -0,0 +1,201 @@
+package org.wordpress.android.fluxc.network;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+public class MemorizingTrustManager implements X509TrustManager {
+    private static final long FUTURE_TASK_TIMEOUT_SECONDS = 10;
+    private static final String ANDROID_KEYSTORE_TYPE = "AndroidKeyStore";
+
+    private FutureTask<X509TrustManager> mTrustManagerFutureTask;
+    private FutureTask<KeyStore> mLocalKeyStoreFutureTask;
+    private X509Certificate mLastFailure;
+
+    @Inject public MemorizingTrustManager() {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        mLocalKeyStoreFutureTask = new FutureTask<>(new Callable<KeyStore>() {
+            public KeyStore call() {
+                return getKeyStore();
+            }
+        });
+        mTrustManagerFutureTask = new FutureTask<>(new Callable<X509TrustManager>() {
+            public X509TrustManager call() {
+                return getTrustManager(null);
+            }
+        });
+        executorService.execute(mLocalKeyStoreFutureTask);
+        executorService.execute(mTrustManagerFutureTask);
+    }
+
+    @NonNull
+    private KeyStore getLocalKeyStore() {
+        try {
+            return mLocalKeyStoreFutureTask.get(FUTURE_TASK_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            AppLog.e(T.API, e);
+            throw new IllegalStateException("Couldn't find KeyStore");
+        }
+    }
+
+    @NonNull
+    private X509TrustManager getDefaultTrustManager() {
+        try {
+            return mTrustManagerFutureTask.get(FUTURE_TASK_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            AppLog.e(T.API, e);
+            throw new IllegalStateException("Couldn't find X509TrustManager");
+        }
+    }
+
+    private KeyStore getKeyStore() {
+        KeyStore localKeyStore;
+        try {
+            localKeyStore = loadTrustStore();
+        } catch (IOException | GeneralSecurityException e) {
+            AppLog.e(T.API, e);
+            throw new IllegalStateException(e);
+        }
+        return localKeyStore;
+    }
+
+    private X509TrustManager getTrustManager(@Nullable KeyStore keyStore) {
+        try {
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(keyStore);
+            for (TrustManager t : tmf.getTrustManagers()) {
+                if (t instanceof X509TrustManager) {
+                    return (X509TrustManager) t;
+                }
+            }
+        } catch (Exception e) {
+            // no op
+        }
+        return null;
+    }
+
+    private KeyStore loadTrustStore() throws IOException, GeneralSecurityException {
+        KeyStore localKeyStore = KeyStore.getInstance(ANDROID_KEYSTORE_TYPE);
+        localKeyStore.load(null);
+        return localKeyStore;
+    }
+
+    public boolean isCertificateAccepted(X509Certificate cert) {
+        try {
+            return getLocalKeyStore().getCertificateAlias(cert) != null;
+        } catch (GeneralSecurityException e) {
+            return false;
+        }
+    }
+
+    public void storeLastFailure() {
+        storeCert(mLastFailure);
+    }
+
+    public void storeCert(X509Certificate cert) {
+        try {
+            getLocalKeyStore().setCertificateEntry(cert.getSubjectDN().toString(), cert);
+        } catch (KeyStoreException e) {
+            AppLog.e(T.API, "Unable to store the certificate: " + cert);
+        }
+    }
+
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        getDefaultTrustManager().checkClientTrusted(chain, authType);
+    }
+
+    @Override
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        try {
+            getDefaultTrustManager().checkServerTrusted(chain, authType);
+        } catch (CertificateException ce) {
+            mLastFailure = chain[0];
+            if (isCertificateAccepted(chain[0])) {
+                // Certificate has already been accepted by the user
+                return;
+            }
+            throw ce;
+        }
+    }
+
+    public X509Certificate[] getAcceptedIssuers() {
+        // return mDefaultTrustManager.getAcceptedIssuers();
+        // ^ Original code is super slow (~1200 msecs) - Return an empty list since it seems unused by OkHttp.
+        return new X509Certificate[0];
+    }
+
+    public X509Certificate getLastFailure() {
+        return mLastFailure;
+    }
+
+    public void clearLocalTrustStore() {
+        KeyStore localKeyStore = getLocalKeyStore();
+        try {
+            Enumeration<String> aliases = localKeyStore.aliases();
+            while (aliases.hasMoreElements()) {
+                String alias = aliases.nextElement();
+                if (localKeyStore.isCertificateEntry(alias)) {
+                    localKeyStore.deleteEntry(alias);
+                }
+            }
+        } catch (KeyStoreException e) {
+            AppLog.e(T.API, "Unable to clear KeyStore");
+        }
+    }
+
+    public HostnameVerifier wrapHostnameVerifier(final HostnameVerifier defaultVerifier) {
+        if (defaultVerifier == null) {
+            throw new IllegalArgumentException("The default verifier may not be null");
+        }
+
+        return new MemorizingHostnameVerifier(defaultVerifier);
+    }
+
+    private class MemorizingHostnameVerifier implements HostnameVerifier {
+        private HostnameVerifier mDefaultVerifier;
+
+        MemorizingHostnameVerifier(HostnameVerifier hostnameVerifier) {
+            mDefaultVerifier = hostnameVerifier;
+        }
+
+        @Override
+        public boolean verify(String hostname, SSLSession session) {
+            // if the default verifier accepts the hostname, we are done
+            if (mDefaultVerifier.verify(hostname, session)) {
+                return true;
+            }
+            // otherwise, we check if the hostname is an alias for this cert in our keystore
+            try {
+                X509Certificate cert = (X509Certificate) session.getPeerCertificates()[0];
+                return cert.equals(getLocalKeyStore().getCertificate(cert.getSubjectDN().toString()));
+            } catch (Exception e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OkHttpStack.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OkHttpStack.java
new file mode 100644
index 00000000000..a3fa5b5f879
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OkHttpStack.java
@@ -0,0 +1,138 @@
+package org.wordpress.android.fluxc.network;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.Header;
+import com.android.volley.Request;
+import com.android.volley.toolbox.BaseHttpStack;
+import com.android.volley.toolbox.HttpResponse;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.Call;
+import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
+/**
+ * Modified version of https://gist.github.com/LOG-TAG/3ad1c191b3ca7eab3ea6834386e30eb9
+ * <p>
+ * OkHttp backed {@link BaseHttpStack BaseHttpStack} that does not
+ * use okhttp-urlconnection
+ */
+public class OkHttpStack extends BaseHttpStack {
+    private final OkHttpClient mOkHttpClient;
+
+    public OkHttpStack(final OkHttpClient okHttpClient) {
+        this.mOkHttpClient = okHttpClient;
+    }
+
+    private static void setConnectionParametersForRequest(okhttp3.Request.Builder builder, Request<?> request)
+            throws AuthFailureError {
+        switch (request.getMethod()) {
+            case Request.Method.DEPRECATED_GET_OR_POST:
+                // Ensure backwards compatibility.  Volley assumes a request with a null body is a GET.
+                byte[] postBody = request.getBody();
+                if (postBody != null) {
+                    builder.post(RequestBody.create(MediaType.parse(request.getBodyContentType()), postBody));
+                }
+                break;
+            case Request.Method.GET:
+                builder.get();
+                break;
+            case Request.Method.DELETE:
+                builder.delete(createRequestBody(request));
+                break;
+            case Request.Method.POST:
+                builder.post(createRequestBody(request));
+                break;
+            case Request.Method.PUT:
+                builder.put(createRequestBody(request));
+                break;
+            case Request.Method.HEAD:
+                builder.head();
+                break;
+            case Request.Method.OPTIONS:
+                builder.method("OPTIONS", null);
+                break;
+            case Request.Method.TRACE:
+                builder.method("TRACE", null);
+                break;
+            case Request.Method.PATCH:
+                builder.patch(createRequestBody(request));
+                break;
+            default:
+                throw new IllegalStateException("Unknown method type.");
+        }
+    }
+
+    @NonNull
+    private static RequestBody createRequestBody(Request r) throws AuthFailureError {
+        final byte[] body = r.getBody();
+        if (body == null) {
+            return RequestBody.create(null, new byte[]{});
+        }
+        return RequestBody.create(MediaType.parse(r.getBodyContentType()), body);
+    }
+
+    @Override
+    public HttpResponse executeRequest(Request<?> request, Map<String, String> additionalHeaders)
+            throws IOException, AuthFailureError {
+        int timeoutMs = request.getTimeoutMs();
+
+        final OkHttpClient timeoutAwareClient = mOkHttpClient.newBuilder()
+                                                             .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                                                             .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                                                             .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                                                             .build();
+
+        okhttp3.Request.Builder okHttpRequestBuilder = new okhttp3.Request.Builder();
+        okHttpRequestBuilder.url(request.getUrl());
+
+        Map<String, String> headers = request.getHeaders();
+        for (final String name : headers.keySet()) {
+            String value = headers.get(name);
+            if (value != null) {
+                okHttpRequestBuilder.addHeader(name, value);
+            }
+        }
+        for (final String name : additionalHeaders.keySet()) {
+            String value = additionalHeaders.get(name);
+            if (value != null) {
+                okHttpRequestBuilder.addHeader(name, value);
+            }
+        }
+
+        setConnectionParametersForRequest(okHttpRequestBuilder, request);
+
+
+        okhttp3.Request okHttpRequest = okHttpRequestBuilder.build();
+        Call okHttpCall = timeoutAwareClient.newCall(okHttpRequest);
+        okhttp3.Response okHttpResponse = okHttpCall.execute();
+
+
+        int code = okHttpResponse.code();
+        ResponseBody body = okHttpResponse.body();
+        InputStream content = body == null ? null : body.byteStream();
+        int contentLength = body == null ? 0 : (int) body.contentLength();
+        List<Header> responseHeaders = mapHeaders(okHttpResponse.headers());
+        return new HttpResponse(code, responseHeaders, contentLength, content);
+    }
+
+    private List<Header> mapHeaders(Headers responseHeaders) {
+        List<Header> headers = new ArrayList<>();
+        for (int i = 0, len = responseHeaders.size(); i < len; i++) {
+            final String name = responseHeaders.name(i), value = responseHeaders.value(i);
+            headers.add(new Header(name, value));
+        }
+        return headers;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OpenJdkCookieManager.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OpenJdkCookieManager.java
new file mode 100644
index 00000000000..d3392fc2da8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/OpenJdkCookieManager.java
@@ -0,0 +1,308 @@
+package org.wordpress.android.fluxc.network;
+
+import androidx.annotation.NonNull;
+
+import java.io.IOException;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.CookieStore;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@SuppressWarnings("all")
+/**
+ * A [CookieManager] that's based on OpenJdk's implementation
+ * https://github.com/openjdk/jdk/blob/20db7800a657b311eeac504a2bbae4adbc209dbf/src/java.base/share/classes/java/net/CookieManager.java
+ * This implementation solves the bug: https://issuetracker.google.com/issues/174647435
+ */
+public class OpenJdkCookieManager extends CookieManager {
+    /* ---------------- Fields -------------- */
+
+    private CookiePolicy policyCallback;
+
+    /* ---------------- Ctors -------------- */
+
+    /**
+     * Create a new cookie manager.
+     *
+     * <p>This constructor will create new cookie manager with default
+     * cookie store and accept policy. The effect is same as
+     * {@code CookieManager(null, null)}.
+     */
+    public OpenJdkCookieManager() {
+        super(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+        this.policyCallback = CookiePolicy.ACCEPT_ORIGINAL_SERVER;
+    }
+
+    /**
+     * Create a new cookie manager with specified cookie store and cookie policy.
+     *
+     * @param store     a {@code CookieStore} to be used by cookie manager.
+     *                  if {@code null}, cookie manager will use a default one,
+     *                  which is an in-memory CookieStore implementation.
+     * @param cookiePolicy      a {@code CookiePolicy} instance
+     *                          to be used by cookie manager as policy callback.
+     */
+    public OpenJdkCookieManager(CookieStore store,
+                                @NonNull CookiePolicy cookiePolicy)
+    {
+        super(store, cookiePolicy);
+        this.policyCallback = cookiePolicy;
+    }
+
+    public Map<String, List<String>>
+    get(URI uri, Map<String, List<String>> requestHeaders)
+            throws IOException {
+        // pre-condition check
+        if (uri == null || requestHeaders == null) {
+            throw new IllegalArgumentException("Argument is null");
+        }
+
+        Map<String, List<String>> cookieMap = new java.util.HashMap<>();
+        // if there's no default CookieStore, no way for us to get any cookie
+        if (getCookieStore() == null)
+            return Collections.unmodifiableMap(cookieMap);
+
+        boolean secureLink = "https".equalsIgnoreCase(uri.getScheme());
+        List<HttpCookie> cookies = new java.util.ArrayList<>();
+        String path = uri.getPath();
+        if (path == null || path.isEmpty()) {
+            path = "/";
+        }
+        for (HttpCookie cookie : getCookieStore().get(uri)) {
+            // apply path-matches rule (RFC 2965 sec. 3.3.4)
+            // and check for the possible "secure" tag (i.e. don't send
+            // 'secure' cookies over unsecure links)
+            if (pathMatches(path, cookie.getPath()) &&
+                    (secureLink || !cookie.getSecure())) {
+                // Enforce httponly attribute
+                if (cookie.isHttpOnly()) {
+                    String s = uri.getScheme();
+                    if (!"http".equalsIgnoreCase(s) && !"https".equalsIgnoreCase(s)) {
+                        continue;
+                    }
+                }
+                // Let's check the authorize port list if it exists
+                String ports = cookie.getPortlist();
+                if (ports != null && !ports.isEmpty()) {
+                    int port = uri.getPort();
+                    if (port == -1) {
+                        port = "https".equals(uri.getScheme()) ? 443 : 80;
+                    }
+                    if (isInPortList(ports, port)) {
+                        cookies.add(cookie);
+                    }
+                } else {
+                    cookies.add(cookie);
+                }
+            }
+        }
+
+        // apply sort rule (RFC 2965 sec. 3.3.4)
+        List<String> cookieHeader = sortByPathAndAge(cookies);
+
+        cookieMap.put("Cookie", cookieHeader);
+        return Collections.unmodifiableMap(cookieMap);
+    }
+
+    public void
+    put(URI uri, Map<String, List<String>> responseHeaders)
+            throws IOException {
+        // pre-condition check
+        if (uri == null || responseHeaders == null) {
+            throw new IllegalArgumentException("Argument is null");
+        }
+
+
+        // if there's no default CookieStore, no need to remember any cookie
+        if (getCookieStore() == null)
+            return;
+
+        for (String headerKey : responseHeaders.keySet()) {
+            // RFC 2965 3.2.2, key must be 'Set-Cookie2'
+            // we also accept 'Set-Cookie' here for backward compatibility
+            if (headerKey == null
+                    || !(headerKey.equalsIgnoreCase("Set-Cookie2")
+                    || headerKey.equalsIgnoreCase("Set-Cookie")
+            )
+            ) {
+                continue;
+            }
+
+            for (String headerValue : responseHeaders.get(headerKey)) {
+                try {
+                    List<HttpCookie> cookies;
+                    try {
+                        cookies = HttpCookie.parse(headerValue);
+                    } catch (IllegalArgumentException e) {
+                        // Bogus header, make an empty list and log the error
+                        cookies = java.util.Collections.emptyList();
+                    }
+                    for (HttpCookie cookie : cookies) {
+                        if (cookie.getPath() == null) {
+                            // If no path is specified, then by default
+                            // the path is the directory of the page/doc
+                            String path = uri.getPath();
+                            if (!path.endsWith("/")) {
+                                int i = path.lastIndexOf('/');
+                                if (i > 0) {
+                                    path = path.substring(0, i + 1);
+                                } else {
+                                    path = "/";
+                                }
+                            }
+                            cookie.setPath(path);
+                        }
+
+                        // As per RFC 2965, section 3.3.1:
+                        // Domain  Defaults to the effective request-host.  (Note that because
+                        // there is no dot at the beginning of effective request-host,
+                        // the default Domain can only domain-match itself.)
+                        if (cookie.getDomain() == null) {
+                            String host = uri.getHost();
+                            if (host != null && !host.contains("."))
+                                host += ".local";
+                            cookie.setDomain(host);
+                        }
+                        String ports = cookie.getPortlist();
+                        if (ports != null) {
+                            int port = uri.getPort();
+                            if (port == -1) {
+                                port = "https".equals(uri.getScheme()) ? 443 : 80;
+                            }
+                            if (ports.isEmpty()) {
+                                // Empty port list means this should be restricted
+                                // to the incoming URI port
+                                cookie.setPortlist("" + port);
+                                if (shouldAcceptInternal(uri, cookie)) {
+                                    getCookieStore().add(uri, cookie);
+                                }
+                            } else {
+                                // Only store cookies with a port list
+                                // IF the URI port is in that list, as per
+                                // RFC 2965 section 3.3.2
+                                if (isInPortList(ports, port) &&
+                                        shouldAcceptInternal(uri, cookie)) {
+                                    getCookieStore().add(uri, cookie);
+                                }
+                            }
+                        } else {
+                            if (shouldAcceptInternal(uri, cookie)) {
+                                getCookieStore().add(uri, cookie);
+                            }
+                        }
+                    }
+                } catch (IllegalArgumentException e) {
+                    // invalid set-cookie header string
+                    // no-op
+                }
+            }
+        }
+    }
+
+    public void setPolicyCallback(CookiePolicy policyCallback) {
+        super.setCookiePolicy(policyCallback);
+        this.policyCallback = policyCallback;
+    }
+
+    /* ---------------- Private operations -------------- */
+
+    // to determine whether or not accept this cookie
+    private boolean shouldAcceptInternal(URI uri, HttpCookie cookie) {
+        try {
+            return policyCallback.shouldAccept(uri, cookie);
+        } catch (Exception ignored) { // protect against malicious callback
+            return false;
+        }
+    }
+
+
+    private static boolean isInPortList(String lst, int port) {
+        int i = lst.indexOf(',');
+        int val = -1;
+        while (i > 0) {
+            try {
+                val = Integer.parseInt(lst.substring(0, i));
+                if (val == port) {
+                    return true;
+                }
+            } catch (NumberFormatException numberFormatException) {
+            }
+            lst = lst.substring(i + 1);
+            i = lst.indexOf(',');
+        }
+        if (!lst.isEmpty()) {
+            try {
+                val = Integer.parseInt(lst);
+                if (val == port) {
+                    return true;
+                }
+            } catch (NumberFormatException numberFormatException) {
+            }
+        }
+        return false;
+    }
+
+    /*
+     * path-matches algorithm, as defined by RFC 2965
+     */
+    private boolean pathMatches(String path, String pathToMatchWith) {
+        if (Objects.equals(path, pathToMatchWith))
+            return true;
+        if (path == null || pathToMatchWith == null)
+            return false;
+        if (path.startsWith(pathToMatchWith))
+            return true;
+
+        return false;
+    }
+
+
+    /*
+     * sort cookies with respect to their path and age: those with more longer Path attributes
+     * precede those with shorter, as defined in RFC 6265. Cookies with the same length
+     * path are distinguished by creation time (older first). Method made PP to enable testing.
+     */
+    static List<String> sortByPathAndAge(List<HttpCookie> cookies) {
+        Collections.sort(cookies, new CookiePathComparator());
+
+        List<String> cookieHeader = new java.util.ArrayList<>();
+        for (HttpCookie cookie : cookies) {
+            // Netscape cookie spec and RFC 2965 have different format of Cookie
+            // header; RFC 2965 requires a leading $Version="1" string while Netscape
+            // does not.
+            // The workaround here is to add a $Version="1" string in advance
+            if (cookies.indexOf(cookie) == 0 && cookie.getVersion() > 0) {
+                cookieHeader.add("$Version=\"1\"");
+            }
+
+            cookieHeader.add(cookie.toString());
+        }
+        return cookieHeader;
+    }
+
+
+    static class CookiePathComparator implements Comparator<HttpCookie> {
+        public int compare(HttpCookie c1, HttpCookie c2) {
+            if (c1 == c2) return 0;
+            if (c1 == null) return -1;
+            if (c2 == null) return 1;
+
+            // path rule only applies to the cookies with same name
+            if (!c1.getName().equals(c2.getName())) return 0;
+
+            // those with more specific Path attributes precede those with less specific
+            if (c1.getPath().startsWith(c2.getPath()))
+                return -1;
+            else if (c2.getPath().startsWith(c1.getPath()))
+                return 1;
+            else
+                return 0;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RawRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RawRequest.kt
new file mode 100644
index 00000000000..271a95f965b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RawRequest.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.network
+
+import com.android.volley.NetworkResponse
+import com.android.volley.Response
+import com.android.volley.Response.Listener
+import com.android.volley.toolbox.HttpHeaderParser
+
+/**
+ * A request that allows returning the network response untouched, this is useful when
+ * we want to read the network response headers.
+ */
+class RawRequest(
+    method: Int,
+    url: String,
+    private val listener: Listener<NetworkResponse>,
+    onErrorListener: BaseErrorListener
+) : BaseRequest<NetworkResponse>(method, url, onErrorListener) {
+    override fun parseNetworkResponse(networkResponse: NetworkResponse): Response<NetworkResponse> {
+        return Response.success(
+            networkResponse,
+            HttpHeaderParser.parseCacheHeaders(networkResponse)
+        )
+    }
+
+    override fun deliverResponse(networkResponse: NetworkResponse) {
+        listener.onResponse(networkResponse)
+    }
+
+    override fun deliverBaseNetworkError(error: BaseNetworkError): BaseNetworkError = error
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/Response.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/Response.java
new file mode 100644
index 00000000000..c0274042375
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/Response.java
@@ -0,0 +1,4 @@
+package org.wordpress.android.fluxc.network;
+
+public interface Response {
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetwork.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetwork.java
new file mode 100644
index 00000000000..b4c226f5a53
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/RetryOnRedirectBasicNetwork.java
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.network;
+
+import com.android.volley.NetworkResponse;
+import com.android.volley.Request;
+import com.android.volley.RetryPolicy;
+import com.android.volley.ServerError;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.BaseHttpStack;
+import com.android.volley.toolbox.BasicNetwork;
+
+/**
+ * Enhances [BasicNetwork] by adding retries on temporary redirect (307) according to the applied retry policy
+ */
+public class RetryOnRedirectBasicNetwork extends BasicNetwork {
+    public static final int HTTP_TEMPORARY_REDIRECT = 307;
+
+    public RetryOnRedirectBasicNetwork(BaseHttpStack httpStack) {
+        super(httpStack);
+    }
+
+    @Override public NetworkResponse performRequest(Request<?> request) throws VolleyError {
+        try {
+            return super.performRequest(request);
+        } catch (ServerError error) {
+            if (request != null && error.networkResponse.statusCode == HTTP_TEMPORARY_REDIRECT) {
+                RetryPolicy policy = request.getRetryPolicy();
+                policy.retry(error); // If no attempts are left an error is thrown
+                try {
+                    Thread.sleep(policy.getCurrentTimeout()); // Wait before retrying
+                } catch (InterruptedException e) {
+                    throw error;
+                }
+                return performRequest(request);
+            }
+            throw error;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/UserAgent.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/UserAgent.kt
new file mode 100644
index 00000000000..4bc1627eee6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/UserAgent.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.network
+
+import android.content.Context
+import android.webkit.WebSettings
+import org.wordpress.android.util.PackageUtils
+
+@SuppressWarnings("SwallowedException", "TooGenericExceptionCaught", "MemberNameEqualsClassName")
+class UserAgent(appContext: Context?, appName: String) {
+    val userAgent: String
+
+    init {
+        // Device's default User-Agent string.
+        // E.g.:
+        //   "Mozilla/5.0 (Linux; Android 6.0; Android SDK built for x86_64 Build/MASTER; wv)
+        //   AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36"
+        val defaultUserAgent = try {
+            WebSettings.getDefaultUserAgent(appContext)
+        } catch (e: RuntimeException) {
+            // `getDefaultUserAgent()` can throw an Exception
+            // see: https://github.com/wordpress-mobile/WordPress-Android/issues/20147#issuecomment-1961238187
+            ""
+        }
+        // User-Agent string when making HTTP connections, for both API traffic and WebViews.
+        // Appends "wp-android/version" to WebView's default User-Agent string for the webservers
+        // to get the full feature list of the browser and serve content accordingly, e.g.:
+        //    "Mozilla/5.0 (Linux; Android 6.0; Android SDK built for x86_64 Build/MASTER; wv)
+        //    AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36
+        //    wp-android/4.7"
+        val appWithVersion = "$appName/${PackageUtils.getVersionName(appContext)}"
+        userAgent = if (defaultUserAgent.isNotEmpty()) "$defaultUserAgent $appWithVersion" else appWithVersion
+    }
+
+    override fun toString(): String = userAgent
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/common/comments/CommentsApiPayload.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/common/comments/CommentsApiPayload.kt
new file mode 100644
index 00000000000..c05f2f28ee9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/common/comments/CommentsApiPayload.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.common.comments
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+
+data class CommentsApiPayload<T>(
+    val response: T? = null
+) : Payload<CommentError>() {
+    constructor(error: CommentError, response: T? = null) : this(response) {
+        this.error = error
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryRequest.java
new file mode 100644
index 00000000000..e6bf4e0ea7f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryRequest.java
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.NetworkResponse;
+import com.android.volley.Response;
+import com.android.volley.Response.Listener;
+import com.android.volley.toolbox.HttpHeaderParser;
+
+import org.wordpress.android.fluxc.network.BaseRequest;
+
+import java.io.UnsupportedEncodingException;
+
+public class DiscoveryRequest extends BaseRequest<String> {
+    private static final String PROTOCOL_CHARSET = "utf-8";
+    private static final String PROTOCOL_CONTENT_TYPE = String.format("text/xml; charset=%s", PROTOCOL_CHARSET);
+
+    @NonNull private final Listener<String> mListener;
+
+    public DiscoveryRequest(
+            @NonNull String url,
+            @NonNull Listener<String> listener,
+            @NonNull BaseErrorListener errorListener) {
+        super(Method.GET, url, errorListener);
+        mListener = listener;
+    }
+
+    @Override
+    protected void deliverResponse(@NonNull String response) {
+        mListener.onResponse(response);
+    }
+
+    @NonNull
+    @Override
+    protected Response<String> parseNetworkResponse(@NonNull NetworkResponse response) {
+        String parsed;
+        try {
+            parsed = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
+        } catch (UnsupportedEncodingException e) {
+            parsed = new String(response.data);
+        }
+        return Response.success(parsed, HttpHeaderParser.parseCacheHeaders(response));
+    }
+
+    @NonNull
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        // no op
+        return error;
+    }
+
+    @NonNull
+    @Override
+    public String getBodyContentType() {
+        return PROTOCOL_CONTENT_TYPE;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryUtils.java
new file mode 100644
index 00000000000..97eff2b829a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryUtils.java
@@ -0,0 +1,145 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import android.text.TextUtils;
+import android.webkit.URLUtil;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.util.AppLog;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DiscoveryUtils {
+    /**
+     * Strip known unnecessary paths from XML-RPC URL and remove trailing slashes
+     */
+    @NonNull
+    public static String stripKnownPaths(@NonNull String url) {
+        // Remove 'wp-login.php' if available in the URL
+        String sanitizedURL = truncateUrl(url, "wp-login.php");
+
+        // Remove '/wp-admin' if available in the URL
+        sanitizedURL = truncateUrl(sanitizedURL, "/wp-admin");
+
+        // Remove '/wp-content' if available in the URL
+        sanitizedURL = truncateUrl(sanitizedURL, "/wp-content");
+
+        sanitizedURL = truncateUrl(sanitizedURL, "/xmlrpc.php?rsd");
+
+        // remove any trailing slashes
+        while (sanitizedURL.endsWith("/")) {
+            sanitizedURL = sanitizedURL.substring(0, sanitizedURL.length() - 1);
+        }
+
+        return sanitizedURL;
+    }
+
+    /**
+     * Truncate a string beginning at the marker
+     * @param url input string
+     * @param marker the marker to begin the truncation from
+     * @return new string truncated to the beginning of the marker or the input string if marker is not found
+     */
+    @NonNull
+    public static String truncateUrl(@NonNull String url, @NonNull String marker) {
+        if (TextUtils.isEmpty(marker) || !url.contains(marker)) {
+            return url;
+        }
+
+        final String newUrl = url.substring(0, url.indexOf(marker));
+
+        return URLUtil.isValidUrl(newUrl) ? newUrl : url;
+    }
+
+    /**
+     * Append 'xmlrpc.php' if missing in the URL
+     */
+    @NonNull
+    public static String appendXMLRPCPath(@NonNull String url) {
+        // Don't use 'ends' here! Some hosting wants parameters passed to baseURL/xmlrpc-php?my-authcode=XXX
+        if (url.contains("xmlrpc.php")) {
+            return url;
+        } else {
+            return url + "/xmlrpc.php";
+        }
+    }
+
+    /**
+     * Verify that the response of system.listMethods matches the expected list of available XML-RPC methods
+     */
+    public static boolean validateListMethodsResponse(@Nullable Object[] availableMethods) {
+        if (availableMethods == null) {
+            AppLog.e(AppLog.T.NUX, "The response of system.listMethods was empty!");
+            return false;
+        }
+        // validate xmlrpc methods
+        String[] requiredMethods = {"wp.getProfile", "wp.getUsersBlogs", "wp.getPage", "wp.getCommentStatusList",
+                "wp.newComment", "wp.editComment", "wp.deleteComment", "wp.getComments", "wp.getComment",
+                "wp.getOptions", "wp.uploadFile", "wp.newCategory",
+                "wp.getTags", "wp.getCategories", "wp.editPage", "wp.deletePage",
+                "wp.newPage", "wp.getPages"};
+
+        for (String currentRequiredMethod : requiredMethods) {
+            boolean match = false;
+            for (Object currentAvailableMethod : availableMethods) {
+                if ((currentAvailableMethod).equals(currentRequiredMethod)) {
+                    match = true;
+                    break;
+                }
+            }
+
+            if (!match) {
+                AppLog.e(AppLog.T.NUX, "The following XML-RPC method: " + currentRequiredMethod + " is missing on the"
+                                       + " server.");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check whether given network error is a 401 Unauthorized HTTP error
+     */
+    public static boolean isHTTPAuthErrorMessage(@Nullable Exception e) {
+        return e != null && e.getMessage() != null && e.getMessage().contains("401");
+    }
+
+    /**
+     * Find the XML-RPC endpoint for the WordPress API.
+     *
+     * @return XML-RPC endpoint for the specified site, or null if unable to discover endpoint.
+     */
+    @Nullable
+    public static String getXMLRPCApiLink(@Nullable String html) {
+        Pattern xmlrpcLink = Pattern.compile("<api\\s*?name=\"WordPress\".*?apiLink=\"(.*?)\"",
+                Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+        if (html != null) {
+            Matcher matcher = xmlrpcLink.matcher(html);
+            if (matcher.find()) {
+                return matcher.group(1);
+            }
+        }
+        return null; // never found the api link tag
+    }
+
+    /**
+     * Find the XML-RPC endpoint by using the pingback tag
+     *
+     * @return String XML-RPC url
+     */
+    @Nullable
+    public static String getXMLRPCPingback(@Nullable String html) {
+        Pattern pingbackLink = Pattern.compile(
+                "<link\\s*?rel=\"pingback\"\\s*?href=\"(.*?)\"",
+                Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+        if (html != null) {
+            Matcher matcher = pingbackLink.matcher(html);
+            if (matcher.find()) {
+                return matcher.group(1);
+            }
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryWPAPIRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryWPAPIRestClient.java
new file mode 100644
index 00000000000..aeef9d3f035
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryWPAPIRestClient.java
@@ -0,0 +1,101 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.network.BaseRequestFuture;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient;
+import org.wordpress.android.fluxc.network.rest.wpapi.OnWPAPIErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequest;
+import org.wordpress.android.util.AppLog;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import static org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.TIMEOUT_MS;
+
+@SuppressWarnings("CommentedOutCode")
+@Singleton
+public class DiscoveryWPAPIRestClient extends BaseWPAPIRestClient {
+    @Inject public DiscoveryWPAPIRestClient(
+            Dispatcher dispatcher,
+            @Named("custom-ssl") RequestQueue requestQueue,
+            UserAgent userAgent) {
+        super(dispatcher, requestQueue, userAgent);
+    }
+
+    @Nullable
+    public String discoverWPAPIBaseURL(@NonNull String url) {
+        BaseRequestFuture<String> future = BaseRequestFuture.newFuture();
+        WPAPIHeadRequest request = new WPAPIHeadRequest(url, future, future);
+        add(request);
+        try {
+            return future.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException | TimeoutException e) {
+            AppLog.e(AppLog.T.API, "Couldn't get HEAD response from server.");
+        } catch (ExecutionException e) {
+            // TODO: Add support for HTTP AUTH and self-signed SSL WP-API sites
+//            if (e.getCause() instanceof AuthFailureError) {
+//                throw new DiscoveryException(DiscoveryError.HTTP_AUTH_REQUIRED, url);
+//            } else if (e.getCause() instanceof NoConnectionError && e.getCause().getCause() != null
+//                    && e.getCause().getCause() instanceof SSLHandshakeException) {
+//                // In the event of an SSL error we should stop attempting discovery
+//                throw new DiscoveryException(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE, url);
+//            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public String verifyWPAPIV2Support(@NonNull String wpApiBaseUrl) {
+        BaseRequestFuture<RootWPAPIRestResponse> future = BaseRequestFuture.newFuture();
+        OnWPAPIErrorListener errorListener = future::onErrorResponse;
+
+        WPAPIGsonRequest<RootWPAPIRestResponse> request = new WPAPIGsonRequest<>(
+                Request.Method.GET,
+                wpApiBaseUrl,
+                null,
+                null,
+                RootWPAPIRestResponse.class,
+                future,
+                errorListener
+        );
+        add(request);
+        try {
+            RootWPAPIRestResponse response = future.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
+            List<String> namespaces = response.getNamespaces();
+            if (namespaces != null && !namespaces.contains("wp/v2")) {
+                AppLog.i(AppLog.T.NUX, "Site does not have the full WP-API available "
+                                       + "(missing wp/v2 namespace)");
+                return null;
+            } else {
+                AppLog.i(AppLog.T.NUX, "Found valid WP-API endpoint! - " + wpApiBaseUrl);
+                // TODO: Extract response.authentication and float it up
+                return wpApiBaseUrl;
+            }
+        } catch (InterruptedException | TimeoutException e) {
+            AppLog.e(AppLog.T.API, "Couldn't get response from root endpoint.");
+        } catch (ExecutionException e) {
+            // TODO: Add support for HTTP AUTH and self-signed SSL WP-API sites
+//            if (e.getCause() instanceof AuthFailureError) {
+//                throw new DiscoveryException(DiscoveryError.HTTP_AUTH_REQUIRED, url);
+//            } else if (e.getCause() instanceof NoConnectionError && e.getCause().getCause() != null
+//                    && e.getCause().getCause() instanceof SSLHandshakeException) {
+//                // In the event of an SSL error we should stop attempting discovery
+//                throw new DiscoveryException(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE, url);
+//            }
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCClient.java
new file mode 100644
index 00000000000..29b687b37c6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCClient.java
@@ -0,0 +1,134 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.NetworkResponse;
+import com.android.volley.NoConnectionError;
+import com.android.volley.RequestQueue;
+import com.android.volley.ServerError;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.network.BaseRequestFuture;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.DiscoveryError;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.DiscoveryException;
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.UrlUtils;
+
+import java.security.cert.CertificateException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.net.ssl.SSLHandshakeException;
+
+import static org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.TIMEOUT_MS;
+
+@Singleton
+public class DiscoveryXMLRPCClient extends BaseXMLRPCClient {
+    @Inject public DiscoveryXMLRPCClient(
+            Dispatcher dispatcher,
+            @Named("custom-ssl") RequestQueue requestQueue,
+            UserAgent userAgent,
+            HTTPAuthManager httpAuthManager) {
+        super(dispatcher, requestQueue, userAgent, httpAuthManager);
+    }
+
+    /**
+     * Obtain the HTML response from a GET request for the given URL.
+     */
+    @Nullable
+    public String getResponse(@NonNull String url) throws DiscoveryException {
+        BaseRequestFuture<String> future = BaseRequestFuture.newFuture();
+        DiscoveryRequest request = new DiscoveryRequest(url, future, future);
+        add(request);
+
+        try {
+            return future.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException | TimeoutException e) {
+            AppLog.e(AppLog.T.API, "Couldn't get XML-RPC response");
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof AuthFailureError) {
+                NetworkResponse networkResponse = ((AuthFailureError) e.getCause()).networkResponse;
+                if (networkResponse == null) {
+                    return null;
+                }
+
+                if (networkResponse.statusCode == 401) {
+                    throw new DiscoveryException(DiscoveryError.HTTP_AUTH_REQUIRED, url);
+                } else if (networkResponse.statusCode == 403) {
+                    throw new DiscoveryException(DiscoveryError.XMLRPC_FORBIDDEN, url);
+                }
+            } else if (e.getCause() instanceof NoConnectionError
+                       && e.getCause().getCause() instanceof SSLHandshakeException
+                       && e.getCause().getCause().getCause() instanceof CertificateException) {
+                // In the event of an SSL handshake error we should stop attempting discovery
+                throw new DiscoveryException(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE, url);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Perform a system.listMethods call on the given URL.
+     */
+    @Nullable
+    public Object[] listMethods(@NonNull String url) throws DiscoveryException {
+        if (!UrlUtils.isValidUrlAndHostNotNull(url)) {
+            AppLog.e(AppLog.T.NUX, "Invalid URL: " + url);
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, url);
+        }
+
+        AppLog.i(AppLog.T.NUX, "Trying system.listMethods on the following URL: " + url);
+
+        BaseRequestFuture<Object[]> future = BaseRequestFuture.newFuture();
+        DiscoveryXMLRPCRequest request = new DiscoveryXMLRPCRequest(url, XMLRPC.LIST_METHODS, future, future);
+        add(request);
+
+        try {
+            return future.get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException | TimeoutException e) {
+            AppLog.e(AppLog.T.API, "Couldn't get XML-RPC response.");
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof AuthFailureError) {
+                NetworkResponse networkResponse = ((AuthFailureError) e.getCause()).networkResponse;
+                if (networkResponse == null) {
+                    return null;
+                }
+
+                if (networkResponse.statusCode == 401) {
+                    throw new DiscoveryException(DiscoveryError.HTTP_AUTH_REQUIRED, url);
+                } else if (networkResponse.statusCode == 403) {
+                    throw new DiscoveryException(DiscoveryError.XMLRPC_FORBIDDEN, url);
+                }
+            } else if (e.getCause() instanceof NoConnectionError
+                       && e.getCause().getCause() instanceof SSLHandshakeException
+                       && e.getCause().getCause().getCause() instanceof CertificateException) {
+                // In the event of an SSL handshake error we should stop attempting discovery
+                throw new DiscoveryException(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE, url);
+            } else if (e.getCause() instanceof ServerError) {
+                NetworkResponse networkResponse = ((ServerError) e.getCause()).networkResponse;
+                if (networkResponse == null) {
+                    return null;
+                }
+
+                if (networkResponse.statusCode == 405 && !new String(networkResponse.data).contains(
+                        "XML-RPC server accepts POST requests only.")) {
+                    // XML-RPC is blocked by the server (POST request returns a 405 "Method Not Allowed" error)
+                    // We exclude the case where Volley followed a 301 redirect and tried to GET the xmlrpc endpoint,
+                    // which also returns a 405 error but with the message "XML-RPC server accepts POST requests only."
+                    throw new DiscoveryException(DiscoveryError.XMLRPC_BLOCKED, url);
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCRequest.java
new file mode 100644
index 00000000000..d2830f4376d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryXMLRPCRequest.java
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Response.Listener;
+
+import org.wordpress.android.fluxc.action.AuthenticationAction;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+
+/**
+ * A custom XMLRPCRequest intended for XML-RPC discovery, which doesn't emit global
+ * {@link AuthenticationAction#AUTHENTICATE_ERROR} events.
+ */
+public class DiscoveryXMLRPCRequest extends XMLRPCRequest {
+    DiscoveryXMLRPCRequest(
+            @NonNull String url,
+            @NonNull XMLRPC method,
+            @NonNull Listener<? super Object[]> listener,
+            @NonNull BaseErrorListener errorListener) {
+        super(url, method, null, listener, errorListener);
+    }
+
+    @NonNull
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        // no op
+        return error;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/RootWPAPIRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/RootWPAPIRestResponse.kt
new file mode 100644
index 00000000000..c14cb7a3896
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/RootWPAPIRestResponse.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.network.discovery
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrEmptyArray
+
+class RootWPAPIRestResponse(
+    val name: String? = null,
+    val description: String? = null,
+    val url: String? = null,
+    @SerializedName("gmt_offset") val gmtOffset: String? = null,
+    val namespaces: List<String>? = null,
+    val authentication: Authentication? = null
+) : Response {
+    class Authentication(
+        @SerializedName("application-passwords") val applicationPasswords: ApplicationPasswords? = null
+    ): JsonObjectOrEmptyArray() {
+        class ApplicationPasswords(
+            val endpoints: Endpoints?
+        ) {
+            class Endpoints(
+                val authorization: String?
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/SelfHostedEndpointFinder.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/SelfHostedEndpointFinder.java
new file mode 100644
index 00000000000..29046b288da
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/SelfHostedEndpointFinder.java
@@ -0,0 +1,385 @@
+package org.wordpress.android.fluxc.network.discovery;
+
+import android.text.TextUtils;
+import android.webkit.URLUtil;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.fluxc.BuildConfig;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.store.Store.OnChangedError;
+import org.wordpress.android.fluxc.utils.WPUrlUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.UrlUtils;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+
+public class SelfHostedEndpointFinder {
+    public static final int TIMEOUT_MS = 60000;
+    /**
+     * Regex pattern for matching the RSD link found in most WordPress sites.
+     */
+    private static final Pattern RSD_LINK = Pattern.compile(
+            "<link\\s*?rel=\"EditURI\"\\s*?type=\"application/rsd\\+xml\"\\s*?title=\"RSD\"\\s*?href=\"(.*?)\"",
+            Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+
+    @NonNull private final Dispatcher mDispatcher;
+    @NonNull private final DiscoveryXMLRPCClient mDiscoveryXMLRPCClient;
+    @NonNull private final DiscoveryWPAPIRestClient mDiscoveryWPAPIRestClient;
+
+    public enum DiscoveryError implements OnChangedError {
+        INVALID_URL,
+        MISSING_XMLRPC_METHOD,
+        ERRONEOUS_SSL_CERTIFICATE,
+        HTTP_AUTH_REQUIRED,
+        NO_SITE_ERROR,
+        WORDPRESS_COM_SITE,
+        XMLRPC_BLOCKED,
+        XMLRPC_FORBIDDEN,
+        GENERIC_ERROR
+    }
+
+    public static class DiscoveryException extends Exception {
+        private static final long serialVersionUID = -300904137122546854L;
+
+        @NonNull public final DiscoveryError discoveryError;
+        @Nullable public final String failedUrl;
+
+        DiscoveryException(@NonNull DiscoveryError failureType, @Nullable String failedUrl) {
+            this.discoveryError = failureType;
+            this.failedUrl = failedUrl;
+        }
+    }
+
+    public static class DiscoveryResultPayload extends Payload<DiscoveryError> {
+        @Nullable public String xmlRpcEndpoint;
+        @Nullable public String wpRestEndpoint;
+        @Nullable public String failedEndpoint;
+
+        public DiscoveryResultPayload(@NonNull String xmlRpcEndpoint, @Nullable String wpRestEndpoint) {
+            this.xmlRpcEndpoint = xmlRpcEndpoint;
+            this.wpRestEndpoint = wpRestEndpoint;
+        }
+
+        public DiscoveryResultPayload(@NonNull DiscoveryError discoveryError, @Nullable String failedEndpoint) {
+            this.error = discoveryError;
+            this.failedEndpoint = failedEndpoint;
+        }
+    }
+
+    @Inject public SelfHostedEndpointFinder(
+            @NonNull Dispatcher dispatcher,
+            @NonNull DiscoveryXMLRPCClient discoveryXMLRPCClient,
+            @NonNull DiscoveryWPAPIRestClient discoveryWPAPIRestClient) {
+        mDispatcher = dispatcher;
+        mDiscoveryXMLRPCClient = discoveryXMLRPCClient;
+        mDiscoveryWPAPIRestClient = discoveryWPAPIRestClient;
+    }
+
+    public void findEndpoint(@NonNull final String url) {
+        new Thread(() -> {
+            try {
+                String wpRestEndpoint = "";
+                if (BuildConfig.ENABLE_WPAPI) {
+                    wpRestEndpoint = discoverWPRESTEndpoint(url);
+                }
+                // TODO: Eventually make the XML-RPC discovery only run if WP-API discovery fails
+                String xmlRpcEndpoint = verifyOrDiscoverXMLRPCEndpoint(url);
+                DiscoveryResultPayload payload = new DiscoveryResultPayload(xmlRpcEndpoint, wpRestEndpoint);
+                mDispatcher.dispatch(AuthenticationActionBuilder.newDiscoveryResultAction(payload));
+            } catch (DiscoveryException e) {
+                // TODO: Handle tracking of XMLRPCDiscoveryException
+                // If a DiscoveryException is caught this high up, it means that either:
+                // 1. The discovery process has completed, and did not turn up a valid WordPress.com site
+                // 2. Discovery was halted early because the given site requires SSL validation, or HTTP AUTH login,
+                // or is a WordPress.com site, or is a completely invalid URL
+                DiscoveryResultPayload payload = new DiscoveryResultPayload(e.discoveryError, e.failedUrl);
+                mDispatcher.dispatch(AuthenticationActionBuilder.newDiscoveryResultAction(payload));
+            }
+        }).start();
+    }
+
+    @NonNull
+    private String verifyOrDiscoverXMLRPCEndpoint(@NonNull final String siteUrl) throws DiscoveryException {
+        if (TextUtils.isEmpty(siteUrl)) {
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, siteUrl);
+        }
+
+        if (WPUrlUtils.isWordPressCom(sanitizeSiteUrl(siteUrl, false))) {
+            throw new DiscoveryException(DiscoveryError.WORDPRESS_COM_SITE, siteUrl);
+        }
+
+        String xmlrpcUrl = verifyXMLRPCUrl(siteUrl);
+
+        if (xmlrpcUrl == null) {
+            AppLog.w(T.NUX, "The XML-RPC endpoint was not found by using our 'smart' cleaning approach. "
+                            + "Time to start the Endpoint discovery process");
+            xmlrpcUrl = discoverXMLRPCEndpoint(siteUrl);
+        }
+
+        // Validate the XML-RPC URL we've found before. This check prevents a crash that can occur
+        // during the setup of self-hosted sites that have malformed xmlrpc URLs in their declaration.
+        if (!URLUtil.isValidUrl(xmlrpcUrl)) {
+            throw new DiscoveryException(DiscoveryError.NO_SITE_ERROR, xmlrpcUrl);
+        }
+
+        return xmlrpcUrl;
+    }
+
+    @NonNull
+    private LinkedHashSet<String> getOrderedVerifyUrlsToTry(@NonNull String siteUrl) throws DiscoveryException {
+        LinkedHashSet<String> urlsToTry = new LinkedHashSet<>();
+        final String sanitizedSiteUrlHttps = sanitizeSiteUrl(siteUrl, true);
+        final String sanitizedSiteUrlHttp = sanitizeSiteUrl(siteUrl, false);
+
+        // Start by adding the URL with 'xmlrpc.php'. This will be the first URL to try.
+        // Prioritize https, unless the user specified the http:// protocol
+        if (siteUrl.startsWith("http://")) {
+            urlsToTry.add(DiscoveryUtils.appendXMLRPCPath(sanitizedSiteUrlHttp));
+            urlsToTry.add(DiscoveryUtils.appendXMLRPCPath(sanitizedSiteUrlHttps));
+        } else {
+            urlsToTry.add(DiscoveryUtils.appendXMLRPCPath(sanitizedSiteUrlHttps));
+            urlsToTry.add(DiscoveryUtils.appendXMLRPCPath(sanitizedSiteUrlHttp));
+        }
+
+        // Add the sanitized URL without the '/xmlrpc.php' suffix added to it
+        // Prioritize https, unless the user specified the http:// protocol
+        if (siteUrl.startsWith("http://")) {
+            urlsToTry.add(sanitizedSiteUrlHttp);
+            urlsToTry.add(sanitizedSiteUrlHttps);
+        } else {
+            urlsToTry.add(sanitizedSiteUrlHttps);
+            urlsToTry.add(sanitizedSiteUrlHttp);
+        }
+
+        // Add the user provided URL as well
+        urlsToTry.add(siteUrl);
+        return urlsToTry;
+    }
+
+    @Nullable
+    private String verifyXMLRPCUrl(@NonNull final String siteUrl) throws DiscoveryException {
+        // Ordered set of Strings that contains the URLs we want to try
+        final LinkedHashSet<String> urlsToTry = getOrderedVerifyUrlsToTry(siteUrl);
+
+        AppLog.i(T.NUX, "Calling system.listMethods on the following URLs: " + urlsToTry);
+        for (String url : urlsToTry) {
+            try {
+                if (checkXMLRPCEndpointValidity(url)) {
+                    // Endpoint found and works fine.
+                    return url;
+                }
+            } catch (DiscoveryException e) {
+                // Stop execution for errors requiring user interaction
+                if (e.discoveryError == DiscoveryError.ERRONEOUS_SSL_CERTIFICATE
+                    || e.discoveryError == DiscoveryError.HTTP_AUTH_REQUIRED
+                    || e.discoveryError == DiscoveryError.MISSING_XMLRPC_METHOD
+                    || e.discoveryError == DiscoveryError.XMLRPC_BLOCKED) {
+                    throw e;
+                }
+                // Otherwise. swallow the error since we are just verifying various URLs
+            } catch (RuntimeException re) {
+                // Depending how corrupt the user entered URL is, it can generate several kinds of runtime exceptions,
+                // ignore them
+            }
+        }
+        // Input url was not verified to be working
+        return null;
+    }
+
+    // Attempts to retrieve the XML-RPC url for a self-hosted site.
+    // See diagrams here https://github.com/wordpress-mobile/WordPress-Android/issues/3805 for details about the
+    // whole process.
+    @NonNull
+    private String discoverXMLRPCEndpoint(@NonNull String siteUrl) throws DiscoveryException {
+        // Ordered set of Strings that contains the URLs we want to try
+        final Set<String> urlsToTry = new LinkedHashSet<>();
+
+        // Add the url as provided by the user
+        urlsToTry.add(siteUrl);
+
+        // Add the sanitized URL url, prioritizing https, unless the user specified the http:// protocol
+        if (siteUrl.startsWith("http://")) {
+            urlsToTry.add(sanitizeSiteUrl(siteUrl, false));
+            urlsToTry.add(sanitizeSiteUrl(siteUrl, true));
+        } else {
+            urlsToTry.add(sanitizeSiteUrl(siteUrl, true));
+            urlsToTry.add(sanitizeSiteUrl(siteUrl, false));
+        }
+
+        AppLog.i(AppLog.T.NUX, "Running RSD discovery process on the following URLs: " + urlsToTry);
+
+        String xmlrpcUrl = null;
+        boolean isWpSite = false;
+        for (String currentURL : urlsToTry) {
+            if (!URLUtil.isValidUrl(currentURL)) {
+                continue;
+            }
+            // Download the HTML content
+            AppLog.i(AppLog.T.NUX, "Downloading the HTML content at the following URL: " + currentURL);
+            String responseHTML = mDiscoveryXMLRPCClient.getResponse(currentURL);
+            if (TextUtils.isEmpty(responseHTML)) {
+                AppLog.w(AppLog.T.NUX, "Content downloaded but it's empty or null. Skipping this URL");
+                continue;
+            }
+
+            // Try to find the RSD tag with a regex
+            String rsdUrl = getRSDMetaTagHrefRegEx(responseHTML);
+            rsdUrl = UrlUtils.addUrlSchemeIfNeeded(rsdUrl, false);
+
+            // If the RSD URL is empty here, try to see if the pingback or Apilink are in the doc, as the user
+            // could have inserted a direct link to the XML-RPC endpoint
+            if (rsdUrl == null) {
+                AppLog.i(AppLog.T.NUX, "Can't find the RSD endpoint in the HTML document. Try to check the "
+                                       + "pingback tag, and the apiLink tag.");
+                xmlrpcUrl = UrlUtils.addUrlSchemeIfNeeded(DiscoveryUtils.getXMLRPCPingback(responseHTML), false);
+                if (xmlrpcUrl == null) {
+                    xmlrpcUrl = UrlUtils.addUrlSchemeIfNeeded(DiscoveryUtils.getXMLRPCApiLink(responseHTML), false);
+                }
+            } else {
+                // If the site contains RSD link, it is WP.org site
+                isWpSite = true;
+                AppLog.i(AppLog.T.NUX, "RSD endpoint found at the following address: " + rsdUrl);
+                AppLog.i(AppLog.T.NUX, "Downloading the RSD document...");
+                String rsdEndpointDocument = mDiscoveryXMLRPCClient.getResponse(rsdUrl);
+                if (TextUtils.isEmpty(rsdEndpointDocument)) {
+                    AppLog.w(AppLog.T.NUX, "Content downloaded but it's empty or null. Skipping this RSD document"
+                                           + " URL.");
+                    continue;
+                }
+                AppLog.i(AppLog.T.NUX, "Extracting the XML-RPC Endpoint address from the RSD document");
+                xmlrpcUrl = UrlUtils.addUrlSchemeIfNeeded(DiscoveryUtils.getXMLRPCApiLink(rsdEndpointDocument),
+                        false);
+            }
+            if (xmlrpcUrl != null) {
+                AppLog.i(AppLog.T.NUX, "Found the XML-RPC endpoint in the HTML document");
+                break;
+            } else {
+                AppLog.i(AppLog.T.NUX, "XML-RPC endpoint not found");
+            }
+        }
+
+        if (URLUtil.isValidUrl(xmlrpcUrl)) {
+            if (xmlrpcUrl != null && checkXMLRPCEndpointValidity(xmlrpcUrl)) {
+                // Endpoint found and works fine.
+                return xmlrpcUrl;
+            }
+        }
+        if (!isWpSite) {
+            throw new DiscoveryException(DiscoveryError.NO_SITE_ERROR, xmlrpcUrl);
+        } else {
+            throw new DiscoveryException(DiscoveryError.MISSING_XMLRPC_METHOD, xmlrpcUrl);
+        }
+    }
+
+    /**
+     * Returns RSD URL based on regex match.
+     */
+    @Nullable
+    private String getRSDMetaTagHrefRegEx(@NonNull String html) {
+        Matcher matcher = RSD_LINK.matcher(html);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return null;
+    }
+
+    @NonNull
+    private String sanitizeSiteUrl(@NonNull String siteUrl, boolean addHttps) throws DiscoveryException {
+        // Remove padding whitespace
+        String url = siteUrl.trim();
+
+        if (TextUtils.isEmpty(url)) {
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, siteUrl);
+        }
+
+        try {
+            // Convert IDN names to punycode if necessary
+            url = UrlUtils.convertUrlToPunycodeIfNeeded(url);
+        } catch (IllegalArgumentException e) {
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, siteUrl);
+        }
+
+        // Add http to the beginning of the URL if needed
+        url = UrlUtils.addUrlSchemeIfNeeded(UrlUtils.removeScheme(url), addHttps);
+
+        // Strip url from known usual trailing paths
+        url = DiscoveryUtils.stripKnownPaths(url);
+
+        if (!(URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url))) {
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, url);
+        }
+
+        return url;
+    }
+
+    private boolean checkXMLRPCEndpointValidity(@NonNull String url) throws DiscoveryException {
+        try {
+            Object[] methods = mDiscoveryXMLRPCClient.listMethods(url);
+            if (methods == null) {
+                AppLog.e(T.NUX, "The response of system.listMethods was empty for " + url);
+                return false;
+            }
+            // Exit the loop on the first URL that replies with a XML-RPC doc.
+            AppLog.i(T.NUX, "system.listMethods replied with XML-RPC objects for " + url);
+            AppLog.i(T.NUX, "Validating the XML-RPC response...");
+            if (DiscoveryUtils.validateListMethodsResponse(methods)) {
+                // Endpoint address found and works fine.
+                AppLog.i(T.NUX, "Validation ended with success! Endpoint found!");
+                return true;
+            } else {
+                // Endpoint found, but it has problem.
+                AppLog.w(T.NUX, "Validation ended with errors! Endpoint found but doesn't contain all the "
+                                + "required methods.");
+                throw new DiscoveryException(DiscoveryError.MISSING_XMLRPC_METHOD, url);
+            }
+        } catch (DiscoveryException e) {
+            AppLog.e(T.NUX, "system.listMethods failed for " + url, e);
+            if (DiscoveryUtils.isHTTPAuthErrorMessage(e)
+                || e.discoveryError.equals(DiscoveryError.HTTP_AUTH_REQUIRED)) {
+                throw new DiscoveryException(DiscoveryError.HTTP_AUTH_REQUIRED, url);
+            } else if (e.discoveryError.equals(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE)) {
+                throw new DiscoveryException(DiscoveryError.ERRONEOUS_SSL_CERTIFICATE, url);
+            } else if (e.discoveryError.equals(DiscoveryError.XMLRPC_BLOCKED)) {
+                throw new DiscoveryException(DiscoveryError.XMLRPC_BLOCKED, url);
+            } else if (e.discoveryError.equals(DiscoveryError.MISSING_XMLRPC_METHOD)) {
+                throw new DiscoveryException(DiscoveryError.MISSING_XMLRPC_METHOD, url);
+            }
+        } catch (IllegalArgumentException e) {
+            // The XML-RPC client returns this error in case of redirect to an invalid URL.
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, url);
+        }
+
+        return false;
+    }
+
+    @Nullable
+    private String discoverWPRESTEndpoint(@NonNull String url) throws DiscoveryException {
+        if (TextUtils.isEmpty(url)) {
+            throw new DiscoveryException(DiscoveryError.INVALID_URL, url);
+        }
+
+        if (WPUrlUtils.isWordPressCom(sanitizeSiteUrl(url, false))) {
+            throw new DiscoveryException(DiscoveryError.WORDPRESS_COM_SITE, url);
+        }
+
+        // TODO: Implement URL validation in this and its called methods, and http/https neutrality
+
+        final String wpApiBaseUrl = mDiscoveryWPAPIRestClient.discoverWPAPIBaseURL(url);
+
+        if (wpApiBaseUrl != null && !wpApiBaseUrl.isEmpty()) {
+            AppLog.i(AppLog.T.NUX, "Base WP-API URL found - verifying that the wp/v2 namespace is supported");
+            return mDiscoveryWPAPIRestClient.verifyWPAPIV2Support(wpApiBaseUrl);
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/WPAPIHeadRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/WPAPIHeadRequest.kt
new file mode 100644
index 00000000000..a6a98eb1024
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/WPAPIHeadRequest.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.network.discovery
+
+import com.android.volley.NetworkResponse
+import com.android.volley.ParseError
+import com.android.volley.Response
+import com.android.volley.Response.Listener
+import com.android.volley.toolbox.HttpHeaderParser
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import java.util.regex.Pattern
+
+class WPAPIHeadRequest(
+    url: String,
+    errorListener: BaseErrorListener,
+    private val mListener: Listener<String?>
+) : BaseRequest<List<String>?>(Method.HEAD, url, errorListener) {
+    override fun deliverResponse(response: List<String>?) {
+        val endpoint = response?.firstNotNullOfOrNull { extractEndpointFromLinkHeader(it) }
+        mListener.onResponse(endpoint)
+    }
+
+    override fun parseNetworkResponse(response: NetworkResponse): Response<List<String>?>? {
+        val headers = response.allHeaders
+            ?.filter { it.name.equals(LINK_HEADER_NAME, ignoreCase = true) }
+            ?.flatMap {
+                it.value.split(",")
+                    .map { value -> value.trimStart() }
+            }
+            ?.ifEmpty { null }
+
+        return if (headers != null) {
+            Response.success(headers, HttpHeaderParser.parseCacheHeaders(response))
+        } else {
+            Response.error(ParseError(Exception("No headers in response")))
+        }
+    }
+
+    override fun deliverBaseNetworkError(error: BaseNetworkError): BaseNetworkError {
+        // no op
+        return WPAPINetworkError(error, null)
+    }
+
+    companion object {
+        private const val LINK_HEADER_NAME = "Link"
+        private val LINK_PATTERN: Pattern = Pattern.compile("^<(.*)>; rel=\"https://api.w.org/\"$")
+
+        private fun extractEndpointFromLinkHeader(linkHeader: String?): String? {
+            if (linkHeader != null) {
+                val matcher = LINK_PATTERN.matcher(linkHeader)
+                if (matcher.find()) {
+                    return matcher.group(1)
+                }
+            }
+            return null
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/GsonRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/GsonRequest.java
new file mode 100644
index 00000000000..0eae924b047
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/GsonRequest.java
@@ -0,0 +1,154 @@
+package org.wordpress.android.fluxc.network.rest;
+
+import androidx.annotation.Nullable;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.NetworkResponse;
+import com.android.volley.ParseError;
+import com.android.volley.Response;
+import com.android.volley.Response.Listener;
+import com.android.volley.toolbox.HttpHeaderParser;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+import org.wordpress.android.fluxc.logging.FluxCCrashLogger;
+import org.wordpress.android.fluxc.logging.FluxCCrashLoggerProvider;
+import org.wordpress.android.fluxc.network.BaseRequest;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class GsonRequest<T> extends BaseRequest<T> {
+    private static final String PROTOCOL_CHARSET = "utf-8";
+    private static final String PROTOCOL_CONTENT_TYPE = String.format("application/json; charset=%s", PROTOCOL_CHARSET);
+
+    private final Gson mGson;
+    private final Class<T> mClass;
+    private final Type mType;
+    private final Listener<T> mListener;
+    private final Map<String, String> mParams;
+    private final Map<String, Object> mBody;
+
+    private final GsonBuilder mCustomGsonBuilder;
+
+    protected GsonRequest(int method, Map<String, String> params, Map<String, Object> body, String url, Class<T> clazz,
+                       Type type, Listener<T> listener, BaseErrorListener errorListener) {
+        super(method, url, errorListener);
+        // HTTP RFC requires a body (even empty) for all POST requests. Volley will default to using the params
+        // for the body so only do this if params is null since this behavior is desirable for form-encoded
+        // POST requests.
+        if (method == Method.POST && body == null && (params == null || params.size() == 0)) {
+            body = new HashMap<>();
+        }
+
+        mClass = clazz;
+        mType = type;
+        mListener = listener;
+        mCustomGsonBuilder = null;
+        mGson = getDefaultGsonBuilder().create();
+        mParams = params;
+        mBody = body;
+    }
+
+    protected GsonRequest(int method, Map<String, String> params, Map<String, Object> body, String url, Class<T> clazz,
+                          Type type, Listener<T> listener, BaseErrorListener errorListener,
+                          GsonBuilder customGsonBuilder) {
+        super(method, url, errorListener);
+        if (method == Method.POST && body == null && (params == null || params.size() == 0)) {
+            body = new HashMap<>();
+        }
+
+        mClass = clazz;
+        mType = type;
+        mListener = listener;
+        mCustomGsonBuilder = customGsonBuilder;
+        mGson = (customGsonBuilder != null ? customGsonBuilder : getDefaultGsonBuilder()).create();
+        mParams = params;
+        mBody = body;
+    }
+
+    @Override
+    protected void deliverResponse(T response) {
+        mListener.onResponse(response);
+    }
+
+    @Override
+    public String getBodyContentType() {
+        if (mBody == null) {
+            return super.getBodyContentType();
+        } else {
+            return PROTOCOL_CONTENT_TYPE;
+        }
+    }
+
+    @Override
+    protected Map<String, String> getParams() {
+        return mParams;
+    }
+
+    @Override
+    public byte[] getBody() throws AuthFailureError {
+        if (mBody == null) {
+            return super.getBody();
+        }
+
+        return mGson.toJson(mBody).getBytes(Charset.forName("UTF-8"));
+    }
+
+    @Nullable
+    protected Map<String, Object> getBodyAsMap() {
+        return mBody;
+    }
+
+    @Override
+    protected Response<T> parseNetworkResponse(NetworkResponse response) {
+        try {
+            String json = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
+            T res;
+            if (mClass == null) {
+                res = mGson.fromJson(json, mType);
+            } else {
+                res = mGson.fromJson(json, mClass);
+            }
+            return Response.success(res, createCacheEntry(response));
+        } catch (UnsupportedEncodingException | JsonSyntaxException e) {
+            logRequestPath();
+            return Response.error(new ParseError(e));
+        }
+    }
+
+    public static GsonBuilder getDefaultGsonBuilder() {
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        gsonBuilder.setLenient();
+        gsonBuilder.registerTypeHierarchyAdapter(JsonObjectOrFalse.class, new JsonObjectOrFalseDeserializer());
+        gsonBuilder.registerTypeHierarchyAdapter(JsonObjectOrEmptyArray.class,
+                new JsonObjectOrEmptyArrayDeserializer());
+        return gsonBuilder;
+    }
+
+    private void logRequestPath() {
+        FluxCCrashLogger logger = FluxCCrashLoggerProvider.INSTANCE.getCrashLogger();
+        if (logger != null) {
+            String path = getPath();
+            if (path != null) {
+                logger.recordEvent(path, "Request path");
+            }
+        }
+    }
+
+    private String getPath() {
+        Map<String, String> params = getParams();
+        String path = null;
+        // If JetpackTunnel is being used the actual path is stored in `path` parameter
+        if (params != null && params.get("path") != null) {
+            path = params.get("path");
+        } else if (mUri != null) {
+            path = mUri.getPath();
+        }
+        return path;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArray.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArray.java
new file mode 100644
index 00000000000..0ebd4167ea6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArray.java
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.network.rest;
+
+public abstract class JsonObjectOrEmptyArray {}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArrayDeserializer.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArrayDeserializer.java
new file mode 100644
index 00000000000..060f4238589
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrEmptyArrayDeserializer.java
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.network.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+
+/**
+ * Deserializes a response that is either an arbitrary JSON object, or an empty JSON array.
+ * For example, if we want to use CustomServerResponse.class to represent the result of an API call that returns either
+ * an object or [], this will deserialize the JSON object into CustomServerResponse.class, or return a null
+ * MyServerResponse if the server response was [].
+ */
+public class JsonObjectOrEmptyArrayDeserializer implements JsonDeserializer<JsonObjectOrEmptyArray> {
+    @Override
+    public JsonObjectOrEmptyArray deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+            throws JsonParseException {
+        if (json.isJsonObject()) {
+            return new Gson().fromJson(json, typeOfT);
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalse.java
new file mode 100644
index 00000000000..1719e963d10
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalse.java
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.network.rest;
+
+public abstract class JsonObjectOrFalse {}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalseDeserializer.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalseDeserializer.java
new file mode 100644
index 00000000000..0b55460f8e9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/JsonObjectOrFalseDeserializer.java
@@ -0,0 +1,88 @@
+package org.wordpress.android.fluxc.network.rest;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+/**
+ * Deserializes a response that is either an arbitrary JSON object, or an arbitrary JSON primitive.
+ * For example, if we want to use CustomServerResponse.class to represent the result of an API call that returns either
+ * an object or 'false', this will deserialize the JSON object into CustomServerResponse.class, or return a null
+ * MyServerResponse if the server response was 'false'.
+ * Note that we don't distinguish between, e.g., 'true' or 'false' - any JSON primitive that was returned will be
+ * deserialized into a null object.
+ * So, this class is only useful if we don't care about the actual value of the primitive, only of the object.
+ */
+public class JsonObjectOrFalseDeserializer implements JsonDeserializer<JsonObjectOrFalse> {
+    @Override
+    public JsonObjectOrFalse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+            throws JsonParseException {
+        JsonObjectOrFalse result;
+
+        try {
+            Class<?> clazz = (Class) typeOfT;
+            Constructor constructor = (Constructor) clazz.getDeclaredConstructor();
+            result = (JsonObjectOrFalse) constructor.newInstance();
+
+            if (json.isJsonPrimitive()) {
+                // If the value is a JSON primitive (generally, 'false', though any static value will have the same
+                // result), we represent it as null
+                return null;
+            }
+
+            Field[] fields = clazz.getFields();
+            Gson gson = new Gson();
+            for (Field field : fields) {
+                JsonElement element = json.getAsJsonObject().get(field.getName());
+                if (element == null) {
+                    continue;
+                }
+
+                if (!element.isJsonPrimitive()) {
+                    field.set(result, gson.fromJson(element, field.getType()));
+                    continue;
+                }
+                Object elementToPrimitive = jsonPrimitiveToJavaPrimitive(field.getType(), element);
+
+                if (elementToPrimitive == null) {
+                    gson.fromJson(element, field.getType());
+                } else {
+                    field.set(result, jsonPrimitiveToJavaPrimitive(field.getType(), element));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new JsonParseException(e.getMessage());
+        }
+        return result;
+    }
+
+    private static Object jsonPrimitiveToJavaPrimitive(Class<?> type, JsonElement element) {
+        if (type == String.class) {
+            return element.getAsString();
+        } else if (type == boolean.class) {
+            return element.getAsBoolean();
+        } else if (type == byte.class) {
+            return element.getAsByte();
+        } else if (type == char.class) {
+            return element.getAsByte();
+        } else if (type == short.class) {
+            return element.getAsShort();
+        } else if (type == int.class) {
+            return element.getAsInt();
+        } else if (type == long.class) {
+            return element.getAsLong();
+        } else if (type == float.class) {
+            return element.getAsFloat();
+        } else if (type == double.class) {
+            return element.getAsDouble();
+        }
+        return null;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializer.kt
new file mode 100644
index 00000000000..0f938e5d05f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializer.kt
@@ -0,0 +1,79 @@
+package org.wordpress.android.fluxc.network.rest
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.internal.LazilyParsedNumber
+import java.lang.reflect.Type
+
+/**
+ * A custom deserializer for JSON objects into Maps that is aware of number types.
+ * This deserializer ensures that numbers are correctly parsed and converted to the appropriate
+ * type (e.g., integer, long, double) based on their value.
+ */
+class NumberAwareMapDeserializer : JsonDeserializer<Map<*, *>> {
+    @Suppress("TooGenericExceptionCaught", "NestedBlockDepth")
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Map<*, *> {
+        val map: MutableMap<Any, Any?> = HashMap()
+        try {
+            val jsonObject = json.asJsonObject
+            for ((key, value) in jsonObject.entrySet()) {
+                if (key !is String) {
+                    throw JsonParseException("Invalid key type: ${key::class.java}")
+                }
+                if (value.isJsonPrimitive) {
+                    val primitive = value.asJsonPrimitive
+                    if (primitive.isNumber) {
+                        map[key] = convertNumber(primitive.asNumber)
+                    } else if (primitive.isBoolean) {
+                        map[key] = primitive.asBoolean
+                    } else {
+                        map[key] = primitive.asString
+                    }
+                } else if (value.isJsonObject) {
+                    map[key] = context.deserialize<Map<*, *>>(value, Map::class.java)
+                } else if (value.isJsonArray) {
+                    map[key] = value.asJsonArray.map {
+                        if (it.isJsonPrimitive && it.asJsonPrimitive.isNumber) {
+                            convertNumber(it.asJsonPrimitive.asNumber)
+                        } else {
+                            context.deserialize<Any>(it, Any::class.java)
+                        }
+                    }
+                } else {
+                    map[key] = null
+                }
+            }
+        } catch (e: Exception) {
+            throw JsonParseException("Error deserializing JSON to Map", e)
+        }
+        return map
+    }
+
+    private fun convertNumber(numberValue: Number): Number {
+        return when {
+            numberValue is LazilyParsedNumber -> {
+                val numberAsString = numberValue.toString()
+                if (numberAsString.contains('.')) {
+                    val doubleValue = numberAsString.toDouble()
+                    if (doubleValue % 1 == 0.0) {
+                        doubleValue.toLong()
+                    } else {
+                        doubleValue
+                    }
+                } else {
+                    val longValue = numberAsString.toLong()
+                    if (longValue in Integer.MIN_VALUE..Integer.MAX_VALUE) {
+                        longValue.toInt()
+                    } else {
+                        longValue
+                    }
+                }
+            }
+            numberValue is Long && numberValue in Integer.MIN_VALUE..Integer.MAX_VALUE -> numberValue.toInt()
+            numberValue is Double && numberValue % 1 == 0.0 -> numberValue.toLong()
+            else -> numberValue
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/BaseWPAPIRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/BaseWPAPIRestClient.java
new file mode 100644
index 00000000000..1b4e55d7667
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/BaseWPAPIRestClient.java
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.network.rest.wpapi;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.OnAuthFailedListener;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.discovery.WPAPIHeadRequest;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+
+public abstract class BaseWPAPIRestClient {
+    private final RequestQueue mRequestQueue;
+    private final Dispatcher mDispatcher;
+    private UserAgent mUserAgent;
+
+    private OnAuthFailedListener mOnAuthFailedListener;
+
+    public BaseWPAPIRestClient(Dispatcher dispatcher, RequestQueue requestQueue,
+                               UserAgent userAgent) {
+        mDispatcher = dispatcher;
+        mRequestQueue = requestQueue;
+        mUserAgent = userAgent;
+        mOnAuthFailedListener = new OnAuthFailedListener() {
+            @Override
+            public void onAuthFailed(AuthenticateErrorPayload authError) {
+                mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateErrorAction(authError));
+            }
+        };
+    }
+
+    protected Request add(WPAPIGsonRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    protected Request add(WPAPIHeadRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    protected Request add(WPAPIEncodedBodyRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    private BaseRequest setRequestAuthParams(BaseRequest request) {
+        request.setOnAuthFailedListener(mOnAuthFailedListener);
+        request.setUserAgent(mUserAgent.getUserAgent());
+        return request;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/CookieNonceAuthenticator.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/CookieNonceAuthenticator.kt
new file mode 100644
index 00000000000..6a7710b6a6b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/CookieNonceAuthenticator.kt
@@ -0,0 +1,154 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import android.webkit.URLUtil
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.discovery.DiscoveryWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Available
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.FailedRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Unknown
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.UrlUtils
+import javax.inject.Inject
+
+class CookieNonceAuthenticator @Inject constructor(
+    private val nonceRestClient: NonceRestClient,
+    private val discoveryWPAPIRestClient: DiscoveryWPAPIRestClient,
+    private val siteSqlUtils: SiteSqlUtils,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun authenticate(
+        siteUrl: String,
+        username: String,
+        password: String
+    ): CookieNonceAuthenticationResult {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "authenticate") {
+            val siteUrlWithScheme = if (!URLUtil.isNetworkUrl(siteUrl)) {
+                // If the URL is missing a scheme, try inferring it from the API endpoint
+                val wpApiUrl = discoverApiEndpoint(UrlUtils.addUrlSchemeIfNeeded(siteUrl, false))
+                val scheme = wpApiUrl.toHttpUrl().scheme
+                UrlUtils.addUrlSchemeIfNeeded(UrlUtils.removeScheme(siteUrl), scheme == "https")
+            } else siteUrl
+
+            when (val nonce = nonceRestClient.requestNonce(siteUrlWithScheme, username, password)) {
+                is Available -> CookieNonceAuthenticationResult.Success
+                is FailedRequest -> {
+                    CookieNonceAuthenticationResult.Error(
+                        type = nonce.type,
+                        message = nonce.errorMessage,
+                        networkError = nonce.networkError
+                    )
+                }
+
+                is Unknown -> CookieNonceAuthenticationResult.Error(type = Nonce.CookieNonceErrorType.UNKNOWN)
+            }
+        }
+    }
+
+    suspend fun <T : WPAPIResponse<*>> makeAuthenticatedWPAPIRequest(
+        site: SiteModel,
+        fetchMethod: suspend (Nonce) -> T
+    ): T {
+        val usingSavedRestUrl = site.wpApiRestUrl != null
+        if (!usingSavedRestUrl) {
+            site.wpApiRestUrl = discoverApiEndpoint(site.url)
+            (siteSqlUtils::insertOrUpdateSite)(site)
+        }
+
+        val response = makeAuthenticatedWPAPIRequest(
+            siteUrl = site.url,
+            wpApiUrl = site.wpApiRestUrl,
+            username = site.username,
+            password = site.password
+        ) { _, nonce ->
+            fetchMethod(nonce)
+        }
+
+        return if (response is WPAPIResponse.Error<*> &&
+            response.error.volleyError?.networkResponse?.statusCode == STATUS_CODE_NOT_FOUND) {
+            // call failed with 'not found' so clear the (failing) rest url
+            site.wpApiRestUrl = null
+            (siteSqlUtils::insertOrUpdateSite)(site)
+
+            if (usingSavedRestUrl) {
+                // If we did the previous call with a saved rest url, try again by making
+                // recursive call. This time there is no saved rest url to use
+                // so the rest url will be retrieved using discovery
+                makeAuthenticatedWPAPIRequest(site, fetchMethod)
+            } else {
+                // Already used discovery to fetch the rest base url and still got 'not found', so
+                // just return the error response
+                response
+            }
+        } else response
+    }
+
+    private suspend fun <T : WPAPIResponse<*>> makeAuthenticatedWPAPIRequest(
+        siteUrl: String,
+        wpApiUrl: String,
+        username: String,
+        password: String,
+        fetchMethod: suspend (wpApiUrl: String, nonce: Nonce) -> T
+    ): T {
+        var nonce = nonceRestClient.getNonce(siteUrl, username)
+        val usingSavedNonce = nonce is Available
+        if (nonce !is Available) {
+            nonce = nonceRestClient.requestNonce(siteUrl, username, password)
+        }
+
+        val response = fetchMethod(wpApiUrl, nonce)
+
+        if (response is WPAPIResponse.Success<*>) return response
+
+        val error = (response as WPAPIResponse.Error<*>).error
+        val statusCode = error.volleyError?.networkResponse?.statusCode
+        val errorCode = (error as? WPAPINetworkError)?.errorCode
+        return when {
+            statusCode == STATUS_CODE_UNAUTHORIZED ||
+                (statusCode == STATUS_CODE_FORBIDDEN && errorCode == "rest_cookie_invalid_nonce") -> {
+                if (usingSavedNonce) {
+                    // Call with saved nonce failed, so try getting a new one
+                    val previousNonce = nonce
+                    val newNonce = nonceRestClient.requestNonce(siteUrl, username, password)
+
+                    // Try original call again if we have a new nonce
+                    val nonceIsUpdated = newNonce != previousNonce
+                    if (nonceIsUpdated) {
+                        fetchMethod(wpApiUrl, newNonce)
+                    } else {
+                        response
+                    }
+                } else {
+                    response
+                }
+            }
+            // For all other failures just return the error response
+            else -> response
+        }
+    }
+
+    private fun discoverApiEndpoint(
+        url: String
+    ): String {
+        return discoveryWPAPIRestClient.discoverWPAPIBaseURL(url) // discover rest api endpoint
+            ?: WPAPIDiscoveryUtils.buildDefaultRESTBaseUrl(url)
+    }
+
+    sealed interface CookieNonceAuthenticationResult {
+        object Success : CookieNonceAuthenticationResult
+        data class Error(
+            val type: Nonce.CookieNonceErrorType,
+            val message: String? = null,
+            val networkError: BaseNetworkError? = null,
+        ) : CookieNonceAuthenticationResult
+    }
+
+    companion object {
+        private const val STATUS_CODE_NOT_FOUND = 404
+        private const val STATUS_CODE_FORBIDDEN = 403
+        private const val STATUS_CODE_UNAUTHORIZED = 401
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/Nonce.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/Nonce.kt
new file mode 100644
index 00000000000..15cd2443d8e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/Nonce.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+sealed interface Nonce {
+    val value: String?
+        get() = null
+    val username: String?
+
+    data class Available(override val value: String, override val username: String) : Nonce
+    data class FailedRequest(
+        val timeOfResponse: Long,
+        override val username: String,
+        val type: CookieNonceErrorType,
+        val networkError: WPAPINetworkError? = null,
+        val errorMessage: String? = null,
+    ) : Nonce
+
+    data class Unknown(override val username: String?) : Nonce
+
+    enum class CookieNonceErrorType {
+        NOT_AUTHENTICATED,
+        INVALID_RESPONSE,
+        INVALID_CREDENTIALS,
+        CUSTOM_LOGIN_URL,
+        CUSTOM_ADMIN_URL,
+        INVALID_NONCE,
+        GENERIC_ERROR,
+        UNKNOWN
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClient.kt
new file mode 100644
index 00000000000..899a4ee4157
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/NonceRestClient.kt
@@ -0,0 +1,162 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import com.android.volley.NoConnectionError
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Available
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.FailedRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Unknown
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import org.wordpress.android.fluxc.utils.extensions.slashJoin
+import org.wordpress.android.util.HtmlUtils
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+private const val NOT_FOUND_STATUS_CODE = 404
+
+@Singleton
+class NonceRestClient @Inject constructor(
+    private val wpApiEncodedBodyRequestBuilder: WPAPIEncodedBodyRequestBuilder,
+    private val currentTimeProvider: CurrentTimeProvider,
+    dispatcher: Dispatcher,
+    @Named("no-redirects") requestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    private val nonceMap: MutableMap<String, Nonce> = mutableMapOf()
+    fun getNonce(siteUrl: String, username: String?): Nonce? = nonceMap[siteUrl]?.takeIf { it.username == username }
+    fun getNonce(site: SiteModel): Nonce? = getNonce(site.url, site.username)
+
+    /**
+     *  Requests a nonce using the
+     *  [rest-nonce endpoint](https://developer.wordpress.org/reference/functions/wp_ajax_rest_nonce/)
+     *  that became available in WordPress 5.3.
+     */
+    suspend fun requestNonce(site: SiteModel): Nonce {
+        if (site.username == null || site.password == null) return Unknown(site.username)
+        return requestNonce(site.url, site.username, site.password)
+    }
+
+    /**
+     *  Requests a nonce using the
+     *  [rest-nonce endpoint](https://developer.wordpress.org/reference/functions/wp_ajax_rest_nonce/)
+     *  that became available in WordPress 5.3.
+     */
+    @Suppress("NestedBlockDepth")
+    suspend fun requestNonce(siteUrl: String, username: String, password: String): Nonce {
+        @Suppress("MagicNumber")
+        fun Int.isRedirect(): Boolean = this in 300..399
+        val wpLoginUrl = siteUrl.slashJoin("wp-login.php")
+        val redirectUrl = siteUrl.slashJoin("wp-admin/admin-ajax.php?action=rest-nonce")
+        val body = mapOf(
+            "log" to username,
+            "pwd" to password,
+            "redirect_to" to redirectUrl
+        )
+        val response =
+            wpApiEncodedBodyRequestBuilder.syncPostRequest(this, wpLoginUrl, body = body)
+        val nonce = when (response) {
+            is Success -> {
+                // A success means we got 200 from the wp-login.php call, which means
+                // a login error: https://core.trac.wordpress.org/ticket/25446
+                // A successful login should result in a redirection to the redirect URL
+
+                // Let's try to extract the login error from the web page, and if we have it, then we'll assume
+                // that it's an authentication issue, otherwise we'll assume it's an invalid response
+                val errorMessage = extractErrorMessage(response.data.orEmpty())
+
+                val errorType = if (hasInvalidCredentialsPattern(response.data.orEmpty())) {
+                    Nonce.CookieNonceErrorType.INVALID_CREDENTIALS
+                } else if (errorMessage != null) {
+                    Nonce.CookieNonceErrorType.NOT_AUTHENTICATED
+                } else {
+                    Nonce.CookieNonceErrorType.INVALID_RESPONSE
+                }
+
+                FailedRequest(
+                    timeOfResponse = currentTimeProvider.currentDate().time,
+                    username = username,
+                    type = errorType,
+                    errorMessage = errorMessage
+                )
+            }
+
+            is Error -> {
+                if (response.error.volleyError is NoConnectionError) {
+                    // No connection, so we do not know if a nonce is available
+                    Unknown(username)
+                } else {
+                    val networkResponse = response.error.volleyError?.networkResponse
+                    if (networkResponse?.statusCode?.isRedirect() == true) {
+                        requestNonce(networkResponse.headers?.get("Location") ?: redirectUrl, username)
+                    } else {
+                        FailedRequest(
+                            timeOfResponse = currentTimeProvider.currentDate().time,
+                            username = username,
+                            type = if (networkResponse?.statusCode == NOT_FOUND_STATUS_CODE) {
+                                Nonce.CookieNonceErrorType.CUSTOM_LOGIN_URL
+                            } else Nonce.CookieNonceErrorType.GENERIC_ERROR,
+                            networkError = response.error,
+                            errorMessage = response.error.message,
+                        )
+                    }
+                }
+            }
+        }
+        return nonce.also {
+            nonceMap[siteUrl] = it
+        }
+    }
+
+    private suspend fun requestNonce(redirectUrl: String, username: String): Nonce {
+        return when (
+            val response = wpApiEncodedBodyRequestBuilder.syncGetRequest(this, redirectUrl)
+        ) {
+            is Success -> {
+                if (response.data?.matches("[0-9a-zA-Z]{2,}".toRegex()) == true) {
+                    Available(value = response.data, username = username)
+                } else {
+                    FailedRequest(
+                        timeOfResponse = currentTimeProvider.currentDate().time,
+                        username = username,
+                        type = Nonce.CookieNonceErrorType.INVALID_NONCE
+                    )
+                }
+            }
+
+            is Error -> {
+                val statusCode = response.error.volleyError?.networkResponse?.statusCode
+                FailedRequest(
+                    timeOfResponse = currentTimeProvider.currentDate().time,
+                    username = username,
+                    type = if (statusCode == NOT_FOUND_STATUS_CODE) Nonce.CookieNonceErrorType.CUSTOM_ADMIN_URL
+                    else Nonce.CookieNonceErrorType.GENERIC_ERROR,
+                    networkError = response.error,
+                    errorMessage = response.error.message,
+                )
+            }
+        }
+    }
+
+    private fun extractErrorMessage(htmlResponse: String): String? {
+        val regex = Regex("<div[^>]*id=\"login_error\"[^>]*>([\\s\\S]+?)</div>")
+        val loginErrorDiv = regex.find(htmlResponse)?.groupValues?.get(1) ?: return null
+        val urlRegex = Regex("<a[^>]*href=\".*\"[^>]*>[\\s\\S]+?</a>")
+
+        val errorHtml = loginErrorDiv.replace(urlRegex, "")
+        // Strip HTML tags
+        return HtmlUtils.fastStripHtml(errorHtml)
+            .trim(' ', '\n')
+    }
+
+    private fun hasInvalidCredentialsPattern(htmlResponse: String) =
+        htmlResponse.contains(INVALID_CREDENTIAL_HTML_PATTERN)
+
+    companion object {
+        const val INVALID_CREDENTIAL_HTML_PATTERN = "document.querySelector('form').classList.add('shake')"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/OnWPAPIErrorListener.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/OnWPAPIErrorListener.kt
new file mode 100644
index 00000000000..580dae178ec
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/OnWPAPIErrorListener.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+
+fun interface OnWPAPIErrorListener {
+    fun onErrorResponse(error: WPAPINetworkError)
+}
+
+class WPAPIErrorListenerWrapper(
+    private val listener: OnWPAPIErrorListener
+) : BaseRequest.BaseErrorListener {
+    override fun onErrorResponse(error: BaseNetworkError) {
+        listener.onErrorResponse(error as WPAPINetworkError)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIDiscoveryUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIDiscoveryUtils.kt
new file mode 100644
index 00000000000..329cd64a571
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIDiscoveryUtils.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import org.wordpress.android.fluxc.utils.extensions.slashJoin
+import org.wordpress.android.util.UrlUtils
+
+internal object WPAPIDiscoveryUtils {
+    fun buildDefaultRESTBaseUrl(
+        url: String
+    ): String {
+        val urlWithoutScheme = UrlUtils.removeScheme(url)
+        val httpsUrl = UrlUtils.addUrlSchemeIfNeeded(urlWithoutScheme, true)
+
+        // TODO investigate the possibility to use `/?rest_route=` instead,
+        //  `/wp-json` works only when permalinks are enabled, where `/?rest_route=` works without them
+        // fallback to ".../wp-json/"
+        return httpsUrl.slashJoin("wp-json")
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequest.kt
new file mode 100644
index 00000000000..d8c26ac7263
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequest.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import com.android.volley.NetworkResponse
+import com.android.volley.Response
+import com.android.volley.Response.Listener
+import com.android.volley.toolbox.HttpHeaderParser
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType
+import java.io.UnsupportedEncodingException
+import java.net.URLEncoder
+import java.nio.charset.Charset
+
+private const val FORBIDDEN = 403
+private const val UNAUTHORIZED = 401
+
+class WPAPIEncodedBodyRequest(
+    method: Int,
+    url: String,
+    private val params: Map<String, String>,
+    private val body: Map<String, String>,
+    private val listener: Listener<String>,
+    errorListener: OnWPAPIErrorListener
+) : BaseRequest<String>(method, url, WPAPIErrorListenerWrapper(errorListener)) {
+    override fun getBody(): ByteArray {
+        return encodeParameters(body)
+    }
+
+    override fun getParams(): MutableMap<String, String> {
+        return params.toMutableMap()
+    }
+
+    override fun deliverBaseNetworkError(error: BaseNetworkError): BaseNetworkError {
+        val authenticationError = when(error.volleyError?.networkResponse?.statusCode){
+            UNAUTHORIZED -> AuthenticationErrorType.AUTHORIZATION_REQUIRED
+            FORBIDDEN -> AuthenticationErrorType.NOT_AUTHENTICATED
+            else -> null
+        }
+
+        if (mOnAuthFailedListener != null && authenticationError != null) {
+            mOnAuthFailedListener.onAuthFailed(AuthenticateErrorPayload(authenticationError))
+        }
+
+        return WPAPINetworkError(error)
+    }
+
+    override fun parseNetworkResponse(response: NetworkResponse?): Response<String> {
+        val contentTypeCharset =
+                response?.headers
+                        ?.let { charset(HttpHeaderParser.parseCharset(it)) }
+                        ?: Charset.defaultCharset()
+
+        val data = response?.data?.toString(contentTypeCharset)
+        return Response.success(data, null)
+    }
+
+    override fun deliverResponse(response: String) {
+        listener.onResponse(response)
+    }
+
+    /**
+     * Based on [com.android.volley.Request.encodeParameters]
+     * @param params parameters that are converted
+     * @return an application/x-www-form-urlencoded encoded string
+     */
+    @Suppress("TooGenericExceptionThrown")
+    private fun encodeParameters(params: Map<String, String>): ByteArray {
+        val encodedParams = StringBuilder()
+        return try {
+            for ((key, value) in params) {
+                encodedParams.append(URLEncoder.encode(key, paramsEncoding))
+                encodedParams.append('=')
+                encodedParams.append(URLEncoder.encode(value, paramsEncoding))
+                encodedParams.append('&')
+            }
+            encodedParams.toString().toByteArray(charset(paramsEncoding))
+        } catch (uee: UnsupportedEncodingException) {
+            throw RuntimeException("Encoding not supported: $paramsEncoding", uee)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequestBuilder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequestBuilder.kt
new file mode 100644
index 00000000000..b05bb55150d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIEncodedBodyRequestBuilder.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import com.android.volley.Request.Method
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import javax.inject.Inject
+import kotlin.coroutines.resume
+
+class WPAPIEncodedBodyRequestBuilder @Inject constructor() {
+    suspend fun syncGetRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<String>> { cont ->
+        callMethod(Method.GET, url, params, body, cont, enableCaching, cacheTimeToLive, nonce, restClient)
+    }
+
+    suspend fun syncPostRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<String>> { cont ->
+        callMethod(Method.POST, url, params, body, cont, enableCaching, cacheTimeToLive, nonce, restClient)
+    }
+
+    @Suppress("LongParameterList")
+    private fun callMethod(
+        method: Int,
+        url: String,
+        params: Map<String, String>,
+        body: Map<String, String>,
+        cont: CancellableContinuation<WPAPIResponse<String>>,
+        enableCaching: Boolean,
+        cacheTimeToLive: Int,
+        nonce: String?,
+        restClient: BaseWPAPIRestClient
+    ) {
+        val request = WPAPIEncodedBodyRequest(method, url, params, body, { response ->
+            cont.resume(Success(response))
+        }, { error ->
+            cont.resume(Error(error))
+        })
+
+        cont.invokeOnCancellation {
+            request.cancel()
+        }
+
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+
+        if (nonce != null) {
+            request.addHeader("x-wp-nonce", nonce)
+        }
+
+        restClient.add(request)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequest.java
new file mode 100644
index 00000000000..55562221697
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequest.java
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.network.rest.wpapi;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Response.Listener;
+import com.android.volley.toolbox.HttpHeaderParser;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.network.rest.GsonRequest;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationError;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType;
+import org.wordpress.android.util.AppLog;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+public class WPAPIGsonRequest<T> extends GsonRequest<T> {
+    public WPAPIGsonRequest(int method, String url, Map<String, String> params, Map<String, Object> body,
+                             Class<T> clazz, Listener<T> listener, OnWPAPIErrorListener errorListener) {
+        super(method, params, body, url, clazz, null, listener, new WPAPIErrorListenerWrapper(errorListener));
+        // If it's a GET request, add the parameters to the URL
+        if (method == Method.GET) {
+            addQueryParameters(params);
+        }
+    }
+    public WPAPIGsonRequest(int method, String url, Map<String, String> params, Map<String, Object> body,
+                            Type type, Listener<T> listener, OnWPAPIErrorListener errorListener) {
+        super(method, params, body, url, null, type, listener, new WPAPIErrorListenerWrapper(errorListener));
+        // If it's a GET request, add the parameters to the URL
+        if (method == Method.GET) {
+            addQueryParameters(params);
+        }
+    }
+
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        String errorCode = null;
+        if (error.hasVolleyError() && error.volleyError.networkResponse != null) {
+            String jsonString;
+            try {
+                jsonString = new String(error.volleyError.networkResponse.data,
+                        HttpHeaderParser.parseCharset(error.volleyError.networkResponse.headers));
+                JSONObject jsonObject = new JSONObject(jsonString);
+
+                String errorMessage = jsonObject.optString("message", "");
+                errorCode = jsonObject.optString("code", "");
+                if (!errorMessage.isEmpty()) {
+                    error.message = errorMessage;
+                }
+            } catch (UnsupportedEncodingException | JSONException e) {
+                AppLog.w(AppLog.T.API, e.toString());
+            }
+
+            if (errorCode == null) {
+                errorCode = "";
+            }
+
+            AuthenticationError authenticationError = null;
+            if (error.volleyError.networkResponse.statusCode == 401) {
+                authenticationError =
+                        new AuthenticationError(AuthenticationErrorType.AUTHORIZATION_REQUIRED, errorCode);
+            } else if (error.volleyError.networkResponse.statusCode == 403) {
+                authenticationError = new AuthenticationError(AuthenticationErrorType.NOT_AUTHENTICATED, errorCode);
+            }
+
+            if (mOnAuthFailedListener != null && authenticationError != null) {
+                mOnAuthFailedListener.onAuthFailed(new AuthenticateErrorPayload(authenticationError));
+            }
+        }
+
+        return new WPAPINetworkError(error, errorCode);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequestBuilder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequestBuilder.kt
new file mode 100644
index 00000000000..c63bb9f9845
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIGsonRequestBuilder.kt
@@ -0,0 +1,136 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import com.android.volley.Request.Method
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import java.lang.reflect.Type
+import javax.inject.Inject
+import kotlin.coroutines.resume
+
+class WPAPIGsonRequestBuilder @Inject constructor() {
+    suspend fun <T> syncGetRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, Any> = emptyMap(),
+        clazz: Class<T>,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<T>> { cont ->
+        callMethod(Method.GET, url, params, body, clazz, cont, enableCaching, cacheTimeToLive, nonce, restClient)
+    }
+    suspend fun <T> syncGetRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, Any> = emptyMap(),
+        type: Type,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<T>> { cont ->
+        callMethod(Method.GET, url, params, body, type, cont, enableCaching, cacheTimeToLive, nonce, restClient)
+    }
+
+    suspend fun <T> syncPostRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        body: Map<String, Any> = emptyMap(),
+        clazz: Class<T>,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<T>> { cont ->
+        callMethod(Method.POST, url, null, body, clazz, cont, false, 0, nonce, restClient)
+    }
+
+    suspend fun <T> syncPutRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        body: Map<String, Any> = emptyMap(),
+        clazz: Class<T>,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<T>> { cont ->
+        callMethod(Method.PUT, url, null, body, clazz, cont, false, 0, nonce, restClient)
+    }
+
+    suspend fun <T> syncDeleteRequest(
+        restClient: BaseWPAPIRestClient,
+        url: String,
+        body: Map<String, Any> = emptyMap(),
+        clazz: Class<T>,
+        nonce: String? = null
+    ) = suspendCancellableCoroutine<WPAPIResponse<T>> { cont ->
+        callMethod(Method.DELETE, url, null, body, clazz, cont, false, 0, nonce, restClient)
+    }
+
+    @Suppress("LongParameterList")
+    private fun <T> callMethod(
+        method: Int,
+        url: String,
+        params: Map<String, String>? = null,
+        body: Map<String, Any> = emptyMap(),
+        clazz: Class<T>,
+        cont: CancellableContinuation<WPAPIResponse<T>>,
+        enableCaching: Boolean,
+        cacheTimeToLive: Int,
+        nonce: String?,
+        restClient: BaseWPAPIRestClient
+    ) {
+        val request = WPAPIGsonRequest(method, url, params, body, clazz, { response ->
+            cont.resume(Success(response))
+        }, { error ->
+            cont.resume(Error(error))
+        })
+
+        cont.invokeOnCancellation {
+            request.cancel()
+        }
+
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+
+        if (nonce != null) {
+            request.addHeader("x-wp-nonce", nonce)
+        }
+
+        restClient.add(request)
+    }
+
+    @Suppress("LongParameterList")
+    private fun <T> callMethod(
+        method: Int,
+        url: String,
+        params: Map<String, String>?,
+        body: Map<String, Any>,
+        type: Type,
+        cont: CancellableContinuation<WPAPIResponse<T>>,
+        enableCaching: Boolean,
+        cacheTimeToLive: Int,
+        nonce: String?,
+        restClient: BaseWPAPIRestClient
+    ) {
+        val request = WPAPIGsonRequest<T>(method, url, params, body, type, { response ->
+            cont.resume(Success(response))
+        }, { error ->
+            cont.resume(Error(error))
+        })
+
+        cont.invokeOnCancellation {
+            request.cancel()
+        }
+
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+
+        if (nonce != null) {
+            request.addHeader("x-wp-nonce", nonce)
+        }
+
+        restClient.add(request)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPINetworkError.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPINetworkError.kt
new file mode 100644
index 00000000000..22c8decde28
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPINetworkError.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+
+class WPAPINetworkError(
+    baseError: BaseNetworkError,
+    val errorCode: String? = null
+) : BaseNetworkError(baseError)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIResponse.kt
new file mode 100644
index 00000000000..5e131338afb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/WPAPIResponse.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.network.rest.wpapi
+
+sealed class WPAPIResponse<T> {
+    data class Success<T>(val data: T?) : WPAPIResponse<T>()
+    data class Error<T>(val error: WPAPINetworkError) : WPAPIResponse<T>()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordCredentials.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordCredentials.kt
new file mode 100644
index 00000000000..e389187a1e6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordCredentials.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+data class ApplicationPasswordCredentials(
+    val userName: String,
+    val password: String,
+    val uuid: ApplicationPasswordUUID? = null
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordUUID.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordUUID.kt
new file mode 100644
index 00000000000..f5974ff3fa1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordUUID.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+internal typealias ApplicationPasswordUUID = String
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsApiResponses.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsApiResponses.kt
new file mode 100644
index 00000000000..09f03aa9e59
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsApiResponses.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.google.gson.annotations.SerializedName
+
+internal data class ApplicationPasswordCreationResponse(
+    @SerializedName("uuid") val uuid: ApplicationPasswordUUID,
+    @SerializedName("name") val name: String,
+    @SerializedName("password") val password: String
+)
+
+internal data class ApplicationPasswordsFetchResponse(
+    @SerializedName("uuid") val uuid: ApplicationPasswordUUID,
+    @SerializedName("name") val name: String
+)
+
+internal data class ApplicationPasswordDeleteResponse(
+    @SerializedName("deleted") val deleted: Boolean
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsConfiguration.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsConfiguration.kt
new file mode 100644
index 00000000000..f58b792fcb5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsConfiguration.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import org.wordpress.android.fluxc.module.ApplicationPasswordsClientId
+import java.util.Optional
+import javax.inject.Inject
+
+/**
+ * Note: the [ApplicationPasswordsClientId] is provided as [Optional] because we want to keep the feature optional and
+ * to not force the client apps to provide it. With this change, we will keep Dagger happy, and we move from a compile
+ * error to a runtime error if it's missing.
+ */
+internal data class ApplicationPasswordsConfiguration @Inject constructor(
+    @ApplicationPasswordsClientId private val applicationNameOptional: Optional<String>
+) {
+    val isEnabled: Boolean
+        get() = applicationNameOptional.isPresent
+
+    val applicationName: String
+        get() = applicationNameOptional.orElseThrow {
+            NoSuchElementException(
+                "Please make sure to inject a String instance with " +
+                    "the annotation @${ApplicationPasswordsClientId::class.simpleName} to the Dagger graph" +
+                    "to be able to use the Application Passwords feature"
+            )
+        }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsListener.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsListener.kt
new file mode 100644
index 00000000000..95caec60d19
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsListener.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+
+interface ApplicationPasswordsListener {
+    fun onNewPasswordCreated(isPasswordRegenerated: Boolean) {}
+    fun onPasswordGenerationFailed(networkError: WPAPINetworkError) {}
+    fun onFeatureUnavailable(siteModel: SiteModel, networkError: WPAPINetworkError) {}
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsManager.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsManager.kt
new file mode 100644
index 00000000000..eaa7c81a6d6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsManager.kt
@@ -0,0 +1,248 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.android.volley.NetworkResponse
+import com.android.volley.VolleyError
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MAIN
+import javax.inject.Inject
+
+private const val UNAUTHORIZED = 401
+private const val CONFLICT = 409
+private const val NOT_FOUND = 404
+private const val APPLICATION_PASSWORDS_DISABLED_ERROR_CODE = "application_passwords_disabled"
+
+internal class ApplicationPasswordsManager @Inject constructor(
+    private val applicationPasswordsStore: ApplicationPasswordsStore,
+    private val jetpackApplicationPasswordsRestClient: JetpackApplicationPasswordsRestClient,
+    private val wpApiApplicationPasswordsRestClient: WPApiApplicationPasswordsRestClient,
+    private val configuration: ApplicationPasswordsConfiguration,
+    private val appLogWrapper: AppLogWrapper
+) {
+    private val applicationName
+        get() = configuration.applicationName
+
+    /**
+     * Checks whether the site supports creating new Application Passwords using the API, and the different cases are:
+     * 1. For Jetpack sites, we always can call the API using the WordPress.com token.
+     * 2. For self-hosted sites, we need to check if we have persisted credentials, otherwise we can't create it. This
+     *    case happens when a site's Application Password was saved directly to the [ApplicationPasswordsStore],
+     *    which happens during the Web Authorization.
+     */
+    private val SiteModel.supportsApplicationPasswordsGeneration
+        get() = origin == SiteModel.ORIGIN_WPCOM_REST ||
+            (!username.isNullOrEmpty() && !password.isNullOrEmpty())
+
+    @Suppress("ReturnCount")
+    suspend fun getApplicationCredentials(
+        site: SiteModel
+    ): ApplicationPasswordCreationResult {
+        if (site.isWPCom) return ApplicationPasswordCreationResult.NotSupported(
+            WPAPINetworkError(
+                BaseNetworkError(
+                    GenericErrorType.UNKNOWN,
+                    "Simple WPCom sites don't support application passwords"
+                )
+            )
+        )
+        val existingPassword = applicationPasswordsStore.getCredentials(site)
+        if (existingPassword != null) {
+            return ApplicationPasswordCreationResult.Existing(existingPassword)
+        }
+
+        val usernamePayload = getOrFetchUsername(site)
+        return if (usernamePayload.isError) {
+            ApplicationPasswordCreationResult.Failure(usernamePayload.error)
+        } else {
+            createApplicationPassword(site, usernamePayload.userName).also {
+                if (it is ApplicationPasswordCreationResult.Created) {
+                    applicationPasswordsStore.saveCredentials(
+                        site,
+                        it.credentials
+                    )
+                }
+            }
+        }
+    }
+
+    private suspend fun getOrFetchUsername(site: SiteModel): UsernameFetchPayload {
+        return if (site.origin == SiteModel.ORIGIN_WPCOM_REST) {
+            jetpackApplicationPasswordsRestClient.fetchWPAdminUsername(site)
+        } else {
+            UsernameFetchPayload(site.username)
+        }
+    }
+
+    private suspend fun createApplicationPassword(
+        site: SiteModel,
+        username: String
+    ): ApplicationPasswordCreationResult {
+        if (!site.supportsApplicationPasswordsGeneration) {
+            ApplicationPasswordCreationResult.Failure(
+                WPAPINetworkError(
+                    BaseNetworkError(
+                        GenericErrorType.NOT_AUTHENTICATED,
+                        "Site password is missing. " +
+                            "The application password was probably authorized using the Web flow",
+                        VolleyError(
+                            NetworkResponse(
+                                UNAUTHORIZED, null, true, System.currentTimeMillis(), emptyList()
+                            )
+                        )
+                    )
+                )
+            )
+        }
+
+        val payload = if (site.origin == SiteModel.ORIGIN_WPCOM_REST) {
+            jetpackApplicationPasswordsRestClient.createApplicationPassword(
+                site = site,
+                applicationName = applicationName
+            )
+        } else {
+            wpApiApplicationPasswordsRestClient.createApplicationPassword(
+                site = site,
+                applicationName = applicationName
+            )
+        }
+
+        return handleApplicationPasswordCreationResult(site, username, payload)
+    }
+
+    private suspend fun handleApplicationPasswordCreationResult(
+        site: SiteModel,
+        username: String,
+        payload: ApplicationPasswordCreationPayload,
+    ): ApplicationPasswordCreationResult {
+        return when {
+            !payload.isError -> ApplicationPasswordCreationResult.Created(
+                ApplicationPasswordCredentials(
+                    userName = username,
+                    password = payload.password,
+                    uuid = payload.uuid
+                )
+            )
+
+            else -> {
+                val statusCode = payload.error.volleyError?.networkResponse?.statusCode
+                val errorCode = payload.error.let {
+                    when (it) {
+                        is WPComGsonNetworkError -> it.apiError
+                        is WPAPINetworkError -> it.errorCode
+                        else -> null
+                    }
+                }
+                when {
+                    statusCode == CONFLICT -> {
+                        appLogWrapper.w(MAIN, "Application Password already exists")
+                        when (val deletionResult = deleteApplicationCredentials(site)) {
+                            ApplicationPasswordDeletionResult.Success ->
+                                createApplicationPassword(site, username)
+
+                            is ApplicationPasswordDeletionResult.Failure ->
+                                ApplicationPasswordCreationResult.Failure(deletionResult.error)
+                        }
+                    }
+
+                    statusCode == NOT_FOUND ||
+                        errorCode == APPLICATION_PASSWORDS_DISABLED_ERROR_CODE -> {
+                        appLogWrapper.w(
+                            MAIN,
+                            "Application Password feature not supported, " +
+                                "status code: $statusCode, errorCode: $errorCode"
+                        )
+                        ApplicationPasswordCreationResult.NotSupported(payload.error)
+                    }
+
+                    else -> {
+                        appLogWrapper.w(
+                            MAIN,
+                            "Application Password creation failed ${payload.error.type}"
+                        )
+                        ApplicationPasswordCreationResult.Failure(payload.error)
+                    }
+                }
+            }
+        }
+    }
+
+    suspend fun deleteApplicationCredentials(
+        site: SiteModel
+    ): ApplicationPasswordDeletionResult {
+        val credentials = applicationPasswordsStore.getCredentials(site)
+
+        val payload = if (credentials == null) {
+            // If we don't have any saved credentials, let's fetch the UUID then delete the password using
+            // either the WP.com token or the self-hosted credentials.
+            val uuid = fetchApplicationPasswordUUID(site).let {
+                if (it.isError) return ApplicationPasswordDeletionResult.Failure(it.error)
+                it.uuid
+            }
+
+            if (site.origin == SiteModel.ORIGIN_WPCOM_REST) {
+                jetpackApplicationPasswordsRestClient.deleteApplicationPassword(
+                    site = site,
+                    uuid = uuid
+                )
+            } else {
+                wpApiApplicationPasswordsRestClient.deleteApplicationPassword(
+                    site = site,
+                    uuid = uuid
+                )
+            }
+        } else {
+            // If we have an Application Password, we can use it itself for the delete request.
+            wpApiApplicationPasswordsRestClient.deleteApplicationPassword(
+                site = site,
+                credentials = credentials
+            )
+        }
+
+        return when {
+            !payload.isError -> {
+                if (payload.isDeleted) {
+                    appLogWrapper.d(AppLog.T.MAIN, "Application password deleted")
+                    deleteLocalApplicationPassword(site)
+                    ApplicationPasswordDeletionResult.Success
+                } else {
+                    appLogWrapper.w(AppLog.T.MAIN, "Application password deletion failed")
+                    ApplicationPasswordDeletionResult.Failure(
+                        BaseNetworkError(
+                            GenericErrorType.UNKNOWN,
+                            "Deletion not confirmed by API"
+                        )
+                    )
+                }
+            }
+
+            else -> {
+                val error = payload.error
+                appLogWrapper.w(
+                    AppLog.T.MAIN, "Application password deletion failed, error: " +
+                    "${error.type} ${error.message}\n" +
+                    "${error.volleyError?.toString()}"
+                )
+                ApplicationPasswordDeletionResult.Failure(error)
+            }
+        }
+    }
+
+    private suspend fun fetchApplicationPasswordUUID(
+        site: SiteModel
+    ): ApplicationPasswordUUIDFetchPayload {
+        return if (site.origin == SiteModel.ORIGIN_WPCOM_REST) {
+            jetpackApplicationPasswordsRestClient.fetchApplicationPasswordUUID(site, applicationName)
+        } else {
+            wpApiApplicationPasswordsRestClient.fetchApplicationPasswordUUID(site, applicationName)
+        }
+    }
+
+    fun deleteLocalApplicationPassword(site: SiteModel) {
+        applicationPasswordsStore.deleteCredentials(site)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetwork.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetwork.kt
new file mode 100644
index 00000000000..0724312d198
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetwork.kt
@@ -0,0 +1,194 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.RequestQueue
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.Credentials
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.HttpMethod
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.toVolleyMethod
+import org.wordpress.android.fluxc.utils.extensions.slashJoin
+import org.wordpress.android.util.AppLog
+import java.util.Optional
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+private const val AUTHORIZATION_HEADER = "Authorization"
+private const val UNAUTHORIZED = 401
+
+@Singleton
+class ApplicationPasswordsNetwork @Inject constructor(
+    @Named("no-cookies") private val requestQueue: RequestQueue,
+    private val userAgent: UserAgent,
+    private val listener: Optional<ApplicationPasswordsListener>
+) {
+    // We can't use construction injection for this variable, as its class is internal
+    @Inject internal lateinit var mApplicationPasswordsManager: ApplicationPasswordsManager
+
+    @Suppress("ReturnCount", "ComplexMethod")
+    suspend fun <T> executeGsonRequest(
+        site: SiteModel,
+        method: HttpMethod,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, Any> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        requestTimeout: Int = BaseRequest.DEFAULT_REQUEST_TIMEOUT,
+        retries: Int = BaseRequest.DEFAULT_MAX_RETRIES,
+        isRegeneratingApplicationPassword: Boolean = false
+    ): WPAPIResponse<T> {
+        fun buildRequest(
+            continuation: Continuation<WPAPIResponse<T>>,
+            authorizationHeader: String
+        ): WPAPIGsonRequest<T> {
+            val request = WPAPIGsonRequest(
+                method.toVolleyMethod(),
+                (site.wpApiRestUrl ?: site.url.slashJoin("wp-json")).slashJoin(path),
+                params,
+                body,
+                clazz,
+                /* listener = */ { continuation.resume(WPAPIResponse.Success(it)) },
+                /* errorListener = */ { continuation.resume(WPAPIResponse.Error(it)) }
+            )
+
+            request.addHeader(AUTHORIZATION_HEADER, authorizationHeader)
+            request.setUserAgent(userAgent.userAgent)
+
+            if (enableCaching) {
+                request.enableCaching(cacheTimeToLive)
+            }
+            if (forced) {
+                request.setShouldForceUpdate()
+            }
+
+            request.retryPolicy = DefaultRetryPolicy(
+                requestTimeout,
+                retries,
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+            )
+
+            return request
+        }
+
+        val credentialsResult = mApplicationPasswordsManager.getApplicationCredentials(site)
+        val credentials = when (credentialsResult) {
+            is ApplicationPasswordCreationResult.Existing -> credentialsResult.credentials
+            is ApplicationPasswordCreationResult.Created -> {
+                if (listener.isPresent) {
+                    listener.get().onNewPasswordCreated(isRegeneratingApplicationPassword)
+                }
+                credentialsResult.credentials
+            }
+            is ApplicationPasswordCreationResult.Failure -> {
+                if (listener.isPresent) {
+                    listener.get().onPasswordGenerationFailed(credentialsResult.error.toWPAPINetworkError())
+                }
+                return WPAPIResponse.Error(credentialsResult.error.toWPAPINetworkError())
+            }
+            is ApplicationPasswordCreationResult.NotSupported -> {
+                val networkError = credentialsResult.originalError.toWPAPINetworkError()
+                if (listener.isPresent) {
+                    listener.get().onFeatureUnavailable(site, networkError)
+                }
+                return WPAPIResponse.Error(networkError)
+            }
+        }
+
+        val authorizationHeader = Credentials.basic(credentials.userName, credentials.password)
+
+        val response = suspendCancellableCoroutine<WPAPIResponse<T>> { continuation ->
+            val request = buildRequest(continuation, authorizationHeader)
+            requestQueue.add(request)
+
+            continuation.invokeOnCancellation {
+                request.cancel()
+            }
+        }
+
+        return if (credentialsResult is ApplicationPasswordCreationResult.Existing &&
+            response is WPAPIResponse.Error &&
+            response.error.volleyError?.networkResponse?.statusCode == UNAUTHORIZED
+        ) {
+            AppLog.w(
+                AppLog.T.MAIN,
+                "Authentication failure using application password, maybe revoked?" +
+                    " Delete the saved one then retry"
+            )
+            mApplicationPasswordsManager.deleteLocalApplicationPassword(site)
+            executeGsonRequest(site, method, path, clazz, params, body, isRegeneratingApplicationPassword = true)
+        } else {
+            response
+        }
+    }
+
+    suspend fun <T> executeGetGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        requestTimeout: Int = BaseRequest.DEFAULT_REQUEST_TIMEOUT,
+        retries: Int = BaseRequest.DEFAULT_MAX_RETRIES
+    ) = executeGsonRequest(
+        site = site,
+        method = HttpMethod.GET,
+        path = path,
+        clazz = clazz,
+        params = params,
+        enableCaching = enableCaching,
+        cacheTimeToLive = cacheTimeToLive,
+        forced = forced,
+        requestTimeout = requestTimeout,
+        retries = retries
+    )
+
+    suspend fun <T> executePostGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap(),
+        params: Map<String, String> = emptyMap()
+    ) = executeGsonRequest(site, HttpMethod.POST, path, clazz, params, body)
+
+    suspend fun <T> executePutGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap(),
+        params: Map<String, String> = emptyMap()
+    ) = executeGsonRequest(site, HttpMethod.PUT, path, clazz, params, body)
+
+    suspend fun <T> executeDeleteGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, Any> = emptyMap()
+    ) = executeGsonRequest(site, HttpMethod.DELETE, path, clazz, params, body)
+}
+
+private fun BaseNetworkError.toWPAPINetworkError(): WPAPINetworkError {
+    return when (this) {
+        is WPAPINetworkError -> this
+        is WPComGsonNetworkError -> WPAPINetworkError(
+            baseError = this,
+            errorCode = this.apiError
+        )
+        else -> WPAPINetworkError(this)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsPayloads.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsPayloads.kt
new file mode 100644
index 00000000000..5172a06b7f6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsPayloads.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+
+internal data class ApplicationPasswordCreationPayload(
+    val password: String,
+    val uuid: String
+) : Payload<BaseNetworkError>() {
+    constructor(error: BaseNetworkError) : this("", "") {
+        this.error = error
+    }
+}
+
+internal data class ApplicationPasswordUUIDFetchPayload(
+    val uuid: ApplicationPasswordUUID
+) : Payload<BaseNetworkError>() {
+    constructor(error: BaseNetworkError) : this("") {
+        this.error = error
+    }
+}
+
+internal data class ApplicationPasswordDeletionPayload(
+    val isDeleted: Boolean
+) : Payload<BaseNetworkError>() {
+    constructor(error: BaseNetworkError) : this(false) {
+        this.error = error
+    }
+}
+
+internal data class UsernameFetchPayload(
+    val userName: String
+) : Payload<BaseNetworkError>() {
+    constructor(error: BaseNetworkError) : this("") {
+        this.error = error
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsResults.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsResults.kt
new file mode 100644
index 00000000000..932ceae4ca2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsResults.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+
+internal sealed interface ApplicationPasswordCreationResult {
+    data class Existing(
+        val credentials: ApplicationPasswordCredentials
+    ) : ApplicationPasswordCreationResult
+
+    data class Created(
+        val credentials: ApplicationPasswordCredentials
+    ) : ApplicationPasswordCreationResult
+
+    data class NotSupported(val originalError: BaseNetworkError) : ApplicationPasswordCreationResult
+    data class Failure(val error: BaseNetworkError) : ApplicationPasswordCreationResult
+}
+
+internal sealed interface ApplicationPasswordDeletionResult {
+    object Success : ApplicationPasswordDeletionResult
+    data class Failure(val error: BaseNetworkError) : ApplicationPasswordDeletionResult
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsStore.kt
new file mode 100644
index 00000000000..6c8d75e614e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsStore.kt
@@ -0,0 +1,135 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKeys
+import okhttp3.Credentials
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.UrlUtils
+import java.security.KeyStore
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ApplicationPasswordsStore @Inject constructor(
+    private val context: Context
+) {
+    companion object {
+        private const val USERNAME_PREFERENCE_KEY_PREFIX = "username_"
+        private const val PASSWORD_PREFERENCE_KEY_PREFIX = "app_password_"
+        private const val UUID_PREFERENCE_KEY_PREFIX = "app_password_uuid_"
+    }
+
+    /*
+    Exposed only to pass to React Native instance so we can authenticate via application password
+    there. Do not use directly in WCAndroid app.
+     */
+    fun getApplicationPasswordAuthHeader(site: SiteModel): String =
+        Credentials.basic(
+            username = encryptedPreferences.getString(site.usernamePrefKey, null).orEmpty(),
+            password = encryptedPreferences.getString(site.passwordPrefKey, null).orEmpty()
+        )
+
+    @Inject internal lateinit var configuration: ApplicationPasswordsConfiguration
+
+    private val applicationName: String
+        get() = configuration.applicationName
+
+    private val encryptedPreferences by lazy {
+        initEncryptedPrefs()
+    }
+
+    @Synchronized
+    internal fun getCredentials(site: SiteModel): ApplicationPasswordCredentials? {
+        val username = encryptedPreferences.getString(site.usernamePrefKey, null)
+        val password = encryptedPreferences.getString(site.passwordPrefKey, null)
+        val uuid = encryptedPreferences.getString(site.uuidPrefKey, null)
+
+        return when {
+            !site.isUsingWpComRestApi && site.username != username -> null
+            username != null && password != null ->
+                ApplicationPasswordCredentials(
+                    userName = username,
+                    password = password,
+                    uuid = uuid
+                )
+            else -> null
+        }
+    }
+
+    @Synchronized
+    fun saveCredentials(site: SiteModel, credentials: ApplicationPasswordCredentials) {
+        encryptedPreferences.edit()
+            .putString(site.usernamePrefKey, credentials.userName)
+            .putString(site.passwordPrefKey, credentials.password)
+            .putString(site.uuidPrefKey, credentials.uuid)
+            .apply()
+    }
+
+    @Synchronized
+    fun deleteCredentials(site: SiteModel) {
+        encryptedPreferences.edit()
+            .remove(site.usernamePrefKey)
+            .remove(site.passwordPrefKey)
+            .remove(site.uuidPrefKey)
+            .apply()
+    }
+
+    private fun initEncryptedPrefs(): SharedPreferences {
+        val keySpec = MasterKeys.AES256_GCM_SPEC
+        val filename = "$applicationName-encrypted-prefs"
+
+        fun createPrefs(): SharedPreferences {
+            val masterKey = MasterKeys.getOrCreate(keySpec)
+            return EncryptedSharedPreferences.create(
+                filename,
+                masterKey,
+                context,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            )
+        }
+
+        fun deletePrefs() {
+            context.deleteSharedPreferences(filename)
+            with(KeyStore.getInstance("AndroidKeyStore")) {
+                load(null)
+                if (containsAlias(keySpec.keystoreAlias)) {
+                    deleteEntry(keySpec.keystoreAlias)
+                }
+            }
+        }
+
+        // The documentation recommends excluding the file from auto backup, but since the file
+        // is defined in an internal library, adding to the backup rules and maintaining them won't
+        // be straightforward.
+        // So instead, we use a destructive approach, if we can't decrypt the file after restoring it,
+        // We simply delete it and create a new one.
+        @Suppress("TooGenericExceptionCaught", "SwallowedException")
+        return try {
+            createPrefs()
+        } catch (e: Exception) {
+            // In case we can't decrypt the file after a backup, let's delete it
+            AppLog.d(
+                AppLog.T.MAIN,
+                "Can't decrypt encrypted preferences, delete it and create new one"
+            )
+            deletePrefs()
+            createPrefs()
+        }
+    }
+
+    private val SiteModel.domainName
+        get() = UrlUtils.removeScheme(url).trim('/')
+
+    private val SiteModel.usernamePrefKey
+        get() = "$USERNAME_PREFERENCE_KEY_PREFIX$domainName"
+
+    private val SiteModel.passwordPrefKey
+        get() = "$PASSWORD_PREFERENCE_KEY_PREFIX$domainName"
+
+    private val SiteModel.uuidPrefKey
+        get() = "$UUID_PREFERENCE_KEY_PREFIX$domainName"
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsRestClient.kt
new file mode 100644
index 00000000000..e0faaebb41f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsRestClient.kt
@@ -0,0 +1,161 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackSuccess
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+internal class JetpackApplicationPasswordsRestClient @Inject constructor(
+    private val jetpackTunnelGsonRequestBuilder: JetpackTunnelGsonRequestBuilder,
+    appContext: Context,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun createApplicationPassword(
+        site: SiteModel,
+        applicationName: String
+    ): ApplicationPasswordCreationPayload {
+        AppLog.d(T.MAIN, "Create an application password using Jetpack Tunnel")
+
+        val url = WPAPI.users.me.application_passwords.urlV2
+        val response = jetpackTunnelGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            site = site,
+            url = url,
+            body = mapOf("name" to applicationName),
+            clazz = ApplicationPasswordCreationResponse::class.java
+        )
+
+        return when (response) {
+            is JetpackSuccess<ApplicationPasswordCreationResponse> -> {
+                response.data?.let {
+                    ApplicationPasswordCreationPayload(it.password, it.uuid)
+                } ?: ApplicationPasswordCreationPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "Password missing from response"
+                    )
+                )
+            }
+            is JetpackError<ApplicationPasswordCreationResponse> ->
+                ApplicationPasswordCreationPayload(response.error)
+        }
+    }
+
+    suspend fun fetchApplicationPasswordUUID(
+        site: SiteModel,
+        applicationName: String
+    ) : ApplicationPasswordUUIDFetchPayload {
+        AppLog.d(T.MAIN, "Fetch application password UUID using Jetpack Tunnel")
+        val url = WPAPI.users.me.application_passwords.urlV2
+        val response = jetpackTunnelGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            site = site,
+            url = url,
+            params = emptyMap(),
+            clazz = Array<ApplicationPasswordCreationResponse>::class.java
+        )
+
+        return when (response) {
+            is JetpackSuccess -> {
+                response.data?.firstOrNull { it.name == applicationName }?.let {
+                    ApplicationPasswordUUIDFetchPayload(it.uuid)
+                } ?: ApplicationPasswordUUIDFetchPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "UUID for application password $applicationName was not found"
+                    )
+                )
+            }
+            is JetpackError -> ApplicationPasswordUUIDFetchPayload(response.error)
+        }
+    }
+
+    suspend fun deleteApplicationPassword(
+        site: SiteModel,
+        uuid: ApplicationPasswordUUID
+    ): ApplicationPasswordDeletionPayload {
+        AppLog.d(T.MAIN, "Delete application password using Jetpack Tunnel")
+
+        val url = WPAPI.users.me.application_passwords.uuid(uuid).urlV2
+        val response = jetpackTunnelGsonRequestBuilder.syncDeleteRequest(
+            restClient = this,
+            site = site,
+            url = url,
+            clazz = ApplicationPasswordDeleteResponse::class.java
+        )
+
+        return when (response) {
+            is JetpackSuccess<ApplicationPasswordDeleteResponse> -> {
+                response.data?.let {
+                    ApplicationPasswordDeletionPayload(it.deleted)
+                } ?: ApplicationPasswordDeletionPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "Response is empty"
+                    )
+                )
+            }
+            is JetpackError<ApplicationPasswordDeleteResponse> -> {
+                ApplicationPasswordDeletionPayload(response.error)
+            }
+        }
+    }
+
+    suspend fun fetchWPAdminUsername(
+        site: SiteModel
+    ): UsernameFetchPayload {
+        AppLog.d(T.MAIN, "Fetch wp-admin username using Jetpack Tunnel")
+
+        val url = WPAPI.users.me.urlV2
+
+        val response = jetpackTunnelGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            site = site,
+            url = url,
+            params = mapOf(
+                "_fields" to "username",
+                "context" to "edit"
+            ),
+            clazz = UserApiResponse::class.java
+        )
+
+        return when (response) {
+            is JetpackSuccess<UserApiResponse> -> {
+                response.data?.let {
+                    UsernameFetchPayload(it.username)
+                } ?: UsernameFetchPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "Response is empty"
+                    )
+                )
+            }
+            is JetpackError<UserApiResponse> -> {
+                UsernameFetchPayload(response.error)
+            }
+        }
+    }
+
+    private data class UserApiResponse(
+        @SerializedName("username") val username: String
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/WPApiApplicationPasswordsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/WPApiApplicationPasswordsRestClient.kt
new file mode 100644
index 00000000000..1d7cec07f3e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/WPApiApplicationPasswordsRestClient.kt
@@ -0,0 +1,229 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.Credentials
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.CookieNonceAuthenticator
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.utils.extensions.slashJoin
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+@Singleton
+internal class WPApiApplicationPasswordsRestClient @Inject constructor(
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    private val cookieNonceAuthenticator: CookieNonceAuthenticator,
+    @Named("no-cookies") private val noCookieRequestQueue: RequestQueue,
+    @Named("regular") requestQueue: RequestQueue,
+    dispatcher: Dispatcher,
+    private val userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    suspend fun createApplicationPassword(
+        site: SiteModel,
+        applicationName: String
+    ): ApplicationPasswordCreationPayload {
+        AppLog.d(T.MAIN, "Create an application password using Cookie Authentication")
+        val path = WPAPI.users.me.application_passwords.urlV2
+
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncPostRequest(
+                restClient = this,
+                url = site.buildUrl(path),
+                body = mapOf("name" to applicationName),
+                clazz = ApplicationPasswordCreationResponse::class.java,
+                nonce = nonce.value
+            )
+        }
+
+        return when (response) {
+            is WPAPIResponse.Success<ApplicationPasswordCreationResponse> -> {
+                response.data?.let {
+                    ApplicationPasswordCreationPayload(it.password, it.uuid)
+                } ?: ApplicationPasswordCreationPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "Password missing from response"
+                    )
+                )
+            }
+
+            is WPAPIResponse.Error<ApplicationPasswordCreationResponse> ->
+                ApplicationPasswordCreationPayload(response.error)
+        }
+    }
+
+    suspend fun fetchApplicationPasswordUUID(
+        site: SiteModel,
+        applicationName: String
+    ): ApplicationPasswordUUIDFetchPayload {
+        AppLog.d(T.MAIN, "Fetch application password UUID using Cookie authentication")
+        val path = WPAPI.users.me.application_passwords.urlV2
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.buildUrl(path),
+                clazz = Array<ApplicationPasswordsFetchResponse>::class.java,
+                nonce = nonce.value
+            )
+        }
+
+        return when (response) {
+            is WPAPIResponse.Success -> {
+                response.data?.firstOrNull { it.name == applicationName }?.let {
+                    ApplicationPasswordUUIDFetchPayload(it.uuid)
+                } ?: ApplicationPasswordUUIDFetchPayload(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "UUID for application password $applicationName was not found"
+                    )
+                )
+            }
+
+            is WPAPIResponse.Error -> ApplicationPasswordUUIDFetchPayload(response.error)
+        }
+    }
+
+    suspend fun deleteApplicationPassword(
+        site: SiteModel,
+        uuid: ApplicationPasswordUUID
+    ): ApplicationPasswordDeletionPayload {
+        AppLog.d(T.MAIN, "Delete application password")
+        val path = WPAPI.users.me.application_passwords.uuid(uuid).urlV2
+
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncDeleteRequest(
+                restClient = this,
+                url = site.buildUrl(path),
+                clazz = ApplicationPasswordDeleteResponse::class.java,
+                nonce = nonce.value
+            )
+        }
+
+        return response.toPayload()
+    }
+
+    suspend fun deleteApplicationPassword(
+        site: SiteModel,
+        credentials: ApplicationPasswordCredentials
+    ): ApplicationPasswordDeletionPayload {
+        AppLog.d(T.MAIN, "Delete application password using Basic Authentication")
+
+        val uuid = credentials.uuid ?: fetchApplicationPasswordUsingBasicAuth(site, credentials).let {
+            if (it is WPAPIResponse.Success && it.data != null) {
+                it.data
+            } else {
+                return ApplicationPasswordDeletionPayload((it as WPAPIResponse.Error).error)
+            }
+        }
+
+        return deleteApplicationPasswordUsingBasicAuth(site, credentials, uuid).toPayload()
+    }
+
+    private suspend fun fetchApplicationPasswordUsingBasicAuth(
+        site: SiteModel,
+        applicationPasswordCredentials: ApplicationPasswordCredentials
+    ): WPAPIResponse<ApplicationPasswordUUID> {
+        AppLog.d(T.MAIN, "Fetching application password UUID using the /introspect endpoint")
+
+        val path = WPAPI.users.me.application_passwords.introspect.urlV2
+
+        val response = invokeRequestUsingBasicAuth<ApplicationPasswordsFetchResponse>(
+            site = site,
+            path = path,
+            credentials = applicationPasswordCredentials,
+            method = Request.Method.GET,
+        )
+
+        @Suppress("UNCHECKED_CAST")
+        return when (response) {
+            is WPAPIResponse.Success -> response.data?.let {
+                WPAPIResponse.Success(it.uuid)
+            } ?: WPAPIResponse.Error(
+                WPAPINetworkError(
+                    BaseNetworkError(
+                        GenericErrorType.UNKNOWN,
+                        "Response is empty"
+                    )
+                )
+            )
+
+            is WPAPIResponse.Error -> response as WPAPIResponse.Error<ApplicationPasswordUUID>
+        }
+    }
+
+    private suspend fun deleteApplicationPasswordUsingBasicAuth(
+        site: SiteModel,
+        credentials: ApplicationPasswordCredentials,
+        uuid: ApplicationPasswordUUID
+    ): WPAPIResponse<ApplicationPasswordDeleteResponse> {
+        val path = WPAPI.users.me.application_passwords.uuid(uuid).urlV2
+
+        return invokeRequestUsingBasicAuth(
+            site = site,
+            credentials = credentials,
+            path = path,
+            method = Request.Method.DELETE
+        )
+    }
+
+    private fun WPAPIResponse<ApplicationPasswordDeleteResponse>.toPayload() = when (this) {
+        is WPAPIResponse.Success<ApplicationPasswordDeleteResponse> -> {
+            data?.let {
+                ApplicationPasswordDeletionPayload(it.deleted)
+            } ?: ApplicationPasswordDeletionPayload(
+                BaseNetworkError(
+                    GenericErrorType.UNKNOWN,
+                    "Response is empty"
+                )
+            )
+        }
+
+        is WPAPIResponse.Error<ApplicationPasswordDeleteResponse> -> {
+            ApplicationPasswordDeletionPayload(error)
+        }
+    }
+
+    private suspend inline fun <reified T> invokeRequestUsingBasicAuth(
+        site: SiteModel,
+        credentials: ApplicationPasswordCredentials,
+        path: String,
+        method: Int
+    ): WPAPIResponse<T> {
+        return suspendCancellableCoroutine { continuation ->
+            val request = WPAPIGsonRequest(
+                method,
+                site.buildUrl(path),
+                emptyMap(),
+                emptyMap(),
+                T::class.java,
+                /* listener = */ { continuation.resume(WPAPIResponse.Success(it)) },
+                /* errorListener = */ { continuation.resume(WPAPIResponse.Error(it)) }
+            )
+
+            request.addHeader("Authorization", Credentials.basic(credentials.userName, credentials.password))
+            request.setUserAgent(userAgent.userAgent)
+
+            noCookieRequestQueue.add(request)
+        }
+    }
+
+    private fun SiteModel.buildUrl(path: String): String {
+        val baseUrl = wpApiRestUrl ?: url.slashJoin("/wp-json")
+        return baseUrl.slashJoin(path)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackConnectionDataResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackConnectionDataResponse.kt
new file mode 100644
index 00000000000..5a25cb37e22
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackConnectionDataResponse.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.jetpack
+
+import com.google.gson.annotations.SerializedName
+
+data class JetpackConnectionDataResponse(
+    val currentUser: CurrentUser
+)
+
+data class CurrentUser(
+    @SerializedName("isConnected") val isConnected: Boolean?,
+    @SerializedName("isMaster") val isMaster: Boolean?,
+    @SerializedName("username") val username: String?,
+    @SerializedName("wpcomUser") val wpcomUser: WpcomUser?,
+    @SerializedName("gravatar") val gravatar: String?,
+    @SerializedName("permissions") val permissions: Map<String, Boolean>?
+)
+
+data class WpcomUser(
+    @SerializedName("ID") val id: Long?,
+    @SerializedName("login") val login: String?,
+    @SerializedName("email") val email: String?,
+    @SerializedName("display_name") val displayName: String?,
+    @SerializedName("text_direction") val textDirection: String?,
+    @SerializedName("site_count") val siteCount: Long?,
+    @SerializedName("jetpack_connect") val jetpackConnect: String?,
+    @SerializedName("avatar") val avatar: String?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackWPAPIRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackWPAPIRestClient.kt
new file mode 100644
index 00000000000..ff66dd83e00
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/jetpack/JetpackWPAPIRestClient.kt
@@ -0,0 +1,170 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.jetpack
+
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.JPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.jetpack.JetpackUser
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.RawRequest
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.CookieNonceAuthenticator
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIEncodedBodyRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+@Singleton
+class JetpackWPAPIRestClient @Inject constructor(
+    private val wpApiEncodedBodyRequestBuilder: WPAPIEncodedBodyRequestBuilder,
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    private val cookieNonceAuthenticator: CookieNonceAuthenticator,
+    private val applicationPasswordsNetwork: ApplicationPasswordsNetwork,
+    dispatcher: Dispatcher,
+    @Named("custom-ssl") requestQueue: RequestQueue,
+    @Named("no-redirects") private val noRedirectsRequestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    suspend fun fetchJetpackConnectionUrl(
+        site: SiteModel,
+        useApplicationPasswords: Boolean = false
+    ): JetpackWPAPIPayload<String> {
+        if (useApplicationPasswords) {
+            val url = JPAPI.connection.url.pathV4
+            val response = applicationPasswordsNetwork.executeGetGsonRequest(
+                    site = site,
+                    path = url,
+                    clazz = String::class.java
+            )
+            return when (response) {
+                is Success<String> -> JetpackWPAPIPayload(response.data)
+                is Error -> JetpackWPAPIPayload(response.error)
+            }
+        }
+
+        val baseUrl = site.wpApiRestUrl ?: "${site.url}/wp-json"
+        val url = "${baseUrl.trimEnd('/')}/${JPAPI.connection.url.pathV4.trimStart('/')}"
+
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiEncodedBodyRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = url,
+                nonce = nonce.value
+            )
+        }
+
+        return when (response) {
+            is Success<String> -> JetpackWPAPIPayload(response.data)
+            is Error -> JetpackWPAPIPayload(response.error)
+        }
+    }
+
+    suspend fun registerJetpackSite(registrationUrl: String): Result<String> {
+        @Suppress("MagicNumber")
+        fun Int.isRedirect(): Boolean = this in 300..399
+        return suspendCancellableCoroutine { cont ->
+            val request = RawRequest(
+                method = Request.Method.GET,
+                url = registrationUrl,
+                listener = {
+                    cont.resume(Result.failure(Exception("Got a success response instead of the expected redirect")))
+                },
+                onErrorListener = { error ->
+                    val response = error.volleyError.networkResponse
+
+                    if (response == null || !response.statusCode.isRedirect()) {
+                        cont.resume(Result.failure(error.volleyError))
+                        return@RawRequest
+                    }
+
+                    response.headers?.get("Location")?.let {
+                        if (it.isNotEmpty()) {
+                            cont.resume(Result.success(it))
+                        } else {
+                            cont.resume(Result.failure(Exception("Location header missing")))
+                        }
+                    }
+                }
+            )
+
+            noRedirectsRequestQueue.add(request)
+
+            cont.invokeOnCancellation {
+                request.cancel()
+            }
+        }
+    }
+
+    suspend fun fetchJetpackUser(
+        site: SiteModel,
+        useApplicationPasswords: Boolean = false
+    ): JetpackWPAPIPayload<JetpackUser> {
+        if (useApplicationPasswords) {
+            val url = JPAPI.connection.data.pathV4
+            val response = applicationPasswordsNetwork.executeGetGsonRequest(
+                    site = site,
+                    path = url,
+                    clazz = JetpackConnectionDataResponse::class.java
+            )
+            return when (response) {
+                is Success<JetpackConnectionDataResponse> -> JetpackWPAPIPayload(
+                        response.data?.toJetpackUser()
+                )
+
+                is Error -> JetpackWPAPIPayload(response.error)
+            }
+        }
+
+        val url = site.buildUrl(JPAPI.connection.data.pathV4)
+
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = url,
+                nonce = nonce.value,
+                clazz = JetpackConnectionDataResponse::class.java
+            )
+        }
+
+        return when (response) {
+            is Success<JetpackConnectionDataResponse> -> JetpackWPAPIPayload(
+                    response.data?.toJetpackUser()
+            )
+
+            is Error -> JetpackWPAPIPayload(response.error)
+        }
+    }
+
+    private fun JetpackConnectionDataResponse.toJetpackUser(): JetpackUser {
+        return JetpackUser(
+            isConnected = currentUser.isConnected ?: false,
+            isMaster = currentUser.isMaster ?: false,
+            username = currentUser.username.orEmpty(),
+            wpcomEmail = currentUser.wpcomUser?.email.orEmpty(),
+            wpcomId = currentUser.wpcomUser?.id ?: 0L,
+            wpcomUsername = currentUser.wpcomUser?.login.orEmpty()
+        )
+    }
+
+    private fun SiteModel.buildUrl(path: String): String {
+        val baseUrl = wpApiRestUrl ?: "${url}/wp-json"
+        return "${baseUrl.trimEnd('/')}/${path.trimStart('/')}"
+    }
+
+    data class JetpackWPAPIPayload<T>(
+        val result: T?
+    ) : Payload<BaseNetworkError?>() {
+        constructor(error: BaseNetworkError) : this(null) {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/ApplicationPasswordsMediaRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/ApplicationPasswordsMediaRestClient.kt
new file mode 100644
index 00000000000..ebe550df6d2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/ApplicationPasswordsMediaRestClient.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.media
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.endpoint.WPAPIEndpoint
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordCreationResult.Created
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordCreationResult.Existing
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordCreationResult.Failure
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordCreationResult.NotSupported
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsManager
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.extensions.slashJoin
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ApplicationPasswordsMediaRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    coroutineEngine: CoroutineEngine,
+    @Named("no-cookies") okHttpClient: OkHttpClient,
+    private val applicationPasswordsNetwork: ApplicationPasswordsNetwork
+) : BaseWPV2MediaRestClient(dispatcher, coroutineEngine, okHttpClient) {
+    @Inject internal lateinit var applicationPasswordsManager: ApplicationPasswordsManager
+
+    override fun WPAPIEndpoint.getFullUrl(site: SiteModel): String {
+        return (site.wpApiRestUrl ?: site.url.slashJoin("wp-json")).slashJoin(urlV2)
+    }
+
+    override suspend fun getAuthorizationHeader(site: SiteModel): String {
+        val credentials = when (val result = applicationPasswordsManager.getApplicationCredentials(site)) {
+            is Created -> result.credentials
+            is Existing -> result.credentials
+            // If there is no saved password yet or the creation fails, the request will simply fail with a 401 error
+            // This is unlikely to happen though, since media handling happens later in the app
+            is Failure -> null
+            is NotSupported -> null
+        }
+
+        return credentials?.let {
+            Credentials.basic(credentials.userName, credentials.password)
+        }.orEmpty()
+    }
+
+    override suspend fun <T : Any> executeGetGsonRequest(
+        site: SiteModel,
+        endpoint: WPAPIEndpoint,
+        params: Map<String, String>,
+        clazz: Class<T>
+    ): WPAPIResponse<T> {
+        return applicationPasswordsNetwork.executeGetGsonRequest(
+            site = site,
+            path = endpoint.urlV2,
+            clazz = clazz,
+            params = params
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/BaseWPV2MediaRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/BaseWPV2MediaRestClient.kt
new file mode 100644
index 00000000000..fb1ef8c0800
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/BaseWPV2MediaRestClient.kt
@@ -0,0 +1,278 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.media
+
+import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.ProducerScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.trySendBlocking
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.json.JSONException
+import org.json.JSONObject
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.endpoint.WPAPIEndpoint
+import org.wordpress.android.fluxc.generated.MediaActionBuilder
+import org.wordpress.android.fluxc.generated.UploadActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState.FAILED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListResponsePayload
+import org.wordpress.android.fluxc.store.MediaStore.MediaError
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType
+import org.wordpress.android.fluxc.store.MediaStore.MediaPayload
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.MimeType
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MEDIA
+import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Named
+
+abstract class BaseWPV2MediaRestClient constructor(
+    private val dispatcher: Dispatcher,
+    private val coroutineEngine: CoroutineEngine,
+    @Named("regular") private val okHttpClient: OkHttpClient
+) {
+    private val gson: Gson by lazy { Gson() }
+
+    private val currentUploads = ConcurrentHashMap<Int, CoroutineScope>()
+
+    protected abstract fun WPAPIEndpoint.getFullUrl(site: SiteModel): String
+
+    protected abstract suspend fun getAuthorizationHeader(site: SiteModel): String
+
+    protected abstract suspend fun <T : Any> executeGetGsonRequest(
+        site: SiteModel,
+        endpoint: WPAPIEndpoint,
+        params: Map<String, String>,
+        clazz: Class<T>
+    ): WPAPIResponse<T>
+
+    fun uploadMedia(site: SiteModel, media: MediaModel) {
+        coroutineEngine.launch(MEDIA, this, "Upload Media using WPCom's v2 API") {
+            syncUploadMedia(site, media)
+                .onStart {
+                    currentUploads[media.id] = this@launch
+                }
+                .onCompletion {
+                    currentUploads.remove(media.id)
+                }
+                .collect { payload ->
+                    dispatcher.dispatch(UploadActionBuilder.newUploadedMediaAction(payload))
+                }
+        }
+    }
+
+    fun cancelUpload(media: MediaModel) {
+        currentUploads[media.id]?.let { scope ->
+            scope.cancel()
+            val payload = ProgressPayload(media, 0f, false, true)
+            dispatcher.dispatch(MediaActionBuilder.newCanceledMediaUploadAction(payload))
+        }
+    }
+
+    fun fetchMediaList(site: SiteModel, number: Int, offset: Int, mimeType: MimeType.Type?) {
+        coroutineEngine.launch(MEDIA, this, "Fetching Media using WPCom's v2 API") {
+            val payload = syncFetchMediaList(site, number, offset, mimeType)
+            dispatcher.dispatch(MediaActionBuilder.newFetchedMediaListAction(payload))
+        }
+    }
+
+    fun fetchMedia(
+        site: SiteModel,
+        media: MediaModel
+    ) {
+        coroutineEngine.launch(MEDIA, this, "Fetching Media using WPCom's v2 API") {
+            val payload = syncFetchMedia(site, media.mediaId)
+            dispatcher.dispatch(MediaActionBuilder.newFetchedMediaAction(payload))
+        }
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun syncUploadMedia(site: SiteModel, media: MediaModel): Flow<ProgressPayload> {
+        fun ProducerScope<ProgressPayload>.handleFailure(media: MediaModel, error: MediaError) {
+            media.setUploadState(FAILED)
+            val payload = ProgressPayload(media, 1f, false, error)
+            trySendBlocking(payload)
+            close()
+        }
+
+        return callbackFlow {
+            val url = WPAPI.media.getFullUrl(site)
+            val body = WPRestUploadRequestBody(media) { media, progress ->
+                val payload = ProgressPayload(media, progress, false, null)
+                trySend(payload)
+            }
+
+            val request = Request.Builder()
+                .url(url)
+                .post(body = body)
+                .header(WPComGsonRequest.REST_AUTHORIZATION_HEADER, getAuthorizationHeader(site))
+                .build()
+
+            val call = okHttpClient.newCall(request)
+
+            call.enqueue(object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    val message = "media upload failed: $e"
+                    AppLog.w(MEDIA, message)
+                    val error = MediaError.fromIOException(e)
+                    error.logMessage = message
+                    handleFailure(media, error)
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    if (response.isSuccessful) {
+                        try {
+                            val res = gson.fromJson(response.body!!.string(), MediaWPRESTResponse::class.java)
+                            val uploadedMedia = res.toMediaModel(site.id)
+                            uploadedMedia.id = media.id
+                            val payload = ProgressPayload(uploadedMedia, 1f, true, false)
+                            trySendBlocking(payload)
+                            close()
+                        } catch (e: JsonSyntaxException) {
+                            AppLog.e(MEDIA, e)
+                            val error = MediaError(MediaErrorType.PARSE_ERROR)
+                            handleFailure(media, error)
+                        } catch (e: NullPointerException) {
+                            AppLog.e(MEDIA, e)
+                            val error = MediaError(MediaErrorType.PARSE_ERROR)
+                            handleFailure(media, error)
+                        }
+                    } else {
+                        val error = response.parseUploadError()
+                        handleFailure(media, error)
+                    }
+                }
+            })
+
+            awaitClose {
+                call.cancel()
+            }
+        }
+    }
+
+    private suspend fun syncFetchMedia(site: SiteModel, mediaId: Long): MediaPayload {
+        val url = WPAPI.media.id(mediaId)
+        val response = executeGetGsonRequest(
+            site,
+            url,
+            emptyMap(),
+            MediaWPRESTResponse::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Error -> {
+                val errorMessage = "Fail to fetch media. Response: $response"
+                AppLog.w(MEDIA, errorMessage)
+                val error = MediaError(MediaErrorType.fromBaseNetworkError(response.error))
+                error.logMessage = errorMessage
+                MediaPayload(site, null, error)
+            }
+
+            is WPAPIResponse.Success -> {
+                val fetchedMedia = response.data?.toMediaModel(site.id)
+                when {
+                    fetchedMedia != null -> {
+                        AppLog.v(MEDIA, "Fetched media successfully for mediaId: $mediaId")
+                        MediaPayload(site, fetchedMedia)
+                    }
+
+                    else -> {
+                        AppLog.w(
+                            MEDIA,
+                            "Request successful but fetched media is null for mediaId: $mediaId"
+                        )
+                        MediaPayload(site, null, MediaError(MediaErrorType.NULL_MEDIA_ARG))
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun syncFetchMediaList(
+        site: SiteModel,
+        perPage: Int,
+        offset: Int,
+        mimeType: MimeType.Type?
+    ): FetchMediaListResponsePayload {
+        val params = mutableMapOf(
+            "per_page" to perPage.toString()
+        )
+        if (offset > 0) {
+            params["offset"] = offset.toString()
+        }
+        if (mimeType != null) {
+            params["media_type"] = mimeType.value
+        }
+        val response = executeGetGsonRequest(
+            site,
+            WPAPI.media,
+            params,
+            Array<MediaWPRESTResponse>::class.java
+        )
+
+        return when (response) {
+            is WPAPIResponse.Error -> {
+                val errorMessage = "could not parse Fetch all media response: $response"
+                AppLog.w(MEDIA, errorMessage)
+                val error = MediaError(MediaErrorType.PARSE_ERROR)
+                error.logMessage = errorMessage
+                FetchMediaListResponsePayload(site, error, mimeType)
+            }
+
+            is WPAPIResponse.Success -> {
+                val mediaList = response.data.orEmpty().map { it.toMediaModel(site.id) }
+                AppLog.v(MEDIA, "Fetched media list for site with size: " + mediaList.size)
+                val canLoadMore = mediaList.size == perPage
+                FetchMediaListResponsePayload(site, mediaList, offset > 0, canLoadMore, mimeType)
+            }
+        }
+    }
+
+    @Suppress("ReturnCount")
+    private fun Response.parseUploadError(): MediaError {
+        val mediaError = MediaError(MediaErrorType.fromHttpStatusCode(code))
+        mediaError.statusCode = code
+        mediaError.logMessage = message
+        if (mediaError.type == MediaErrorType.REQUEST_TOO_LARGE) {
+            // 413 (Request too large) errors are coming from the web server and are not an API response like the rest
+            mediaError.message = message
+            return mediaError
+        }
+        try {
+            val responseBody = body
+            if (responseBody == null) {
+                AppLog.e(MEDIA, "error uploading media, response body was empty $this")
+                mediaError.type = MediaErrorType.PARSE_ERROR
+                return mediaError
+            }
+            val jsonBody = JSONObject(responseBody.string())
+            jsonBody.optString("message").takeIf { it.isNotEmpty() }?.let {
+                mediaError.message = it
+            }
+            jsonBody.optString("code").takeIf { it.isNotEmpty() }?.let {
+                mediaError.logMessage = it
+            }
+        } catch (e: JSONException) {
+            // no op
+            mediaError.logMessage = e.message
+        } catch (e: IOException) {
+            mediaError.logMessage = e.message
+        }
+        return mediaError
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/MediaWPRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/MediaWPRestResponse.kt
new file mode 100644
index 00000000000..976bae2ba1e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/MediaWPRestResponse.kt
@@ -0,0 +1,95 @@
+@file:Suppress("MatchingDeclarationName")
+
+package org.wordpress.android.fluxc.network.rest.wpapi.media
+
+import com.google.gson.annotations.SerializedName
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrEmptyArray
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaWPComRestResponse
+import org.wordpress.android.util.DateTimeUtils
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+data class MediaWPRESTResponse(
+    val id: Long,
+    @SerializedName("date_gmt") val dateGmt: String,
+    val guid: Attribute,
+    val slug: String,
+    val status: String,
+    val type: String,
+    val link: String,
+    val title: Attribute,
+    val author: Long,
+    val post: Long? = null,
+    val description: Attribute,
+    val caption: Attribute,
+    @SerializedName("alt_text") val altText: String,
+    @SerializedName("media_type") val mediaType: String,
+    @SerializedName("mime_type") val mimeType: String,
+    @SerializedName("media_details") val mediaDetails: MediaDetails,
+    @SerializedName("source_url") val sourceURL: String?
+) {
+    data class Attribute(
+        val rendered: String
+    )
+
+    data class MediaDetails(
+        val width: Int,
+        val height: Int,
+        val file: String?,
+        val sizes: Sizes?
+    )
+
+    data class Sizes(
+        val medium: ImageSize?,
+        val thumbnail: ImageSize?,
+        val full: ImageSize?
+    ): JsonObjectOrEmptyArray()
+
+    data class ImageSize(
+        val path: String?,
+        val file: String?,
+        val width: Long,
+        val height: Long,
+        val virtual: Boolean?,
+        @SerializedName("media_type") val mimeType: String,
+        @SerializedName("source_url") val sourceURL: String,
+        val uncropped: Boolean? = null
+    )
+}
+
+fun MediaWPRESTResponse.toMediaModel(localSiteId: Int) = MediaModel(
+    localSiteId,
+    id,
+    post ?: 0L,
+    author,
+    guid.rendered,
+    DateTimeUtils.iso8601FromDate(
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT).parse(dateGmt)
+    ),
+    sourceURL.orEmpty(),
+    mediaDetails.sizes?.thumbnail?.sourceURL,
+    mediaDetails.file,
+    mediaDetails.file?.substringAfterLast('.', ""),
+    mimeType,
+    StringEscapeUtils.unescapeHtml4(title.rendered),
+    StringEscapeUtils.unescapeHtml4(caption.rendered),
+    StringEscapeUtils.unescapeHtml4(description.rendered),
+    StringEscapeUtils.unescapeHtml4(altText),
+    mediaDetails.width,
+    mediaDetails.height,
+        0,
+        null,
+        false,
+    if (MediaWPComRestResponse.DELETED_STATUS == status) {
+        MediaUploadState.DELETED
+    } else {
+        MediaUploadState.UPLOADED
+    },
+    null,
+    null,
+    null,
+    MediaWPComRestResponse.DELETED_STATUS == status
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/WPRestUploadRequestBody.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/WPRestUploadRequestBody.kt
new file mode 100644
index 00000000000..3263336cadf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/WPRestUploadRequestBody.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.media
+
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okio.BufferedSink
+import okio.buffer
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MEDIA
+import java.io.File
+import java.io.IOException
+import java.net.URLEncoder
+
+private const val FILE_FORM_KEY = "file"
+private const val TITLE_FORM_KEY = "title"
+private const val DESCRIPTION_FORM_KEY = "description"
+private const val CAPTION_FORM_KEY = "caption"
+private const val ALT_FORM_KEY = "alt_text"
+private const val POST_ID_FORM_KEY = "post"
+
+class WPRestUploadRequestBody(
+    media: MediaModel,
+    progressListener: ProgressListener
+) : BaseUploadRequestBody(media, progressListener) {
+    private val multipartBody: MultipartBody
+
+    init {
+        multipartBody = buildMultipartBody()
+    }
+
+    private fun buildMultipartBody(): MultipartBody {
+        fun MultipartBody.Builder.addParamIfNotEmpty(key: String, attribute: String?): MultipartBody.Builder {
+            return apply {
+                attribute?.takeIf { it.isNotEmpty() }?.let {
+                    addFormDataPart(key, it)
+                }
+            }
+        }
+
+        val builder: MultipartBody.Builder = MultipartBody.Builder()
+                .setType(MultipartBody.FORM)
+                .addParamIfNotEmpty(TITLE_FORM_KEY, media.title)
+                .addParamIfNotEmpty(DESCRIPTION_FORM_KEY, media.description)
+                .addParamIfNotEmpty(CAPTION_FORM_KEY, media.caption)
+                .addParamIfNotEmpty(ALT_FORM_KEY, media.alt)
+                .addParamIfNotEmpty(POST_ID_FORM_KEY, media.postId.takeIf { it > 0L }?.toString())
+
+        val filePath = media.filePath
+        val mimeType = media.mimeType
+        if (filePath != null && mimeType != null) {
+            val mediaFile = File(filePath)
+            val body = mediaFile.asRequestBody(mimeType.toMediaType())
+            val fileName = URLEncoder.encode(media.fileName, "UTF-8")
+            builder.addFormDataPart(FILE_FORM_KEY, fileName, body)
+        }
+
+        return builder.build()
+    }
+
+    override fun contentLength(): Long {
+        return try {
+            multipartBody.contentLength()
+        } catch (e: IOException) {
+            AppLog.w(MEDIA, "Error determining mMultipartBody content length: $e")
+            -1L
+        }
+    }
+
+    override fun contentType(): MediaType = multipartBody.contentType()
+
+    override fun writeTo(sink: BufferedSink) {
+        val countingSink = CountingSink(sink)
+        val bufferedSink = countingSink.buffer()
+        multipartBody.writeTo(bufferedSink)
+        bufferedSink.flush()
+    }
+
+    override fun getProgress(bytesWritten: Long): Float = bytesWritten.toFloat() / contentLength()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginResponseModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginResponseModel.kt
new file mode 100644
index 00000000000..0f5f33fdf4a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginResponseModel.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.plugin
+
+import com.google.gson.annotations.SerializedName
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+
+/**
+ * [{"plugin":"akismet\/akismet",
+ * "status":"inactive",
+ * "name":"Akismet Anti-Spam",
+ * "plugin_uri":"https:\/\/akismet.com\/",
+ * "author":"Automattic",
+ * "author_uri":"https:\/\/automattic.com\/wordpress-plugins\/",
+ * "description":{
+ *      "raw":"Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam<\/strong>. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key.",
+ *      "rendered":"Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam<\/strong>. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key. <cite>By <a href=\"https:\/\/automattic.com\/wordpress-plugins\/\">Automattic<\/a>.<\/cite>"
+ * },
+ * "version":"4.1.9",
+ * "network_only":false,
+ * "requires_wp":"",
+ * "requires_php":"",
+ * "textdomain":"akismet",
+ * "_links":{"self":[{"href":"https:\/\/ripe-peacock.jurassic.ninja\/wp-json\/wp\/v2\/plugins\/akismet\/akismet"}]}
+ * },
+ * {"plugin":"companion\/companion","status":"active","name":"Companion Plugin","plugin_uri":"https:\/\/github.com\/Automattic\/companion","author":"Osk","author_uri":"","description":{"raw":"Helps keep the launched WordPress in order.","rendered":"Helps keep the launched WordPress in order. <cite>By Osk.<\/cite>"},"version":"1.18","network_only":false,"requires_wp":"","requires_php":"","textdomain":"companion","_links":{"self":[{"href":"https:\/\/ripe-peacock.jurassic.ninja\/wp-json\/wp\/v2\/plugins\/companion\/companion"}]}},{"plugin":"hello","status":"inactive","name":"Hello Dolly","plugin_uri":"http:\/\/wordpress.org\/plugins\/hello-dolly\/","author":"Matt Mullenweg","author_uri":"http:\/\/ma.tt\/","description":{"raw":"This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page.","rendered":"This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. <cite>By <a href=\"http:\/\/ma.tt\/\">Matt Mullenweg<\/a>.<\/cite>"},"version":"1.7.2","network_only":false,"requires_wp":"","requires_php":"","textdomain":"","_links":{"self":[{"href":"https:\/\/ripe-peacock.jurassic.ninja\/wp-json\/wp\/v2\/plugins\/hello"}]}},
+ * {"plugin":"jetpack\/jetpack","status":"active","name":"Jetpack","plugin_uri":"https:\/\/jetpack.com","author":"Automattic","author_uri":"https:\/\/jetpack.com","description":{"raw":"Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.","rendered":"Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things. <cite>By <a href=\"https:\/\/jetpack.com\">Automattic<\/a>.<\/cite>"},"version":"9.8.1","network_only":false,"requires_wp":"5.6","requires_php":"5.6",
+ * "textdomain":"jetpack","_links":{"self":[{"href":"https:\/\/ripe-peacock.jurassic.ninja\/wp-json\/wp\/v2\/plugins\/jetpack\/jetpack"}]}}]
+ */
+@Suppress("MaxLineLength")
+data class PluginResponseModel(
+    val plugin: String?,
+    val status: String?,
+    val name: String?,
+    @SerializedName("plugin_uri") val pluginUri: String?,
+    val author: String?,
+    @SerializedName("author_uri") val authorUri: String?,
+    val description: Description?,
+    val version: String?,
+    @SerializedName("network_only") val networkOnly: Boolean,
+    @SerializedName("requires_wp") val requiresWp: String?,
+    @SerializedName("requires_php") val requiresPhp: String?,
+    @SerializedName("textdomain") val textDomain: String
+) {
+    data class Description(
+        val raw: String?,
+        val rendered: String?
+    )
+}
+
+fun PluginResponseModel.toDomainModel(siteId: Int): SitePluginModel {
+    val model = SitePluginModel().apply {
+        localSiteId = siteId
+        name = this@toDomainModel.plugin
+        displayName = this@toDomainModel.name
+        authorName = StringEscapeUtils.unescapeHtml4(this@toDomainModel.author)
+        authorUrl = this@toDomainModel.authorUri
+        description = this@toDomainModel.description?.raw
+        pluginUrl = this@toDomainModel.pluginUri
+        slug = this@toDomainModel.textDomain
+        version = this@toDomainModel.version
+    }
+    model.setIsActive(this.status == "active")
+    return model
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPAPIRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPAPIRestClient.kt
new file mode 100644
index 00000000000..6d167053d72
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/plugin/PluginWPAPIRestClient.kt
@@ -0,0 +1,164 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.plugin
+
+import com.android.volley.RequestQueue
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.CookieNonceAuthenticator
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.store.PluginCoroutineStore.WPApiPluginsPayload
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PluginWPAPIRestClient @Inject constructor(
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    private val cookieNonceAuthenticator: CookieNonceAuthenticator,
+    dispatcher: Dispatcher,
+    @Named("custom-ssl") requestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    suspend fun fetchPlugins(
+        site: SiteModel,
+        enableCaching: Boolean = false
+    ): WPApiPluginsPayload<List<SitePluginModel>> {
+        val url = buildUrl(site)
+        val type = object : TypeToken<List<PluginResponseModel>>() {}.type
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncGetRequest<List<PluginResponseModel>>(
+                restClient = this,
+                url = url,
+                type = type,
+                enableCaching = enableCaching,
+                nonce = nonce.value
+            )
+        }
+        return when (response) {
+            is Success -> {
+                val plugins = response.data?.map {
+                    it.toDomainModel(site.id)
+                }
+                WPApiPluginsPayload(site, plugins)
+            }
+
+            is Error -> {
+                WPApiPluginsPayload(response.error)
+            }
+        }
+    }
+
+    suspend fun fetchPlugin(
+        site: SiteModel,
+        pluginName: String
+    ): WPApiPluginsPayload<SitePluginModel> {
+        val url = buildUrl(site, pluginName)
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = url,
+                clazz = PluginResponseModel::class.java,
+                nonce = nonce.value
+            )
+        }
+        return handleResponse(response, site)
+    }
+
+    suspend fun installPlugin(
+        site: SiteModel,
+        installedPluginSlug: String
+    ): WPApiPluginsPayload<SitePluginModel> {
+        val url = buildUrl(site)
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncPostRequest(
+                restClient = this,
+                url = url,
+                body = mapOf("slug" to installedPluginSlug),
+                clazz = PluginResponseModel::class.java,
+                nonce = nonce.value
+            )
+        }
+        return handleResponse(response, site)
+    }
+
+    suspend fun updatePlugin(
+        site: SiteModel,
+        updatedPlugin: String,
+        active: Boolean
+    ): WPApiPluginsPayload<SitePluginModel> {
+        val url = buildUrl(site, updatedPlugin)
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncPutRequest(
+                restClient = this,
+                url = url,
+                body = mapOf("status" to if (active) "active" else "inactive"),
+                clazz = PluginResponseModel::class.java,
+                nonce = nonce.value
+            )
+        }
+        return handleResponse(response, site)
+    }
+
+    suspend fun deletePlugin(
+        site: SiteModel,
+        deletedPlugin: String
+    ): WPApiPluginsPayload<SitePluginModel> {
+        val url = buildUrl(site, deletedPlugin)
+        val response = cookieNonceAuthenticator.makeAuthenticatedWPAPIRequest(site) { nonce ->
+            wpApiGsonRequestBuilder.syncDeleteRequest(
+                restClient = this,
+                url = url,
+                clazz = PluginResponseModel::class.java,
+                nonce = nonce.value
+            )
+        }
+        return handleResponse(response, site)
+    }
+
+    private fun handleResponse(
+        response: WPAPIResponse<PluginResponseModel>,
+        site: SiteModel
+    ) = when (response) {
+        is Success -> {
+            val plugin = response.data?.toDomainModel(site.id)
+            WPApiPluginsPayload(site, plugin)
+        }
+
+        is Error -> {
+            WPApiPluginsPayload(response.error)
+        }
+    }
+
+    /**
+     * - POST /wp/v2/plugins { slug: "akismet" } installs the plugin with the slug akismet from the WordPress.org plugin
+     * directory. The endpoint does not support uploading a plugin zip.
+     *
+     * - PUT /wp/v2/plugins/akismet/akismet { status: "active" } activates the selected plugin. The status can be set to
+     * network-active to network activate the plugin on Multisite. To deactivate the plugin set the status to inactive.
+     * There is not a separate network-inactive status, inactive will perform a network deactivation if the plugin was
+     * network activated.
+     *
+     * - DELETE /wp/v2/plugins/akismet/akismet uninstalls the selected plugin. The plugin must be inactive before
+     * deleting it.
+     */
+    private fun buildUrl(site: SiteModel, path: String? = null): String {
+        return buildString {
+            append(site.url)
+            append(WP_API_URL)
+            if (path != null) {
+                append("/")
+                append(path)
+            }
+        }
+    }
+
+    companion object {
+        private const val WP_API_URL = "/wp-json/wp/v2/plugins"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClient.kt
new file mode 100644
index 00000000000..0db7038ec4c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/reactnative/ReactNativeWPAPIRestClient.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.reactnative
+
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ReactNativeWPAPIRestClient @Inject constructor(
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    @Named("custom-ssl") requestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    suspend fun getRequest(
+        url: String,
+        params: Map<String, String>,
+        successHandler: (data: JsonElement?) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        nonce: String? = null,
+        enableCaching: Boolean = true
+    ): ReactNativeFetchResponse {
+        val response =
+                wpApiGsonRequestBuilder.syncGetRequest(
+                        this,
+                        url,
+                        params,
+                        emptyMap(),
+                        JsonElement::class.java,
+                        enableCaching,
+                        nonce = nonce)
+        return when (response) {
+            is Success -> successHandler(response.data)
+            is Error -> errorHandler(response.error)
+        }
+    }
+
+    suspend fun postRequest(
+        url: String,
+        body: Map<String, Any>,
+        successHandler: (data: JsonElement?) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        nonce: String? = null,
+    ): ReactNativeFetchResponse {
+        val response =
+            wpApiGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                body,
+                JsonElement::class.java,
+                nonce = nonce)
+        return when (response) {
+            is Success -> successHandler(response.data)
+            is Error -> errorHandler(response.error)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/site/SiteWPAPIRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/site/SiteWPAPIRestClient.kt
new file mode 100644
index 00000000000..6b90b190041
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/site/SiteWPAPIRestClient.kt
@@ -0,0 +1,107 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.site
+
+import com.android.volley.RequestQueue
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.discovery.DiscoveryUtils
+import org.wordpress.android.fluxc.network.discovery.DiscoveryWPAPIRestClient
+import org.wordpress.android.fluxc.network.discovery.RootWPAPIRestResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIDiscoveryUtils
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse.Success
+import org.wordpress.android.fluxc.store.SiteStore.FetchWPAPISitePayload
+import org.wordpress.android.util.UrlUtils
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SiteWPAPIRestClient @Inject constructor(
+    private val wpapiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    private val discoveryWPAPIRestClient: DiscoveryWPAPIRestClient,
+    dispatcher: Dispatcher,
+    @Named("custom-ssl") requestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    companion object {
+        private const val WOO_API_NAMESPACE_PREFIX = "wc/"
+        private const val FETCH_API_CALL_FIELDS =
+            "name,description,gmt_offset,url,authentication,namespaces"
+        private const val APPLICATION_PASSWORDS_URL_SUFFIX = "authorize-application.php"
+    }
+
+    suspend fun fetchWPAPISite(
+        payload: FetchWPAPISitePayload
+    ): SiteModel {
+        val cleanedUrl = UrlUtils.addUrlSchemeIfNeeded(payload.url, false).let { urlWithScheme ->
+            DiscoveryUtils.stripKnownPaths(urlWithScheme)
+        }
+
+        val discoveredWpApiUrl = discoverApiEndpoint(cleanedUrl)
+        val urlScheme = discoveredWpApiUrl.toHttpUrl().scheme
+
+        val result = wpapiGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = discoveredWpApiUrl,
+            clazz = RootWPAPIRestResponse::class.java,
+            params = mapOf("_fields" to FETCH_API_CALL_FIELDS)
+        )
+
+        return when (result) {
+            is Success -> {
+                val response = result.data
+                SiteModel().apply {
+                    name = response?.name
+                    description = response?.description
+                    timezone = response?.gmtOffset
+                    origin = SiteModel.ORIGIN_WPAPI
+                    hasWooCommerce = response?.namespaces?.any {
+                        it.startsWith(WOO_API_NAMESPACE_PREFIX)
+                    } ?: false
+
+                    applicationPasswordsAuthorizeUrl = response?.authentication?.applicationPasswords
+                        ?.endpoints?.authorization
+                    if (!applicationPasswordsAuthorizeUrl.isNullOrEmpty() &&
+                        applicationPasswordsAuthorizeUrl.contains(APPLICATION_PASSWORDS_URL_SUFFIX)) {
+                        // Infer the admin URL from the application passwords authorization URL
+                        adminUrl = applicationPasswordsAuthorizeUrl.substringBefore(APPLICATION_PASSWORDS_URL_SUFFIX)
+                    }
+
+                    wpApiRestUrl = discoveredWpApiUrl
+                    this.url = cleanedUrl.replaceBefore("://", urlScheme)
+                    this.username = payload.username
+                    this.password = payload.password
+                }
+            }
+
+            is Error -> {
+                SiteModel().apply {
+                    error = result.error
+                }
+            }
+        }
+    }
+
+    suspend fun fetchWPAPISite(
+        site: SiteModel
+    ): SiteModel {
+        return fetchWPAPISite(
+            payload = FetchWPAPISitePayload(
+                url = site.url,
+                username = site.username,
+                password = site.password,
+            )
+        )
+    }
+
+    private fun discoverApiEndpoint(
+        url: String
+    ): String {
+        return discoveryWPAPIRestClient.discoverWPAPIBaseURL(url) // discover rest api endpoint
+            ?: WPAPIDiscoveryUtils.buildDefaultRESTBaseUrl(url)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClient.java
new file mode 100644
index 00000000000..69bebb25bbb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClient.java
@@ -0,0 +1,145 @@
+package org.wordpress.android.fluxc.network.rest.wpcom;
+
+import android.content.Context;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+
+import static org.wordpress.android.fluxc.utils.WPComRestClientUtils.getLocaleParamName;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.network.AcceptHeaderStrategy;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.OnAuthFailedListener;
+import org.wordpress.android.fluxc.network.BaseRequest.OnParseErrorListener;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.OnJetpackTimeoutError;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.OnJetpackTunnelTimeoutListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountSocialRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError;
+import org.wordpress.android.util.LanguageUtils;
+
+public abstract class BaseWPComRestClient {
+    private AccessToken mAccessToken;
+    private final RequestQueue mRequestQueue;
+
+    protected final Context mAppContext;
+    protected final Dispatcher mDispatcher;
+    protected UserAgent mUserAgent;
+    protected AcceptHeaderStrategy mAcceptHeaderStrategy;
+
+    private OnAuthFailedListener mOnAuthFailedListener;
+    private OnParseErrorListener mOnParseErrorListener;
+    private OnJetpackTunnelTimeoutListener mOnJetpackTunnelTimeoutListener;
+
+    public BaseWPComRestClient(Context appContext, Dispatcher dispatcher, RequestQueue requestQueue,
+                               AccessToken accessToken, UserAgent userAgent) {
+        this(appContext, dispatcher, requestQueue, accessToken, userAgent, null);
+    }
+    public BaseWPComRestClient(Context appContext, Dispatcher dispatcher, RequestQueue requestQueue,
+                               AccessToken accessToken, UserAgent userAgent,
+                               AcceptHeaderStrategy acceptHeaderStrategy) {
+        mRequestQueue = requestQueue;
+        mDispatcher = dispatcher;
+        mAccessToken = accessToken;
+        mUserAgent = userAgent;
+        mAppContext = appContext;
+        mAcceptHeaderStrategy = acceptHeaderStrategy;
+        mOnAuthFailedListener = new OnAuthFailedListener() {
+            @Override
+            public void onAuthFailed(AuthenticateErrorPayload authError) {
+                mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateErrorAction(authError));
+            }
+        };
+        mOnParseErrorListener = new OnParseErrorListener() {
+            @Override
+            public void onParseError(OnUnexpectedError event) {
+                mDispatcher.emitChange(event);
+            }
+        };
+        mOnJetpackTunnelTimeoutListener = new OnJetpackTunnelTimeoutListener() {
+            @Override
+            public void onJetpackTunnelTimeout(OnJetpackTimeoutError onTimeoutError) {
+                mDispatcher.emitChange(onTimeoutError);
+            }
+        };
+    }
+
+    public Request add(WPComGsonRequest request) {
+        // Add "locale=xx_XX" query parameter to all request by default
+        return add(request, true);
+    }
+
+    protected Request add(WPComGsonRequest request, boolean addLocaleParameter) {
+        if (addLocaleParameter) {
+            addLocaleToRequest(request);
+        }
+        // TODO: If !mAccountToken.exists() then trigger the mOnAuthFailedListener
+        return addRequest(setRequestAuthParams(request, true));
+    }
+
+    protected Request addUnauthedRequest(AccountSocialRequest request) {
+        // Add "locale=xx_XX" query parameter to all request by default
+        return addUnauthedRequest(request, true);
+    }
+
+    protected Request addUnauthedRequest(AccountSocialRequest request, boolean addLocaleParameter) {
+        if (addLocaleParameter) {
+            addLocaleToRequest(request);
+            request.setUserAgent(mUserAgent.getUserAgent());
+        }
+        return addRequest(request);
+    }
+
+    protected Request addUnauthedRequest(WPComGsonRequest request) {
+        // Add "locale=xx_XX" query parameter to all request by default
+        return addUnauthedRequest(request, true);
+    }
+
+    protected Request addUnauthedRequest(WPComGsonRequest request, boolean addLocaleParameter) {
+        if (addLocaleParameter) {
+            addLocaleToRequest(request);
+        }
+        return addRequest(setRequestAuthParams(request, false));
+    }
+
+    protected AccessToken getAccessToken() {
+        return mAccessToken;
+    }
+
+    private WPComGsonRequest setRequestAuthParams(WPComGsonRequest request, boolean shouldAuth) {
+        request.setOnAuthFailedListener(mOnAuthFailedListener);
+        request.setOnJetpackTunnelTimeoutListener(mOnJetpackTunnelTimeoutListener);
+        request.setUserAgent(mUserAgent.getUserAgent());
+        request.setAccessToken(shouldAuth ? mAccessToken.get() : null);
+        return request;
+    }
+
+    private Request addRequest(BaseRequest request) {
+        request.setOnParseErrorListener(mOnParseErrorListener);
+        if (request.shouldCache() && request.shouldForceUpdate()) {
+            mRequestQueue.getCache().invalidate(request.mUri.toString(), true);
+        }
+        addAcceptHeaderIfNeeded(request);
+        return mRequestQueue.add(request);
+    }
+
+    private void addLocaleToRequest(BaseRequest request) {
+        String url = request.getUrl();
+        // Sanity check
+        if (url != null) {
+            // WPCOM V2 endpoints use a different locale parameter than other endpoints
+            String localeParamName = getLocaleParamName(url);
+            request.addQueryParameter(localeParamName, LanguageUtils.getPatchedCurrentDeviceLanguage(mAppContext));
+        }
+    }
+
+    private void addAcceptHeaderIfNeeded(BaseRequest request) {
+        if (mAcceptHeaderStrategy == null) return;
+
+        request.addHeader(mAcceptHeaderStrategy.getHeader(), mAcceptHeaderStrategy.getValue());
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/JetpackTunnelWPAPINetwork.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/JetpackTunnelWPAPINetwork.kt
new file mode 100644
index 00000000000..17254e8b76f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/JetpackTunnelWPAPINetwork.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.fluxc.network.rest.wpcom
+
+import android.content.Context
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+/**
+ * This class acts as a network engine for using Jetpack Tunnel to call WP API endpoints.
+ * The goal of adding this class instead of directly inheriting from [BaseWPComRestClient] is allowing to move away
+ * from the traditional model of inheritance, and allowing the feature RestClients to have multiple network
+ * implementations at the same time.
+ */
+@Singleton
+class JetpackTunnelWPAPINetwork @Inject constructor(
+    appContext: Context,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val jetpackTunnelGsonRequestBuilder: JetpackTunnelGsonRequestBuilder
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun <T : Any> executeGetGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        requestTimeout: Int = BaseRequest.DEFAULT_REQUEST_TIMEOUT,
+        retries: Int = BaseRequest.DEFAULT_MAX_RETRIES
+    ): JetpackResponse<T> {
+        return jetpackTunnelGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            site = site,
+            url = path,
+            params = params,
+            clazz = clazz,
+            enableCaching = enableCaching,
+            cacheTimeToLive = cacheTimeToLive,
+            forced = forced,
+            retryPolicy = DefaultRetryPolicy(
+                requestTimeout,
+                retries,
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+            )
+        )
+    }
+
+    suspend fun <T : Any> executePostGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap(),
+    ): JetpackResponse<T> {
+        return jetpackTunnelGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            site = site,
+            url = path,
+            clazz = clazz,
+            body = body
+        )
+    }
+
+    suspend fun <T : Any> executePutGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        body: Map<String, Any> = emptyMap()
+    ): JetpackResponse<T> {
+        return jetpackTunnelGsonRequestBuilder.syncPutRequest(
+            restClient = this,
+            site = site,
+            url = path,
+            clazz = clazz,
+            body = body
+        )
+    }
+
+    suspend fun <T : Any> executeDeleteGsonRequest(
+        site: SiteModel,
+        path: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap()
+    ): JetpackResponse<T> {
+        return jetpackTunnelGsonRequestBuilder.syncDeleteRequest(
+            restClient = this,
+            site = site,
+            url = path,
+            clazz = clazz,
+            params = params
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequest.java
new file mode 100644
index 00000000000..b144267187a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequest.java
@@ -0,0 +1,244 @@
+package org.wordpress.android.fluxc.network.rest.wpcom;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Response.Listener;
+import com.android.volley.toolbox.HttpHeaderParser;
+import com.google.gson.GsonBuilder;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.network.rest.GsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator;
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTimeoutRequestHandler;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationError;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+public class WPComGsonRequest<T> extends GsonRequest<T> {
+    public interface WPComErrorListener {
+        void onErrorResponse(@NonNull WPComGsonNetworkError error);
+    }
+
+    public interface OnJetpackTunnelTimeoutListener {
+        void onJetpackTunnelTimeout(OnJetpackTimeoutError event);
+    }
+
+    public static class OnJetpackTimeoutError {
+        public String apiPath;
+        public int timesRetried;
+
+        public OnJetpackTimeoutError(String apiPath, int timesRetried) {
+            this.apiPath = apiPath;
+            this.timesRetried = timesRetried;
+        }
+    }
+
+    private OnJetpackTunnelTimeoutListener mOnJetpackTunnelTimeoutListener;
+
+    private int mNumManualRetries = 0;
+
+    public static final String REST_AUTHORIZATION_HEADER = "Authorization";
+    public static final String REST_AUTHORIZATION_FORMAT = "Bearer %s";
+
+    public static class WPComGsonNetworkError extends BaseNetworkError {
+        @NonNull public String apiError;
+        public WPComGsonNetworkError(@NonNull BaseNetworkError error) {
+            super(error);
+            this.apiError = "";
+        }
+    }
+
+    private WPComGsonRequest(int method, String url, Map<String, String> params, Map<String, Object> body,
+                             Class<T> clazz, Type type, Listener<T> listener, BaseErrorListener errorListener) {
+        super(method, params, body, url, clazz, type, listener, errorListener);
+        addQueryParameters(params);
+    }
+
+    private WPComGsonRequest(int method, String url, Map<String, String> params, Map<String, Object> body,
+                             Class<T> clazz, Type type, Listener<T> listener, BaseErrorListener errorListener,
+                             GsonBuilder customGsonBuilder) {
+        super(method, params, body, url, clazz, type, listener, errorListener, customGsonBuilder);
+        addQueryParameters(params);
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    public static <T> WPComGsonRequest<T> buildGetRequest(String url, Map<String, String> params, Class<T> clazz,
+                                                          Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.GET, url, params, null, clazz, null, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    public static <T> WPComGsonRequest<T> buildGetRequest(String url, Map<String, String> params, Type type,
+                                                          Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.GET, url, params, null, null, type, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    // Overloaded method to include custom GsonBuilder
+    public static <T> WPComGsonRequest<T> buildGetRequest(String url, Map<String, String> params, Class<T> clazz,
+                                                          Listener<T> listener, WPComErrorListener errorListener,
+                                                          GsonBuilder customGsonBuilder) {
+        return new WPComGsonRequest<>(Method.GET, url, params, null, clazz, null, listener,
+                wrapInBaseListener(errorListener), customGsonBuilder);
+    }
+
+    // Overloaded method to include custom GsonBuilder
+    public static <T> WPComGsonRequest<T> buildGetRequest(String url, Map<String, String> params, Type type,
+                                                          Listener<T> listener, WPComErrorListener errorListener,
+                                                          GsonBuilder customGsonBuilder) {
+        return new WPComGsonRequest<>(Method.GET, url, params, null, null, type, listener,
+                wrapInBaseListener(errorListener), customGsonBuilder);
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request.
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using {@link com.google.gson.Gson Gson}
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    public static <T> WPComGsonRequest<T> buildPostRequest(String url, Map<String, Object> body, Class<T> clazz,
+                                                           Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.POST, url, null, body, clazz, null, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request.
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param body the content body, which will be converted to JSON using {@link com.google.gson.Gson Gson}
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    public static <T> WPComGsonRequest<T> buildPostRequest(String url, Map<String, String> params,
+                                                           Map<String, Object> body, Class<T> clazz,
+                                                           Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.POST, url, params, body, clazz, null, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    public static <T> WPComGsonRequest<T> buildPostRequest(String url, Map<String, Object> body, Type type,
+                                                           Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.POST, url, null, body, null, type, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    public static <T> WPComGsonRequest<T> buildFormPostRequest(String url, Map<String, String> params, Type type,
+                                                           Listener<T> listener, WPComErrorListener errorListener) {
+        return new WPComGsonRequest<>(Method.POST, url, params, null, null, type, listener,
+                wrapInBaseListener(errorListener));
+    }
+
+    private static BaseErrorListener wrapInBaseListener(final WPComErrorListener wpComErrorListener) {
+        return new BaseErrorListener() {
+            @Override
+            public void onErrorResponse(@NonNull BaseNetworkError error) {
+                if (wpComErrorListener != null) {
+                    wpComErrorListener.onErrorResponse((WPComGsonNetworkError) error);
+                }
+            }
+        };
+    }
+
+    private String addDefaultParameters(String url) {
+        return url;
+    }
+
+    void setOnJetpackTunnelTimeoutListener(OnJetpackTunnelTimeoutListener onJetpackTunnelTimeoutListener) {
+        mOnJetpackTunnelTimeoutListener = onJetpackTunnelTimeoutListener;
+    }
+
+    /**
+     * Mark that this request has been retried manually (by duplicating and re-enqueuing it).
+     */
+    public void increaseManualRetryCount() {
+        mNumManualRetries++;
+    }
+
+    public void setAccessToken(String token) {
+        if (token == null) {
+            mHeaders.remove(REST_AUTHORIZATION_HEADER);
+        } else {
+            mHeaders.put(REST_AUTHORIZATION_HEADER, String.format(REST_AUTHORIZATION_FORMAT, token));
+        }
+    }
+
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        WPComGsonNetworkError returnedError = new WPComGsonNetworkError(error);
+        if (error.hasVolleyError() && error.volleyError.networkResponse != null
+                && error.volleyError.networkResponse.statusCode >= 400) {
+            String jsonString;
+            try {
+                jsonString = new String(error.volleyError.networkResponse.data,
+                        HttpHeaderParser.parseCharset(error.volleyError.networkResponse.headers));
+            } catch (UnsupportedEncodingException e) {
+                jsonString = "";
+            }
+
+            JSONObject jsonObject;
+            try {
+                jsonObject = new JSONObject(jsonString);
+            } catch (JSONException e) {
+                jsonObject = new JSONObject();
+            }
+            String apiError = jsonObject.optString("error", "");
+            if (TextUtils.isEmpty(apiError)) {
+                // WP V2 endpoints use "code" instead of "error"
+                apiError = jsonObject.optString("code", "");
+            }
+            String apiMessage = jsonObject.optString("message", "");
+            if (TextUtils.isEmpty(apiMessage)) {
+                // Auth endpoints use "error_description" instead of "message"
+                apiMessage = jsonObject.optString("error_description", "");
+            }
+
+            // Augment BaseNetworkError by what we can parse from the response
+            returnedError.apiError = apiError;
+            returnedError.message = apiMessage;
+
+            // Check if we know this error
+            if (apiError.equals("authorization_required") || apiError.equals("invalid_token")
+                    || apiError.equals("access_denied") || apiError.equals("needs_2fa")) {
+                AuthenticationError authError = new AuthenticationError(
+                        Authenticator.wpComApiErrorToAuthenticationError(apiError, returnedError.message),
+                        returnedError.message);
+                AuthenticateErrorPayload payload = new AuthenticateErrorPayload(authError);
+                mOnAuthFailedListener.onAuthFailed(payload);
+            }
+
+            if (JetpackTimeoutRequestHandler.isJetpackTimeoutError(returnedError)) {
+                OnJetpackTimeoutError onJetpackTimeoutError = null;
+                if (getMethod() == Method.GET && getParams() != null) {
+                    onJetpackTimeoutError = new OnJetpackTimeoutError(getParams().get("path"), mNumManualRetries);
+                } else if (getMethod() == Method.POST && getBodyAsMap() != null) {
+                    Object pathValue = getBodyAsMap().get("path");
+                    if (pathValue != null) {
+                        onJetpackTimeoutError = new OnJetpackTimeoutError(pathValue.toString(), mNumManualRetries);
+                    }
+                }
+                if (onJetpackTimeoutError != null) {
+                    mOnJetpackTunnelTimeoutListener.onJetpackTunnelTimeout(onJetpackTimeoutError);
+                }
+            }
+        }
+
+        return returnedError;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequestBuilder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequestBuilder.kt
new file mode 100644
index 00000000000..50cdb5e9156
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComGsonRequestBuilder.kt
@@ -0,0 +1,183 @@
+package org.wordpress.android.fluxc.network.rest.wpcom
+
+import com.android.volley.RetryPolicy
+import com.google.gson.GsonBuilder
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import java.lang.reflect.Type
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+@Singleton
+class WPComGsonRequestBuilder
+@Inject constructor() {
+    /**
+     * Creates a new GET request.
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    fun <T> buildGetRequest(
+        url: String,
+        params: Map<String, String>,
+        clazz: Class<T>,
+        listener: (T) -> Unit,
+        errorListener: (WPComGsonNetworkError) -> Unit,
+        customGsonBuilder: GsonBuilder? = null
+    ): WPComGsonRequest<T> {
+        return WPComGsonRequest.buildGetRequest(url, params, clazz, listener, errorListener, customGsonBuilder)
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param clazz the class defining the expected response
+     */
+    suspend fun <T> syncGetRequest(
+        restClient: BaseWPComRestClient,
+        url: String,
+        params: Map<String, String>,
+        clazz: Class<T>,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        customGsonBuilder: GsonBuilder? = null,
+        authenticatedRequest: Boolean = true
+    ) = suspendCancellableCoroutine<Response<T>> { cont ->
+        val request = WPComGsonRequest.buildGetRequest(url, params, clazz, {
+            cont.resume(Success(it))
+        }, {
+            cont.resume(Error(it))
+        }, customGsonBuilder)
+        cont.invokeOnCancellation { request.cancel() }
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+        if (forced) {
+            request.setShouldForceUpdate()
+        }
+        if (authenticatedRequest) {
+            restClient.add(request)
+        } else {
+            restClient.addUnauthedRequest(request)
+        }
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param type the type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    fun <T> buildGetRequest(
+        url: String,
+        params: Map<String, String>,
+        type: Type,
+        listener: (T) -> Unit,
+        errorListener: (WPComGsonNetworkError) -> Unit,
+        customGsonBuilder: GsonBuilder? = null
+    ): WPComGsonRequest<T> {
+        return WPComGsonRequest.buildGetRequest(url, params, type, listener, errorListener, customGsonBuilder)
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param type the type defining the expected response
+     */
+    suspend fun <T> syncGetRequest(
+        restClient: BaseWPComRestClient,
+        url: String,
+        params: Map<String, String>,
+        type: Type,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        authenticatedRequest: Boolean = true
+    ) = suspendCancellableCoroutine<Response<T>> { cont ->
+        val request = WPComGsonRequest.buildGetRequest<T>(url, params, type, {
+            cont.resume(Success(it))
+        }, {
+            cont.resume(Error(it))
+        })
+        cont.invokeOnCancellation { request.cancel() }
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+        if (forced) {
+            request.setShouldForceUpdate()
+        }
+        if (authenticatedRequest) {
+            restClient.add(request)
+        } else {
+            restClient.addUnauthedRequest(request)
+        }
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request.
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using [Gson][com.google.gson.Gson]
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    fun <T> buildPostRequest(
+        url: String,
+        body: Map<String, Any>,
+        clazz: Class<T>,
+        listener: (T) -> Unit,
+        errorListener: (WPComGsonNetworkError) -> Unit
+    ): WPComGsonRequest<T> {
+        return WPComGsonRequest.buildPostRequest(url, body, clazz, listener, errorListener)
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request, triggers it and awaits results synchronously.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using [Gson][com.google.gson.Gson]
+     * @param clazz the class defining the expected response
+     * @param retryPolicy optional retry policy for the request
+     * @param headers optional headers for the request
+     */
+    suspend fun <T> syncPostRequest(
+        restClient: BaseWPComRestClient,
+        url: String,
+        params: Map<String, String>?,
+        body: Map<String, Any>?,
+        clazz: Class<T>,
+        retryPolicy: RetryPolicy? = null,
+        headers: Map<String, String> = emptyMap()
+    ) = suspendCancellableCoroutine<Response<T>> { cont ->
+        val request = WPComGsonRequest.buildPostRequest(url, params, body, clazz, {
+            cont.resume(Success(it))
+        }, {
+            cont.resume(Error(it))
+        }).also { request ->
+            headers.forEach { request.addHeader(it.key, it.value) }
+        }
+        retryPolicy?.let {
+            request.retryPolicy = retryPolicy
+        }
+        cont.invokeOnCancellation { request.cancel() }
+        restClient.add(request)
+    }
+
+    sealed class Response<T> {
+        data class Success<T>(val data: T) : Response<T>()
+        data class Error<T>(val error: WPComGsonNetworkError) : Response<T>()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComNetwork.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComNetwork.kt
new file mode 100644
index 00000000000..1e01cda2864
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/WPComNetwork.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.fluxc.network.rest.wpcom
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+/**
+ * This class acts as a network engine for using Jetpack Tunnel to call WP API endpoints.
+ * The goal of adding this class instead of directly inheriting from [BaseWPComRestClient] is allowing to move away
+ * from the traditional model of inheritance, and allowing the feature RestClients to have multiple network
+ * implementations at the same time when it's needed
+ */
+@Singleton
+class WPComNetwork @Inject constructor(
+    appContext: Context,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun <T : Any> executeGetGsonRequest(
+        url: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false
+    ): WPComGsonRequestBuilder.Response<T> {
+        return wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = params,
+            clazz = clazz,
+            enableCaching = enableCaching,
+            cacheTimeToLive = cacheTimeToLive,
+            forced = forced
+        )
+    }
+
+    suspend fun <T : Any> executePostGsonRequest(
+        url: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap(),
+        body: Map<String, Any> = emptyMap(),
+    ): WPComGsonRequestBuilder.Response<T> {
+        return wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            clazz = clazz,
+            params = params,
+            body = body
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountBoolResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountBoolResponse.java
new file mode 100644
index 00000000000..dc180361429
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountBoolResponse.java
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class AccountBoolResponse implements Response {
+    public boolean success;
+    public String error;
+    public String message;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountClosure.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountClosure.kt
new file mode 100644
index 00000000000..1c642fa280b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountClosure.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account
+
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.account.CloseAccountResult.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.account.CloseAccountResult.Failure
+import org.wordpress.android.fluxc.network.rest.wpcom.account.CloseAccountResult.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.account.CloseAccountResult.ErrorType
+
+/**
+ * Performs an HTTP POST call to v1.1 /me/account/close endpoint to close the user account.
+ */
+fun AccountRestClient.closeAccount(onResult: (CloseAccountResult) -> Unit) {
+    add(WPComGsonRequest.buildPostRequest(
+        WPCOMREST.me.account.close.urlV1_1,
+        null,
+        CloseAccountResponse::class.java,
+        { onResult(Success) },
+        { error ->
+            val errorType = ErrorType.values().firstOrNull { error.apiError == it.token } ?: ErrorType.UNKNOWN
+            onResult(Failure(error = Error(errorType, error.message)))
+        },
+
+    ))
+}
+
+class CloseAccountResponse: Response
+
+sealed class CloseAccountResult {
+    object Success: CloseAccountResult()
+    data class Failure(val error: Error): CloseAccountResult()
+    data class Error(val errorType: ErrorType, val message: String)
+    enum class ErrorType(val token: String? = null) {
+        UNAUTHORIZED("unauthorized"),
+        ATOMIC_SITE("atomic-site"),
+        CHARGEBACKED_SITE("chargebacked-site"),
+        ACTIVE_SUBSCRIPTIONS("active-subscriptions"),
+        ACTIVE_MEMBERSHIPS("active-memberships"),
+        INVALID_TOKEN("invalid_token"),
+        UNKNOWN,
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountResponse.java
new file mode 100644
index 00000000000..cf4ffb34c94
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountResponse.java
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+/**
+ * Stores data retrieved from the WordPress.com REST API Account endpoint (/me). Field names
+ * correspond to REST response keys.
+ *
+ * See <a href="https://developer.wordpress.com/docs/api/1.1/get/me/">documentation</a>
+ */
+public class AccountResponse implements Response {
+    public long ID;
+    public String display_name;
+    public String username;
+    public String email;
+    public long primary_blog;
+    public String avatar_URL;
+    public String profile_URL;
+    public boolean email_verified;
+    public String date;
+    public int site_count;
+    public int visible_site_count;
+    public boolean has_unseen_notes;
+    public String user_ip_country_code;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountRestClient.java
new file mode 100644
index 00000000000..df5d0e9c06a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountRestClient.java
@@ -0,0 +1,1211 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+import com.android.volley.VolleyError;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.AccountAction;
+import org.wordpress.android.fluxc.generated.AccountActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2;
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.model.DomainContactModel;
+import org.wordpress.android.fluxc.model.SubscriptionModel;
+import org.wordpress.android.fluxc.model.SubscriptionsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseErrorListener;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.SubscriptionRestResponse.SubscriptionsResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AppSecrets;
+import org.wordpress.android.fluxc.store.AccountStore.AccountFetchUsernameSuggestionsError;
+import org.wordpress.android.fluxc.store.AccountStore.AccountSocialError;
+import org.wordpress.android.fluxc.store.AccountStore.AccountSocialErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.AccountUsernameActionType;
+import org.wordpress.android.fluxc.store.AccountStore.AccountUsernameError;
+import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction;
+import org.wordpress.android.fluxc.store.AccountStore.AuthOptionsError;
+import org.wordpress.android.fluxc.store.AccountStore.AuthOptionsErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.DomainContactError;
+import org.wordpress.android.fluxc.store.AccountStore.DomainContactErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.IsAvailableError;
+import org.wordpress.android.fluxc.store.AccountStore.NewUserError;
+import org.wordpress.android.fluxc.store.AccountStore.NewUserErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.SubscriptionError;
+import org.wordpress.android.fluxc.store.AccountStore.SubscriptionResponsePayload;
+import org.wordpress.android.fluxc.store.AccountStore.SubscriptionType;
+import org.wordpress.android.fluxc.store.AccountStore.UpdateSubscriptionPayload.SubscriptionFrequency;
+import org.wordpress.android.fluxc.utils.extensions.StringExtensionsKt;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.LanguageUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class AccountRestClient extends BaseWPComRestClient {
+    private static final String SOCIAL_AUTH_ENDPOINT_VERSION = "1";
+    private static final String SOCIAL_LOGIN_ENDPOINT_VERSION = "1";
+    private static final String SOCIAL_SMS_ENDPOINT_VERSION = "1";
+
+    private final AppSecrets mAppSecrets;
+
+    public static class AccountRestPayload extends Payload<WPComGsonNetworkError> {
+        public AccountRestPayload(AccountModel account, WPComGsonNetworkError error) {
+            this.account = account;
+            this.error = error;
+        }
+        public AccountModel account;
+    }
+
+    public static class AccountPushSettingsResponsePayload extends Payload<BaseNetworkError> {
+        public AccountPushSettingsResponsePayload(BaseNetworkError error) {
+            this.error = error;
+        }
+        public Map<String, Object> settings;
+    }
+
+    public static class AccountPushSocialResponsePayload extends Payload<AccountSocialError> {
+        public AccountPushSocialResponsePayload(AccountSocialResponse response) {
+            this.bearerToken = response.bearer_token;
+            this.createdAccount = response.created_account;
+            this.phoneNumber = response.phone_number;
+            this.twoStepNonce = response.two_step_nonce;
+            this.twoStepNonceAuthenticator = response.two_step_nonce_authenticator;
+            this.twoStepNonceBackup = response.two_step_nonce_backup;
+            this.twoStepNonceSms = response.two_step_nonce_sms;
+            this.twoStepNonceWebauthn = response.two_step_nonce_webauthn;
+            this.twoStepNotificationSent = response.two_step_notification_sent;
+            this.twoStepTypes = convertJsonArrayToStringList(response.two_step_supported_auth_types);
+            this.userId = response.user_id;
+            this.userName = response.username;
+        }
+        public AccountPushSocialResponsePayload() {
+        }
+        public List<String> twoStepTypes;
+        public String bearerToken;
+        public String phoneNumber;
+        public String twoStepNonce;
+        public String twoStepNonceAuthenticator;
+        public String twoStepNonceBackup;
+        public String twoStepNonceSms;
+        public String twoStepNonceWebauthn;
+        public String twoStepNotificationSent;
+        public String userId;
+        public String userName;
+        public boolean createdAccount;
+
+        private List<String> convertJsonArrayToStringList(JSONArray array) {
+            List<String> list = new ArrayList<>();
+
+            if (array != null) {
+                try {
+                    for (int i = 0; i < array.length(); i++) {
+                        list.add(array.getString(i));
+                    }
+                } catch (JSONException exception) {
+                    AppLog.e(T.API, "Unable to parse two step types: " + exception.getMessage());
+                }
+            }
+
+            return list;
+        }
+
+        public boolean hasPhoneNumber() {
+            return !TextUtils.isEmpty(this.phoneNumber);
+        }
+
+        public boolean hasToken() {
+            return !TextUtils.isEmpty(this.bearerToken);
+        }
+
+        public boolean hasTwoStepTypes() {
+            return this.twoStepTypes != null && this.twoStepTypes.size() > 0;
+        }
+
+        public boolean hasUsername() {
+            return !TextUtils.isEmpty(this.userName);
+        }
+    }
+
+    public static class AccountPushUsernameResponsePayload extends Payload<AccountUsernameError> {
+        public AccountUsernameActionType type;
+        public String username;
+
+        public AccountPushUsernameResponsePayload(String username, AccountUsernameActionType type) {
+            this.username = username;
+            this.type = type;
+        }
+    }
+
+    public static class AccountFetchUsernameSuggestionsResponsePayload extends
+            Payload<AccountFetchUsernameSuggestionsError> {
+        public List<String> suggestions;
+
+        public AccountFetchUsernameSuggestionsResponsePayload() {
+        }
+
+        public AccountFetchUsernameSuggestionsResponsePayload(List<String> suggestions) {
+            this.suggestions = suggestions;
+        }
+    }
+
+    public static class DomainContactPayload extends Payload<DomainContactError> {
+        @Nullable public DomainContactModel contactModel;
+
+        public DomainContactPayload(@NonNull DomainContactModel contactModel) {
+            this.contactModel = contactModel;
+        }
+
+        public DomainContactPayload(@NonNull DomainContactError error) {
+            this.error = error;
+        }
+    }
+
+    public static class FetchAuthOptionsResponsePayload extends Payload<AuthOptionsError> {
+        public boolean isPasswordless;
+        public boolean isEmailVerified;
+    }
+
+    public static class NewAccountResponsePayload extends Payload<NewUserError> {
+        public boolean dryRun;
+    }
+
+    public static class IsAvailableResponsePayload extends Payload<IsAvailableError> {
+        public IsAvailable type;
+        public String value;
+        public boolean isAvailable;
+    }
+
+    public enum IsAvailable {
+        EMAIL,
+        USERNAME,
+        BLOG
+    }
+
+    @Inject public AccountRestClient(Context appContext, Dispatcher dispatcher,
+                                     @Named("regular") RequestQueue requestQueue,
+                             AppSecrets appSecrets, AccessToken accessToken, UserAgent userAgent) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+        mAppSecrets = appSecrets;
+    }
+
+    /**
+     * Performs an HTTP GET call to the v1.1 /me/ endpoint. Upon receiving a
+     * response (success or error) a {@link AccountAction#FETCHED_ACCOUNT} action is dispatched
+     * with a payload of type {@link AccountRestPayload}. {@link AccountRestPayload#isError()} can
+     * be used to determine the result of the request.
+     */
+    public void fetchAccount() {
+        String url = WPCOMREST.me.getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, null, AccountResponse.class,
+                new Listener<AccountResponse>() {
+                    @Override
+                    public void onResponse(AccountResponse response) {
+                        AccountModel account = responseToAccountModel(response);
+                        AccountRestPayload payload = new AccountRestPayload(account, null);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedAccountAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountRestPayload payload = new AccountRestPayload(null, error);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedAccountAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP GET call to the v1.1 /me/settings/ endpoint. Upon receiving
+     * a response (success or error) a {@link AccountAction#FETCHED_SETTINGS} action is dispatched
+     * with a payload of type {@link AccountRestPayload}. {@link AccountRestPayload#isError()} can
+     * be used to determine the result of the request.
+     */
+    public void fetchAccountSettings() {
+        String url = WPCOMREST.me.settings.getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, null, AccountSettingsResponse.class,
+                new Listener<AccountSettingsResponse>() {
+                    @Override
+                    public void onResponse(AccountSettingsResponse response) {
+                        AccountModel settings = responseToAccountSettingsModel(response);
+                        AccountRestPayload payload = new AccountRestPayload(settings, null);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedSettingsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountRestPayload payload = new AccountRestPayload(null, error);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedSettingsAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP GET call to the v2 /users/usernames/suggestions endpoint.  Upon receiving a response
+     * (success or error) a {@link AccountAction#FETCHED_USERNAME_SUGGESTIONS} action is dispatched with a
+     * payload of type {@link AccountRestPayload}.
+     *
+     * {@link AccountRestPayload#isError()} can be used to check the request result.
+     *
+     * No HTTP GET call is made if the given parameter map is null or contains no entries.
+     *
+     * @param name  Text (e.g. display name) from which to create username suggestions
+     */
+    public void fetchUsernameSuggestions(@NonNull String name) {
+        String url = WPCOMV2.users.username.suggestions.getUrl();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("name", name);
+
+        addUnauthedRequest(WPComGsonRequest.buildGetRequest(url, params, UsernameSuggestionsResponse.class,
+                new Listener<UsernameSuggestionsResponse>() {
+                    @Override
+                    public void onResponse(UsernameSuggestionsResponse response) {
+                        AccountFetchUsernameSuggestionsResponsePayload payload = new
+                                AccountFetchUsernameSuggestionsResponsePayload(response.suggestions);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedUsernameSuggestionsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountFetchUsernameSuggestionsResponsePayload payload =
+                                new AccountFetchUsernameSuggestionsResponsePayload();
+                        payload.error = new AccountFetchUsernameSuggestionsError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedUsernameSuggestionsAction(payload));
+                    }
+                }
+        ));
+    }
+
+    public void sendVerificationEmail() {
+        String url = WPCOMREST.me.send_verification_email.getUrlV1_1();
+        add(WPComGsonRequest.buildPostRequest(url, null, AccountBoolResponse.class,
+                new Listener<AccountBoolResponse>() {
+                    @Override
+                    public void onResponse(AccountBoolResponse response) {
+                        NewAccountResponsePayload payload = new NewAccountResponsePayload();
+                        mDispatcher.dispatch(AccountActionBuilder.newSentVerificationEmailAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        NewAccountResponsePayload payload = volleyErrorToAccountResponsePayload(error.volleyError);
+                        mDispatcher.dispatch(AccountActionBuilder.newSentVerificationEmailAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP POST call to the v1.1 /me/settings/ endpoint. Upon receiving
+     * a response (success or error) a {@link AccountAction#PUSHED_SETTINGS} action is dispatched
+     * with a payload of type {@link AccountPushSettingsResponsePayload}.
+     * {@link AccountPushSettingsResponsePayload#isError()} can be used to determine the result of the request.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     */
+    public void pushAccountSettings(Map<String, Object> body) {
+        if (body == null || body.isEmpty()) return;
+        String url = WPCOMREST.me.settings.getUrlV1_1();
+        // Note: we have to use a Map as a response here because the API response format is different depending
+        // of the request we do.
+        add(WPComGsonRequest.buildPostRequest(url, body, Map.class,
+                new Listener<Map<String, Object>>() {
+                    @Override
+                    public void onResponse(Map<String, Object> response) {
+                        AccountPushSettingsResponsePayload payload = new AccountPushSettingsResponsePayload(null);
+                        payload.settings = response;
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSettingsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountPushSettingsResponsePayload payload = new AccountPushSettingsResponsePayload(error);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSettingsAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP POST call to https://wordpress.com/wp-login.php with two-step-authentication-endpoint action.
+     * Upon receiving a response (success or error) a {@link AccountAction#PUSHED_SOCIAL} action is dispatched with a
+     * payload of type {@link AccountPushSocialResponsePayload}.
+     *
+     * {@link AccountPushSocialResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param userId    WordPress.com user identification number
+     * @param type      Two-factor authentication type (e.g. authenticator, sms, backup)
+     * @param nonce     One-time-use token returned in {@link #pushSocialLogin(String, String)}} response
+     * @param code      Two-factor authentication code input by the user
+     */
+    public void pushSocialAuth(@NonNull String userId, @NonNull String type, @NonNull String nonce,
+                               @NonNull String code) {
+        String url = "https://wordpress.com/wp-login.php";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("action", "two-step-authentication-endpoint");
+        params.put("version", SOCIAL_AUTH_ENDPOINT_VERSION);
+        params.put("user_id", userId);
+        params.put("auth_type", type);
+        params.put("two_step_nonce", nonce);
+        params.put("two_step_code", code);
+        params.put("get_bearer_token", "true");
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        AccountSocialRequest request = new AccountSocialRequest(url, params,
+                new Listener<AccountSocialResponse>() {
+                    @Override
+                    public void onResponse(AccountSocialResponse response) {
+                        if (response != null) {
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload(response);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        } else {
+                            String message = "Received empty response to https://wordpress.com/wp-login.php"
+                                             + "?action=two-step-authentication-endpoint";
+                            AppLog.e(T.API, message);
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                            payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, message);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        }
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        AccountPushSocialResponsePayload payload =
+                                volleyErrorToAccountSocialResponsePayload(error.volleyError);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                    }
+                }
+        );
+        request.disableRetries();
+        addUnauthedRequest(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to the v1.1 /me/social-login/connect/ endpoint.  Upon receiving a
+     * response (success or error) a {@link AccountAction#PUSHED_SOCIAL} action is dispatched with a
+     * payload of type {@link AccountPushSocialResponsePayload}.
+     *
+     * {@link AccountPushSocialResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param idToken       OpenID Connect Token (JWT) from the service the user is using to
+     *                      authenticate their account.
+     * @param service       Slug representing the service for the given token (e.g. google).
+     */
+    public void pushSocialConnect(@NonNull String idToken, @NonNull String service) {
+        String url = WPCOMREST.me.social_login.connect.getUrlV1_1();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("id_token", idToken);
+        params.put("service", service);
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        add(WPComGsonRequest.buildPostRequest(url, params, AccountSocialResponse.class,
+                new Listener<AccountSocialResponse>() {
+                    @Override
+                    public void onResponse(AccountSocialResponse response) {
+                        if (response != null) {
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload(response);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        } else {
+                            String message = "Received empty response to /me/social-login/connect";
+                            AppLog.e(T.API, message);
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                            payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, message);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        }
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                        payload.error = new AccountSocialError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP POST call to https://wordpress.com/wp-login.php with social-login-endpoint action.  Upon
+     * receiving a response (success or error) a {@link AccountAction#PUSHED_SOCIAL} action is dispatched with a
+     * payload of type {@link AccountPushSocialResponsePayload}.
+     *
+     * {@link AccountPushSocialResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param idToken       OpenID Connect Token (JWT) from the service the user is using to
+     *                      authenticate their account.
+     * @param service       Slug representing the service for the given token (e.g. google).
+     */
+    public void pushSocialLogin(@NonNull String idToken, @NonNull String service) {
+        String url = "https://wordpress.com/wp-login.php";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("action", "social-login-endpoint");
+        params.put("version", SOCIAL_LOGIN_ENDPOINT_VERSION);
+        params.put("id_token", idToken);
+        params.put("service", service);
+        params.put("get_bearer_token", "true");
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        addUnauthedRequest(new AccountSocialRequest(url, params,
+                new Listener<AccountSocialResponse>() {
+                    @Override
+                    public void onResponse(AccountSocialResponse response) {
+                        if (response != null) {
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload(response);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        } else {
+                            String message = "Received empty response to https://wordpress.com/wp-login.php"
+                                             + "?action=social-login-endpoint";
+                            AppLog.e(T.API, message);
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                            payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, message);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        }
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        AccountPushSocialResponsePayload payload =
+                                volleyErrorToAccountSocialResponsePayload(error.volleyError);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP POST call to the v1.1 /users/social/new endpoint.  Upon receiving a response
+     * (success or error) a {@link AccountAction#PUSHED_SOCIAL} action is dispatched with a payload
+     * of type {@link AccountPushSocialResponsePayload}.
+     *
+     * {@link AccountPushSocialResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param idToken       OpenID Connect Token (JWT) from the service the user is using to
+     *                      authenticate their account.
+     * @param service       Slug representing the service for the given token (e.g. google).
+     */
+    public void pushSocialSignup(@NonNull String idToken, @NonNull String service) {
+        String url = WPCOMREST.users.social.new_.getUrlV1_1();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("id_token", idToken);
+        params.put("service", service);
+        params.put("signup_flow_name", "social");
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        add(WPComGsonRequest.buildPostRequest(url, params, AccountSocialResponse.class,
+                new Listener<AccountSocialResponse>() {
+                    @Override
+                    public void onResponse(AccountSocialResponse response) {
+                        if (response != null) {
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload(response);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        } else {
+                            String message = "Received empty response to /users/social/new";
+                            AppLog.e(T.API, message);
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                            payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, message);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        }
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                        payload.error = new AccountSocialError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                    }
+                }
+        ));
+    }
+
+    /**
+     * Performs an HTTP POST call to https://wordpress.com/wp-login.php with send-sms-code-endpoint action.  Upon
+     * receiving a response (success or error) a {@link AccountAction#PUSHED_SOCIAL} action is dispatched with a
+     * payload of type {@link AccountPushSocialResponsePayload}.
+     *
+     * {@link AccountPushSocialResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param userId    WordPress.com user identification number
+     * @param nonce     One-time-use token returned in {@link #pushSocialLogin(String, String)}} response
+     */
+    public void pushSocialSms(@NonNull String userId, @NonNull String nonce) {
+        String url = "https://wordpress.com/wp-login.php";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("action", "send-sms-code-endpoint");
+        params.put("version", SOCIAL_SMS_ENDPOINT_VERSION);
+        params.put("user_id", userId);
+        params.put("two_step_nonce", nonce);
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        AccountSocialRequest request = new AccountSocialRequest(url, params,
+                new Listener<AccountSocialResponse>() {
+                    @Override
+                    public void onResponse(AccountSocialResponse response) {
+                        if (response != null) {
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload(response);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        } else {
+                            String message = "Received empty response to https://wordpress.com/wp-login.php"
+                                             + "?action=send-sms-code-endpoint";
+                            AppLog.e(T.API, message);
+                            AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+                            payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, message);
+                            mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                        }
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        AccountPushSocialResponsePayload payload =
+                                volleyErrorToAccountSocialResponsePayload(error.volleyError);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedSocialAction(payload));
+                    }
+                }
+        );
+        request.disableRetries();
+        addUnauthedRequest(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to v1.1 /me/username endpoint.  Upon receiving a response
+     * (success or error) a {@link AccountAction#PUSHED_USERNAME} action is dispatched with a
+     * payload of type {@link AccountPushUsernameResponsePayload}.
+     *
+     * {@link AccountPushUsernameResponsePayload#isError()} can be used to check the request result.
+     *
+     * No HTTP POST call is made if the given parameter map is null or contains no entries.
+     *
+     * @param username      Alphanumeric string to save as unique WordPress.com account identifier
+     * @param actionType    {@link AccountUsernameActionType} to take on WordPress.com site after username is changed
+     */
+    public void pushUsername(@NonNull final String username, @NonNull final AccountUsernameActionType actionType) {
+        String url = WPCOMREST.me.username.getUrlV1_1();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("username", username);
+        params.put("action", AccountUsernameActionType.getStringFromType(actionType));
+
+        add(WPComGsonRequest.buildPostRequest(url, params,
+                AccountBoolResponse.class,
+                new Listener<AccountBoolResponse>() {
+                    @Override
+                    public void onResponse(AccountBoolResponse response) {
+                        AccountPushUsernameResponsePayload payload = new AccountPushUsernameResponsePayload(username,
+                                actionType);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedUsernameAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AccountPushUsernameResponsePayload payload = new AccountPushUsernameResponsePayload(username,
+                                actionType);
+                        payload.error = new AccountUsernameError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newPushedUsernameAction(payload));
+                    }
+                }
+        ));
+    }
+
+    public void newAccount(@NonNull String username, @NonNull String password, @NonNull String email,
+                           final boolean dryRun) {
+        String url = WPCOMREST.users.new_.getUrlV1();
+        Map<String, Object> body = new HashMap<>();
+        body.put("username", username);
+        body.put("password", password);
+        body.put("email", email);
+        body.put("validate", dryRun ? "1" : "0");
+        body.put("client_id", mAppSecrets.getAppId());
+        body.put("client_secret", mAppSecrets.getAppSecret());
+
+        // backend needs locale set both the POST body _and_ the query param to fully set up the user's locale settings
+        //  (messages language, followed blogs initialization)
+        body.put("locale", getLocaleForUsersNewEndpoint());
+
+        WPComGsonRequest<AccountBoolResponse> request = WPComGsonRequest.buildPostRequest(url, body,
+                AccountBoolResponse.class,
+                new Listener<AccountBoolResponse>() {
+                    @Override
+                    public void onResponse(AccountBoolResponse response) {
+                        NewAccountResponsePayload payload = new NewAccountResponsePayload();
+                        payload.dryRun = dryRun;
+                        mDispatcher.dispatch(AccountActionBuilder.newCreatedNewAccountAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        NewAccountResponsePayload payload = volleyErrorToAccountResponsePayload(error.volleyError);
+                        payload.dryRun = dryRun;
+                        mDispatcher.dispatch(AccountActionBuilder.newCreatedNewAccountAction(payload));
+                    }
+                }
+        );
+
+        request.disableRetries();
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP GET call to v1.2 /read/following/mine endpoint.  Upon receiving a response
+     * (success or error) a {@link AccountAction#FETCHED_SUBSCRIPTIONS} action is dispatched with a
+     * payload of type {@link SubscriptionsModel}.
+     *
+     * {@link SubscriptionsModel#isError()} can be used to check the request result.
+     */
+    public void fetchSubscriptions() {
+        String url = WPCOMREST.read.following.mine.getUrlV1_2();
+        final Map<String, String> params = new HashMap<>();
+        params.put("meta", "site");
+        final WPComGsonRequest<SubscriptionsResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                SubscriptionsResponse.class,
+                new Listener<SubscriptionsResponse>() {
+                    @Override
+                    public void onResponse(SubscriptionsResponse response) {
+                        if (response != null) {
+                            List<SubscriptionModel> subscriptionArray = new ArrayList<>();
+
+                            for (SubscriptionRestResponse subscriptionResponse : response.subscriptions) {
+                                subscriptionArray.add(responseToSubscriptionModel(subscriptionResponse));
+                            }
+
+                            mDispatcher.dispatch(AccountActionBuilder.newFetchedSubscriptionsAction(
+                                    new SubscriptionsModel(subscriptionArray)));
+                        } else {
+                            AppLog.e(T.API, "Received empty response from /read/following/mine");
+                            SubscriptionsModel payload = new SubscriptionsModel();
+                            payload.error = new BaseNetworkError(GenericErrorType.INVALID_RESPONSE);
+                            mDispatcher.dispatch(AccountActionBuilder.newFetchedSubscriptionsAction(payload));
+                        }
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        SubscriptionsModel payload = new SubscriptionsModel();
+                        payload.error = error;
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedSubscriptionsAction(payload));
+                    }
+                }
+                                                                                                );
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to v1.2 /read/site/$site/comment_email_subscriptions/$action endpoint.  Upon
+     * receiving a response (success or error) a {@link AccountAction#UPDATED_SUBSCRIPTION} action
+     * is dispatched with a payload of type {@link SubscriptionResponsePayload}.
+     *
+     * {@link SubscriptionResponsePayload#isError()} can be used to check the request result.
+     *
+     * @param siteId    Identification number of site to update comment email subscription
+     * @param action    {@link SubscriptionAction} to add or remove comment email subscription
+     */
+    public void updateSubscriptionEmailComment(@NonNull String siteId, @NonNull SubscriptionAction action) {
+        String actionLowerCase = action.toString();
+        String url = WPCOMREST.read.site.item(siteId).comment_email_subscriptions.action(actionLowerCase).getUrlV1_2();
+        final WPComGsonRequest<SubscriptionResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                SubscriptionResponse.class,
+                new Listener<SubscriptionResponse>() {
+                    @Override
+                    public void onResponse(SubscriptionResponse response) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload(response.subscribed);
+                        payload.type = SubscriptionType.EMAIL_COMMENT;
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload();
+                        payload.error = new SubscriptionError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to v1.2 /read/site/$site/post_email_subscriptions/$action endpoint.  Upon
+     * receiving a response (success or error) a {@link AccountAction#UPDATED_SUBSCRIPTION} action
+     * is dispatched with a payload of type {@link SubscriptionResponsePayload}.
+     *
+     * {@link SubscriptionResponsePayload#isError()} can be used to check the request result.
+     *
+     * @param siteId    Identification number of site to update post email subscription
+     * @param action    {@link SubscriptionAction} to add or remove post email subscription
+     */
+    public void updateSubscriptionEmailPost(@NonNull String siteId, @NonNull SubscriptionAction action) {
+        String actionLowerCase = action.toString();
+        String url = WPCOMREST.read.site.item(siteId).post_email_subscriptions.action(actionLowerCase).getUrlV1_2();
+        final WPComGsonRequest<SubscriptionResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                SubscriptionResponse.class,
+                new Listener<SubscriptionResponse>() {
+                    @Override
+                    public void onResponse(SubscriptionResponse response) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload(response.subscribed);
+                        payload.type = SubscriptionType.EMAIL_POST;
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload();
+                        payload.error = new SubscriptionError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to v1.2 /read/site/$site/post_email_subscriptions/update endpoint.  Upon
+     * receiving a response (success or error) a {@link AccountAction#UPDATED_SUBSCRIPTION} action
+     * is dispatched with a payload of type {@link SubscriptionResponsePayload}.
+     *
+     * {@link SubscriptionResponsePayload#isError()} can be used to check the request result.
+     *
+     * @param siteId        Identification number of site to update post email subscription
+     * @param frequency     rate at which post emails are sent as {@link SubscriptionFrequency} value
+     */
+    public void updateSubscriptionEmailPostFrequency(@NonNull String siteId, @NonNull SubscriptionFrequency frequency) {
+        String frequencyLowerCase = frequency.toString();
+        String url = WPCOMREST.read.site.item(siteId).post_email_subscriptions.update.getUrlV1_2();
+        Map<String, Object> body = new HashMap<>();
+        body.put("delivery_frequency", frequencyLowerCase);
+        final WPComGsonRequest<SubscriptionResponse> request = WPComGsonRequest.buildPostRequest(url, body,
+                SubscriptionResponse.class,
+                new Listener<SubscriptionResponse>() {
+                    @Override
+                    public void onResponse(SubscriptionResponse response) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload(response.subscribed);
+                        payload.type = SubscriptionType.EMAIL_POST_FREQUENCY;
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload();
+                        payload.error = new SubscriptionError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP POST call to v2 /read/sites/$site/notification-subscriptions/$action endpoint.  Upon
+     * receiving a response (success or error) a {@link AccountAction#UPDATED_SUBSCRIPTION} action
+     * is dispatched with a payload of type {@link SubscriptionResponsePayload}.
+     *
+     * {@link SubscriptionResponsePayload#isError()} can be used to check the request result.
+     *
+     * @param siteId    Identification number of site to update post notification subscription
+     * @param action    {@link SubscriptionAction} to add or remove post notification subscription
+     */
+    public void updateSubscriptionNotificationPost(@NonNull String siteId, @NonNull SubscriptionAction action) {
+        String actionLowerCase = action.toString();
+        String url = WPCOMV2.read.sites.site(siteId).notification_subscriptions.action(actionLowerCase).getUrl();
+        final WPComGsonRequest<SubscriptionResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                SubscriptionResponse.class,
+                new Listener<SubscriptionResponse>() {
+                    @Override
+                    public void onResponse(SubscriptionResponse response) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload(response.subscribed);
+                        payload.type = SubscriptionType.NOTIFICATION_POST;
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(
+                                payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        SubscriptionResponsePayload payload = new SubscriptionResponsePayload();
+                        payload.error = new SubscriptionError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newUpdatedSubscriptionAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    /**
+     * Performs an HTTP GET call to v1.1 /me/domain-contact-information/ endpoint.  Upon receiving a response
+     * (success or error) a {@link AccountAction#FETCHED_DOMAIN_CONTACT} action is dispatched with a
+     * payload of type {@link DomainContactPayload}.
+     *
+     * {@link DomainContactPayload#isError()} can be used to check the request result.
+     */
+    public void fetchDomainContact() {
+        String url = WPCOMREST.me.domain_contact_information.getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, null, DomainContactResponse.class,
+                new Listener<DomainContactResponse>() {
+                    @Override
+                    public void onResponse(DomainContactResponse response) {
+                        DomainContactPayload payload = new DomainContactPayload(responseToDomainContactModel(response));
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedDomainContactAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Domain contact should always be available for a valid, authenticated user.
+                        // Therefore, only GENERIC_ERROR is identified here.
+                        DomainContactError contactError =
+                                new DomainContactError(DomainContactErrorType.GENERIC_ERROR, error.message);
+                        DomainContactPayload payload = new DomainContactPayload(contactError);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedDomainContactAction(payload));
+                    }
+                }));
+    }
+
+    /**
+     * Performs an HTTP GET call to the v1.1 /users/$emailOrUsername/auth-options endpoint. Upon receiving a response
+     * (success or error) a {@link AccountAction#FETCHED_AUTH_OPTIONS} action is dispatched with a payload of type
+     * {@link FetchAuthOptionsResponsePayload}.
+     *
+     * {@link FetchAuthOptionsResponsePayload#isError()} can be used to check the request result.
+     */
+    public void fetchAuthOptions(@NonNull String emailOrUsername) {
+        final String url = WPCOMREST
+                .users
+                .emailOrUsername(StringExtensionsKt.encodeRfc3986Delimiters(emailOrUsername))
+                .auth_options
+                .getUrlV1_1();
+        addUnauthedRequest(WPComGsonRequest.buildGetRequest(url, null, AuthOptionsResponse.class,
+                new Listener<AuthOptionsResponse>() {
+                    @Override
+                    public void onResponse(AuthOptionsResponse response) {
+                        FetchAuthOptionsResponsePayload payload = new FetchAuthOptionsResponsePayload();
+
+                        try {
+                            payload.isPasswordless = response.getPasswordless();
+                            payload.isEmailVerified = response.getEmail_verified();
+                        } catch (NullPointerException e) {
+                            String message = "Received empty response to " + url;
+                            AppLog.e(T.API, message, e);
+                            payload.error = new AuthOptionsError(AuthOptionsErrorType.GENERIC_ERROR, message);
+                        }
+
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedAuthOptionsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        FetchAuthOptionsResponsePayload payload = new FetchAuthOptionsResponsePayload();
+                        payload.error = new AuthOptionsError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newFetchedAuthOptionsAction(payload));
+                    }
+                }));
+    }
+
+    private SubscriptionModel responseToSubscriptionModel(SubscriptionRestResponse response) {
+        SubscriptionModel subscription = new SubscriptionModel();
+        subscription.setSubscriptionId(response.ID);
+        subscription.setBlogId(response.blog_ID);
+        subscription.setFeedId(response.feed_ID);
+        subscription.setUrl(response.URL);
+
+        if (response.delivery_methods != null) {
+            if (response.delivery_methods.email != null) {
+                subscription.setShouldEmailPosts(response.delivery_methods.email.send_posts);
+                subscription.setShouldEmailComments(response.delivery_methods.email.send_comments);
+                subscription.setEmailPostsFrequency(response.delivery_methods.email.post_delivery_frequency);
+            }
+
+            if (response.delivery_methods.notification != null) {
+                subscription.setShouldNotifyPosts(response.delivery_methods.notification.send_posts);
+            }
+        }
+
+        if (response.meta != null && response.meta.data != null && response.meta.data.site != null) {
+            subscription.setBlogName(response.meta.data.site.name);
+        }
+
+        return subscription;
+    }
+
+    private String getLocaleForUsersNewEndpoint() {
+        final Locale loc = LanguageUtils.getCurrentDeviceLanguage(mAppContext);
+        final String lang = LanguageUtils.patchDeviceLanguageCode(loc.getLanguage());
+        final String country = loc.getCountry().toLowerCase(Locale.ROOT); // backend needs it lowercase
+        final String langMinusCountry = lang + '-' + country; // backend needs it separated by a minus
+
+        // the `/users/new` endpoint expects only some locales to have a territory/Country, the rest being language only
+        switch (langMinusCountry) {
+            case "el-po":
+            case "en-gb":
+            case "es-mx":
+            case "fr-be":
+            case "fr-ca":
+            case "fr-ch":
+            case "pt-br":
+            case "zh-cn":
+            case "zh-tw":
+                // return a lowercase, separated by a "minus" sign locale
+                return langMinusCountry;
+            default:
+                // return the language part of the locale only
+                return lang;
+        }
+    }
+
+    public void isAvailable(@NonNull final String value, final IsAvailable type) {
+        String url = "";
+        switch (type) {
+            case BLOG:
+                url = WPCOMREST.is_available.blog.getUrlV0();
+                break;
+            case EMAIL:
+                url = WPCOMREST.is_available.email.getUrlV0();
+                break;
+            case USERNAME:
+                url = WPCOMREST.is_available.username.getUrlV0();
+                break;
+        }
+
+        Map<String, String> params = new HashMap<>();
+        params.put("q", value);
+
+        WPComGsonRequest request = WPComGsonRequest.buildGetRequest(url, params, IsAvailableResponse.class,
+                new Listener<IsAvailableResponse>() {
+                    @Override
+                    public void onResponse(IsAvailableResponse response) {
+                        IsAvailableResponsePayload payload = new IsAvailableResponsePayload();
+                        payload.value = value;
+                        payload.type = type;
+
+                        if (response == null) {
+                            // The 'is-available' endpoints return either true or a JSON object representing an error
+                            // The JsonObjectOrFalseDeserializer will deserialize true to null, so a null response
+                            // actually means that there were no errors and the queried item (e.g., email) is available
+                            payload.isAvailable = true;
+                        } else {
+                            if (response.error.equals("taken")) {
+                                // We consider "taken" not to be an error, and we report that the item is unavailable
+                                payload.isAvailable = false;
+                            } else if (response.error.equals("invalid") && type.equals(IsAvailable.BLOG)
+                                    && response.message.contains("reserved")) {
+                                // Special case for /is-available/blog, which returns 'invalid' instead of 'taken'
+                                // The messages from the server are not localized at the time of writing, but that may
+                                // change in the future and cause this to be registered as a generic error
+                                payload.isAvailable = false;
+                            } else {
+                                // Genuine error (probably a malformed item)
+                                payload.error = new IsAvailableError(response.error, response.message);
+                            }
+                        }
+                        mDispatcher.dispatch(AccountActionBuilder.newCheckedIsAvailableAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // We don't expect anything but server errors here - the API itself returns errors with a
+                        // 200 status code, which will appear under Listener.onResponse instead
+                        IsAvailableResponsePayload payload = new IsAvailableResponsePayload();
+                        payload.value = value;
+                        payload.type = type;
+
+                        payload.error = new IsAvailableError(error.apiError, error.message);
+                        mDispatcher.dispatch(AccountActionBuilder.newCheckedIsAvailableAction(payload));
+                    }
+                }
+        );
+
+        add(request);
+    }
+
+    private NewAccountResponsePayload volleyErrorToAccountResponsePayload(VolleyError error) {
+        NewAccountResponsePayload payload = new NewAccountResponsePayload();
+        payload.error = new NewUserError(NewUserErrorType.GENERIC_ERROR, "");
+        if (error.networkResponse != null && error.networkResponse.data != null) {
+            AppLog.e(T.API, new String(error.networkResponse.data));
+            String jsonString = new String(error.networkResponse.data);
+            try {
+                JSONObject errorObj = new JSONObject(jsonString);
+                payload.error.type = NewUserErrorType.fromString((String) errorObj.get("error"));
+                payload.error.message = (String) errorObj.get("message");
+            } catch (JSONException e) {
+                // Do nothing (keep default error)
+            }
+        }
+        return payload;
+    }
+
+    private AccountPushSocialResponsePayload volleyErrorToAccountSocialResponsePayload(VolleyError error) {
+        AccountPushSocialResponsePayload payload = new AccountPushSocialResponsePayload();
+        payload.error = new AccountSocialError(AccountSocialErrorType.GENERIC_ERROR, "");
+
+        if (error.networkResponse != null && error.networkResponse.data != null) {
+            AppLog.e(T.API, new String(error.networkResponse.data));
+
+            try {
+                String responseBody = new String(error.networkResponse.data, "UTF-8");
+                JSONObject object = new JSONObject(responseBody);
+                JSONObject data = object.getJSONObject("data");
+                payload.error.nonce = data.optString("two_step_nonce");
+                JSONArray errors = data.getJSONArray("errors");
+                payload.error.type = AccountSocialErrorType.fromString(errors.getJSONObject(0).getString("code"));
+                payload.error.message = errors.getJSONObject(0).getString("message");
+            } catch (UnsupportedEncodingException | JSONException exception) {
+                AppLog.e(T.API, "Unable to parse social error response: " + exception.getMessage());
+            }
+        }
+
+        return payload;
+    }
+
+    private AccountModel responseToAccountModel(AccountResponse from) {
+        AccountModel account = new AccountModel();
+        account.setUserId(from.ID);
+        account.setDisplayName(StringEscapeUtils.unescapeHtml4(from.display_name));
+        account.setUserName(from.username);
+        account.setEmail(from.email);
+        account.setPrimarySiteId(from.primary_blog);
+        account.setAvatarUrl(from.avatar_URL);
+        account.setProfileUrl(from.profile_URL);
+        account.setEmailVerified(from.email_verified);
+        account.setDate(from.date);
+        account.setSiteCount(from.site_count);
+        account.setVisibleSiteCount(from.visible_site_count);
+        account.setHasUnseenNotes(from.has_unseen_notes);
+        return account;
+    }
+
+    private AccountModel responseToAccountSettingsModel(AccountSettingsResponse from) {
+        AccountModel account = new AccountModel();
+        account.setUserName(from.user_login);
+        account.setDisplayName(StringEscapeUtils.unescapeHtml4(from.display_name));
+        account.setFirstName(StringEscapeUtils.unescapeHtml4(from.first_name));
+        account.setLastName(StringEscapeUtils.unescapeHtml4(from.last_name));
+        account.setAboutMe(StringEscapeUtils.unescapeHtml4(from.description));
+        account.setNewEmail(from.new_user_email);
+        account.setAvatarUrl(from.avatar_URL);
+        account.setPendingEmailChange(from.user_email_change_pending);
+        account.setTwoStepEnabled(from.two_step_enabled);
+        account.setUsernameCanBeChanged(from.user_login_can_be_changed);
+        account.setTracksOptOut(from.tracks_opt_out);
+        account.setWebAddress(from.user_URL);
+        account.setPrimarySiteId(from.primary_site_ID);
+        return account;
+    }
+
+    public static boolean updateAccountModelFromPushSettingsResponse(AccountModel accountModel,
+                Map<String, Object> from) {
+        AccountModel old = new AccountModel();
+        old.copyAccountAttributes(accountModel);
+        old.setId(accountModel.getId());
+        old.copyAccountSettingsAttributes(accountModel);
+        if (from.containsKey("display_name")) {
+            accountModel.setDisplayName(StringEscapeUtils.unescapeHtml4((String) from.get("display_name")));
+        }
+        if (from.containsKey("first_name")) {
+            accountModel.setFirstName(StringEscapeUtils.unescapeHtml4((String) from.get("first_name")));
+        }
+        if (from.containsKey("last_name")) {
+            accountModel.setLastName(StringEscapeUtils.unescapeHtml4((String) from.get("last_name")));
+        }
+        if (from.containsKey("description")) {
+            accountModel.setAboutMe(StringEscapeUtils.unescapeHtml4((String) from.get("description")));
+        }
+        if (from.containsKey("user_email")) accountModel.setEmail((String) from.get("user_email"));
+        if (from.containsKey("user_email_change_pending")) {
+            accountModel.setPendingEmailChange((Boolean) from.get("user_email_change_pending"));
+        }
+        if (from.containsKey("two_step_enabled")) {
+            Object twoStepEnabledValue = from.get("two_step_enabled");
+            accountModel.setTwoStepEnabled(twoStepEnabledValue instanceof Boolean && (Boolean) twoStepEnabledValue);
+        }
+        if (from.containsKey("tracks_opt_out")) {
+            accountModel.setTracksOptOut((Boolean) from.get("tracks_opt_out"));
+        }
+        if (from.containsKey("new_user_email")) accountModel.setEmail((String) from.get("new_user_email"));
+        if (from.containsKey("user_URL")) accountModel.setWebAddress((String) from.get("user_URL"));
+        if (from.containsKey("primary_site_ID")) {
+            accountModel.setPrimarySiteId(((Double) from.get("primary_site_ID")).longValue());
+        }
+        return !old.equals(accountModel);
+    }
+
+    private DomainContactModel responseToDomainContactModel(DomainContactResponse response) {
+        String firstName = StringEscapeUtils.unescapeHtml4(response.getFirst_name());
+        String lastName = StringEscapeUtils.unescapeHtml4(response.getLast_name());
+        String organization = StringEscapeUtils.unescapeHtml4(response.getOrganization());
+        String addressLine1 = response.getAddress_1();
+        String addressLine2 = response.getAddress_2();
+        String city = response.getCity();
+        String state = response.getState();
+        String postalCode = response.getPostal_code();
+        String countryCode = response.getCountry_code();
+        String phone = response.getPhone();
+        String fax = response.getFax();
+        String email = response.getEmail();
+        return new DomainContactModel(firstName, lastName, organization, addressLine1, addressLine2, postalCode, city,
+                state, countryCode, email, phone, fax);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSettingsResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSettingsResponse.java
new file mode 100644
index 00000000000..979e3422fb3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSettingsResponse.java
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+/**
+ * Stores data retrieved from the WordPress.com REST API Account Settings endpoint (/me/settings).
+ * Field names correspond to REST response keys.
+ *
+ * See <a href="https://developer.wordpress.com/docs/api/1.1/get/me/settings">documentation</a>
+ */
+public class AccountSettingsResponse implements Response {
+    public String user_login;
+    public String display_name;
+    public String first_name;
+    public String last_name;
+    public String description;
+    public String new_user_email;
+    public boolean two_step_enabled;
+    public boolean user_email_change_pending;
+    public boolean user_login_can_be_changed;
+    public String user_URL;
+    public String avatar_URL;
+    public long primary_site_ID;
+    public boolean tracks_opt_out;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialRequest.java
new file mode 100644
index 00000000000..ca8e6668d53
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialRequest.java
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.NetworkResponse;
+import com.android.volley.Response;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.Map;
+
+public class AccountSocialRequest extends BaseRequest<AccountSocialResponse> {
+    private static final String PROTOCOL_CHARSET = "utf-8";
+    private static final String PROTOCOL_CONTENT = "application/x-www-form-urlencoded";
+
+    private final Map<String, String> mParams;
+    private final Response.Listener<AccountSocialResponse> mListener;
+
+    public AccountSocialRequest(String url, Map<String, String> params,
+                                Response.Listener<AccountSocialResponse> listener, BaseErrorListener errorListener) {
+        super(Method.POST, url, errorListener);
+        mParams = params;
+        mListener = listener;
+    }
+
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        return error;
+    }
+
+    @Override
+    protected void deliverResponse(AccountSocialResponse response) {
+        mListener.onResponse(response);
+    }
+
+    @Override
+    public String getBodyContentType() {
+        return String.format("%s; charset=%s", PROTOCOL_CONTENT, PROTOCOL_CHARSET);
+    }
+
+    @Override
+    protected Map<String, String> getParams() throws AuthFailureError {
+        return mParams;
+    }
+
+    @Override
+    protected Response<AccountSocialResponse> parseNetworkResponse(NetworkResponse response) {
+        try {
+            AccountSocialResponse parsed = new AccountSocialResponse();
+            String responseBody = new String(response.data);
+            JSONObject object = new JSONObject(responseBody);
+            JSONObject data = object.getJSONObject("data");
+            parsed.bearer_token = data.optString("bearer_token");
+            parsed.phone_number = data.optString("phone_number");
+            parsed.two_step_nonce = data.optString("two_step_nonce");
+            parsed.two_step_supported_auth_types = data.optJSONArray("two_step_supported_auth_types");
+            parsed.two_step_nonce_authenticator = data.optString("two_step_nonce_authenticator");
+            parsed.two_step_nonce_backup = data.optString("two_step_nonce_backup");
+            parsed.two_step_nonce_sms = data.optString("two_step_nonce_sms");
+            parsed.two_step_nonce_webauthn = data.optString("two_step_nonce_webauthn");
+            parsed.two_step_notification_sent = data.optString("two_step_notification_sent");
+            parsed.user_id = data.optString("user_id");
+            parsed.username = data.optString("username");
+            parsed.created_account = data.optBoolean("created_account");
+            return Response.success(parsed, null);
+        } catch (JSONException exception) {
+            AppLog.e(T.API, "Unable to parse network response: " + exception.getMessage());
+            return null;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialResponse.java
new file mode 100644
index 00000000000..5e3e68e065a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AccountSocialResponse.java
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.json.JSONArray;
+import org.wordpress.android.fluxc.network.Response;
+
+public class AccountSocialResponse implements Response {
+    public JSONArray two_step_supported_auth_types;
+    public String bearer_token;
+    public String phone_number;
+    public String two_step_nonce;
+    public String two_step_nonce_authenticator;
+    public String two_step_nonce_backup;
+    public String two_step_nonce_sms;
+    public String two_step_nonce_webauthn;
+    public String two_step_notification_sent;
+    public String user_id;
+    public String username;
+    public boolean created_account;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AuthOptionsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AuthOptionsResponse.kt
new file mode 100644
index 00000000000..dfa102d69f4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/AuthOptionsResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("VariableNaming")
+class AuthOptionsResponse : Response {
+    var passwordless: Boolean? = null
+    var email_verified: Boolean? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/DomainContactResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/DomainContactResponse.kt
new file mode 100644
index 00000000000..1e17c4a9eca
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/DomainContactResponse.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account
+
+@Suppress("VariableNaming")
+class DomainContactResponse {
+    var first_name: String? = null
+    var last_name: String? = null
+    var organization: String? = null
+    var address_1: String? = null
+    var address_2: String? = null
+    var postal_code: String? = null
+    var city: String? = null
+    var state: String? = null
+    var country_code: String? = null
+    var email: String? = null
+    var phone: String? = null
+    var fax: String? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/IsAvailableResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/IsAvailableResponse.java
new file mode 100644
index 00000000000..3514b6c2342
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/IsAvailableResponse.java
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalse;
+
+public class IsAvailableResponse extends JsonObjectOrFalse {
+    public String error;
+    public String message;
+    public String status;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionResponse.java
new file mode 100644
index 00000000000..702503e09ca
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionResponse.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class SubscriptionResponse implements Response {
+    public boolean subscribed;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionRestResponse.java
new file mode 100644
index 00000000000..3816856ce01
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/SubscriptionRestResponse.java
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+import java.util.List;
+
+public class SubscriptionRestResponse implements Response {
+    public class SubscriptionsResponse {
+        public List<SubscriptionRestResponse> subscriptions;
+    }
+
+    public class DeliveryMethod {
+        public class Email {
+            public boolean send_posts;
+            public boolean send_comments;
+            public String post_delivery_frequency;
+        }
+
+        public class Notification {
+            public boolean send_posts;
+        }
+
+        public Email email;
+        public Notification notification;
+    }
+
+    public class Meta {
+        public class Data {
+            public class Site {
+                public String name;
+            }
+
+            public Site site;
+        }
+
+        public Data data;
+    }
+
+    public String ID;
+    public String blog_ID;
+    public String feed_ID;
+    public String URL;
+    public DeliveryMethod delivery_methods;
+    public Meta meta;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/UsernameSuggestionsResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/UsernameSuggestionsResponse.java
new file mode 100644
index 00000000000..133018549ed
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/UsernameSuggestionsResponse.java
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account;
+
+import org.wordpress.android.fluxc.network.Response;
+
+import java.util.List;
+
+public class UsernameSuggestionsResponse implements Response {
+    public List<String> suggestions;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/close/CloseAccountRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/close/CloseAccountRestClient.kt
new file mode 100644
index 00000000000..d865c692eaf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/close/CloseAccountRestClient.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account.close
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class CloseAccountRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun closeAccount(): CloseAccountWPAPIPayload<Unit> {
+        val url = WPCOMREST.me.account.close.urlV1_1
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = emptyMap(),
+            body = emptyMap(),
+            clazz = Unit::class.java
+        )
+        return when (response) {
+            is Success -> CloseAccountWPAPIPayload(Unit)
+            is Error -> CloseAccountWPAPIPayload(response.error)
+        }
+    }
+
+    data class CloseAccountWPAPIPayload<T>(
+        val result: T?
+    ) : Payload<WPComGsonNetworkError?>() {
+        constructor(error: WPComGsonNetworkError) : this(null) {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/AccountCreatedDto.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/AccountCreatedDto.kt
new file mode 100644
index 00000000000..f6eca582a2c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/AccountCreatedDto.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account.signup
+
+import com.google.gson.annotations.SerializedName
+
+data class AccountCreatedDto(
+    @SerializedName("success") val success: Boolean,
+    @SerializedName("username") val username: String,
+    @SerializedName("user_id") val id: String,
+    @SerializedName("bearer_token") val token: String,
+    )
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/SignUpRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/SignUpRestClient.kt
new file mode 100644
index 00000000000..239e87c4a8e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/account/signup/SignUpRestClient.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.account.signup
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.account.UsernameSuggestionsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AppSecrets
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@SuppressWarnings("LongParameterList")
+@Singleton
+class SignUpRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val appSecrets: AppSecrets
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchUsernameSuggestions(username: String): SignUpWPAPIPayload<List<String>> {
+        val url = WPCOMV2.users.username.suggestions.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = mapOf("name" to username),
+            UsernameSuggestionsResponse::class.java
+        )
+        return when (response) {
+            is Success -> SignUpWPAPIPayload(response.data.suggestions)
+            is Error -> SignUpWPAPIPayload(response.error)
+        }
+    }
+
+    suspend fun createWPAccount(
+        email: String,
+        password: String,
+        username: String
+    ): SignUpWPAPIPayload<AccountCreatedDto> {
+        val url = WPCOMREST.users.new_.urlV1_1
+        val body = mapOf(
+            "email" to email,
+            "password" to password,
+            "username" to username,
+            "client_id" to appSecrets.appId,
+            "client_secret" to appSecrets.appSecret,
+            "signup_flow_name" to "mobile-android",
+            "flow" to "signup",
+            "send_verification_email" to true
+        )
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            clazz = AccountCreatedDto::class.java
+        )
+        return when (response) {
+            is Success -> SignUpWPAPIPayload(response.data)
+            is Error -> SignUpWPAPIPayload(response.error)
+        }
+    }
+
+    data class SignUpWPAPIPayload<T>(
+        val result: T?
+    ) : Payload<WPComGsonNetworkError?>() {
+        constructor(error: WPComGsonNetworkError) : this(null) {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClient.kt
new file mode 100644
index 00000000000..ef6adf634b1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityLogRestClient.kt
@@ -0,0 +1,547 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.activity
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.JsonAdapter
+import org.wordpress.android.fluxc.BuildConfig
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Credentials
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityError
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityLogErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityLogErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityLogErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityLogErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityTypesError
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityTypesErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadError
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadStatusError
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadStatusErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadError
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedActivityLogPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedActivityTypesResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedBackupDownloadStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchedRewindStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindError
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindResultPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.utils.NetworkErrorMapper
+import org.wordpress.android.fluxc.utils.TimeZoneProvider
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ActivityLogRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val timeZoneProvider: TimeZoneProvider,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchActivity(payload: FetchActivityLogPayload, number: Int, offset: Int): FetchedActivityLogPayload {
+        val url = WPCOMV2.sites.site(payload.site.siteId).activity.url
+        val params = buildParams(offset, number, payload)
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, params, ActivitiesResponse::class.java)
+        return when (response) {
+            is Success -> {
+                val activities = response.data.current?.orderedItems ?: listOf()
+                val totalItems = response.data.totalItems ?: 0
+                buildActivityPayload(activities, payload.site, totalItems, number, offset)
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        GENERIC_ERROR,
+                        INVALID_RESPONSE,
+                        AUTHORIZATION_REQUIRED
+                )
+                val error = ActivityError(errorType, response.error.message)
+                FetchedActivityLogPayload(error, payload.site, number = number, offset = offset)
+            }
+        }
+    }
+
+    suspend fun fetchActivityRewind(site: SiteModel): FetchedRewindStatePayload {
+        val url = WPCOMV2.sites.site(site.siteId).rewind.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), RewindStatusResponse::class.java)
+        return when (response) {
+            is Success -> {
+                buildRewindStatusPayload(response.data, site)
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        RewindStatusErrorType.GENERIC_ERROR,
+                        RewindStatusErrorType.INVALID_RESPONSE,
+                        RewindStatusErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = RewindStatusError(errorType, response.error.message)
+                FetchedRewindStatePayload(error, site)
+            }
+        }
+    }
+
+    suspend fun rewind(site: SiteModel, rewindId: String, types: RewindRequestTypes? = null): RewindResultPayload {
+        val url = WPCOMREST.activity_log.site(site.siteId).rewind.to.rewind(rewindId).urlV1
+        val typesBody = if (types != null) {
+            mapOf("types" to types)
+        } else {
+            mapOf()
+        }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(this, url, null, typesBody, RewindResponse::class.java)
+        return when (response) {
+            is Success -> {
+                if (response.data.ok != true && (response.data.error != null && response.data.error.isNotEmpty())) {
+                    RewindResultPayload(RewindError(API_ERROR, response.data.error), rewindId, site)
+                } else {
+                    RewindResultPayload(rewindId, response.data.restore_id, site)
+                }
+            }
+            is Error -> {
+                val error = RewindError(
+                        NetworkErrorMapper.map(
+                                response.error,
+                                RewindErrorType.GENERIC_ERROR,
+                                RewindErrorType.INVALID_RESPONSE,
+                                RewindErrorType.AUTHORIZATION_REQUIRED
+                        ), response.error.message
+                )
+                RewindResultPayload(error, rewindId, site)
+            }
+        }
+    }
+
+    suspend fun backupDownload(
+        site: SiteModel,
+        rewindId: String,
+        types: BackupDownloadRequestTypes
+    ): BackupDownloadResultPayload {
+        val url = WPCOMV2.sites.site(site.siteId).rewind.downloads.url
+        val request = mapOf("rewindId" to rewindId, "types" to types)
+        val response =
+                wpComGsonRequestBuilder.syncPostRequest(this, url, null, request, BackupDownloadResponse::class.java)
+        return when (response) {
+            is Success -> {
+                BackupDownloadResultPayload(
+                        response.data.rewindId,
+                        response.data.downloadId,
+                        response.data.backupPoint,
+                        response.data.startedAt,
+                        response.data.progress,
+                        site
+                )
+            }
+            is Error -> {
+                val error = BackupDownloadError(
+                        NetworkErrorMapper.map(
+                                response.error,
+                                BackupDownloadErrorType.GENERIC_ERROR,
+                                BackupDownloadErrorType.INVALID_RESPONSE,
+                                BackupDownloadErrorType.AUTHORIZATION_REQUIRED
+                        ), response.error.message
+                )
+                BackupDownloadResultPayload(error, rewindId, site)
+            }
+        }
+    }
+
+    suspend fun fetchBackupDownloadState(site: SiteModel): FetchedBackupDownloadStatePayload {
+        val url = WPCOMV2.sites.site(site.siteId).rewind.downloads.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                mapOf(),
+                Array<BackupDownloadStatusResponse>::class.java
+        )
+        return when (response) {
+            is Success -> {
+                if (response.data.isNotEmpty()) {
+                    buildBackupDownloadStatusPayload(response.data[0], site)
+                } else {
+                    FetchedBackupDownloadStatePayload(null, site)
+                }
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        BackupDownloadStatusErrorType.GENERIC_ERROR,
+                        BackupDownloadStatusErrorType.INVALID_RESPONSE,
+                        BackupDownloadStatusErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = BackupDownloadStatusError(errorType, response.error.message)
+                FetchedBackupDownloadStatePayload(error, site)
+            }
+        }
+    }
+
+    suspend fun fetchActivityTypes(remoteSiteId: Long, after: Date?, before: Date?): FetchedActivityTypesResultPayload {
+        val url = WPCOMV2.sites.site(remoteSiteId).activity.count.group.url
+        val params = mutableMapOf<String, String>()
+        addDateRangeParams(params, after, before)
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                ActivityTypesResponse::class.java
+        )
+        return when (response) {
+            is Success -> buildActivityTypesPayload(response.data, remoteSiteId)
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        ActivityTypesErrorType.GENERIC_ERROR,
+                        ActivityTypesErrorType.INVALID_RESPONSE,
+                        ActivityTypesErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = ActivityTypesError(errorType, response.error.message)
+                FetchedActivityTypesResultPayload(error, remoteSiteId)
+            }
+        }
+    }
+
+    suspend fun dismissBackupDownload(
+        site: SiteModel,
+        downloadId: Long
+    ): DismissBackupDownloadResultPayload {
+        val url = WPCOMV2.sites.site(site.siteId).rewind.downloads.download(downloadId).url
+        val request = mapOf("dismissed" to true.toString())
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                request,
+                DismissBackupDownloadResponse::class.java
+        )
+        return when (response) {
+            is Success -> DismissBackupDownloadResultPayload(
+                    site.siteId,
+                    response.data.downloadId,
+                    response.data.isDismissed
+            )
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        DismissBackupDownloadErrorType.GENERIC_ERROR,
+                        DismissBackupDownloadErrorType.INVALID_RESPONSE,
+                        DismissBackupDownloadErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = DismissBackupDownloadError(errorType, response.error.message)
+                DismissBackupDownloadResultPayload(error, site.siteId, downloadId)
+            }
+        }
+    }
+
+    private fun buildParams(
+        offset: Int,
+        number: Int,
+        payload: FetchActivityLogPayload
+    ): MutableMap<String, String> {
+        val pageNumber = offset / number + 1
+        val params = mutableMapOf(
+                "page" to pageNumber.toString(),
+                "number" to number.toString()
+        )
+
+        addDateRangeParams(params, payload.after, payload.before)
+        payload.groups.forEachIndexed { index, value ->
+            params["group[$index]"] = value
+        }
+        return params
+    }
+
+    private fun addDateRangeParams(
+        params: MutableMap<String, String>,
+        after: Date? = null,
+        before: Date? = null
+    ) {
+        after?.let {
+            val offset = timeZoneProvider.getDefaultTimeZone().getOffset(it.time)
+            params["after"] = DateTimeUtils.iso8601UTCFromDate(Date(it.time - offset))
+        }
+        before?.let {
+            val offset = timeZoneProvider.getDefaultTimeZone().getOffset(it.time)
+            params["before"] = DateTimeUtils.iso8601UTCFromDate(Date(it.time - offset))
+        }
+    }
+
+    private fun buildActivityPayload(
+        activityResponses: List<ActivitiesResponse.ActivityResponse>,
+        site: SiteModel,
+        totalItems: Int,
+        number: Int,
+        offset: Int
+    ): FetchedActivityLogPayload {
+        var error: ActivityLogErrorType? = null
+
+        val activities = activityResponses.mapNotNull {
+            when {
+                it.activity_id == null -> {
+                    error = ActivityLogErrorType.MISSING_ACTIVITY_ID
+                    null
+                }
+                it.summary == null -> {
+                    error = ActivityLogErrorType.MISSING_SUMMARY
+                    null
+                }
+                it.content?.text == null -> {
+                    error = ActivityLogErrorType.MISSING_CONTENT_TEXT
+                    null
+                }
+                it.published == null -> {
+                    error = ActivityLogErrorType.MISSING_PUBLISHED_DATE
+                    null
+                }
+                else -> {
+                    ActivityLogModel(
+                            activityID = it.activity_id,
+                            summary = it.summary,
+                            content = it.content,
+                            name = it.name,
+                            type = it.type,
+                            gridicon = it.gridicon,
+                            status = it.status,
+                            rewindable = it.is_rewindable,
+                            rewindID = it.rewind_id,
+                            published = it.published,
+                            actor = it.actor?.let {
+                                ActivityLogModel.ActivityActor(
+                                        it.name,
+                                        it.type,
+                                        it.wpcom_user_id,
+                                        it.icon?.url,
+                                        it.role
+                                )
+                            }
+                    )
+                }
+            }
+        }
+        error?.let {
+            return FetchedActivityLogPayload(ActivityError(it), site, totalItems, number, offset)
+        }
+        return FetchedActivityLogPayload(activities, site, totalItems, number, offset)
+    }
+
+    @Suppress("ReturnCount")
+    private fun buildRewindStatusPayload(response: RewindStatusResponse, site: SiteModel):
+            FetchedRewindStatePayload {
+        val state = RewindStatusModel.State.fromValue(response.state)
+                ?: return buildErrorPayload(site, RewindStatusErrorType.INVALID_RESPONSE)
+        val reason = RewindStatusModel.Reason.fromValue(response.reason)
+        val rewindModel = response.rewind?.let {
+            val rewindId = it.rewind_id
+                    ?: return buildErrorPayload(site, RewindStatusErrorType.MISSING_REWIND_ID)
+            val restoreId = it.restore_id
+                    ?: return buildErrorPayload(site, RewindStatusErrorType.MISSING_RESTORE_ID)
+            val restoreStatusValue = it.status
+            val restoreStatus = RewindStatusModel.Rewind.Status.fromValue(restoreStatusValue)
+                    ?: return buildErrorPayload(site, RewindStatusErrorType.INVALID_REWIND_STATE)
+            RewindStatusModel.Rewind(
+                    rewindId = rewindId,
+                    restoreId = restoreId,
+                    status = restoreStatus,
+                    progress = it.progress,
+                    reason = it.reason,
+                    message = it.message,
+                    currentEntry = it.currentEntry
+            )
+        }
+
+        val rewindStatusModel = RewindStatusModel(
+                state = state,
+                reason = reason,
+                lastUpdated = response.last_updated,
+                canAutoconfigure = response.can_autoconfigure,
+                credentials = response.credentials?.map {
+                    Credentials(it.type, it.role, it.host, it.port, it.still_valid)
+                },
+                rewind = rewindModel
+        )
+        return FetchedRewindStatePayload(rewindStatusModel, site)
+    }
+
+    private fun buildErrorPayload(site: SiteModel, errorType: RewindStatusErrorType) =
+            FetchedRewindStatePayload(RewindStatusError(errorType), site)
+
+    private fun buildBackupDownloadStatusPayload(response: BackupDownloadStatusResponse, site: SiteModel):
+            FetchedBackupDownloadStatePayload {
+        val statusModel = BackupDownloadStatusModel(
+                rewindId = response.rewindId,
+                downloadId = response.downloadId,
+                backupPoint = response.backupPoint,
+                startedAt = response.startedAt,
+                progress = response.progress,
+                downloadCount = response.downloadCount,
+                validUntil = response.validUntil,
+                url = response.url
+        )
+        return FetchedBackupDownloadStatePayload(statusModel, site)
+    }
+
+    private fun buildActivityTypesPayload(
+        response: ActivityTypesResponse,
+        remoteSiteId: Long
+    ): FetchedActivityTypesResultPayload {
+        val activityTypes = response.groups?.activityTypes
+                ?.filter { it.key != null && it.name != null }
+                ?.map { ActivityTypeModel(requireNotNull(it.key), requireNotNull(it.name), it.count ?: 0) }
+                ?: listOf()
+
+        check(!BuildConfig.DEBUG || (response.groups?.activityTypes?.size ?: 0) == activityTypes.size) {
+            "ActivityTypes parsing failed - one or more items were ignored."
+        }
+
+        return FetchedActivityTypesResultPayload(
+                remoteSiteId,
+                activityTypes,
+                response.totalItems ?: 0
+        )
+    }
+
+    @Suppress("ConstructorParameterNaming")
+    class ActivitiesResponse(
+        val totalItems: Int?,
+        val summary: String?,
+        val current: Page?,
+        // This class is reused in CardsRestClient, the error field is not used for activity log
+        val error: String? = null
+    ) {
+        class Page(val orderedItems: List<ActivityResponse>)
+
+        data class ActivityResponse(
+            val summary: String?,
+            val content: FormattableContent?,
+            val name: String?,
+            val actor: Actor?,
+            val type: String?,
+            val published: Date?,
+            val generator: Generator?,
+            val is_rewindable: Boolean?,
+            val rewind_id: String?,
+            val gridicon: String?,
+            val status: String?,
+            val activity_id: String?
+        )
+
+        class Actor(
+            val type: String?,
+            val name: String?,
+            val external_user_id: Long?,
+            val wpcom_user_id: Long?,
+            val icon: Icon?,
+            val role: String?
+        )
+
+        class Icon(val type: String?, val url: String?, val width: Int?, val height: Int?)
+
+        class Generator(val jetpack_version: Float?, val blog_id: Long?)
+    }
+
+    @Suppress("ConstructorParameterNaming")
+    data class RewindStatusResponse(
+        val state: String,
+        val reason: String?,
+        val last_updated: Date,
+        val can_autoconfigure: Boolean?,
+        val credentials: List<Credentials>?,
+        val rewind: Rewind?,
+        val message: String?,
+        val currentEntry: String?
+    ) {
+        data class Credentials(
+            val type: String,
+            val role: String,
+            val host: String?,
+            val port: Int?,
+            val still_valid: Boolean
+        )
+
+        data class Rewind(
+            val site_id: String?,
+            val status: String?,
+            val restore_id: Long?,
+            val rewind_id: String?,
+            val progress: Int?,
+            val reason: String?,
+            val message: String?,
+            val currentEntry: String?
+        )
+    }
+
+    @Suppress("ConstructorParameterNaming")
+    class RewindResponse(
+        val restore_id: Long,
+        val ok: Boolean?,
+        val error: String?
+    )
+
+    class BackupDownloadResponse(
+        val downloadId: Long,
+        val rewindId: String,
+        val backupPoint: String,
+        val startedAt: String,
+        val progress: Int
+    )
+
+    data class BackupDownloadStatusResponse(
+        val downloadId: Long,
+        val rewindId: String,
+        val backupPoint: Date,
+        val startedAt: Date,
+        val progress: Int?,
+        val downloadCount: Int?,
+        val validUntil: Date?,
+        val url: String?
+    )
+
+    data class ActivityTypesResponse(
+        @JsonAdapter(ActivityTypesDeserializer::class) val groups: Groups?,
+        val totalItems: Int?
+    ) : Response {
+        data class Groups(
+            val activityTypes: List<ActivityType>
+        )
+
+        data class ActivityType(
+            val key: String?,
+            val name: String?,
+            val count: Int?
+        )
+    }
+
+    class DismissBackupDownloadResponse(
+        val downloadId: Long,
+        val isDismissed: Boolean
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityTypesDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityTypesDeserializer.kt
new file mode 100644
index 00000000000..914b04d81ee
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/activity/ActivityTypesDeserializer.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.activity
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivityTypesResponse.ActivityType
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivityTypesResponse.Groups
+import java.lang.reflect.Type
+
+class ActivityTypesDeserializer : JsonDeserializer<Groups?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Groups? {
+        return if (context != null && json != null && json.isJsonObject) {
+            /**
+             * Response example:
+             * {
+             *   "post": {
+             *   "name": "Posts and Pages",
+             *   "count": 69
+             *   },
+             *   "attachment": {
+             *     "name": "Media",
+             *     "count": 5
+             *   },
+             *   "user": {
+             *     "name": "People",
+             *     "count": 2
+             *   }
+             * }
+             */
+            val item: ArrayList<ActivityType> = arrayListOf()
+
+            val rowsJsonObject = json.asJsonObject
+            rowsJsonObject.keySet().iterator().forEach { key ->
+                val activityType = getActivityType(key, rowsJsonObject)
+                activityType?.let { item.add(it) }
+            }
+
+            return Groups(item)
+        } else {
+            null
+        }
+    }
+
+    @Suppress("SwallowedException")
+    private fun getActivityType(
+        key: String,
+        groups: JsonObject
+    ): ActivityType? {
+        return groups.get(key)?.takeIf { it.isJsonObject }?.asJsonObject?.let { item ->
+            try {
+                ActivityType(
+                        key = key,
+                        name = item.get(NAME)?.asString,
+                        count = item.get(COUNT)?.asInt
+                )
+            } catch (ex: ClassCastException) {
+                null
+            } catch (ex: IllegalStateException) {
+                null
+            }
+        }
+    }
+
+    companion object {
+        private const val NAME = "name"
+        private const val COUNT = "count"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AccessToken.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AccessToken.java
new file mode 100644
index 00000000000..a5b4bb04213
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AccessToken.java
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+import org.wordpress.android.fluxc.utils.PreferenceUtils;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class AccessToken {
+    private static final String ACCOUNT_TOKEN_PREF_KEY = "ACCOUNT_TOKEN_PREF_KEY";
+    private String mToken;
+    private Context mContext;
+
+    @Inject public AccessToken(Context appContext) {
+        mContext = appContext;
+        mToken = getFluxCPreferences().getString(ACCOUNT_TOKEN_PREF_KEY, "");
+        if (mToken.isEmpty()) {
+            // Check the old token storage location, since we might init the access token
+            // before the token migration completes (DB upgrade 38 -> 39)
+            mToken = PreferenceManager.getDefaultSharedPreferences(mContext).getString(ACCOUNT_TOKEN_PREF_KEY, "");
+        }
+    }
+
+    public boolean exists() {
+        return !TextUtils.isEmpty(mToken);
+    }
+
+    public String get() {
+        return mToken;
+    }
+
+    public void set(String token) {
+        mToken = token;
+        getFluxCPreferences().edit().putString(ACCOUNT_TOKEN_PREF_KEY, token).apply();
+    }
+
+    private SharedPreferences getFluxCPreferences() {
+        return PreferenceUtils.getFluxCPreferences(mContext);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AppSecrets.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AppSecrets.java
new file mode 100644
index 00000000000..96e966696f6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AppSecrets.java
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth;
+
+public class AppSecrets {
+    private final String mAppId;
+    private final String mAppSecret;
+
+    public AppSecrets(String appId, String appSecret) {
+        mAppId = appId;
+        mAppSecret = appSecret;
+    }
+
+    public String getAppId() {
+        return mAppId;
+    }
+
+    public String getAppSecret() {
+        return mAppSecret;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AuthEmailWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AuthEmailWPComRestResponse.java
new file mode 100644
index 00000000000..81980a39ef7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/AuthEmailWPComRestResponse.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class AuthEmailWPComRestResponse implements Response {
+    public boolean success;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/Authenticator.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/Authenticator.java
new file mode 100644
index 00000000000..f9474accd5b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/Authenticator.java
@@ -0,0 +1,406 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Cache;
+import com.android.volley.NetworkResponse;
+import com.android.volley.ParseError;
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.HttpHeaderParser;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.WebauthnChallengeRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.WebauthnToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.WebauthnTokenRequest;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailError;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailErrorType;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayloadScheme;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.LanguageUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class Authenticator {
+    private static final String WPCOM_OAUTH_PREFIX = "https://public-api.wordpress.com/oauth2";
+    private static final String WPCOM_PREFIX = "https://wordpress.com";
+    private static final String AUTHORIZE_ENDPOINT = WPCOM_OAUTH_PREFIX + "/authorize";
+    private static final String TOKEN_ENDPOINT = WPCOM_OAUTH_PREFIX + "/token";
+    private static final String AUTHORIZE_ENDPOINT_FORMAT = "%s?client_id=%s&response_type=code";
+    private static final String LOGIN_BASE_ENDPOINT = WPCOM_PREFIX + "/wp-login.php?action=login-endpoint";
+    public static final String CLIENT_ID_PARAM_NAME = "client_id";
+    public static final String CLIENT_SECRET_PARAM_NAME = "client_secret";
+    public static final String CODE_PARAM_NAME = "code";
+    public static final String GRANT_TYPE_PARAM_NAME = "grant_type";
+    public static final String USERNAME_PARAM_NAME = "username";
+    public static final String PASSWORD_PARAM_NAME = "password";
+    public static final String WITH_AUTH_TYPES = "with_auth_types";
+    public static final String GET_BEARER_TOKEN = "get_bearer_token";
+
+    public static final String PASSWORD_GRANT_TYPE = "password";
+    public static final String BEARER_GRANT_TYPE = "bearer";
+    public static final String AUTHORIZATION_CODE_GRANT_TYPE = "authorization_code";
+
+    // Authentication error response keys/descriptions recognized
+    private static final String INVALID_REQUEST_ERROR = "invalid_request";
+    private static final String NEEDS_TWO_STEP_ERROR = "needs_2fa";
+    private static final String INVALID_OTP_ERROR = "invalid_otp";
+    private static final String INVALID_CREDS_ERROR = "Incorrect username or password.";
+
+    private final Context mAppContext;
+    private final Dispatcher mDispatcher;
+    private final RequestQueue mRequestQueue;
+    private AppSecrets mAppSecrets;
+
+    public interface Listener extends Response.Listener<OauthResponse> {
+    }
+
+    public interface ErrorListener extends Response.ErrorListener {
+    }
+
+    public static class AuthEmailResponsePayload extends Payload<AuthEmailError> {
+        public final boolean isSignup;
+
+        public AuthEmailResponsePayload(boolean isSignup) {
+            this.isSignup = isSignup;
+        }
+    }
+
+    @Inject
+    public Authenticator(Context appContext,
+                         Dispatcher dispatcher,
+                         @Named("regular") RequestQueue requestQueue,
+                         AppSecrets secrets) {
+        mAppContext = appContext;
+        mDispatcher = dispatcher;
+        mRequestQueue = requestQueue;
+        mAppSecrets = secrets;
+    }
+
+    public void authenticate(String username, String password, Listener listener, ErrorListener errorListener) {
+        OauthRequest request = makeRequest(username, password, listener, errorListener);
+        mRequestQueue.add(request);
+    }
+
+    public void authenticate(String username, String password, String twoStepCode, boolean shouldSendTwoStepSMS,
+                             Listener listener, ErrorListener errorListener) {
+        OauthRequest request = makeRequest(username, password, twoStepCode, shouldSendTwoStepSMS, listener,
+                errorListener);
+        mRequestQueue.add(request);
+    }
+
+    public String getAuthorizationURL() {
+        return String.format(AUTHORIZE_ENDPOINT_FORMAT, AUTHORIZE_ENDPOINT, mAppSecrets.getAppId());
+    }
+
+    public OauthRequest makeRequest(String username, String password, Listener listener, ErrorListener errorListener) {
+        return new PasswordRequest(mAppSecrets.getAppId(), mAppSecrets.getAppSecret(),
+                username, password, listener, errorListener);
+    }
+
+    public OauthRequest makeRequest(String username, String password, String twoStepCode, boolean shouldSendTwoStepSMS,
+                                    Listener listener, ErrorListener errorListener) {
+        return new TwoFactorRequest(mAppSecrets.getAppId(), mAppSecrets.getAppSecret(),
+                username, password, twoStepCode, shouldSendTwoStepSMS, listener, errorListener);
+    }
+
+    public void makeRequest(String userId, String webauthnNonce,
+                            Response.Listener<JSONObject> listener,
+                            ErrorListener errorListener) {
+        WebauthnChallengeRequest request = new WebauthnChallengeRequest(
+                userId,
+                webauthnNonce,
+                mAppSecrets.getAppId(),
+                mAppSecrets.getAppSecret(),
+                listener,
+                errorListener
+        );
+        mRequestQueue.add(request);
+    }
+
+    public void makeRequest(String userId, String twoStepNonce,
+                            String clientData, Response.Listener<WebauthnToken> listener,
+                            ErrorListener errorListener) {
+        WebauthnTokenRequest request = new WebauthnTokenRequest(
+                userId,
+                twoStepNonce,
+                mAppSecrets.getAppId(),
+                mAppSecrets.getAppSecret(),
+                clientData,
+                listener,
+                errorListener
+        );
+        mRequestQueue.add(request);
+    }
+
+    private static class OauthRequest extends Request<OauthResponse> {
+        private static final String DATA = "data";
+        private static final String BEARER_TOKEN = "bearer_token";
+        private static final String ACCESS_TOKEN = "access_token";
+        private final Listener mListener;
+        protected Map<String, String> mParams = new HashMap<>();
+
+        OauthRequest(String url, String appId, String appSecret, Listener listener, ErrorListener errorListener) {
+            super(Method.POST, url, errorListener);
+            mListener = listener;
+            mParams.put(CLIENT_ID_PARAM_NAME, appId);
+            mParams.put(CLIENT_SECRET_PARAM_NAME, appSecret);
+        }
+
+        @Override
+        public Map<String, String> getParams() {
+            return mParams;
+        }
+
+        @Override
+        public void deliverResponse(OauthResponse response) {
+            mListener.onResponse(response);
+        }
+
+        @Override
+        protected Response<OauthResponse> parseNetworkResponse(NetworkResponse response) {
+            try {
+                String jsonString = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
+                JSONObject responseJson = new JSONObject(jsonString);
+                JSONObject responseData = responseJson.optJSONObject(DATA);
+                Cache.Entry headers = HttpHeaderParser.parseCacheHeaders(response);
+                if (responseData != null) {
+                    return handleDataObjectResponse(headers, responseData);
+                } else {
+                    String accessToken = responseJson.getString(ACCESS_TOKEN);
+                    return Response.success(new Token(accessToken), headers);
+                }
+            } catch (UnsupportedEncodingException | JSONException e) {
+                return Response.error(new ParseError(e));
+            }
+        }
+
+        @NonNull
+        private static Response<OauthResponse> handleDataObjectResponse(Cache.Entry headers, JSONObject responseData)
+                throws JSONException {
+            String bearerToken = responseData.optString(BEARER_TOKEN);
+            if (bearerToken.isEmpty()) {
+                return Response.success(new TwoFactorResponse(responseData), headers);
+            }
+
+            return Response.success(new Token(bearerToken), headers);
+        }
+    }
+
+    public static class PasswordRequest extends OauthRequest {
+        public PasswordRequest(String appId, String appSecret, String username, String password,
+                               Listener listener, ErrorListener errorListener) {
+            super(TOKEN_ENDPOINT, appId, appSecret, listener, errorListener);
+            mParams.put(USERNAME_PARAM_NAME, username);
+            mParams.put(PASSWORD_PARAM_NAME, password);
+            mParams.put(GRANT_TYPE_PARAM_NAME, PASSWORD_GRANT_TYPE);
+            mParams.put("wpcom_supports_2fa", "true");
+            mParams.put(WITH_AUTH_TYPES, "true");
+        }
+    }
+
+    public static class TwoFactorRequest extends OauthRequest {
+        public TwoFactorRequest(String appId, String appSecret, String username, String password, String twoStepCode,
+                                boolean shouldSendTwoStepSMS, Listener listener, ErrorListener errorListener) {
+            super(TOKEN_ENDPOINT, appId, appSecret, listener, errorListener);
+            mParams.put(USERNAME_PARAM_NAME, username);
+            mParams.put(PASSWORD_PARAM_NAME, password);
+            mParams.put(GRANT_TYPE_PARAM_NAME, PASSWORD_GRANT_TYPE);
+            mParams.put(GET_BEARER_TOKEN, "true");
+            mParams.put("wpcom_otp", twoStepCode);
+            if (shouldSendTwoStepSMS && TextUtils.isEmpty(twoStepCode)) {
+                mParams.put("wpcom_resend_otp", "true");
+            }
+            mParams.put("wpcom_supports_2fa", "true");
+            mParams.put(WITH_AUTH_TYPES, "true");
+        }
+    }
+
+    public static class BearerRequest extends OauthRequest {
+        public BearerRequest(String appId, String appSecret, String code, Listener listener,
+                             ErrorListener errorListener) {
+            super(TOKEN_ENDPOINT, appId, appSecret, listener, errorListener);
+            mParams.put(CODE_PARAM_NAME, code);
+            mParams.put(GRANT_TYPE_PARAM_NAME, BEARER_GRANT_TYPE);
+        }
+    }
+
+    public interface OauthResponse {
+    }
+
+    public static class Token implements OauthResponse {
+        private String mAccessToken;
+
+        public Token(String accessToken) {
+            mAccessToken = accessToken;
+        }
+
+        public String getAccessToken() {
+            return mAccessToken;
+        }
+
+        public String toString() {
+            return getAccessToken();
+        }
+    }
+
+    public static class TwoFactorResponse implements OauthResponse {
+        private static final String USER_ID = "user_id";
+        private static final String TWO_STEP_WEBAUTHN_NONCE = "two_step_nonce_webauthn";
+        private static final String TWO_STEP_BACKUP_NONCE = "two_step_nonce_backup";
+        private static final String TWO_STEP_AUTHENTICATOR_NONCE = "two_step_nonce_authenticator";
+        private static final String TWO_STEP_PUSH_NONCE = "two_step_nonce_push";
+        private static final String TWO_STEP_SUPPORTED_AUTH_TYPES = "two_step_supported_auth_types";
+        public final String mUserId;
+        public final String mWebauthnNonce;
+        public final String mBackupNonce;
+        public final String mAuthenticatorNonce;
+        public final String mPushNonce;
+        public final List<String> mSupportedAuthTypes;
+
+        public TwoFactorResponse(JSONObject data) throws JSONException {
+            mUserId = data.getString(USER_ID);
+            mWebauthnNonce = data.optString(TWO_STEP_WEBAUTHN_NONCE);
+            mBackupNonce = data.optString(TWO_STEP_BACKUP_NONCE);
+            mAuthenticatorNonce = data.optString(TWO_STEP_AUTHENTICATOR_NONCE);
+            mPushNonce = data.optString(TWO_STEP_PUSH_NONCE);
+            JSONArray supportedTypes = data.getJSONArray(TWO_STEP_SUPPORTED_AUTH_TYPES);
+            if (supportedTypes.length() == 0) {
+                throw new JSONException("No supported auth types found");
+            }
+
+            ArrayList<String> supportedAuthTypes = new ArrayList<>();
+            for (int i = 0; i < supportedTypes.length(); i++) {
+                supportedAuthTypes.add(supportedTypes.getString(i));
+            }
+            mSupportedAuthTypes = supportedAuthTypes;
+        }
+    }
+
+    public void sendAuthEmail(final AuthEmailPayload payload) {
+        String url = WPCOMREST.auth.send_login_email.getUrlV1_3();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("email", payload.emailOrUsername);
+        params.put("client_id", mAppSecrets.getAppId());
+        params.put("client_secret", mAppSecrets.getAppSecret());
+
+        AuthEmailPayloadScheme scheme = payload.scheme;
+        if (scheme == null) {
+            scheme = AuthEmailPayloadScheme.WORDPRESS;
+        }
+        params.put("scheme", scheme.toString());
+
+        if (payload.flow != null) {
+            params.put("flow", payload.flow.getName());
+        }
+
+        if (payload.source != null) {
+            params.put("source", payload.source.getName());
+        }
+
+        if (payload.signupFlowName != null && !TextUtils.isEmpty(payload.signupFlowName)) {
+            params.put("signup_flow_name", payload.signupFlowName);
+        }
+
+        if (payload.isSignup) {
+            params.put("create_account", true);
+        }
+
+        WPComGsonRequest request = WPComGsonRequest.buildPostRequest(url, params, AuthEmailWPComRestResponse.class,
+                new Response.Listener<AuthEmailWPComRestResponse>() {
+                    @Override
+                    public void onResponse(AuthEmailWPComRestResponse response) {
+                        AuthEmailResponsePayload responsePayload = new AuthEmailResponsePayload(payload.isSignup);
+
+                        if (!response.success) {
+                            responsePayload.error = new AuthEmailError(AuthEmailErrorType.UNSUCCESSFUL, "");
+                        }
+                        mDispatcher.dispatch(AuthenticationActionBuilder.newSentAuthEmailAction(responsePayload));
+                    }
+                }, new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AuthEmailResponsePayload responsePayload = new AuthEmailResponsePayload(payload.isSignup);
+                        responsePayload.error = new AuthEmailError(error.apiError, error.message);
+                        mDispatcher.dispatch(AuthenticationActionBuilder.newSentAuthEmailAction(responsePayload));
+                    }
+                }
+                                                                    );
+        request.addQueryParameter("locale", LanguageUtils.getPatchedCurrentDeviceLanguage(mAppContext));
+
+        mRequestQueue.add(request);
+    }
+
+    public static AuthenticationErrorType volleyErrorToAuthenticationError(VolleyError error) {
+        if (error != null && error.networkResponse != null && error.networkResponse.data != null) {
+            String jsonString = new String(error.networkResponse.data);
+            try {
+                JSONObject jsonObject = new JSONObject(jsonString);
+                return jsonErrorToAuthenticationError(jsonObject);
+            } catch (JSONException e) {
+                AppLog.e(T.API, e);
+            }
+        }
+        return AuthenticationErrorType.GENERIC_ERROR;
+    }
+
+    public static String volleyErrorToErrorMessage(VolleyError error) {
+        if (error != null && error.networkResponse != null && error.networkResponse.data != null) {
+            String jsonString = new String(error.networkResponse.data);
+            try {
+                JSONObject jsonObject = new JSONObject(jsonString);
+                return jsonObject.getString("error_description");
+            } catch (JSONException e) {
+                AppLog.e(T.API, e);
+            }
+        }
+        return null;
+    }
+
+    public static AuthenticationErrorType jsonErrorToAuthenticationError(JSONObject jsonObject) {
+        AuthenticationErrorType error = AuthenticationErrorType.GENERIC_ERROR;
+        if (jsonObject != null) {
+            String errorType = jsonObject.optString("error", "");
+            String errorMessage = jsonObject.optString("error_description", "");
+            error = wpComApiErrorToAuthenticationError(errorType, errorMessage);
+        }
+        return error;
+    }
+
+    public static AuthenticationErrorType wpComApiErrorToAuthenticationError(String errorType, String errorMessage) {
+        AuthenticationErrorType error = AuthenticationErrorType.fromString(errorType);
+        // Special cases for vague error types
+        if (error == AuthenticationErrorType.INVALID_REQUEST) {
+            // Try to parse the error message to specify the error
+            if (errorMessage.contains("Incorrect username or password.")) {
+                return AuthenticationErrorType.INCORRECT_USERNAME_OR_PASSWORD;
+            }
+        }
+        return error;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/BaseWebauthnRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/BaseWebauthnRequest.kt
new file mode 100644
index 00000000000..34e25b43490
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/BaseWebauthnRequest.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn
+
+import com.android.volley.NetworkResponse
+import com.android.volley.ParseError
+import com.android.volley.Request
+import com.android.volley.Response
+import com.android.volley.Response.ErrorListener
+import com.android.volley.toolbox.HttpHeaderParser
+import com.google.gson.Gson
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.UnsupportedEncodingException
+
+abstract class BaseWebauthnRequest<T>(
+    url: String,
+    errorListener: ErrorListener,
+    private val listener: Response.Listener<T>
+) : Request<T>(Method.POST, url, errorListener) {
+    abstract val parameters: Map<String, String>
+    abstract fun serializeResponse(response: String): T
+
+    internal val gson by lazy { Gson() }
+
+    private fun NetworkResponse?.extractResult(): Response<T> {
+        if (this == null) {
+            val error = WebauthnChallengeRequestException("Webauthn challenge response is null")
+            return Response.error(ParseError(error))
+        }
+
+        return try {
+            val headers = HttpHeaderParser.parseCacheHeaders(this)
+            val charsetName = HttpHeaderParser.parseCharset(this.headers)
+            String(this.data, charset(charsetName))
+                .let { JSONObject(it).getJSONObject(WEBAUTHN_DATA) }
+                .let { serializeResponse(it.toString()) }
+                .let { Response.success(it, headers) }
+        }
+        catch (exception: UnsupportedEncodingException) { Response.error(ParseError(exception)) }
+        catch (exception: JSONException) { Response.error(ParseError(exception)) }
+    }
+
+    override fun getParams() = parameters
+    override fun deliverResponse(response: T) = listener.onResponse(response)
+    override fun parseNetworkResponse(response: NetworkResponse?) = response.extractResult()
+
+    internal enum class WebauthnRequestParameters(val value: String) {
+        USER_ID("user_id"),
+        AUTH_TYPE("auth_type"),
+        TWO_STEP_NONCE("two_step_nonce"),
+        CLIENT_ID("client_id"),
+        CLIENT_SECRET("client_secret"),
+        CLIENT_DATA("client_data"),
+        GET_BEARER_TOKEN("get_bearer_token"),
+        CREATE_2FA_COOKIES_ONLY("create_2fa_cookies_only")
+    }
+
+    class WebauthnChallengeRequestException(message: String): Exception(message)
+
+    companion object {
+        private const val baseWPLoginUrl = "https://wordpress.com/wp-login.php?action"
+        private const val challengeEndpoint = "webauthn-challenge-endpoint"
+        private const val authEndpoint = "webauthn-authentication-endpoint"
+        private const val WEBAUTHN_DATA = "data"
+
+        internal const val webauthnChallengeEndpointUrl = "$baseWPLoginUrl=$challengeEndpoint"
+        internal const val webauthnAuthEndpointUrl = "$baseWPLoginUrl=$authEndpoint"
+        internal const val WEBAUTHN_AUTH_TYPE = "webauthn"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/VolleyWebauthnRequests.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/VolleyWebauthnRequests.kt
new file mode 100644
index 00000000000..c9e6f0a43e4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/auth/webauthn/VolleyWebauthnRequests.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn
+
+import com.android.volley.Response
+import com.android.volley.Response.ErrorListener
+import com.google.gson.annotations.SerializedName
+import org.json.JSONObject
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.AUTH_TYPE
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.CLIENT_DATA
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.CLIENT_ID
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.CLIENT_SECRET
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.CREATE_2FA_COOKIES_ONLY
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.GET_BEARER_TOKEN
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.TWO_STEP_NONCE
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.BaseWebauthnRequest.WebauthnRequestParameters.USER_ID
+
+class WebauthnChallengeRequest(
+    userId: String,
+    twoStepNonce: String,
+    clientId: String,
+    clientSecret: String,
+    listener: Response.Listener<JSONObject>,
+    errorListener: ErrorListener
+): BaseWebauthnRequest<JSONObject>(webauthnChallengeEndpointUrl, errorListener, listener) {
+    override val parameters: Map<String, String> = mapOf(
+        CLIENT_ID.value to clientId,
+        CLIENT_SECRET.value to clientSecret,
+        USER_ID.value to userId,
+        AUTH_TYPE.value to WEBAUTHN_AUTH_TYPE,
+        TWO_STEP_NONCE.value to twoStepNonce
+    )
+
+    override fun serializeResponse(response: String) = JSONObject(response)
+}
+
+@SuppressWarnings("LongParameterList")
+class WebauthnTokenRequest(
+    userId: String,
+    twoStepNonce: String,
+    clientId: String,
+    clientSecret: String,
+    clientData: String,
+    listener: Response.Listener<WebauthnToken>,
+    errorListener: ErrorListener
+) : BaseWebauthnRequest<WebauthnToken>(webauthnAuthEndpointUrl, errorListener, listener) {
+    override val parameters = mapOf(
+        CLIENT_ID.value to clientId,
+        CLIENT_SECRET.value to clientSecret,
+        USER_ID.value to userId,
+        AUTH_TYPE.value to WEBAUTHN_AUTH_TYPE,
+        TWO_STEP_NONCE.value to twoStepNonce,
+        CLIENT_DATA.value to clientData,
+        GET_BEARER_TOKEN.value to "true",
+        CREATE_2FA_COOKIES_ONLY.value to "true"
+    )
+
+    override fun serializeResponse(response: String): WebauthnToken =
+        gson.fromJson(response, WebauthnToken::class.java)
+}
+
+class WebauthnToken(
+    @SerializedName("bearer_token")
+    val bearerToken: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsResponse.kt
new file mode 100644
index 00000000000..699b68c3974
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsResponse.kt
@@ -0,0 +1,113 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.blaze
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignsModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+
+data class BlazeCampaignsFetchedPayload<T>(
+    val response: T? = null
+) : Payload<BlazeCampaignsError>() {
+    constructor(error: BlazeCampaignsError) : this() {
+        this.error = error
+    }
+}
+
+class BlazeCampaignsError
+@JvmOverloads constructor(
+    val type: BlazeCampaignsErrorType,
+    val message: String? = null
+) : OnChangedError
+
+enum class BlazeCampaignsErrorType {
+    GENERIC_ERROR,
+    AUTHORIZATION_REQUIRED,
+    INVALID_RESPONSE,
+    API_ERROR,
+    TIMEOUT
+}
+
+fun WPComGsonNetworkError.toBlazeCampaignsError(): BlazeCampaignsError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> BlazeCampaignsErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> BlazeCampaignsErrorType.API_ERROR
+
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> BlazeCampaignsErrorType.INVALID_RESPONSE
+
+        GenericErrorType.HTTP_AUTH_ERROR,
+        GenericErrorType.AUTHORIZATION_REQUIRED,
+        GenericErrorType.NOT_AUTHENTICATED -> BlazeCampaignsErrorType.AUTHORIZATION_REQUIRED
+
+        GenericErrorType.UNKNOWN,
+        null -> BlazeCampaignsErrorType.GENERIC_ERROR
+    }
+    return BlazeCampaignsError(type, message)
+}
+
+data class CampaignStats(
+    @SerializedName("impressions_total") val impressionsTotal: Long? = null,
+    @SerializedName("clicks_total") val clicksTotal: Long? = null
+)
+
+data class BlazeCampaignListResponse(
+    @SerializedName("campaigns") val campaigns: List<BlazeCampaign>,
+    @SerializedName("skipped") val skipped: Int,
+    @SerializedName("total_count") val totalCount: Int,
+) {
+    fun toCampaignsModel() = BlazeCampaignsModel(
+        campaigns = campaigns.map { it.toCampaignsModel() },
+        skipped = skipped,
+        totalItems = totalCount,
+    )
+}
+
+data class BlazeCampaign(
+    @SerializedName("id") val id: String,
+    @SerializedName("main_image") val image: CampaignImage,
+    @SerializedName("target_url") val targetUrl: String,
+    @SerializedName("text_snippet") val textSnippet: String,
+    @SerializedName("site_name") val siteName: String,
+    @SerializedName("clicks") val clicks: Long,
+    @SerializedName("impressions") val impressions: Long,
+    @SerializedName("spent_budget") val spentBudget: Double,
+    @SerializedName("total_budget") val totalBudget: Double,
+    @SerializedName("duration_days") val durationDays: Int,
+    @SerializedName("start_time") val startTime: String,
+    @SerializedName("target_urn") val targetUrn: String,
+    @SerializedName("status") val status: String,
+    @SerializedName("is_evergreen") val isEvergreen: Boolean, // If the campaign duration is unlimited
+) {
+    fun toCampaignsModel(): BlazeCampaignModel {
+        val startDate = BlazeCampaignsUtils.stringToDate(startTime)
+        return BlazeCampaignModel(
+            campaignId = id,
+            title = siteName,
+            imageUrl = image.url,
+            startTime = startDate,
+            durationInDays = durationDays,
+            uiStatus = status,
+            impressions = impressions,
+            clicks = clicks,
+            targetUrn = targetUrn,
+            totalBudget = totalBudget,
+            spentBudget = spentBudget,
+            isEndlessCampaign = isEvergreen
+        )
+    }
+}
+
+data class CampaignImage(
+    @SerializedName("height") val height: Float,
+    @SerializedName("width") val width: Float,
+    @SerializedName("mime_type") val mimeType: String,
+    @SerializedName("url") val url: String,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClient.kt
new file mode 100644
index 00000000000..680226cfe75
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsRestClient.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.blaze
+
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.utils.extensions.putIfNotNull
+import javax.inject.Inject
+
+class BlazeCampaignsRestClient @Inject constructor(
+    private val wpComNetwork: WPComNetwork
+) {
+    companion object {
+        const val DEFAULT_PER_PAGE = 25 // Number of items to fetch in a single request
+    }
+
+    suspend fun fetchBlazeCampaigns(
+        siteId: Long,
+        offset: Int,
+        perPage: Int,
+        locale: String,
+        status: String? = null,
+    ): BlazeCampaignsFetchedPayload<BlazeCampaignListResponse> {
+        val url = WPCOMV2.sites.site(siteId).wordads.dsp.api.v1_1.campaigns.url
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mutableMapOf(
+                "site_id" to siteId.toString(),
+                "skip" to offset.toString(),
+                "limit" to perPage.toString(),
+                "locale" to locale
+            ).putIfNotNull("status" to status),
+            clazz = BlazeCampaignListResponse::class.java
+        )
+        return when (response) {
+            is Success -> BlazeCampaignsFetchedPayload(response.data)
+            is Error -> BlazeCampaignsFetchedPayload(response.error.toBlazeCampaignsError())
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsUtils.kt
new file mode 100644
index 00000000000..f7745dc8e67
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCampaignsUtils.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.blaze
+
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object BlazeCampaignsUtils {
+    private val DATE_FORMAT: ThreadLocal<DateFormat> = object : ThreadLocal<DateFormat>() {
+        override fun initialValue(): DateFormat {
+            return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT)
+        }
+    }
+
+    fun dateToString(date: Date): String {
+        val formatter = DATE_FORMAT.get() as DateFormat
+        return formatter.format(date)
+    }
+
+    fun stringToDate(date: String): Date {
+        return try {
+            val formatter = DATE_FORMAT.get() as DateFormat
+            return formatter.parse(date) ?: Date()
+        } catch (exception: ParseException) {
+            Date()
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt
new file mode 100644
index 00000000000..dff6c1b78c8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt
@@ -0,0 +1,492 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.blaze
+
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.blaze.BlazeAdForecast
+import org.wordpress.android.fluxc.model.blaze.BlazeAdSuggestion
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignCreationRequest
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignObjective
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethod
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethodUrls
+import org.wordpress.android.fluxc.model.blaze.BlazePaymentMethods
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingDevice
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingLanguage
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingLocation
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingParameters
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingTopic
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.utils.extensions.filterNotNull
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+
+class BlazeCreationRestClient @Inject constructor(
+    private val wpComNetwork: WPComNetwork
+) {
+    private val dateFormatter by lazy { SimpleDateFormat("yyyy-MM-dd", Locale.ROOT) }
+
+    suspend fun fetchCampaignObjectives(
+        site: SiteModel,
+        locale: String
+    ): BlazePayload<List<BlazeCampaignObjective>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.campaigns.objectives.url
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mapOf("locale" to locale),
+            clazz = BlazeCampaignObjectiveListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> {
+                BlazePayload(response.data.objectives.map { it.toDomainModel() })
+            }
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchTargetingLocations(
+        site: SiteModel,
+        query: String,
+        locale: String
+    ): BlazePayload<List<BlazeTargetingLocation>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.targeting.locations.url
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mapOf(
+                "query" to query,
+                "locale" to locale
+            ),
+            clazz = BlazeTargetingLocationListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(
+                response.data.locations.map { it.toDomainModel() }
+            )
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchTargetingTopics(
+        site: SiteModel,
+        locale: String
+    ): BlazePayload<List<BlazeTargetingTopic>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.targeting.page_topics.url
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mapOf("locale" to locale),
+            clazz = BlazeTargetingTopicListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(
+                response.data.topics.map { it.toDomainModel() }
+            )
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchTargetingDevices(
+        site: SiteModel,
+        locale: String
+    ): BlazePayload<List<BlazeTargetingDevice>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.targeting.devices.url
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mapOf("locale" to locale),
+            clazz = BlazeTargetingDeviceListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(
+                response.data.devices.map { it.toDomainModel() }
+            )
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchTargetingLanguages(
+        site: SiteModel,
+        locale: String
+    ): BlazePayload<List<BlazeTargetingLanguage>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.targeting.languages.url
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            params = mapOf("locale" to locale),
+            clazz = BlazeTargetingLanguageListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(
+                response.data.languages.map { it.toDomainModel() }
+            )
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchAdSuggestions(
+        site: SiteModel,
+        productId: Long
+    ): BlazePayload<List<BlazeAdSuggestion>> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.suggestions.url
+
+        val response = wpComNetwork.executePostGsonRequest(
+            url = url,
+            body = mapOf(
+                "urn" to "urn:wpcom:post:${site.siteId}:$productId"
+            ),
+            clazz = BlazeAdSuggestionListResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(
+                response.data.creatives.map { it.toDomainModel() }
+            )
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun fetchAdForecast(
+        site: SiteModel,
+        startDate: Date,
+        endDate: Date,
+        totalBudget: Double,
+        timeZoneId: String,
+        targetingParameters: BlazeTargetingParameters?
+    ): BlazePayload<BlazeAdForecast> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.forecast.url
+
+        val response = wpComNetwork.executePostGsonRequest(
+            url = url,
+            body = mutableMapOf(
+                "start_date" to dateFormatter.format(startDate),
+                "end_date" to dateFormatter.format(endDate),
+                "time_zone" to timeZoneId,
+                "total_budget" to totalBudget.toString(),
+                "targeting" to targetingParameters?.let {
+                    mapOf(
+                        "locations" to targetingParameters.locations,
+                        "languages" to targetingParameters.languages,
+                        "devices" to targetingParameters.devices,
+                        "page_topics" to targetingParameters.topics
+                    ).filterNotNull()
+                }
+            ).filterNotNull(),
+            clazz = BlazeAdForecastNetworkModel::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(response.data.toDomainModel())
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun fetchPaymentMethods(site: SiteModel): BlazePayload<BlazePaymentMethods> {
+        val url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.payment_methods.url
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            clazz = BlazePaymentMethodsResponse::class.java
+        )
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(response.data.toDomainModel())
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    suspend fun createCampaign(
+        site: SiteModel,
+        request: BlazeCampaignCreationRequest
+    ): BlazePayload<BlazeCampaignModel> {
+        val body = mutableMapOf(
+            "origin" to request.origin,
+            "origin_version" to request.originVersion,
+            "target_urn" to "urn:wpcom:post:${site.siteId}:${request.targetResourceId}",
+            "type" to request.type.value,
+            "payment_method_id" to request.paymentMethodId,
+            "start_date" to dateFormatter.format(request.startDate),
+            "end_date" to dateFormatter.format(request.endDate),
+            "time_zone" to request.timeZoneId,
+            "budget" to mapOf(
+                "mode" to request.budget.mode,
+                "amount" to request.budget.amount,
+                "currency" to request.budget.currency
+            ),
+            "site_name" to request.tagLine,
+            "text_snippet" to request.description,
+            "cta_text" to request.ctaText,
+            "target_url" to request.targetUrl,
+            "url_params" to request.urlParams.entries.joinToString(separator = "&") { "${it.key}=${it.value}" },
+            "main_image" to JsonObject().apply {
+                addProperty("url", request.mainImage.url)
+                addProperty("mime_type", request.mainImage.mimeType)
+            },
+            "targeting" to request.targetingParameters?.let {
+                mapOf(
+                    "locations" to it.locations,
+                    "languages" to it.languages,
+                    "devices" to it.devices,
+                    "page_topics" to it.topics
+                ).filterNotNull()
+            },
+            "is_evergreen" to request.isEndlessCampaign,
+            "objective" to request.objectiveId
+        ).filterNotNull()
+
+        val response = wpComNetwork.executePostGsonRequest(
+            url = WPCOMV2.sites.site(site.siteId).wordads.dsp.api.v1_1.campaigns.url,
+            body = body,
+            clazz = BlazeCampaignCreationNetworkResponse::class.java
+        )
+
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> BlazePayload(response.data.toDomainModel())
+
+            is WPComGsonRequestBuilder.Response.Error -> BlazePayload(response.error)
+        }
+    }
+
+    data class BlazePayload<T>(
+        val data: T?
+    ) : Payload<WPComGsonNetworkError>() {
+        constructor(error: WPComGsonNetworkError) : this(null) {
+            this.error = error
+        }
+    }
+}
+
+private class BlazeCampaignObjectiveListResponse(
+    @SerializedName("objectives")
+    val objectives: List<BlazeCampaignObjectiveNetworkModel>
+) {
+    class BlazeCampaignObjectiveNetworkModel(
+        val id: String,
+        val title: String,
+        val description: String,
+        @SerializedName("suitable_for_description") val suitableForDescription: String
+    ) {
+        fun toDomainModel() = BlazeCampaignObjective(id, title, description, suitableForDescription)
+    }
+}
+
+private class BlazeTargetingLocationListResponse(
+    val locations: List<BlazeTargetingLocationNetworkModel>
+) {
+    class BlazeTargetingLocationNetworkModel(
+        val id: Long,
+        val name: String,
+        val type: String,
+        @SerializedName("parent_location")
+        val parent: BlazeTargetingLocationNetworkModel?
+    ) {
+        fun toDomainModel(): BlazeTargetingLocation {
+            return BlazeTargetingLocation(
+                id = id,
+                name = name,
+                type = type,
+                parent = parent?.toDomainModel()
+            )
+        }
+    }
+}
+
+private class BlazeTargetingTopicListResponse(
+    @SerializedName("page_topics")
+    val topics: List<BlazeTargetingTopicNetworkModel>
+) {
+    class BlazeTargetingTopicNetworkModel(
+        val id: String,
+        val name: String
+    ) {
+        fun toDomainModel(): BlazeTargetingTopic {
+            return BlazeTargetingTopic(
+                id = id,
+                description = name
+            )
+        }
+    }
+}
+
+private class BlazeTargetingDeviceListResponse(
+    val devices: List<BlazeTargetingDeviceNetworkModel>
+) {
+    class BlazeTargetingDeviceNetworkModel(
+        val id: String,
+        val name: String
+    ) {
+        fun toDomainModel(): BlazeTargetingDevice {
+            return BlazeTargetingDevice(
+                id = id,
+                name = name
+            )
+        }
+    }
+}
+
+private class BlazeTargetingLanguageListResponse(
+    val languages: List<BlazeTargetingLanguageNetworkModel>
+) {
+    class BlazeTargetingLanguageNetworkModel(
+        val id: String,
+        val name: String
+    ) {
+        fun toDomainModel(): BlazeTargetingLanguage {
+            return BlazeTargetingLanguage(
+                id = id,
+                name = name
+            )
+        }
+    }
+}
+
+private class BlazeAdSuggestionListResponse(
+    val creatives: List<BlazeAdSuggestionNetworkModel>
+) {
+    class BlazeAdSuggestionNetworkModel(
+        @SerializedName("site_name")
+        val siteName: String,
+        @SerializedName("text_snippet")
+        val textSnippet: String,
+        @SerializedName("cta_text")
+        val ctaText: String,
+    ) {
+        fun toDomainModel(): BlazeAdSuggestion {
+            return BlazeAdSuggestion(
+                tagLine = siteName,
+                description = textSnippet,
+                ctaText = ctaText
+            )
+        }
+    }
+}
+
+private class BlazeAdForecastNetworkModel(
+    @SerializedName("total_impressions_min") val minImpressions: Long,
+    @SerializedName("total_impressions_max") val maxImpressions: Long,
+) {
+    fun toDomainModel(): BlazeAdForecast = BlazeAdForecast(
+        minImpressions = minImpressions,
+        maxImpressions = maxImpressions
+    )
+}
+
+private class BlazePaymentMethodsResponse(
+    @SerializedName("payment_methods")
+    val savedPaymentMethods: List<BlazePaymentMethodsNetworkModel>,
+    @SerializedName("add_payment_method")
+    val addPaymentMethodUrls: BlazeAddPaymentMethodUrlsNetworkModel? // TODO make this non nullable when used
+) {
+    fun toDomainModel(): BlazePaymentMethods {
+        return BlazePaymentMethods(
+            savedPaymentMethods = savedPaymentMethods.map { it.toDomainModel() },
+            addPaymentMethodUrls = addPaymentMethodUrls?.toDomainModel()
+        )
+    }
+
+    class BlazePaymentMethodsNetworkModel(
+        val id: String,
+        val type: String,
+        val name: String,
+        val info: JsonObject
+    ) {
+        fun toDomainModel(): BlazePaymentMethod {
+            return BlazePaymentMethod(
+                id = id,
+                name = name,
+                info = when (type) {
+                    "credit_card" -> BlazePaymentMethod.PaymentMethodInfo.CreditCardInfo(
+                        lastDigits = info.get("last_digits").asString,
+                        expMonth = info.get("expiring").asJsonObject.get("month").asInt,
+                        expYear = info.get("expiring").asJsonObject.get("year").asInt,
+                        type = info.get("type").asString,
+                        nickname = info.get("nickname").asString,
+                        cardHolderName = info.get("cardholder_name").asString
+                    )
+
+                    else -> BlazePaymentMethod.PaymentMethodInfo.Unknown
+                }
+            )
+        }
+    }
+
+    class BlazeAddPaymentMethodUrlsNetworkModel(
+        @SerializedName("form_url")
+        val formUrl: String,
+        @SerializedName("success_url")
+        val successUrl: String,
+        @SerializedName("id_url_parameter")
+        val idUrlParameter: String
+    ) {
+        fun toDomainModel(): BlazePaymentMethodUrls {
+            return BlazePaymentMethodUrls(
+                formUrl = formUrl,
+                successUrl = successUrl,
+                idUrlParameter = idUrlParameter
+            )
+        }
+    }
+}
+
+private data class BlazeCampaignCreationNetworkResponse(
+    val id: String,
+    val status: String,
+    @SerializedName("target_urn")
+    val targetUrn: String,
+    @SerializedName("start_time")
+    val startTime: String,
+    @SerializedName("duration_days")
+    val durationDays: Int,
+    @SerializedName("total_budget")
+    val totalBudget: Double,
+    @SerializedName("site_name")
+    val siteName: String,
+    @SerializedName("text_snippet")
+    val textSnippet: String,
+    @SerializedName("target_url")
+    val targetURL: String,
+    @SerializedName("main_image")
+    val mainImage: BlazeImageNetworkModel,
+    @SerializedName("is_evergreen")
+    val isEvergreen: Boolean
+) {
+    data class BlazeImageNetworkModel(
+        val url: String
+    )
+
+    @Suppress("MagicNumber")
+    fun toDomainModel(): BlazeCampaignModel = BlazeCampaignModel(
+        targetUrn = targetUrn,
+        startTime = Date(), // Set to current date, as the API does not return the actual creation date
+        durationInDays = durationDays,
+        imageUrl = mainImage.url,
+        uiStatus = status,
+        // TODO revisit this when the API returns the actual values to confirm the format of IDs
+        campaignId = id.substringAfter("campaign-"),
+        clicks = 0L,
+        impressions = 0L,
+        title = siteName,
+        totalBudget = totalBudget,
+        spentBudget = 0.0,
+        isEndlessCampaign = isEvergreen
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClient.kt
new file mode 100644
index 00000000000..74814296afe
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsRestClient.kt
@@ -0,0 +1,144 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV3
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient.BloggingPromptResponse
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class BloggingPromptsRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPrompts(
+        site: SiteModel,
+        perPage: Int,
+        after: Date,
+        ignoresYear: Boolean = true,
+    ): BloggingPromptsPayload<BloggingPromptsListResponse> {
+        val url = WPCOMV3.sites.site(site.siteId).blogging_prompts.url
+        val params = mutableMapOf(
+            "per_page" to perPage.toString(),
+            "after" to BloggingPromptsUtils.dateToString(after, ignoresYear)
+        )
+        if (ignoresYear) {
+            // when ignoring the year we force the response to be for the current year
+            // we also need to use order desc to get the latest prompt for each date, even though
+            // the list of actual prompts is ordered ascending by date
+            params["force_year"] = BloggingPromptsUtils.yearForDate(after)
+            params["order"] = "desc"
+        }
+        val response = wpComGsonRequestBuilder.syncGetRequest<BloggingPromptsListResponse>(
+            this,
+            url,
+            params,
+            BloggingPromptsListResponseTypeToken.type
+        )
+        return when (response) {
+            is Success -> BloggingPromptsPayload(response.data)
+            is Error -> BloggingPromptsPayload(response.error.toBloggingPromptsError())
+        }
+    }
+
+    data class BloggingPromptResponse(
+        @SerializedName("id") val id: Int,
+        @SerializedName("text") val text: String,
+        @SerializedName("date") val date: String,
+        @SerializedName("answered") val isAnswered: Boolean,
+        @SerializedName("attribution") val attribution: String,
+        @SerializedName("answered_users_count") val respondentsCount: Int,
+        @SerializedName("answered_users_sample") val respondentsAvatars: List<BloggingPromptsRespondentAvatar>,
+        @SerializedName("answered_link") val answeredLink: String,
+        @SerializedName("answered_link_text") val answeredLinkText: String,
+        @SerializedName("bloganuary_id") val bloganuaryId: String? = null,
+    ) {
+        fun toBloggingPromptModel() = BloggingPromptModel(
+            id = id,
+            text = text,
+            date = BloggingPromptsUtils.stringToDate(date),
+            isAnswered = isAnswered,
+            attribution = attribution,
+            respondentsCount = respondentsCount,
+            respondentsAvatarUrls = respondentsAvatars.map { it.avatarUrl },
+            answeredLink = answeredLink,
+            bloganuaryId = bloganuaryId,
+        )
+    }
+
+    data class BloggingPromptsRespondentAvatar(
+        @SerializedName("avatar") val avatarUrl: String
+    )
+}
+
+data class BloggingPromptsPayload<T>(
+    val response: T? = null
+) : Payload<BloggingPromptsError>() {
+    constructor(error: BloggingPromptsError) : this() {
+        this.error = error
+    }
+}
+
+class BloggingPromptsError(
+    val type: BloggingPromptsErrorType,
+    val message: String? = null
+) : OnChangedError
+
+enum class BloggingPromptsErrorType {
+    GENERIC_ERROR,
+    AUTHORIZATION_REQUIRED,
+    INVALID_RESPONSE,
+    API_ERROR,
+    TIMEOUT
+}
+
+fun WPComGsonNetworkError.toBloggingPromptsError(): BloggingPromptsError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> BloggingPromptsErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> BloggingPromptsErrorType.API_ERROR
+
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> BloggingPromptsErrorType.INVALID_RESPONSE
+
+        GenericErrorType.HTTP_AUTH_ERROR,
+        GenericErrorType.AUTHORIZATION_REQUIRED,
+        GenericErrorType.NOT_AUTHENTICATED -> BloggingPromptsErrorType.AUTHORIZATION_REQUIRED
+
+        GenericErrorType.UNKNOWN,
+        null -> BloggingPromptsErrorType.GENERIC_ERROR
+    }
+    return BloggingPromptsError(type, message)
+}
+
+typealias BloggingPromptsListResponse = List<BloggingPromptResponse>
+
+object BloggingPromptsListResponseTypeToken : TypeToken<BloggingPromptsListResponse>()
+
+fun BloggingPromptsListResponse.toBloggingPrompts() = map { it.toBloggingPromptModel() }
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsUtils.kt
new file mode 100644
index 00000000000..4324ee13f14
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/bloggingprompts/BloggingPromptsUtils.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts
+
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+object BloggingPromptsUtils {
+    private val DATE_FORMAT: ThreadLocal<DateFormat> = object : ThreadLocal<DateFormat>() {
+        override fun initialValue(): DateFormat {
+            return SimpleDateFormat("yyyy-MM-dd", Locale.US)
+        }
+    }
+
+    private val DATE_FORMAT_IGNORES_YEAR: ThreadLocal<DateFormat> = object : ThreadLocal<DateFormat>() {
+        override fun initialValue(): DateFormat {
+            return SimpleDateFormat("--MM-dd", Locale.US)
+        }
+    }
+
+    fun dateToString(date: Date, ignoresYear: Boolean = false): String {
+        val formatter = if (ignoresYear) {
+            DATE_FORMAT_IGNORES_YEAR.get()
+        } else {
+            DATE_FORMAT.get()
+        } as DateFormat
+        return formatter.format(date)
+    }
+
+    fun stringToDate(date: String): Date {
+        return try {
+            val formatter = DATE_FORMAT.get() as DateFormat
+            return formatter.parse(date) ?: Date()
+        } catch (exception: ParseException) {
+            Date()
+        }
+    }
+
+    @Suppress("MagicNumber")
+    fun yearForDate(date: Date): String = dateToString(date).substring(0, 4)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentLikeWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentLikeWPComRestResponse.java
new file mode 100644
index 00000000000..c4cc3d69f66
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentLikeWPComRestResponse.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comment;
+
+public class CommentLikeWPComRestResponse {
+    public boolean success;
+    public boolean i_like;
+    public long like_count;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentParent.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentParent.java
new file mode 100644
index 00000000000..b1f077444fa
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentParent.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comment;
+
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalse;
+
+public class CommentParent extends JsonObjectOrFalse {
+    public long ID;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentRestClient.java
new file mode 100644
index 00000000000..5d2c99ce2cf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentRestClient.java
@@ -0,0 +1,324 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comment;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.CommentActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.CommentStatus;
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.LikeModel.LikeType;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.CommentsWPComRestResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikeWPComRestResponse.LikesWPComRestResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikesUtilsProvider;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.FetchedCommentLikesResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentResponsePayload;
+import org.wordpress.android.fluxc.utils.CommentErrorUtils;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class CommentRestClient extends BaseWPComRestClient {
+    @NonNull private final LikesUtilsProvider mLikesUtilsProvider;
+
+    @Inject public CommentRestClient(
+            Context appContext,
+            Dispatcher dispatcher,
+            @Named("regular") RequestQueue requestQueue,
+            AccessToken accessToken,
+            UserAgent userAgent,
+            @NonNull LikesUtilsProvider likesUtilsProvider) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+        mLikesUtilsProvider = likesUtilsProvider;
+    }
+
+    public void fetchComments(
+            @NonNull final SiteModel site,
+            final int number,
+            final int offset,
+            @NonNull final CommentStatus status) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).comments.getUrlV1_1();
+        Map<String, String> params = new HashMap<>();
+        params.put("status", status.toString());
+        params.put("offset", String.valueOf(offset));
+        params.put("number", String.valueOf(number));
+        params.put("force", "wpcom");
+        final WPComGsonRequest<CommentsWPComRestResponse> request = WPComGsonRequest.buildGetRequest(
+                url, params, CommentsWPComRestResponse.class,
+                response -> {
+                    List<CommentModel> comments = commentsResponseToCommentList(response, site);
+                    FetchCommentsResponsePayload payload = new FetchCommentsResponsePayload(
+                            comments, site, number, offset, status
+                    );
+                    mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentsAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentsAction(
+                        CommentErrorUtils.commentErrorToFetchCommentsPayload(error, site))));
+        add(request);
+    }
+
+    public void pushComment(
+            @NonNull final SiteModel site,
+            @NonNull final CommentModel comment) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(comment.getRemoteCommentId()).getUrlV1_1();
+        Map<String, Object> params = new HashMap<>();
+        params.put("content", comment.getContent());
+        params.put("date", comment.getDatePublished());
+        params.put("status", comment.getStatus());
+        final WPComGsonRequest<CommentWPComRestResponse> request = WPComGsonRequest.buildPostRequest(
+                url, params, CommentWPComRestResponse.class,
+                response -> {
+                    CommentModel newComment = commentResponseToComment(response, site);
+                    newComment.setId(comment.getId()); // reconciliate local instance and newly created object
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(newComment);
+                    mDispatcher.dispatch(CommentActionBuilder.newPushedCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newPushedCommentAction(
+                        CommentErrorUtils.commentErrorToPushCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void fetchComment(
+            @NonNull final SiteModel site,
+            long remoteCommentId,
+            @Nullable final CommentModel comment) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(remoteCommentId).getUrlV1_1();
+        final WPComGsonRequest<CommentWPComRestResponse> request = WPComGsonRequest.buildGetRequest(
+                url, null, CommentWPComRestResponse.class,
+                response -> {
+                    CommentModel comment1 = commentResponseToComment(response, site);
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment1);
+                    mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void fetchCommentLikes(
+            final long siteId,
+            final long commentId,
+            final boolean requestNextPage,
+            final int pageLength) {
+        String url = WPCOMREST.sites.site(siteId).comments.comment(commentId).likes.getUrlV1_2();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("number", String.valueOf(pageLength));
+
+        if (requestNextPage) {
+            Map<String, String> pageOffsetParams = mLikesUtilsProvider.getPageOffsetParams(
+                    LikeType.COMMENT_LIKE,
+                    siteId,
+                    commentId);
+            if (pageOffsetParams != null) {
+                params.putAll(pageOffsetParams);
+            }
+        }
+
+        final WPComGsonRequest<LikesWPComRestResponse> request = WPComGsonRequest.buildGetRequest(
+                url, params, LikesWPComRestResponse.class,
+                response -> {
+                    List<LikeModel> likes = mLikesUtilsProvider.likesResponseToLikeList(
+                            response,
+                            siteId,
+                            commentId,
+                            LikeType.COMMENT_LIKE);
+
+                    FetchedCommentLikesResponsePayload payload = new FetchedCommentLikesResponsePayload(
+                            likes,
+                            siteId,
+                            commentId,
+                            requestNextPage,
+                            likes.size() >= pageLength
+                    );
+                    mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentLikesAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentLikesAction(
+                        CommentErrorUtils.commentErrorToFetchedCommentLikesPayload(
+                                error,
+                                siteId,
+                                commentId,
+                                requestNextPage,
+                                true))));
+        add(request);
+    }
+
+    public void deleteComment(
+            @NonNull final SiteModel site,
+            long remoteCommentId,
+            @Nullable final CommentModel comment) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(remoteCommentId).delete.getUrlV1_1();
+        final WPComGsonRequest<CommentWPComRestResponse> request = WPComGsonRequest.buildPostRequest(
+                url, null, CommentWPComRestResponse.class,
+                response -> {
+                    CommentModel modifiedComment = commentResponseToComment(response, site);
+                    if (comment != null) {
+                        // reconciliate local instance and newly created object if it exists locally
+                        modifiedComment.setId(comment.getId());
+                    }
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(modifiedComment);
+                    mDispatcher.dispatch(CommentActionBuilder.newDeletedCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newDeletedCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void createNewReply(
+            @NonNull final SiteModel site,
+            @NonNull final CommentModel comment,
+            @NonNull final CommentModel reply) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(comment.getRemoteCommentId())
+                .replies.new_.getUrlV1_1();
+        Map<String, Object> params = new HashMap<>();
+        params.put("content", reply.getContent());
+        final WPComGsonRequest<CommentWPComRestResponse> request = WPComGsonRequest.buildPostRequest(
+                url, params, CommentWPComRestResponse.class,
+                response -> {
+                    CommentModel newComment = commentResponseToComment(response, site);
+                    newComment.setId(reply.getId()); // reconciliate local instance and newly created object
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(newComment);
+                    mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, reply))));
+        add(request);
+    }
+
+    public void createNewComment(
+            @NonNull final SiteModel site,
+            @NonNull final PostModel post,
+            @NonNull final CommentModel comment) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId())
+                .replies.new_.getUrlV1_1();
+        Map<String, Object> params = new HashMap<>();
+        params.put("content", comment.getContent());
+        final WPComGsonRequest<CommentWPComRestResponse> request = WPComGsonRequest.buildPostRequest(
+                url, params, CommentWPComRestResponse.class,
+                response -> {
+                    CommentModel newComment = commentResponseToComment(response, site);
+                    newComment.setId(comment.getId()); // reconciliate local instance and newly created object
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(newComment);
+                    mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void likeComment(
+            @NonNull final SiteModel site,
+            long remoteCommentId,
+            @Nullable final CommentModel comment,
+            boolean like) {
+        String url;
+        if (like) {
+            url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(remoteCommentId).likes.new_.getUrlV1_1();
+        } else {
+            url = WPCOMREST.sites.site(site.getSiteId()).comments.comment(remoteCommentId).likes.mine.delete
+                    .getUrlV1_1();
+        }
+        final WPComGsonRequest<CommentLikeWPComRestResponse> request = WPComGsonRequest.buildPostRequest(
+                url, null, CommentLikeWPComRestResponse.class,
+                response -> {
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+
+                    if (comment != null) {
+                        comment.setILike(response.i_like);
+                    }
+                    mDispatcher.dispatch(CommentActionBuilder.newLikedCommentAction(payload));
+                },
+
+                error -> mDispatcher.dispatch(CommentActionBuilder.newLikedCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    // Private methods
+
+    @NonNull
+    private List<CommentModel> commentsResponseToCommentList(
+            @NonNull CommentsWPComRestResponse response,
+            @NonNull SiteModel site) {
+        List<CommentModel> comments = new ArrayList<>();
+        if (response.comments != null) {
+            for (CommentWPComRestResponse restComment : response.comments) {
+                comments.add(commentResponseToComment(restComment, site));
+            }
+        }
+        return comments;
+    }
+
+    @NonNull
+    private CommentModel commentResponseToComment(
+            @NonNull CommentWPComRestResponse response,
+            @NonNull SiteModel site) {
+        CommentModel comment = new CommentModel();
+
+        comment.setRemoteCommentId(response.ID);
+        comment.setLocalSiteId(site.getId());
+        comment.setRemoteSiteId(site.getSiteId());
+
+        comment.setStatus(response.status);
+        comment.setDatePublished(response.date);
+        comment.setContent(response.content);
+        comment.setILike(response.i_like);
+        comment.setUrl(response.URL);
+        comment.setPublishedTimestamp(DateTimeUtils.timestampFromIso8601(response.date));
+
+        if (response.author != null) {
+            comment.setAuthorId(response.author.ID);
+            comment.setAuthorUrl(response.author.URL);
+            comment.setAuthorName(StringEscapeUtils.unescapeHtml4(response.author.name));
+            if ("false".equals(response.author.email)) {
+                comment.setAuthorEmail("");
+            } else {
+                comment.setAuthorEmail(response.author.email);
+            }
+            comment.setAuthorProfileImageUrl(response.author.avatar_URL);
+        }
+
+        if (response.post != null) {
+            comment.setRemotePostId(response.post.ID);
+            comment.setPostTitle(StringEscapeUtils.unescapeHtml4(response.post.title));
+        }
+
+        if (response.parent != null) {
+            comment.setHasParent(true);
+            comment.setParentId(response.parent.ID);
+        } else {
+            comment.setHasParent(false);
+        }
+
+        return comment;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentWPComRestResponse.java
new file mode 100644
index 00000000000..8483191af31
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentWPComRestResponse.java
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.List;
+
+@SuppressWarnings("NotNullFieldNotInitialized")
+public class CommentWPComRestResponse {
+    public static class CommentsWPComRestResponse {
+        @Nullable public List<CommentWPComRestResponse> comments;
+    }
+
+    public static class Post {
+        public long ID;
+        @NonNull public String title;
+        @NonNull public String type;
+        @NonNull public String link;
+    }
+
+    public static class Author {
+        public long ID;
+        @NonNull public String email; // can be boolean "false" if not set
+        @NonNull public String name;
+        @NonNull public String URL;
+        @NonNull public String avatar_URL;
+    }
+
+    public long ID;
+    @Nullable public CommentParent parent;
+    @Nullable public Post post;
+    @Nullable public Author author;
+    @NonNull public String date;
+    @NonNull public String status;
+    @NonNull public String content;
+    public boolean i_like;
+    @NonNull public String URL;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentsRestClient.kt
new file mode 100644
index 00000000000..a44cd18bcaa
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/comment/CommentsRestClient.kt
@@ -0,0 +1,244 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.comment
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.common.comments.CommentsApiPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentWPComRestResponse.CommentsWPComRestResponse
+import org.wordpress.android.fluxc.persistence.comments.CommentEntityList
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.utils.CommentErrorUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Suppress("LongParameterList")
+@Singleton
+class CommentsRestClient @Inject constructor(
+    appContext: Context?,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val commentErrorUtilsWrapper: CommentErrorUtilsWrapper,
+    private val commentsMapper: CommentsMapper
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchCommentsPage(
+        site: SiteModel,
+        number: Int,
+        offset: Int,
+        status: CommentStatus
+    ): CommentsApiPayload<CommentEntityList> {
+        val url = WPCOMREST.sites.site(site.siteId).comments.urlV1_1
+
+        val params = mutableMapOf(
+                "status" to status.toString(),
+                "offset" to offset.toString(),
+                "number" to number.toString(),
+                "force" to "wpcom"
+        )
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                CommentsWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(response.data.comments?.map { commentDto ->
+                    commentsMapper.commentDtoToEntity(commentDto, site)
+                } ?: listOf())
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun pushComment(site: SiteModel, comment: CommentEntity): CommentsApiPayload<CommentEntity> {
+        val request = mutableMapOf(
+                "content" to comment.content.orEmpty(),
+                "date" to comment.datePublished.orEmpty(),
+                "status" to comment.status.orEmpty()
+        )
+
+        return updateCommentFields(site, comment, request)
+    }
+
+    suspend fun updateEditComment(site: SiteModel, comment: CommentEntity): CommentsApiPayload<CommentEntity> {
+        val request = mutableMapOf(
+                "content" to comment.content.orEmpty(),
+                "author" to comment.authorName.orEmpty(),
+                "author_email" to comment.authorEmail.orEmpty(),
+                "author_url" to comment.authorUrl.orEmpty()
+        )
+
+        return updateCommentFields(site, comment, request)
+    }
+
+    private suspend fun updateCommentFields(
+        site: SiteModel,
+        comment: CommentEntity,
+        request: Map<String, String>
+    ): CommentsApiPayload<CommentEntity> {
+        val url = WPCOMREST.sites.site(site.siteId).comments.comment(comment.remoteCommentId).urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                request,
+                CommentWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentDtoToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun fetchComment(site: SiteModel, remoteCommentId: Long): CommentsApiPayload<CommentEntity> {
+        val url = WPCOMREST.sites.site(site.siteId).comments.comment(remoteCommentId).urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                mapOf(),
+                CommentWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentDtoToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun deleteComment(site: SiteModel, remoteCommentId: Long): CommentsApiPayload<CommentEntity> {
+        val url = WPCOMREST.sites.site(site.siteId).comments.comment(remoteCommentId).delete.urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                null,
+                CommentWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentDtoToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun createNewReply(
+        site: SiteModel,
+        remoteCommentId: Long,
+        replayContent: String?
+    ): CommentsApiPayload<CommentEntity> {
+        val url = WPCOMREST.sites.site(site.siteId).comments.comment(remoteCommentId).replies.new_.urlV1_1
+
+        val request = mutableMapOf(
+                "content" to replayContent.orEmpty()
+        )
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                request,
+                CommentWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentDtoToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun createNewComment(
+        site: SiteModel,
+        remotePostId: Long,
+        content: String?
+    ): CommentsApiPayload<CommentEntity> {
+        val url = WPCOMREST.sites.site(site.siteId).posts.post(remotePostId).replies.new_.urlV1_1
+
+        val request = mutableMapOf(
+                "content" to content.orEmpty()
+        )
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                request,
+                CommentWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentDtoToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun likeComment(
+        site: SiteModel,
+        remoteCommentId: Long,
+        isLike: Boolean
+    ): CommentsApiPayload<CommentLikeWPComRestResponse> {
+        val url = if (isLike) {
+            WPCOMREST.sites.site(site.siteId).comments.comment(remoteCommentId).likes.new_.urlV1_1
+        } else {
+            WPCOMREST.sites.site(site.siteId).comments.comment(remoteCommentId).likes.mine.delete.urlV1_1
+        }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                null,
+                CommentLikeWPComRestResponse::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(response.data)
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikeWPComRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikeWPComRestResponse.kt
new file mode 100644
index 00000000000..e41e4e9c1c2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikeWPComRestResponse.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.common
+
+@Suppress("VariableNaming")
+class LikeWPComRestResponse {
+    inner class LikesWPComRestResponse {
+        var likes: List<LikeWPComRestResponse>? = null
+    }
+
+    inner class PreferredBlogResponse {
+        var id: Long = 0
+        var name: String? = null
+        var url: String? = null
+        var icon: PreferredBlogIcon? = null
+    }
+
+    inner class PreferredBlogIcon {
+        var ico: String? = null
+        var img: String? = null
+    }
+
+    var ID: Long = 0
+    var login: String? = null
+    var name: String? = null
+    var avatar_URL: String? = null
+    var bio: String? = null
+    var site_ID: Long = 0
+    var primary_blog: String? = null
+    var date_liked: String? = null
+    var preferred_blog: PreferredBlogResponse? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikesUtilsProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikesUtilsProvider.kt
new file mode 100644
index 00000000000..db659fb3534
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/common/LikesUtilsProvider.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.common
+
+import com.wellsql.generated.LikeModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.model.LikeModel.LikeType
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikeWPComRestResponse.LikesWPComRestResponse
+import java.util.ArrayList
+import java.util.HashMap
+import javax.inject.Inject
+
+class LikesUtilsProvider @Inject constructor() {
+    fun getPageOffsetParams(type: LikeType, siteId: Long, remoteItemId: Long): Map<String, String?>? {
+        val oldestDateLiked = WellSql.select(LikeModel::class.java)
+                .columns(LikeModelTable.DATE_LIKED)
+                .limit(1)
+                .where().beginGroup()
+                .equals(LikeModelTable.TYPE, type.typeName)
+                .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                .equals(LikeModelTable.REMOTE_ITEM_ID, remoteItemId)
+                .endGroup().endWhere()
+                .orderBy(LikeModelTable.DATE_LIKED, SelectQuery.ORDER_ASCENDING)
+                .asModel
+
+        val params: MutableMap<String, String?> = HashMap()
+
+        if (oldestDateLiked.size == 1) {
+            params["before"] = oldestDateLiked[0].dateLiked
+
+            val oldestLikers = WellSql.select(LikeModel::class.java)
+                    .where()
+                    .beginGroup()
+                    .equals(LikeModelTable.TYPE, type.typeName)
+                    .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                    .equals(LikeModelTable.REMOTE_ITEM_ID, remoteItemId)
+                    .equals(LikeModelTable.DATE_LIKED, oldestDateLiked[0].dateLiked)
+                    .endGroup()
+                    .endWhere()
+                    .asModel
+
+            oldestLikers?.let {
+                val excludeParams = oldestLikers.joinToString(separator = "&exclude[]=") { liker ->
+                    "${liker.likerId}"
+                }
+
+                if (excludeParams.isNotBlank()) {
+                    params["exclude[]"] = excludeParams
+                }
+            }
+        }
+        return params
+    }
+
+    fun likesResponseToLikeList(
+        response: LikesWPComRestResponse,
+        siteId: Long,
+        commentId: Long,
+        likeType: LikeType
+    ): List<LikeModel> {
+        val likes: MutableList<LikeModel> = ArrayList()
+        response.likes?.let { likesItems ->
+            for (restLike in likesItems) {
+                likes.add(likeResponseToLike(restLike, siteId, commentId, likeType))
+            }
+        }
+        return likes
+    }
+
+    private fun likeResponseToLike(
+        response: LikeWPComRestResponse,
+        siteId: Long,
+        commentId: Long,
+        likeType: LikeType
+    ): LikeModel {
+        return LikeModel().apply {
+            remoteSiteId = siteId
+            type = likeType.typeName
+            remoteItemId = commentId
+            likerId = response.ID
+            likerLogin = response.login
+            likerName = response.name
+            likerAvatarUrl = response.avatar_URL
+            likerBio = response.bio
+            likerSiteId = response.site_ID
+            likerSiteUrl = response.primary_blog
+            preferredBlogId = response.preferred_blog?.id ?: 0
+            preferredBlogName = response.preferred_blog?.name
+            preferredBlogUrl = response.preferred_blog?.url
+            preferredBlogBlavatarUrl = response.preferred_blog?.icon?.img
+            dateLiked = response.date_liked
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClient.kt
new file mode 100644
index 00000000000..463a11e7312
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsRestClient.kt
@@ -0,0 +1,301 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.dashboard
+
+import android.content.Context
+import android.os.Build
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.ActivityCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.CardOrder
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.DynamicCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.DynamicCardsModel.DynamicCardRowModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PagesCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PagesCardModel.PageCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.PostsCardModel.PostCardModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel.TodaysStatsCardModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient.ActivitiesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.ActivityCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.CardsPayload
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.PostCardErrorType
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardError
+import org.wordpress.android.fluxc.store.dashboard.CardsStore.TodaysStatsCardErrorType
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class CardsRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchCards(payload: FetchCardsPayload): CardsPayload<CardsResponse> {
+        val url = WPCOMV2.sites.site(payload.site.siteId).dashboard.cards_data.url
+        val params = buildDashboardCardsParams(payload)
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                CardsResponse::class.java
+        )
+        return when (response) {
+            is Success -> CardsPayload(response.data)
+            is Error -> CardsPayload(response.error.toCardsError())
+        }
+    }
+
+    private fun buildDashboardCardsParams(payload: FetchCardsPayload) = mapOf(
+        CARDS to payload.cardTypes.joinToString(",") { it.label },
+        "build_number" to payload.buildNumber,
+        "device_id" to payload.deviceId,
+        "identifier" to payload.identifier,
+        "marketing_version" to payload.marketingVersion,
+        "platform" to payload.platform,
+        "os_version" to payload.osVersion,
+        )
+
+    data class FetchCardsPayload(
+        val site: SiteModel,
+        val cardTypes: List<CardModel.Type>,
+        val buildNumber: String,
+        val deviceId: String,
+        val identifier: String,
+        val marketingVersion: String,
+        val platform: String,
+        val osVersion: String = Build.VERSION.RELEASE,
+    )
+
+    data class CardsResponse(
+        @SerializedName("todays_stats") val todaysStats: TodaysStatsResponse? = null,
+        @SerializedName("posts") val posts: PostsResponse? = null,
+        @SerializedName("pages") val pages: List<PageResponse>? = null,
+        @SerializedName("activity") val activity: ActivitiesResponse? = null,
+        @SerializedName("dynamic") val dynamic: List<DynamicCardResponse>? = null,
+    ) {
+        fun toCards() = arrayListOf<CardModel>().apply {
+            todaysStats?.let { add(it.toTodaysStatsCard()) }
+            posts?.let { add(it.toPosts()) }
+            pages?.let { add(getPagesCardModel(it))}
+            activity?.let { add(it.toActivityCardModel()) }
+            dynamic?.let { add(getDynamicCardsModel(it)) }
+        }.toList()
+
+        private fun getPagesCardModel(pages: List<PageResponse>): PagesCardModel {
+            return PagesCardModel(pages.map{ it.toPages() })
+        }
+
+        private fun getDynamicCardsModel(dynamicCards: List<DynamicCardResponse>): DynamicCardsModel {
+            return DynamicCardsModel(dynamicCards.map { it.toDynamicCard() })
+        }
+    }
+
+    data class TodaysStatsResponse(
+        @SerializedName("views") val views: Int? = null,
+        @SerializedName("visitors") val visitors: Int? = null,
+        @SerializedName("likes") val likes: Int? = null,
+        @SerializedName("comments") val comments: Int? = null,
+        @SerializedName("error") val error: String? = null
+    ) {
+        fun toTodaysStatsCard() = TodaysStatsCardModel(
+                views = views ?: 0,
+                visitors = visitors ?: 0,
+                likes = likes ?: 0,
+                comments = comments ?: 0,
+                error = error?.let { toTodaysStatsCardsError(it) }
+        )
+
+        private fun toTodaysStatsCardsError(error: String): TodaysStatsCardError {
+            val errorType = when (error) {
+                JETPACK_DISCONNECTED -> TodaysStatsCardErrorType.JETPACK_DISCONNECTED
+                JETPACK_DISABLED -> TodaysStatsCardErrorType.JETPACK_DISABLED
+                UNAUTHORIZED -> TodaysStatsCardErrorType.UNAUTHORIZED
+                else -> TodaysStatsCardErrorType.GENERIC_ERROR
+            }
+            return TodaysStatsCardError(errorType, error)
+        }
+    }
+
+    data class PostsResponse(
+        @SerializedName("has_published") val hasPublished: Boolean? = null,
+        @SerializedName("draft") val draft: List<PostResponse>? = null,
+        @SerializedName("scheduled") val scheduled: List<PostResponse>? = null,
+        @SerializedName("error") val error: String? = null
+    ) {
+        fun toPosts() = PostsCardModel(
+                hasPublished = hasPublished ?: false,
+                draft = draft?.map { it.toPost() } ?: emptyList(),
+                scheduled = scheduled?.map { it.toPost() } ?: emptyList(),
+                error = error?.let { toPostCardError(it) }
+        )
+
+        private fun toPostCardError(error: String): PostCardError {
+            val errorType = when (error) {
+                UNAUTHORIZED -> PostCardErrorType.UNAUTHORIZED
+                else -> PostCardErrorType.GENERIC_ERROR
+            }
+            return PostCardError(errorType, error)
+        }
+    }
+
+    data class PostResponse(
+        @SerializedName("id") val id: Int,
+        @SerializedName("title") val title: String,
+        @SerializedName("content") val content: String,
+        @SerializedName("featured_image") val featuredImage: String?,
+        @SerializedName("date") val date: String
+    ) {
+        fun toPost() = PostCardModel(
+                id = id,
+                title = title,
+                content = content,
+                featuredImage = featuredImage,
+                date = CardsUtils.fromDate(date)
+        )
+    }
+
+    data class PageResponse(
+        @SerializedName("id") val id: Int,
+        @SerializedName("title") val title: String,
+        @SerializedName("content") val content: String,
+        @SerializedName("modified") val modified: String,
+        @SerializedName("status") val status: String,
+        @SerializedName("date") val date: String
+    ){
+        fun toPages() = PageCardModel(
+                id = id,
+                title = title,
+                content = content,
+                lastModifiedOrScheduledOn = CardsUtils.fromDate(modified),
+                status = status,
+                date = CardsUtils.fromDate(date)
+        )
+    }
+
+    data class DynamicCardResponse(
+        @SerializedName("id") val id: String,
+        @SerializedName("title") val title: String?,
+        @SerializedName("featured_image") val featuredImage: String?,
+        @SerializedName("url") val url: String?,
+        @SerializedName("action") val action: String?,
+        @SerializedName("order") val order: String?,
+        @SerializedName("rows") val rows: List<DynamicCardRowResponse>?,
+    ) {
+        fun toDynamicCard() = DynamicCardModel(
+            id = id,
+            title = title,
+            featuredImage = featuredImage,
+            url = url,
+            action = action,
+            order = CardOrder.fromString(order),
+            rows = rows?.map { it.toDynamicCardRow() } ?: emptyList()
+        )
+    }
+
+    data class DynamicCardRowResponse(
+        @SerializedName("icon") val icon: String?,
+        @SerializedName("title") val title: String?,
+        @SerializedName("description") val description: String?,
+    ) {
+        fun toDynamicCardRow() = DynamicCardRowModel(
+            icon = icon,
+            title = title,
+            description = description
+        )
+    }
+
+    companion object {
+        private const val CARDS = "cards"
+        private const val JETPACK_DISCONNECTED = "jetpack_disconnected"
+        private const val JETPACK_DISABLED = "jetpack_disabled"
+        const val UNAUTHORIZED = "unauthorized"
+    }
+}
+
+fun WPComGsonNetworkError.toCardsError(): CardsError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> CardsErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> CardsErrorType.API_ERROR
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> CardsErrorType.INVALID_RESPONSE
+        GenericErrorType.HTTP_AUTH_ERROR,
+        GenericErrorType.AUTHORIZATION_REQUIRED,
+        GenericErrorType.NOT_AUTHENTICATED -> CardsErrorType.AUTHORIZATION_REQUIRED
+        GenericErrorType.UNKNOWN,
+        null -> CardsErrorType.GENERIC_ERROR
+    }
+    return CardsError(type, message)
+}
+
+fun ActivitiesResponse.toActivityCardModel(): ActivityCardModel {
+    val error = error?.let { toActivityCardError(it) }
+
+    val activities = current?.orderedItems?.mapNotNull {
+        when {
+            it.activity_id == null || it.summary == null || it.content?.text == null ||
+            it.published == null -> {
+                null
+            }
+            else -> {
+                ActivityLogModel(
+                    activityID = it.activity_id,
+                    summary = it.summary,
+                    content = it.content,
+                    name = it.name,
+                    type = it.type,
+                    gridicon = it.gridicon,
+                    status = it.status,
+                    rewindable = it.is_rewindable,
+                    rewindID = it.rewind_id,
+                    published = it.published,
+                    actor = it.actor?.let { act ->
+                        ActivityLogModel.ActivityActor(
+                            act.name,
+                            act.type,
+                            act.wpcom_user_id,
+                            act.icon?.url,
+                            act.role
+                        )
+                    }
+                )
+            }
+        }
+    }
+
+    return ActivityCardModel(
+        activities = activities ?: emptyList(),
+        error = error
+    )
+}
+fun toActivityCardError(error: String): ActivityCardError {
+    val errorType = when (error) {
+        CardsRestClient.UNAUTHORIZED -> ActivityCardErrorType.UNAUTHORIZED
+        else -> ActivityCardErrorType.GENERIC_ERROR
+    }
+    return ActivityCardError(errorType, error)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsUtils.kt
new file mode 100644
index 00000000000..6f3258259b8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/dashboard/CardsUtils.kt
@@ -0,0 +1,77 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.dashboard
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+object CardsUtils {
+    private const val INSERT_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ"
+
+    private const val DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"
+    private const val TIMEZONE = "GMT"
+
+    val GSON: Gson by lazy {
+        val builder = GsonBuilder()
+        builder.registerTypeAdapter(Date::class.java, GsonDateAdapter())
+        builder.create()
+    }
+
+    fun getInsertDate(): String {
+        val calendar = Calendar.getInstance()
+        val dateFormat = SimpleDateFormat(INSERT_DATE_FORMAT, Locale.ROOT)
+        return dateFormat.format(calendar.time)
+    }
+
+    fun fromDate(date: String): Date {
+        val dateFormat = SimpleDateFormat(DATE_FORMAT, Locale.ROOT)
+        dateFormat.timeZone = TimeZone.getTimeZone(TIMEZONE)
+        return dateFormat.parse(date) ?: Date()
+    }
+
+    /* GSON ADAPTER */
+
+    private class GsonDateAdapter : JsonSerializer<Date>, JsonDeserializer<Date> {
+        private val dateFormat: DateFormat
+
+        @Synchronized
+        override fun serialize(
+            date: Date,
+            type: Type?,
+            jsonSerializationContext: JsonSerializationContext?
+        ): JsonElement {
+            return JsonPrimitive(dateFormat.format(date))
+        }
+
+        @Synchronized
+        override fun deserialize(
+            jsonElement: JsonElement,
+            type: Type?,
+            jsonDeserializationContext: JsonDeserializationContext?
+        ): Date {
+            return try {
+                dateFormat.parse(jsonElement.asString) ?: Date()
+            } catch (e: ParseException) {
+                throw JsonParseException(e)
+            }
+        }
+
+        init {
+            dateFormat = SimpleDateFormat(DATE_FORMAT, Locale.ROOT)
+            dateFormat.timeZone = TimeZone.getTimeZone(TIMEZONE)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/encryptedlog/EncryptedLogRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/encryptedlog/EncryptedLogRestClient.kt
new file mode 100644
index 00000000000..d252ec6bd34
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/encryptedlog/EncryptedLogRestClient.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog
+
+import com.android.volley.NoConnectionError
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.json.JSONException
+import org.json.JSONObject
+import org.wordpress.android.fluxc.network.EncryptedLogUploadRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AppSecrets
+import org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog.UploadEncryptedLogResult.LogUploadFailed
+import org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog.UploadEncryptedLogResult.LogUploaded
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+private const val INVALID_REQUEST = "invalid-request"
+private const val TOO_MANY_REQUESTS = "too_many_requests"
+
+@Singleton
+class EncryptedLogRestClient @Inject constructor(
+    @Named("regular") private val requestQueue: RequestQueue,
+    private val appSecrets: AppSecrets
+) {
+    suspend fun uploadLog(logUuid: String, contents: String): UploadEncryptedLogResult {
+        return suspendCancellableCoroutine { cont ->
+            val request = EncryptedLogUploadRequest(logUuid, contents, appSecrets.appSecret, {
+                cont.resume(LogUploaded)
+            }, { error ->
+                cont.resume(LogUploadFailed(mapError(error)))
+            })
+            cont.invokeOnCancellation { request.cancel() }
+            requestQueue.add(request)
+        }
+    }
+
+    /**
+     * {
+     *   "error":"too_many_requests",
+     *   "message":"You're sending too many messages. Please slow down."
+     * }
+     * {
+     *   "error":"invalid-request",
+     *   "message":"Invalid UUID: uuids must only contain letters, numbers, dashes, and curly brackets"
+     * }
+     */
+    @Suppress("ReturnCount")
+    private fun mapError(error: VolleyError): UploadEncryptedLogError {
+        if (error is NoConnectionError) {
+            return UploadEncryptedLogError.NoConnection
+        }
+        error.networkResponse?.let { networkResponse ->
+            val statusCode = networkResponse.statusCode
+            val dataString = String(networkResponse.data)
+            val json = try {
+                JSONObject(dataString)
+            } catch (jsonException: JSONException) {
+                AppLog.e(API, "Received response not in JSON format: " + jsonException.message)
+                return UploadEncryptedLogError.Unknown(message = dataString)
+            }
+            val errorMessage = json.getString("message")
+            json.getString("error").let { errorType ->
+                if (errorType == INVALID_REQUEST) {
+                    return UploadEncryptedLogError.InvalidRequest
+                } else if (errorType == TOO_MANY_REQUESTS) {
+                    return UploadEncryptedLogError.TooManyRequests
+                }
+            }
+            return UploadEncryptedLogError.Unknown(statusCode, errorMessage)
+        }
+        return UploadEncryptedLogError.Unknown()
+    }
+}
+
+sealed class UploadEncryptedLogResult {
+    object LogUploaded : UploadEncryptedLogResult()
+    class LogUploadFailed(val error: UploadEncryptedLogError) : UploadEncryptedLogResult()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClient.kt
new file mode 100644
index 00000000000..1ccc41f5827
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/experiments/ExperimentRestClient.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.experiments
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.experiments.AssignmentsModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.ExperimentStore.ExperimentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ExperimentStore.FetchAssignmentsError
+import org.wordpress.android.fluxc.store.ExperimentStore.FetchedAssignmentsPayload
+import org.wordpress.android.fluxc.store.ExperimentStore.Platform
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ExperimentRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchAssignments(
+        platform: Platform,
+        experimentNames: List<String>,
+        anonymousId: String? = null,
+        version: String = DEFAULT_VERSION
+    ): FetchedAssignmentsPayload {
+        val url = WPCOMV2.experiments.version(version).assignments.platform(platform.value).url
+        val params = mapOf(
+                "experiment_names" to experimentNames.joinToString(","),
+                "anon_id" to anonymousId.orEmpty()
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                FetchAssignmentsResponse::class.java,
+                enableCaching = false,
+                forced = true
+        )
+        return when (response) {
+            is Success -> FetchedAssignmentsPayload(response.data.let { AssignmentsModel(it.variations, it.ttl) })
+            is Error -> FetchedAssignmentsPayload(FetchAssignmentsError(GENERIC_ERROR, response.error.message))
+        }
+    }
+
+    data class FetchAssignmentsResponse(
+        val variations: Map<String, String?>,
+        val ttl: Int
+    )
+
+    companion object {
+        const val DEFAULT_VERSION = "0.1.0"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/geo/WpComGeoRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/geo/WpComGeoRestClient.kt
new file mode 100644
index 00000000000..4c8075a6a0a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/geo/WpComGeoRestClient.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.geo
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class WpComGeoRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchCountryCode(): Result<String?> {
+        val url = WPCOMREST.geo.urlV0
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            emptyMap(),
+            GeoResponse::class.java
+        )
+        return when (response) {
+            is WPComGsonRequestBuilder.Response.Success -> Result.success(response.data.countryCode)
+            is WPComGsonRequestBuilder.Response.Error -> Result.failure(response.error.volleyError)
+        }
+    }
+}
+
+data class GeoResponse(
+    @SerializedName("country_short")
+    val countryCode: String? = null
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureDto.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureDto.kt
new file mode 100644
index 00000000000..430d5455c39
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureDto.kt
@@ -0,0 +1,127 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.jetpackai.Costs
+import org.wordpress.android.fluxc.model.jetpackai.FeaturedPostImage
+import org.wordpress.android.fluxc.model.jetpackai.JetpackAIAssistantFeature
+import org.wordpress.android.fluxc.model.jetpackai.JetpackAiLogoGenerator
+import org.wordpress.android.fluxc.model.jetpackai.Tier
+import org.wordpress.android.fluxc.model.jetpackai.UsagePeriod
+
+data class UsagePeriodDto(
+    @SerializedName("current-start")
+    val currentStart: String?,
+    @SerializedName("next-start")
+    val nextStart: String?,
+    @SerializedName("requests-count")
+    val requestsCount: Int?,
+) {
+    fun toUsagePeriod(): UsagePeriod {
+        return UsagePeriod(
+            currentStart = currentStart.orEmpty(),
+            nextStart = nextStart.orEmpty(),
+            requestsCount = requestsCount ?: 0
+        )
+    }
+}
+
+data class TierDto(
+    @SerializedName("slug")
+    val slug: String?,
+    @SerializedName("limit")
+    val limit: Int?,
+    @SerializedName("value")
+    val value: Int?,
+    @SerializedName("readable-limit")
+    val readableLimit: String?
+) {
+    fun toTier(): Tier {
+        return Tier(
+            slug = slug.orEmpty(),
+            limit = limit ?: 0,
+            value = value ?: 0,
+            readableLimit = readableLimit
+        )
+    }
+}
+
+data class JetpackAiLogoGeneratorDto(
+    @SerializedName("logo") val logo: Int
+) {
+    fun toJetpackAiLogoGenerator(): JetpackAiLogoGenerator {
+        return JetpackAiLogoGenerator(
+            logo = logo
+        )
+    }
+}
+
+data class FeaturedPostImageDto(
+    @SerializedName("image") val image: Int
+) {
+    fun toFeaturedPostImage(): FeaturedPostImage {
+        return FeaturedPostImage(
+            image = image
+        )
+    }
+}
+
+data class CostsDto(
+    @SerializedName("jetpack-ai-logo-generator")
+    val jetpackAiLogoGenerator: JetpackAiLogoGeneratorDto,
+    @SerializedName("featured-post-image")
+    val featuredPostImage: FeaturedPostImageDto
+) {
+    fun toCosts(): Costs {
+        return Costs(
+            jetpackAiLogoGenerator = jetpackAiLogoGenerator.toJetpackAiLogoGenerator(),
+            featuredPostImage = featuredPostImage.toFeaturedPostImage()
+        )
+    }
+}
+
+data class JetpackAIAssistantFeatureDto(
+    @SerializedName("has-feature")
+    val hasFeature: Boolean?,
+    @SerializedName("is-over-limit")
+    val isOverLimit: Boolean?,
+    @SerializedName("requests-count")
+    val requestsCount: Int?,
+    @SerializedName("requests-limit")
+    val requestsLimit: Int?,
+    @SerializedName("usage-period")
+    val usagePeriod: UsagePeriodDto?,
+    @SerializedName("site-require-upgrade")
+    val siteRequireUpgrade: Boolean?,
+    @SerializedName("upgrade-type")
+    val upgradeType: String?,
+    @SerializedName("upgrade-url")
+    val upgradeUrl: String?,
+    @SerializedName("current-tier")
+    val currentTier: TierDto?,
+    @SerializedName("next-tier")
+    val nextTier: TierDto?,
+    @SerializedName("tier-plans")
+    val tierPlans: List<TierDto>?,
+    @SerializedName("tier-plans-enabled")
+    val tierPlansEnabled: Boolean?,
+    @SerializedName("costs")
+    val costs: CostsDto?
+) {
+    fun toJetpackAIAssistantFeature(): JetpackAIAssistantFeature {
+        return JetpackAIAssistantFeature(
+            hasFeature = hasFeature ?: false,
+            isOverLimit = isOverLimit ?: false,
+            requestsCount = requestsCount ?: 0,
+            requestsLimit = requestsLimit ?: 0,
+            usagePeriod = usagePeriod?.toUsagePeriod(),
+            siteRequireUpgrade = siteRequireUpgrade ?: false,
+            upgradeType = upgradeType.orEmpty(),
+            upgradeUrl = upgradeUrl, // Can be null
+            currentTier = currentTier?.toTier(),
+            nextTier = nextTier?.toTier(),
+            tierPlans = tierPlans?.map { it.toTier() } ?: emptyList(),
+            tierPlansEnabled = tierPlansEnabled ?: false,
+            costs = costs?.toCosts()
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureResponse.kt
new file mode 100644
index 00000000000..305fa0d6305
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureResponse.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+import org.wordpress.android.fluxc.model.jetpackai.JetpackAIAssistantFeature
+
+sealed class JetpackAIAssistantFeatureResponse {
+    data class Success(val model: JetpackAIAssistantFeature) : JetpackAIAssistantFeatureResponse()
+    data class Error(
+        val type: JetpackAIAssistantFeatureErrorType,
+        val message: String? = null
+    ) : JetpackAIAssistantFeatureResponse()
+}
+
+enum class JetpackAIAssistantFeatureErrorType {
+    API_ERROR,
+    AUTH_ERROR,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    TIMEOUT,
+    NETWORK_ERROR
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIQueryResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIQueryResponse.kt
new file mode 100644
index 00000000000..cf43a8ef697
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIQueryResponse.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+sealed class JetpackAIQueryResponse {
+    data class Success(val model: String?, val choices: List<Choice>) : JetpackAIQueryResponse() {
+        data class Choice(val index: Int?, val message: Message?) {
+            data class Message(val role: String?, val content: String?)
+        }
+    }
+
+    data class Error(
+        val type: JetpackAIQueryErrorType,
+        val message: String? = null
+    ) : JetpackAIQueryResponse()
+}
+
+enum class JetpackAIQueryErrorType {
+    API_ERROR,
+    AUTH_ERROR,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    TIMEOUT,
+    NETWORK_ERROR,
+    INVALID_DATA
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIRestClient.kt
new file mode 100644
index 00000000000..1d3025f4263
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIRestClient.kt
@@ -0,0 +1,418 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.JWTToken
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.utils.extensions.filterNotNull
+import org.wordpress.android.fluxc.utils.extensions.putIfNotNull
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class JetpackAIRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    companion object {
+        private const val FIELDS_TO_REQUEST = "completion"
+    }
+
+    suspend fun fetchJetpackAIJWTToken(
+        site: SiteModel
+    ): JetpackAIJWTTokenResponse {
+        val url = WPCOMV2.sites.site(site.siteId).jetpack_openai_query.jwt.url
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = null,
+            clazz = JetpackAIJWTTokenDto::class.java,
+        )
+
+        return when (response) {
+            is Response.Success -> JetpackAIJWTTokenResponse.Success(JWTToken(response.data.token))
+            is Response.Error -> JetpackAIJWTTokenResponse.Error(
+                response.error.toJetpackAICompletionsError(),
+                response.error.message
+            )
+        }
+    }
+
+    suspend fun fetchJetpackAITextCompletion(
+        token: JWTToken,
+        prompt: String,
+        feature: String,
+        format: ResponseFormat? = null,
+        model: String? = null
+    ): JetpackAICompletionsResponse {
+        val url = WPCOMV2.text_completion.url
+        val body = mutableMapOf<String, String>()
+        body.apply {
+            put("token", token.value)
+            put("prompt", prompt)
+            put("feature", feature)
+            put("_fields", FIELDS_TO_REQUEST)
+            putIfNotNull("response_format" to format?.value, "model" to model)
+        }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            clazz = JetpackAITextCompletionDto::class.java
+        )
+
+        return when (response) {
+            is Response.Success -> JetpackAICompletionsResponse.Success(response.data.completion)
+            is Response.Error -> JetpackAICompletionsResponse.Error(
+                response.error.toJetpackAICompletionsError(),
+                response.error.message
+            )
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI completions for a given prompt.
+     *
+     * @param site      The site for which completions are fetched.
+     * @param prompt    The prompt used to generate completions.
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param skipCache If true, bypasses the default 30-second throttle and fetches fresh data.
+     * @param postId    Optional post ID to mark its content as generated by Jetpack AI. If provided,
+     *                  a post meta`_jetpack_ai_calls` is added or updated, indicating the number
+     *                  of times AI is used in the post. Not required if marking is not needed.
+     */
+    suspend fun fetchJetpackAICompletions(
+        site: SiteModel,
+        prompt: String,
+        feature: String? = null,
+        skipCache: Boolean = false,
+        postId: Long? = null,
+    ): JetpackAICompletionsResponse {
+        val url = WPCOMV2.sites.site(site.siteId).jetpack_ai.completions.url
+        val body = mutableMapOf<String, Any>()
+        body.apply {
+            put("content", prompt)
+            postId?.let { put("post_id", it) }
+            put("skip_cache", skipCache)
+            feature?.let { put("feature", it) }
+        }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            clazz = String::class.java
+        )
+
+        return when (response) {
+            is Response.Success -> JetpackAICompletionsResponse.Success(response.data)
+            is Response.Error -> JetpackAICompletionsResponse.Error(
+                response.error.toJetpackAICompletionsError(),
+                response.error.message
+            )
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI Query for a given message.
+     *
+     * @param jwtToken  The jwt authorization token.
+     * @param message   The message to be expanded by the Jetpack AI BE.
+     * @param role      A special marker to indicate that the message needs to be expanded by the Jetpack AI BE.
+     * @param type      An indication of which kind of post-processing action will be executed over the content.
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param stream    When true, the response is a set of EventSource events, otherwise a single response
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAiMessageQuery(
+        jwtToken: JWTToken,
+        message: String,
+        role: String,
+        type: String,
+        feature: String?,
+        stream: Boolean
+    ): JetpackAIQueryResponse {
+        val url = WPCOMV2.jetpack_ai_query.url
+
+        val body = mutableMapOf<String, Any>().apply {
+            put("messages", createJetpackAIQueryMessage(text = message, role = role, type = type))
+            put("stream", stream)
+            putIfNotNull("feature" to feature)
+        }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = mapOf("token" to jwtToken.value),
+            body = body,
+            clazz = JetpackAIQueryDto::class.java,
+        )
+
+        return when (response) {
+            is Response.Success -> {
+                val data = response.data as? JetpackAIQueryDto
+                data?.toJetpackAIQueryResponse()
+                    ?: JetpackAIQueryResponse.Error(
+                        JetpackAIQueryErrorType.INVALID_DATA, "Can not get the object"
+                    )
+            }
+
+            is Response.Error -> {
+                JetpackAIQueryResponse.Error(
+                    response.error.toJetpackAIQueryError(),
+                    response.error.message
+                )
+            }
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI Query for a given message.
+     *
+     * @param jwtToken  The jwt authorization token.
+     * @param question  The question to be expanded by the Jetpack AI BE.
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param stream    When true, the response is a set of EventSource events, otherwise a single response
+     * @param format    The format of the response: 'text' or 'json_object'
+     * @param model     The model to be used for the query: 'gpt-4o' or 'gpt-3.5-turbo-1106'
+     * @param maxTokens The maximum number of tokens to generate in the response, leave null for default
+     * @param fields    The fields to be requested in the response
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAiQuestionQuery(
+        jwtToken: JWTToken,
+        question: String,
+        feature: String,
+        model: String,
+        stream: Boolean,
+        format: ResponseFormat,
+        maxTokens: Int? = null,
+        fields: String? = null
+    ): JetpackAIQueryResponse {
+        val url = WPCOMV2.jetpack_ai_query.url
+
+        val body = mapOf(
+            "question" to question,
+            "stream" to stream,
+            "feature" to feature,
+            "format" to format.value,
+            "model" to model,
+            "max_tokens" to maxTokens
+        ).filterNotNull()
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = mutableMapOf("token" to jwtToken.value).apply {
+                putIfNotNull("_fields" to fields)
+            },
+            body = body,
+            clazz = JetpackAIQueryDto::class.java,
+        )
+
+        return when (response) {
+            is Response.Success -> {
+                val data = response.data as? JetpackAIQueryDto
+                data?.toJetpackAIQueryResponse()
+                    ?: JetpackAIQueryResponse.Error(
+                        JetpackAIQueryErrorType.INVALID_DATA, "Can not get the object"
+                    )
+            }
+
+            is Response.Error -> {
+                JetpackAIQueryResponse.Error(
+                    response.error.toJetpackAIQueryError(),
+                    response.error.message
+                )
+            }
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI Assistant feature for site
+     *
+     * @param site  The SiteModel for which the Jetpack AI Assistant feature is fetched
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAiAssistantFeature(
+        site: SiteModel
+    ): JetpackAIAssistantFeatureResponse {
+        val url = WPCOMV2.sites.site(site.siteId).jetpack_ai.ai_assistant_feature.url
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = emptyMap(),
+            clazz = JetpackAIAssistantFeatureDto::class.java,
+        )
+
+        return when (response) {
+            is Response.Success -> {
+                JetpackAIAssistantFeatureResponse.Success(
+                    response.data.toJetpackAIAssistantFeature()
+                )
+            }
+
+            is Response.Error -> {
+                JetpackAIAssistantFeatureResponse.Error(
+                    response.error.toJetpackAIAssistantFeatureError(),
+                    response.error.message
+                )
+            }
+        }
+    }
+
+    internal data class JetpackAIJWTTokenDto(
+        @SerializedName("success") val success: Boolean,
+        @SerializedName("token") val token: String
+    )
+
+    internal data class JetpackAITextCompletionDto(
+        @SerializedName("completion") val completion: String
+    )
+
+    @VisibleForTesting
+    internal data class JetpackAIQueryDto(val model: String?, val choices: List<Choice>?) {
+        data class Choice(val index: Int?, val message: Message?) {
+            data class Message(val role: String?, val content: String?)
+        }
+    }
+
+    sealed class JetpackAIJWTTokenResponse {
+        data class Success(val token: JWTToken) : JetpackAIJWTTokenResponse()
+        data class Error(
+            val type: JetpackAICompletionsErrorType,
+            val message: String? = null
+        ) : JetpackAIJWTTokenResponse()
+    }
+
+    sealed class JetpackAICompletionsResponse {
+        data class Success(val completion: String) : JetpackAICompletionsResponse()
+        data class Error(
+            val type: JetpackAICompletionsErrorType,
+            val message: String? = null
+        ) : JetpackAICompletionsResponse()
+    }
+
+    enum class JetpackAICompletionsErrorType {
+        API_ERROR,
+        AUTH_ERROR,
+        GENERIC_ERROR,
+        INVALID_RESPONSE,
+        TIMEOUT,
+        NETWORK_ERROR
+    }
+
+    private fun JetpackAIQueryDto.toJetpackAIQueryResponse(): JetpackAIQueryResponse {
+        val safeChoices = choices ?: emptyList()
+
+        if (safeChoices.isEmpty() || safeChoices[0].message?.content.isNullOrEmpty())
+            return JetpackAIQueryResponse.Error(
+                JetpackAIQueryErrorType.INVALID_DATA,
+                "Response content is empty or null"
+            )
+
+        return JetpackAIQueryResponse.Success(model, safeChoices.map { choice ->
+            JetpackAIQueryResponse.Success.Choice(
+                index = choice.index,
+                message = choice.message?.let { message ->
+                    JetpackAIQueryResponse.Success.Choice.Message(
+                        role = message.role,
+                        content = message.content
+                    )
+                }
+            )
+        })
+    }
+
+    private fun createJetpackAIQueryMessage(text: String, type: String, role: String) =
+        listOf(mapOf("context" to mapOf("type" to type, "content" to text), "role" to role))
+
+    enum class ResponseFormat(val value: String) {
+        JSON("json_object"),
+        TEXT("text")
+    }
+
+    private fun WPComGsonNetworkError.toJetpackAICompletionsError() =
+        when (type) {
+            GenericErrorType.TIMEOUT -> JetpackAICompletionsErrorType.TIMEOUT
+            GenericErrorType.NO_CONNECTION,
+            GenericErrorType.INVALID_SSL_CERTIFICATE,
+            GenericErrorType.NETWORK_ERROR -> JetpackAICompletionsErrorType.NETWORK_ERROR
+
+            GenericErrorType.SERVER_ERROR -> JetpackAICompletionsErrorType.API_ERROR
+            GenericErrorType.PARSE_ERROR,
+            GenericErrorType.NOT_FOUND,
+            GenericErrorType.CENSORED,
+            GenericErrorType.INVALID_RESPONSE -> JetpackAICompletionsErrorType.INVALID_RESPONSE
+
+            GenericErrorType.HTTP_AUTH_ERROR,
+            GenericErrorType.AUTHORIZATION_REQUIRED,
+            GenericErrorType.NOT_AUTHENTICATED -> JetpackAICompletionsErrorType.AUTH_ERROR
+
+            GenericErrorType.UNKNOWN -> JetpackAICompletionsErrorType.GENERIC_ERROR
+            null -> JetpackAICompletionsErrorType.GENERIC_ERROR
+        }
+
+    private fun WPComGsonNetworkError.toJetpackAIQueryError() =
+        when (type) {
+            GenericErrorType.TIMEOUT -> JetpackAIQueryErrorType.TIMEOUT
+            GenericErrorType.NO_CONNECTION,
+            GenericErrorType.INVALID_SSL_CERTIFICATE,
+            GenericErrorType.NETWORK_ERROR -> JetpackAIQueryErrorType.NETWORK_ERROR
+
+            GenericErrorType.SERVER_ERROR -> JetpackAIQueryErrorType.API_ERROR
+            GenericErrorType.PARSE_ERROR,
+            GenericErrorType.NOT_FOUND,
+            GenericErrorType.CENSORED,
+            GenericErrorType.INVALID_RESPONSE -> JetpackAIQueryErrorType.INVALID_RESPONSE
+
+            GenericErrorType.HTTP_AUTH_ERROR,
+            GenericErrorType.AUTHORIZATION_REQUIRED,
+            GenericErrorType.NOT_AUTHENTICATED -> JetpackAIQueryErrorType.AUTH_ERROR
+
+            GenericErrorType.UNKNOWN -> JetpackAIQueryErrorType.GENERIC_ERROR
+            null -> JetpackAIQueryErrorType.GENERIC_ERROR
+        }
+
+    private fun WPComGsonNetworkError.toJetpackAIAssistantFeatureError() =
+        when (type) {
+            GenericErrorType.TIMEOUT -> JetpackAIAssistantFeatureErrorType.TIMEOUT
+            GenericErrorType.NO_CONNECTION,
+            GenericErrorType.INVALID_SSL_CERTIFICATE,
+            GenericErrorType.NETWORK_ERROR -> JetpackAIAssistantFeatureErrorType.NETWORK_ERROR
+
+            GenericErrorType.SERVER_ERROR -> JetpackAIAssistantFeatureErrorType.API_ERROR
+            GenericErrorType.PARSE_ERROR,
+            GenericErrorType.NOT_FOUND,
+            GenericErrorType.CENSORED,
+            GenericErrorType.INVALID_RESPONSE -> JetpackAIAssistantFeatureErrorType.INVALID_RESPONSE
+
+            GenericErrorType.HTTP_AUTH_ERROR,
+            GenericErrorType.AUTHORIZATION_REQUIRED,
+            GenericErrorType.NOT_AUTHENTICATED -> JetpackAIAssistantFeatureErrorType.AUTH_ERROR
+
+            GenericErrorType.UNKNOWN -> JetpackAIAssistantFeatureErrorType.GENERIC_ERROR
+            null -> JetpackAIAssistantFeatureErrorType.GENERIC_ERROR
+        }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionResponse.kt
new file mode 100644
index 00000000000..7fb7d048134
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionResponse.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+sealed class JetpackAITranscriptionResponse {
+    data class Success(val model: String) : JetpackAITranscriptionResponse()
+    data class Error(
+        val type: JetpackAITranscriptionErrorType,
+        val message: String? = null
+    ) : JetpackAITranscriptionResponse()
+}
+
+
+enum class JetpackAITranscriptionErrorType {
+    API_ERROR,
+    AUTH_ERROR,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    TIMEOUT,
+    NETWORK_ERROR,
+    CONNECTION_ERROR,
+    // local errors
+    INELIGIBLE_AUDIO_FILE,
+    PARSE_ERROR,
+    // HTTP
+    BAD_REQUEST,
+    NOT_FOUND,
+    NOT_AUTHENTICATED,
+    REQUEST_TOO_LARGE,
+    SERVER_ERROR,
+    TOO_MANY_REQUESTS,
+    JETPACK_AI_SERVICE_UNAVAILABLE
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionRestClient.kt
new file mode 100644
index 00000000000..45909eeff6e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAITranscriptionRestClient.kt
@@ -0,0 +1,213 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
+
+import android.content.Context
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.JWTToken
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.utils.JetpackAITranscriptionUtils
+import org.wordpress.android.fluxc.utils.WPComRestClientUtils.getHttpUrlWithLocale
+import org.wordpress.android.util.AppLog
+import java.io.File
+import java.io.IOException
+import java.lang.reflect.Type
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Named
+
+class JetpackAITranscriptionRestClient  @Inject constructor(
+    private val appContext: Context,
+    private val userAgent: UserAgent,
+    @Named("regular") private val okHttpClient: OkHttpClient,
+    private val jetpackAIUtils: JetpackAITranscriptionUtils
+) {
+    companion object {
+        private const val DEFAULT_AUDIO_FILE_SIZE_LIMIT: Long = 25 * 1024 * 1024 // 25 MB
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    suspend fun fetchJetpackAITranscription(
+        jwtToken: JWTToken,
+        feature: String?,
+        audioFile: File,
+        audioFileSizeLimit: Long = DEFAULT_AUDIO_FILE_SIZE_LIMIT
+    ) : JetpackAITranscriptionResponse {
+        if (!jetpackAIUtils.isFileEligibleForTranscription(audioFile, audioFileSizeLimit)) {
+            JetpackAITranscriptionResponse.Error(
+                JetpackAITranscriptionErrorType.INELIGIBLE_AUDIO_FILE)
+        }
+
+        val url = WPCOMV2.jetpack_ai_transcription.url
+        val requestBody = MultipartBody.Builder().apply {
+            setType(MultipartBody.FORM)
+            addFormDataPart(
+                "audio_file",
+                audioFile.name,
+                audioFile.asRequestBody("audio/mp4".toMediaType()))
+            feature?.let { addFormDataPart("feature", it) }
+        }.build()
+
+        val request = Request.Builder().apply {
+            getHttpUrlWithLocale(appContext, url)?.let {
+                url(it)
+            } ?: url(url)
+            addHeader("Authorization", "Bearer ${jwtToken.value}")
+            addHeader("User-Agent",  userAgent.toString())
+            post(requestBody)
+        }.build()
+
+        val result = runCatching {
+            okHttpClient.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) {
+                    val errorMessage = response.message.takeIf { msg -> msg.isNotBlank() }
+                            ?: "Unknown okHttpClient error ${response.code}"
+                    return@use JetpackAITranscriptionResponse.Error(
+                        fromHttpStatusCode(response.code),
+                        errorMessage
+                    )
+                } else {
+                    val body = response.body?.use {
+                        it.string()
+                    }
+
+                    val dto = try {
+                        val gson = GsonBuilder()
+                            .registerTypeAdapter(
+                                JetpackAITranscriptionDto::class.java,
+                                JetpackAITranscriptionDeserializer()
+                            )
+                            .create()
+                        gson.fromJson(body, JetpackAITranscriptionDto::class.java)
+                    } catch (e: Exception) {
+                        // Handle all potential exceptions gracefully to prevent the app from crashing.
+                        // Possible exceptions include:
+                        // - JsonSyntaxException: Thrown when the JSON is not in the expected format.
+                        // - ParseException: Thrown during date parsing or other parsing operations.
+                        // - IllegalStateException: Thrown when an operation is not called at an appropriate time.
+                        // All exceptions are logged for debugging purposes, but
+                        // return null to ensure the app continues to run smoothly.
+                        AppLog.e(AppLog.T.API, "Failed to parse transcription response: $e")
+                        null
+                    }
+                    return@use dto.toJetpackAITranscriptionResponse()
+                }
+            }
+        }
+
+        return result.getOrElse {
+            val errorMessage = it.message?.takeIf { msg -> msg.isNotBlank() }
+                ?: "Unknown error of type ${it::class.java.simpleName}"
+            JetpackAITranscriptionResponse.Error(
+                fromThrowable(it), errorMessage)
+        }
+    }
+
+    internal data class JetpackAITranscriptionDto(
+        val text: String? = null,
+        val code: String? = null,
+        val message: String? = null,
+        val data: JetpackAITranscriptionErrorDto? = null
+    )
+
+    internal data class JetpackAITranscriptionErrorDto(
+        val status: Int
+    )
+
+    private fun JetpackAITranscriptionDto?.toJetpackAITranscriptionResponse():
+        JetpackAITranscriptionResponse {
+        return when (this) {
+            null -> {
+                JetpackAITranscriptionResponse.Error(
+                    JetpackAITranscriptionErrorType.PARSE_ERROR,
+                    "Unable to parse transcription response"
+                )
+            }
+
+            else -> this.toResponse()
+        }
+    }
+
+    private fun JetpackAITranscriptionDto.toResponse(): JetpackAITranscriptionResponse {
+        return when {
+            text != null -> JetpackAITranscriptionResponse.Success(text)
+            data != null -> JetpackAITranscriptionResponse.Error(
+                fromHttpStatusCode(data.status),
+                "Error while handling response $code $message"
+            )
+            else -> JetpackAITranscriptionResponse.Error(
+                JetpackAITranscriptionErrorType.GENERIC_ERROR,
+                "Invalid response"
+            )
+        }
+    }
+
+    internal class JetpackAITranscriptionDeserializer : JsonDeserializer<JetpackAITranscriptionDto>
+    {
+        override fun deserialize(
+            json: JsonElement?,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): JetpackAITranscriptionDto {
+            val jsonObject = json?.asJsonObject ?: throw JsonParseException("Invalid JSON")
+
+            return if (jsonObject.has("text")) {
+                JetpackAITranscriptionDto(text = jsonObject.get("text").asString)
+            } else if (jsonObject.has("code") &&
+                jsonObject.has("message") && jsonObject.has("data")) {
+                val data: JetpackAITranscriptionErrorDto? =
+                    context?.deserialize(
+                        jsonObject.get("data"),
+                        JetpackAITranscriptionErrorDto::class.java
+                    )
+                JetpackAITranscriptionDto(
+                    code = jsonObject.get("code").asString,
+                    message = jsonObject.get("message").asString,
+                    data = data
+                )
+            } else {
+                throw JsonParseException("Unknown JSON structure")
+            }
+        }
+    }
+
+    @Suppress("MagicNumber")
+    private fun fromHttpStatusCode(code: Int): JetpackAITranscriptionErrorType {
+        AppLog.e(AppLog.T.API, "Failed transcription http status: $code")
+        return when (code) {
+            400 -> JetpackAITranscriptionErrorType.BAD_REQUEST
+            401 -> JetpackAITranscriptionErrorType.AUTH_ERROR
+            404 -> JetpackAITranscriptionErrorType.NOT_FOUND
+            403 -> JetpackAITranscriptionErrorType.NOT_AUTHENTICATED
+            413 -> JetpackAITranscriptionErrorType.REQUEST_TOO_LARGE
+            429 -> JetpackAITranscriptionErrorType.TOO_MANY_REQUESTS
+            500 -> JetpackAITranscriptionErrorType.SERVER_ERROR
+            503 -> JetpackAITranscriptionErrorType.JETPACK_AI_SERVICE_UNAVAILABLE
+            else -> JetpackAITranscriptionErrorType.GENERIC_ERROR
+        }
+    }
+
+    private fun fromThrowable(e: Throwable): JetpackAITranscriptionErrorType {
+        AppLog.e(AppLog.T.API, "Failed transcription network response: $e")
+        return if (e is IOException) {
+            when (e) {
+                is SocketTimeoutException -> JetpackAITranscriptionErrorType.TIMEOUT
+                is ConnectException,
+                is UnknownHostException -> JetpackAITranscriptionErrorType.CONNECTION_ERROR
+                else -> JetpackAITranscriptionErrorType.GENERIC_ERROR
+            }
+        } else {
+            JetpackAITranscriptionErrorType.GENERIC_ERROR
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClient.kt
new file mode 100644
index 00000000000..09a4c5cc940
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackRestClient.kt
@@ -0,0 +1,124 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.JPAPI
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackSuccess
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleError
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModulePayload
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleResultPayload
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallError
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.SITE_IS_JETPACK
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.USERNAME_OR_PASSWORD_MISSING
+import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstalledPayload
+import org.wordpress.android.fluxc.utils.NetworkErrorMapper
+import java.net.URLEncoder
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class JetpackRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val jetpackTunnelGsonRequestBuilder: JetpackTunnelGsonRequestBuilder
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun installJetpack(site: SiteModel): JetpackInstalledPayload {
+        val url = WPCOMREST.jetpack_install.site(URLEncoder.encode(site.url, "UTF-8")).urlV1
+        val body = mapOf("user" to site.username, "password" to site.password)
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                JetpackInstallResponse::class.java
+        )
+        return when (response) {
+            is Success -> JetpackInstalledPayload(site, response.data.status)
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val error = when {
+                    response.error.apiError == "SITE_IS_JETPACK" -> SITE_IS_JETPACK
+                    response.error.isGeneric &&
+                            response.error.type == BaseRequest.GenericErrorType.INVALID_RESPONSE -> INVALID_RESPONSE
+                    response.error.apiError == "unauthorized" -> AUTHORIZATION_REQUIRED
+                    response.error.apiError == "INVALID_INPUT" -> USERNAME_OR_PASSWORD_MISSING
+                    else -> GENERIC_ERROR
+                }
+                JetpackInstalledPayload(
+                        JetpackInstallError(error, response.error.apiError, response.error.message),
+                        site
+                )
+            }
+        }
+    }
+
+    data class JetpackInstallResponse(val status: Boolean)
+
+    /**
+     * Makes a POST request to `POST /jetpack/v4/module/stats/active/` to activate
+     * the jetpack stats module
+     *
+     * Dispatches a post to activate action with the result
+     * url = "/jetpack/v4/module/stats/active/"
+     *
+     * Response{"path":"/jetpack/v4/module/stats/active/","body":"{\"active\":true}"}
+     *
+     * @param [payload] The payload to activate the stats module
+     */
+    suspend fun activateStatsModule(payload: ActivateStatsModulePayload): ActivateStatsModuleResultPayload {
+        val url = JPAPI.module.stats.active.pathV4
+        val params = mutableMapOf("active" to true)
+        val response = jetpackTunnelGsonRequestBuilder.syncPostRequest(
+                this,
+                payload.site,
+                url,
+                params,
+                StatsModuleActivatedApiResponse::class.java
+        )
+        return when (response) {
+            is JetpackSuccess -> {
+                if (response.data?.code == "success") {
+                    ActivateStatsModuleResultPayload(true, payload.site)
+                } else {
+                    val error = ActivateStatsModuleError(API_ERROR)
+                    ActivateStatsModuleResultPayload(error, payload.site)
+                }
+            }
+            is JetpackError -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        ActivateStatsModuleErrorType.GENERIC_ERROR,
+                        ActivateStatsModuleErrorType.INVALID_RESPONSE,
+                        ActivateStatsModuleErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = ActivateStatsModuleError(errorType, response.error.message)
+                ActivateStatsModuleResultPayload(error, payload.site)
+            }
+        }
+    }
+
+    class StatsModuleActivatedApiResponse : Response {
+        val code: String? = null
+        val message: String? = null
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTimeoutRequestHandler.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTimeoutRequestHandler.kt
new file mode 100644
index 00000000000..2352a5d197a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTimeoutRequestHandler.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+import com.android.volley.Response.Listener
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.util.AppLog
+import java.lang.reflect.Type
+
+/**
+ * Wraps a [WPComGsonRequest] with a custom error handler for Jetpack timeout errors (which occur when the overall
+ * request to the Jetpack site takes longer than 5 seconds).
+ *
+ * Will retry up to [maxRetries] times, and finally trigger the normal error handler for the request.
+ */
+class JetpackTimeoutRequestHandler<T>(
+    url: String,
+    params: Map<String, String>,
+    type: Type,
+    listener: Listener<T>,
+    errorListener: WPComErrorListener,
+    retryListener: (WPComGsonRequest<*>) -> Unit,
+    private val maxRetries: Int = DEFAULT_MAX_RETRIES
+) {
+    private val gsonRequest: WPComGsonRequest<T>
+    private var numRetries = 0
+
+    init {
+        val wrappedErrorListener = buildJPTimeoutRetryListener(url, errorListener, retryListener)
+        gsonRequest = WPComGsonRequest.buildGetRequest(
+            url,
+            params,
+            type,
+            listener,
+            wrappedErrorListener
+        )
+    }
+
+    companion object {
+        const val DEFAULT_MAX_RETRIES = 1
+
+        @JvmStatic
+        fun WPComGsonNetworkError.isJetpackTimeoutError(): Boolean {
+            return apiError == "http_request_failed" && message.startsWith("cURL error 28")
+        }
+    }
+
+    fun getRequest(): WPComGsonRequest<T> {
+        return gsonRequest
+    }
+
+    /**
+     * Wraps the given [WPComErrorListener] in a new one that recognizes Jetpack timeout errors and triggers the
+     * [jpTimeoutListener] (if provided) to do custom handling.
+     */
+    private fun buildJPTimeoutRetryListener(
+        wpApiEndpoint: String,
+        wpComErrorListener: WPComErrorListener,
+        jpTimeoutListener: (WPComGsonRequest<T>) -> Unit
+    ): WPComErrorListener {
+        return WPComErrorListener { error ->
+            if (error.isJetpackTimeoutError()) {
+                if (numRetries < maxRetries) {
+                    AppLog.e(
+                        AppLog.T.API,
+                        "30-second timeout reached for endpoint $wpApiEndpoint, retrying..."
+                    )
+                    jpTimeoutListener(gsonRequest.apply { increaseManualRetryCount() })
+                    numRetries++
+                } else {
+                    AppLog.e(
+                        AppLog.T.API,
+                        "30-second timeout reached for endpoint $wpApiEndpoint - maximum retries reached"
+                    )
+                    wpComErrorListener.onErrorResponse(error)
+                }
+            } else {
+                wpComErrorListener.onErrorResponse(error)
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt
new file mode 100644
index 00000000000..a52340f8496
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt
@@ -0,0 +1,273 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+import com.android.volley.Response
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener
+import java.lang.reflect.Type
+
+/**
+ * A request making a WP-API call to a Jetpack site via the WordPress.com /jetpack-blogs/$site/rest-api/ tunnel.
+ *
+ * # Requests
+ *
+ * The tunnel endpoint expects requests to be made in this way:
+ *
+ * ## GET:
+ *
+ * Example request:
+ * https://public-api.wordpress.com/rest/v1.1/jetpack-blogs/$siteId/rest-api/
+ * ?path=%2Fwp%2Fv2%2Fposts%2F%26json%3Dtrue%26_method%3Dget&query=%7B%22status%22%3A%22draft%22%7D
+ *
+ * Broken down, the GET parameters are:
+ * path=/wp/v2/posts/&_method=get
+ * json=true
+ * query={"status":"draft"}
+ *
+ * The path parameter is sent HTML-encoded so that it's discernible from the other arguments by WordPress.com.
+ * In this example, this would become a GET request to {JSON endpoint root}/wp/v2/posts/?status=draft.
+ *
+ * Any additional top-level params are received by the WordPress.com API, and are not sent through to the
+ * WP-API endpoint (e.g. `json=true`).
+ *
+ * ## POST:
+ *
+ * Example request:
+ * https://public-api.wordpress.com/rest/v1.1/jetpack-blogs/$siteId/rest-api/
+ *
+ * Body (Form URL-Encoded):
+ * path=%2Fwp%2Fv2%2Fposts%2F%26_method%3Dpost&body=%7B%22title%22%3A%22test-title%22%7D&json=true
+ *
+ * Broken down, the POST parameters are:
+ * path=/wp/v2/posts/&_method=post
+ * body={"title":"A title"}
+ * json=true
+ *
+ * Again, the path parameter is sent encoded so that it's separate from the rest of the arguments.
+ * The body parameter is a JSON object, and contains the POST body that would be sent if the WP-API endpoint
+ * were called directly.
+ *
+ * In this example, this would become a POST request to {JSON endpoint root}/wp/v2/posts/, with body:
+ * {"title":"A title"}
+ *
+ * Any additional top-level arguments are received by the WordPress.com API, and are not sent through to the
+ * WP-API endpoint.
+ *
+ * ## PUT/PATCH
+ *
+ * For PUT and PATCH, a POST request is made to /jetpack-blogs/$siteId/rest-api/ just as the POST case,
+ * but with `_method=put` (or `patch`).
+ *
+ * ## DELETE
+ *
+ * DELETE requests are also made as POST requests to /jetpack-blogs/$siteId/rest-api/.
+ * Any arguments intended for the WP-API endpoint are added to the `body` parameter.
+ *
+ * Example request:
+ * https://public-api.wordpress.com/rest/v1.1/jetpack-blogs/$siteId/rest-api/
+ *
+ * Body (Form URL-Encoded):
+ * path=%2Fwp%2Fv2%2Fposts%2F123456%2F%26_method%3Ddelete%26&body=%7B%22force%22%3A%22true%22%7De&json=true
+ *
+ * Broken down, the POST parameters are:
+ * path=/wp/v2/posts/123456&_method=delete
+ * body={"force":"true"}
+ * json=true
+ *
+ * # Responses
+ *
+ * The WordPress.com endpoint will return the response it received from the WP-API endpoint, wrapped in a `data`
+ * object (see [JetpackTunnelResponse]). The response is unwrapped, and the pure WP-API response is handed
+ * to the listeners.
+ *
+ * # Errors
+ *
+ * Any errors from WP-API are converted into usual WP.com API errors.
+ *
+ */
+object JetpackTunnelGsonRequest {
+    private val gson by lazy { Gson() }
+
+    /**
+     * Creates a new GET request to the given WP-API endpoint, calling it via the WP.com Jetpack WP-API tunnel.
+     *
+     * @param wpApiEndpoint the WP-API request endpoint (e.g. /wp/v2/posts/)
+     * @param siteId the WordPress.com site ID
+     * @param params the parameters to append to the request URL
+     * @param type the Type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     * @param jpTimeoutListener the listener for Jetpack timeout errors (can be used to silently retry the request)
+     *
+     * @param T the expected response object from the WP-API endpoint
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildGetRequest(
+        wpApiEndpoint: String,
+        siteId: Long,
+        params: Map<String, String>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener,
+        jpTimeoutListener: ((WPComGsonRequest<*>) -> Unit)?
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val wrappedParams = createTunnelParams(params, wpApiEndpoint)
+
+        val tunnelRequestUrl = getTunnelApiUrl(siteId)
+        val wrappedType = TypeToken.getParameterized(JetpackTunnelResponse::class.java, type).type
+        val wrappedListener = Response.Listener<JetpackTunnelResponse<T>> { listener(it.data) }
+
+        return jpTimeoutListener?.let { retryListener ->
+            JetpackTimeoutRequestHandler(tunnelRequestUrl, wrappedParams, wrappedType,
+                    wrappedListener, errorListener, retryListener).getRequest()
+        } ?: WPComGsonRequest.buildGetRequest(tunnelRequestUrl, wrappedParams, wrappedType,
+                wrappedListener, errorListener)
+    }
+
+    /**
+     * Creates a new POST request to the given WP-API endpoint, calling it via the WP.com Jetpack WP-API tunnel.
+     *
+     * @param wpApiEndpoint the WP-API request endpoint (e.g. /wp/v2/posts/)
+     * @param siteId the WordPress.com site ID
+     * @param body the request body
+     * @param type the Type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     *
+     * @param T the expected response object from the WP-API endpoint
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildPostRequest(
+        wpApiEndpoint: String,
+        siteId: Long,
+        body: Map<String, Any>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val wrappedBody = createTunnelBody(method = "post", body = body, path = wpApiEndpoint)
+        return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener)
+    }
+
+    /**
+     * Creates a new PATCH request to the given WP-API endpoint, calling it via the WP.com Jetpack WP-API tunnel.
+     *
+     * @param wpApiEndpoint the WP-API request endpoint (e.g. /wp/v2/posts/)
+     * @param siteId the WordPress.com site ID
+     * @param body the request body
+     * @param type the Type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     *
+     * @param T the expected response object from the WP-API endpoint
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildPatchRequest(
+        wpApiEndpoint: String,
+        siteId: Long,
+        body: Map<String, Any>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val wrappedBody = createTunnelBody(method = "patch", body = body, path = wpApiEndpoint)
+        return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener)
+    }
+
+    /**
+     * Creates a new PUT request to the given WP-API endpoint, calling it via the WP.com Jetpack WP-API tunnel.
+     *
+     * @param wpApiEndpoint the WP-API request endpoint (e.g. /wp/v2/posts/)
+     * @param siteId the WordPress.com site ID
+     * @param body the request body
+     * @param type the Type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     *
+     * @param T the expected response object from the WP-API endpoint
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildPutRequest(
+        wpApiEndpoint: String,
+        siteId: Long,
+        body: Map<String, Any>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val wrappedBody = createTunnelBody(method = "put", body = body, path = wpApiEndpoint)
+        return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener)
+    }
+
+    /**
+     * Creates a new DELETE request to the given WP-API endpoint, calling it via the WP.com Jetpack WP-API tunnel.
+     *
+     * @param wpApiEndpoint the WP-API request endpoint (e.g. /wp/v2/posts/)
+     * @param siteId the WordPress.com site ID
+     * @param params the parameters of the request, those will be put in the tunnelled request body
+     * @param type the Type defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     *
+     * @param T the expected response object from the WP-API endpoint
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildDeleteRequest(
+        wpApiEndpoint: String,
+        siteId: Long,
+        params: Map<String, String>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val wrappedBody = createTunnelBody(method = "delete", body = params, path = wpApiEndpoint)
+        return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener)
+    }
+
+    private fun <T : Any> buildWrappedPostRequest(
+        siteId: Long,
+        wrappedBody: Map<String, Any>,
+        type: Type,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        val tunnelRequestUrl = getTunnelApiUrl(siteId)
+        val wrappedType = TypeToken.getParameterized(JetpackTunnelResponse::class.java, type).type
+        val wrappedListener = Response.Listener<JetpackTunnelResponse<T>> { listener(it.data) }
+
+        return WPComGsonRequest.buildPostRequest(tunnelRequestUrl, wrappedBody, wrappedType,
+                wrappedListener, errorListener)
+    }
+
+    private fun getTunnelApiUrl(siteId: Long): String = WPCOMREST.jetpack_blogs.site(siteId).rest_api.urlV1_1
+
+    private fun createTunnelParams(params: Map<String, String>, path: String): MutableMap<String, String> {
+        val finalParams = mutableMapOf<String, String>()
+        with(finalParams) {
+            put("path", "$path&_method=get")
+            put("json", "true")
+            if (params.isNotEmpty()) {
+                put("query", gson.toJson(params, object : TypeToken<Map<String, String>>() {}.type))
+            }
+        }
+        return finalParams
+    }
+
+    private fun createTunnelBody(
+        method: String,
+        body: Map<String, Any> = mapOf(),
+        path: String
+    ): MutableMap<String, Any> {
+        val finalBody = mutableMapOf<String, Any>()
+        with(finalBody) {
+            put("path", "$path&_method=$method")
+            put("json", "true")
+            if (body.isNotEmpty()) {
+                put("body", gson.toJson(body, object : TypeToken<Map<String, Any>>() {}.type))
+            }
+        }
+        return finalBody
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequestBuilder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequestBuilder.kt
new file mode 100644
index 00000000000..24482d33ba9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequestBuilder.kt
@@ -0,0 +1,206 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+import com.android.volley.RetryPolicy
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackError
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequestBuilder.JetpackResponse.JetpackSuccess
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+@Singleton
+class JetpackTunnelGsonRequestBuilder @Inject constructor() {
+    /**
+     * Creates a new GET request.
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildGetRequest(
+        site: SiteModel,
+        url: String,
+        params: Map<String, String>,
+        clazz: Class<T>,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener,
+        jpTimeoutListener: ((WPComGsonRequest<*>) -> Unit)?
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        return JetpackTunnelGsonRequest.buildGetRequest(
+            url,
+            site.siteId,
+            params,
+            clazz,
+            listener,
+            errorListener,
+            jpTimeoutListener
+        )
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param params the parameters to append to the request URL
+     * @param clazz the class defining the expected response
+     */
+    @Suppress("LongParameterList")
+    suspend fun <T : Any> syncGetRequest(
+        restClient: BaseWPComRestClient,
+        site: SiteModel,
+        url: String,
+        params: Map<String, String>,
+        clazz: Class<T>,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false,
+        retryPolicy: RetryPolicy? = null
+    ) = suspendCancellableCoroutine<JetpackResponse<T>> { cont ->
+        val request = JetpackTunnelGsonRequest.buildGetRequest<T>(
+            url,
+            site.siteId,
+            params,
+            clazz,
+            listener = { cont.resume(JetpackSuccess(it)) },
+            errorListener = { cont.resume(JetpackError(it)) },
+            jpTimeoutListener = { request: WPComGsonRequest<*> -> restClient.add(request) }
+        )
+        cont.invokeOnCancellation {
+            request?.cancel()
+        }
+        if (enableCaching) {
+            request?.enableCaching(cacheTimeToLive)
+        }
+        if (forced) {
+            request?.setShouldForceUpdate()
+        }
+        retryPolicy?.let {
+            AppLog.i(AppLog.T.API, "Timeout set to: ${it.currentTimeout}")
+            request?.setRetryPolicy(it)
+        }
+        restClient.add(request)
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request.
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using [Gson][com.google.gson.Gson]
+     * @param clazz the class defining the expected response
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    @Suppress("LongParameterList")
+    fun <T : Any> buildPostRequest(
+        site: SiteModel,
+        url: String,
+        body: Map<String, Any>,
+        clazz: Class<T>,
+        listener: (T?) -> Unit,
+        errorListener: WPComErrorListener
+    ): WPComGsonRequest<JetpackTunnelResponse<T>>? {
+        return JetpackTunnelGsonRequest.buildPostRequest(
+            url,
+            site.siteId,
+            body,
+            clazz,
+            listener,
+            errorListener
+        )
+    }
+
+    /**
+     * Creates a new JSON-formatted POST request, triggers it and awaits results synchronously.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using [Gson][com.google.gson.Gson]
+     * @param clazz the class defining the expected response
+     */
+    suspend fun <T : Any> syncPostRequest(
+        restClient: BaseWPComRestClient,
+        site: SiteModel,
+        url: String,
+        body: Map<String, Any>,
+        clazz: Class<T>
+    ) = suspendCancellableCoroutine<JetpackResponse<T>> { cont ->
+        val request = JetpackTunnelGsonRequest.buildPostRequest<T>(
+            url,
+            site.siteId, body,
+            clazz,
+            listener = { cont.resume(JetpackSuccess(it)) },
+            errorListener = { cont.resume(JetpackError(it)) }
+        )
+        cont.invokeOnCancellation {
+            request?.cancel()
+        }
+        restClient.add(request)
+    }
+
+    /**
+     * Extends JetpackTunnelGsonRequestBuilder to make available a new JSON-formatted PUT requests,
+     * triggers it and awaits results synchronously.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param body the content body, which will be converted to JSON using [Gson][com.google.gson.Gson]
+     * @param clazz the class defining the expected response
+     */
+
+    suspend fun <T : Any> syncPutRequest(
+        restClient: BaseWPComRestClient,
+        site: SiteModel,
+        url: String,
+        body: Map<String, Any>,
+        clazz: Class<T>
+    ) = suspendCancellableCoroutine<JetpackResponse<T>> { cont ->
+        val request = JetpackTunnelGsonRequest.buildPutRequest<T>(url, site.siteId, body, clazz,
+            listener = { cont.resume(JetpackSuccess(it)) },
+            errorListener = { cont.resume(JetpackError(it)) }
+        )
+        cont.invokeOnCancellation {
+            request?.cancel()
+        }
+        restClient.add(request)
+    }
+
+    /**
+     * Extends JetpackTunnelGsonRequestBuilder to make available a new JSON-formatted DELETE requests,
+     * triggers it and awaits results synchronously.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param clazz the class defining the expected response
+     */
+
+    suspend fun <T : Any> syncDeleteRequest(
+        restClient: BaseWPComRestClient,
+        site: SiteModel,
+        url: String,
+        clazz: Class<T>,
+        params: Map<String, String> = emptyMap()
+    ) = suspendCancellableCoroutine<JetpackResponse<T>> { cont ->
+        val request = JetpackTunnelGsonRequest.buildDeleteRequest<T>(
+            url,
+            site.siteId,
+            params,
+            clazz,
+            listener = { cont.resume(JetpackSuccess(it)) },
+            errorListener = { cont.resume(JetpackError(it)) }
+        )
+        cont.invokeOnCancellation {
+            request?.cancel()
+        }
+        restClient.add(request)
+    }
+
+    sealed class JetpackResponse<T> {
+        data class JetpackSuccess<T>(val data: T?) : JetpackResponse<T>()
+        data class JetpackError<T>(val error: WPComGsonNetworkError) : JetpackResponse<T>()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelResponse.kt
new file mode 100644
index 00000000000..41f35bf641c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelResponse.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel
+
+class JetpackTunnelResponse<T> {
+    val data: T? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaResponseUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaResponseUtils.kt
new file mode 100644
index 00000000000..6ab8f1036af
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaResponseUtils.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media
+
+import android.text.TextUtils
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaWPComRestResponse.MultipleMediaResponse
+import javax.inject.Inject
+
+class MediaResponseUtils
+@Inject constructor() {
+    /**
+     * Creates a [MediaModel] list from a WP.com REST response to a request for all media.
+     */
+    fun getMediaListFromRestResponse(
+        from: MultipleMediaResponse,
+        localSiteId: Int
+    ): List<MediaModel> {
+        return from.media.mapNotNull {
+            getMediaFromRestResponse(it).apply { this.localSiteId = localSiteId }
+        }
+    }
+
+    /**
+     * Creates a [MediaModel] from a WP.com REST response to a fetch request.
+     */
+    fun getMediaFromRestResponse(from: MediaWPComRestResponse) = MediaModel(
+        0,
+        from.ID,
+        from.post_ID,
+        from.author_ID,
+        from.guid,
+        from.date,
+        from.URL,
+        from.thumbnails?.let {
+            if (!TextUtils.isEmpty(it.fmt_std)) {
+                it.fmt_std
+            } else {
+                it.thumbnail
+            }
+        },
+        from.file,
+        from.extension,
+        from.mime_type,
+        StringEscapeUtils.unescapeHtml4(from.title),
+        StringEscapeUtils.unescapeHtml4(from.caption),
+        StringEscapeUtils.unescapeHtml4(from.description),
+        StringEscapeUtils.unescapeHtml4(from.alt),
+        from.width,
+        from.height,
+        from.length,
+        from.videopress_guid,
+        from.videopress_processing_done,
+        if (MediaWPComRestResponse.DELETED_STATUS == from.status) {
+            MediaUploadState.DELETED
+        } else {
+            MediaUploadState.UPLOADED
+        },
+        from.thumbnails?.let { if (!TextUtils.isEmpty(it.medium)) it.medium else null },
+        null,
+        from.thumbnails?.let { if (!TextUtils.isEmpty(it.large)) it.large else null },
+        MediaWPComRestResponse.DELETED_STATUS == from.status
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaRestClient.java
new file mode 100644
index 00000000000..ebe71662c4b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaRestClient.java
@@ -0,0 +1,626 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.stream.JsonReader;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.MediaActionBuilder;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaFields;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.StockMediaModel;
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody.ProgressListener;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaWPComRestResponse.MultipleMediaResponse;
+import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListResponsePayload;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.MediaStore.MediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload;
+import org.wordpress.android.fluxc.store.MediaStore.UploadStockMediaError;
+import org.wordpress.android.fluxc.store.MediaStore.UploadStockMediaErrorType;
+import org.wordpress.android.fluxc.store.MediaStore.UploadedStockMediaPayload;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+import org.wordpress.android.fluxc.utils.MimeType;
+import org.wordpress.android.fluxc.utils.WPComRestClientUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.StringUtils;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+/**
+ * MediaRestClient provides an interface for manipulating a WP.com site's media. It provides
+ * methods to:
+ *
+ * <ul>
+ *     <li>Fetch existing media from a WP.com site
+ *     (via {@link #fetchMediaList(SiteModel, int, int, MimeType.Type)} and
+ *     {@link #fetchMedia(SiteModel, MediaModel)}</li>
+ *     <li>Push new media to a WP.com site
+ *     (via {@link #uploadMedia(SiteModel, MediaModel)})</li>
+ *     <li>Push updates to existing media to a WP.com site
+ *     (via {@link #pushMedia(SiteModel, MediaModel)})</li>
+ *     <li>Delete existing media from a WP.com site
+ *     (via {@link #deleteMedia(SiteModel, MediaModel)})</li>
+ * </ul>
+ */
+@Singleton
+public class MediaRestClient extends BaseWPComRestClient implements ProgressListener {
+    @NonNull private final OkHttpClient mOkHttpClient;
+    @NonNull private final MediaResponseUtils mMediaResponseUtils;
+    // this will hold which media is being uploaded by which call, in order to be able
+    // to monitor multiple uploads
+    @NonNull private final ConcurrentHashMap<Integer, Call> mCurrentUploadCalls = new ConcurrentHashMap<>();
+
+    @Inject public MediaRestClient(
+            Context appContext,
+            Dispatcher dispatcher,
+            @Named("regular") RequestQueue requestQueue,
+            @NonNull @Named("regular") OkHttpClient okHttpClient,
+            AccessToken accessToken,
+            UserAgent userAgent,
+            @NonNull MediaResponseUtils mediaResponseUtils) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+        mOkHttpClient = okHttpClient;
+        mMediaResponseUtils = mediaResponseUtils;
+    }
+
+    @Override
+    public void onProgress(@NonNull MediaModel media, float progress) {
+        if (mCurrentUploadCalls.containsKey(media.getId())) {
+            notifyMediaProgress(media, Math.min(progress, 0.99f));
+        }
+    }
+
+    public void pushMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "Pushed media is null";
+            notifyMediaPushed(site, null, error);
+            return;
+        }
+
+        String url = WPCOMREST.sites.site(site.getSiteId()).media.item(media.getMediaId()).getUrlV1_1();
+
+        add(WPComGsonRequest.buildPostRequest(url, getEditRequestParams(media), MediaWPComRestResponse.class,
+                response -> {
+                    MediaModel responseMedia = mMediaResponseUtils.getMediaFromRestResponse(response);
+                    AppLog.v(T.MEDIA, "media changes pushed for " + responseMedia.getTitle());
+                    responseMedia.setLocalSiteId(site.getId());
+                    notifyMediaPushed(site, responseMedia, null);
+                },
+                error -> {
+                    String errorMessage = "error editing remote media: " + error;
+                    AppLog.e(T.MEDIA, errorMessage);
+                    MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                    mediaError.logMessage = errorMessage;
+                    notifyMediaPushed(site, media, mediaError);
+                }));
+    }
+
+    /**
+     * Uploads a single media item to a WP.com site.
+     */
+    public void uploadMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null || media.getId() == 0) {
+            // we can't have a MediaModel without an ID - otherwise we can't keep track of them.
+            MediaError error = new MediaError(MediaErrorType.INVALID_ID);
+            if (media == null) {
+                error.logMessage = "Media object is null on upload";
+            } else {
+                error.logMessage = "Media ID is 0 on upload";
+            }
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        if (!MediaUtils.canReadFile(media.getFilePath())) {
+            MediaError error = new MediaError(MediaErrorType.FS_READ_PERMISSION_DENIED);
+            error.logMessage = "Can't read file on upload";
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        String url = WPCOMREST.sites.site(site.getSiteId()).media.new_.getUrlV1_1();
+        RestUploadRequestBody body = new RestUploadRequestBody(media, getEditRequestParams(media), this);
+
+        // Abort upload if it exceeds the site upload limit
+        if (site.hasMaxUploadSize() && body.contentLength() > site.getMaxUploadSize()) {
+            String errorMessage = "Media size of " + body.contentLength() + " exceeds site limit of "
+                                  + site.getMaxUploadSize();
+            AppLog.d(T.MEDIA, errorMessage);
+            MediaError error = new MediaError(MediaErrorType.EXCEEDS_FILESIZE_LIMIT);
+            error.logMessage = errorMessage;
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        // Abort upload if it exceeds the 'safe' memory limit for the site
+        double maxFilesizeForMemoryLimit = MediaUtils.getMaxFilesizeForMemoryLimit(site.getMemoryLimit());
+        if (site.hasMemoryLimit() && body.contentLength() > maxFilesizeForMemoryLimit) {
+            String errorMessage = "Media size of " + body.contentLength() + " exceeds safe memory limit of "
+                                  + maxFilesizeForMemoryLimit + " for this site";
+            AppLog.d(T.MEDIA, errorMessage);
+            MediaError error = new MediaError(MediaErrorType.EXCEEDS_MEMORY_LIMIT);
+            error.logMessage = errorMessage;
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        // Abort upload if it exceeds the space quota limit for the site
+        if (site.hasDiskSpaceQuotaInformation() && body.contentLength() > site.getSpaceAvailable()) {
+            String errorMessage = "Media size of " + body.contentLength() + " exceeds disk space quota remaining  "
+                                  + site.getSpaceAvailable() + " for this site";
+            AppLog.d(T.MEDIA, errorMessage);
+            MediaError error = new MediaError(MediaErrorType.EXCEEDS_SITE_SPACE_QUOTA_LIMIT);
+            error.logMessage = errorMessage;
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        String authHeader = String.format(WPComGsonRequest.REST_AUTHORIZATION_FORMAT, getAccessToken().get());
+
+        Request request = new Request.Builder()
+                .addHeader(WPComGsonRequest.REST_AUTHORIZATION_HEADER, authHeader)
+                .addHeader("User-Agent", mUserAgent.toString())
+                .url(url)
+                .post(body)
+                .build();
+
+        // Try to add locale query param
+        HttpUrl httpUrl = WPComRestClientUtils.getHttpUrlWithLocale(mAppContext, url);
+
+        if (null != httpUrl) {
+            request = request.newBuilder()
+                             .url(httpUrl)
+                             .build();
+        } else {
+            AppLog.d(T.MEDIA, "Could not add locale query param for url '" + url + "'.");
+        }
+
+        Call call = mOkHttpClient.newCall(request);
+        mCurrentUploadCalls.put(media.getId(), call);
+
+        AppLog.d(T.MEDIA, "starting upload for: " + media.getId());
+        call.enqueue(new Callback() {
+            @Override
+            public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
+                if (response.isSuccessful()) {
+                    ResponseBody responseBody = response.body();
+                    if (responseBody == null) {
+                        String errorMessage = "error uploading media, response body was empty " + response;
+                        AppLog.e(T.MEDIA, errorMessage);
+                        MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                        error.logMessage = errorMessage;
+                        notifyMediaUploaded(media, error);
+                        return;
+                    }
+
+                    AppLog.d(T.MEDIA, "media upload successful: " + response);
+                    String jsonBody = responseBody.string();
+
+                    Gson gson = new Gson();
+                    JsonReader reader = new JsonReader(new StringReader(jsonBody));
+                    reader.setLenient(true);
+                    MultipleMediaResponse mediaResponse = gson.fromJson(reader, MultipleMediaResponse.class);
+
+                    List<MediaModel> responseMedia = mMediaResponseUtils.getMediaListFromRestResponse(
+                            mediaResponse,
+                            site.getId());
+                    if (!responseMedia.isEmpty()) {
+                        MediaModel uploadedMedia = responseMedia.get(0);
+                        uploadedMedia.setId(media.getId());
+                        uploadedMedia.setLocalPostId(media.getLocalPostId());
+                        uploadedMedia.setMarkedLocallyAsFeatured(media.getMarkedLocallyAsFeatured());
+
+                        notifyMediaUploaded(uploadedMedia, null);
+                    } else {
+                        MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                        error.logMessage = "Failed to parse response on uploadMedia";
+                        notifyMediaUploaded(media, error);
+                    }
+                } else {
+                    AppLog.e(T.MEDIA, "error uploading media: " + response.message());
+
+                    MediaError error = parseUploadError(response, site);
+
+                    if (error.type == MediaErrorType.BAD_REQUEST) {
+                        AppLog.e(T.MEDIA, "media upload error message: " + error.message);
+                    }
+
+                    notifyMediaUploaded(media, error);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                String message = "media upload failed: " + e;
+                AppLog.w(T.MEDIA, message);
+                if (!mCurrentUploadCalls.containsKey(media.getId())) {
+                    // This call has already been removed from the in-progress list - probably because it was cancelled
+                    // In that case this has already been handled and there's nothing to do
+                    return;
+                }
+
+                MediaError error = MediaError.fromIOException(e);
+                error.logMessage = message;
+                notifyMediaUploaded(media, error);
+            }
+        });
+    }
+
+    /**
+     * Gets a list of media items given the offset on a WP.com site.
+     * <p>
+     * NOTE: Only media item data is gathered, the actual media file can be downloaded from the URL
+     * provided in the response {@link MediaModel}'s (via {@link MediaModel#getUrl()}).
+     */
+    public void fetchMediaList(
+            @NonNull final SiteModel site,
+            final int number,
+            final int offset,
+            @Nullable final MimeType.Type mimeType) {
+        final Map<String, String> params = new HashMap<>();
+        params.put("number", String.valueOf(number));
+        if (offset > 0) {
+            params.put("offset", String.valueOf(offset));
+        }
+        if (mimeType != null) {
+            params.put("mime_type", mimeType.getValue());
+        }
+        String url = WPCOMREST.sites.site(site.getSiteId()).media.getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, params, MultipleMediaResponse.class,
+                response -> {
+                    List<MediaModel> mediaList = mMediaResponseUtils.getMediaListFromRestResponse(
+                            response,
+                            site.getId());
+                    AppLog.v(T.MEDIA, "Fetched media list for site with size: " + mediaList.size());
+                    boolean canLoadMore = mediaList.size() == number;
+                    notifyMediaListFetched(site, mediaList, offset > 0, canLoadMore, mimeType);
+                },
+                error -> {
+                    String errorMessage = "VolleyError Fetching media: " + error;
+                    AppLog.e(T.MEDIA, errorMessage);
+                    MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                    mediaError.message = error.message;
+                    mediaError.logMessage = error.apiError;
+                    notifyMediaListFetched(site, mediaError, mimeType);
+                }));
+    }
+
+    /**
+     * Gets a list of media items whose media IDs match the provided list.
+     */
+    public void fetchMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "Requested media is null";
+            notifyMediaFetched(site, null, error);
+            return;
+        }
+
+        String url = WPCOMREST.sites.site(site.getSiteId()).media.item(media.getMediaId()).getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, null, MediaWPComRestResponse.class,
+                response -> {
+                    MediaModel responseMedia = mMediaResponseUtils.getMediaFromRestResponse(response);
+                    responseMedia.setLocalSiteId(site.getId());
+                    AppLog.v(T.MEDIA, "Fetched media with ID: " + media.getMediaId());
+                    notifyMediaFetched(site, responseMedia, null);
+                },
+                error -> {
+                    AppLog.e(T.MEDIA, "VolleyError Fetching media: " + error);
+                    MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                    mediaError.message = error.message;
+                    mediaError.logMessage = error.apiError;
+                    notifyMediaFetched(site, media, mediaError);
+                }));
+    }
+
+    /**
+     * Deletes media from a WP.com site whose media ID is in the provided list.
+     */
+    public void deleteMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "Null media on delete";
+            notifyMediaDeleted(site, null, error);
+            return;
+        }
+
+        String url = WPCOMREST.sites.site(site.getSiteId()).media.item(media.getMediaId()).delete.getUrlV1_1();
+        add(WPComGsonRequest.buildPostRequest(url, null, MediaWPComRestResponse.class,
+                response -> {
+                    mMediaResponseUtils.getMediaFromRestResponse(response);
+                    AppLog.v(T.MEDIA, "deleted media: " + media.getTitle());
+                    notifyMediaDeleted(site, media, null);
+                },
+                error -> {
+                    AppLog.e(T.MEDIA, "VolleyError deleting media (ID=" + media.getMediaId() + "): " + error);
+                    MediaErrorType mediaErrorType = MediaErrorType.fromBaseNetworkError(error);
+                    if (mediaErrorType == MediaErrorType.NOT_FOUND) {
+                        AppLog.i(T.MEDIA, "Attempted to delete media that does not exist remotely.");
+                    }
+                    MediaError mediaError = new MediaError(mediaErrorType);
+                    mediaError.message = error.message;
+                    mediaError.logMessage = error.apiError;
+                    notifyMediaDeleted(site, media, mediaError);
+                }));
+    }
+
+    public void cancelUpload(@Nullable final MediaModel media) {
+        if (media == null) {
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "Null media on cancel upload";
+            notifyMediaUploaded(null, error);
+            return;
+        }
+
+        // cancel in-progress upload if necessary
+        Call correspondingCall = mCurrentUploadCalls.get(media.getId());
+        if (correspondingCall != null && correspondingCall.isExecuted() && !correspondingCall.isCanceled()) {
+            AppLog.d(T.MEDIA, "Canceled in-progress upload: " + media.getFileName());
+            removeCallFromCurrentUploadsMap(media.getId());
+            correspondingCall.cancel();
+
+            // report the upload was successfully cancelled
+            notifyMediaUploadCanceled(media);
+        }
+    }
+
+    private void removeCallFromCurrentUploadsMap(int id) {
+        mCurrentUploadCalls.remove(id);
+        AppLog.d(T.MEDIA, "mediaRestClient: removed id: " + id + " from current uploads, remaining: "
+                          + mCurrentUploadCalls.size());
+    }
+
+    public void uploadStockMedia(@NonNull final SiteModel site,
+                                 @NonNull List<StockMediaModel> stockMediaList) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).external_media_upload.getUrlV1_1();
+
+        JsonArray jsonBody = new JsonArray();
+        for (StockMediaModel stockMedia : stockMediaList) {
+            JsonObject json = new JsonObject();
+            json.addProperty("url", StringUtils.notNullStr(stockMedia.getUrl()));
+            json.addProperty("name", StringUtils.notNullStr(stockMedia.getName()));
+            json.addProperty("title", StringUtils.notNullStr(stockMedia.getTitle()));
+            jsonBody.add(json.toString());
+        }
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("service", "pexels");
+        body.put("external_ids", jsonBody);
+
+        WPComGsonRequest<MultipleMediaResponse> request = WPComGsonRequest.buildPostRequest(
+                url,
+                body,
+                MultipleMediaResponse.class,
+                response -> {
+                    // response is a list of media, exactly like that of MediaRestClient.fetchMediaList()
+                    List<MediaModel> mediaList = mMediaResponseUtils.getMediaListFromRestResponse(
+                            response,
+                            site.getId());
+                    UploadedStockMediaPayload payload = new UploadedStockMediaPayload(site, mediaList);
+                    mDispatcher.dispatch(MediaActionBuilder.newUploadedStockMediaAction(payload));
+                },
+                error -> {
+                    AppLog.e(T.MEDIA, "VolleyError uploading stock media: " + error);
+                    UploadStockMediaError mediaError = new UploadStockMediaError(
+                            UploadStockMediaErrorType.fromNetworkError(error), error.message);
+                    UploadedStockMediaPayload payload = new UploadedStockMediaPayload(site, mediaError);
+                    mDispatcher.dispatch(MediaActionBuilder.newUploadedStockMediaAction(payload));
+                });
+
+        add(request);
+    }
+
+    //
+    // Helper methods to dispatch media actions
+    //
+    @NonNull
+    private MediaError parseUploadError(
+            @NonNull Response response,
+            @NonNull SiteModel siteModel) {
+        MediaError mediaError = new MediaError(MediaErrorType.fromHttpStatusCode(response.code()));
+        mediaError.statusCode = response.code();
+        mediaError.logMessage = response.message();
+        if (mediaError.type == MediaErrorType.REQUEST_TOO_LARGE) {
+            // 413 (Request too large) errors are coming from the web server and are not an API response like the rest
+            mediaError.message = response.message();
+            return mediaError;
+        }
+
+        try {
+            ResponseBody responseBody = response.body();
+            if (responseBody == null) {
+                AppLog.e(T.MEDIA, "error uploading media, response body was empty " + response);
+                mediaError.type = MediaErrorType.PARSE_ERROR;
+                return mediaError;
+            }
+            JSONObject body = new JSONObject(responseBody.string());
+            // Can be an array or errors
+            if (body.has("errors")) {
+                JSONArray errors = body.getJSONArray("errors");
+                if (errors.length() == 1) {
+                    JSONObject error = errors.getJSONObject(0);
+                    // error.getString("error")) is always "upload_error"
+                    if (error.has("message")) {
+                        mediaError.message = error.getString("message");
+                        mediaError.logMessage = error.getString("message");
+                    }
+                }
+            }
+            // Or an object
+            if (body.has("message")) {
+                mediaError.message = body.getString("message");
+                mediaError.logMessage = body.getString("message");
+            }
+
+            if (!siteModel.isWPCom()) {
+                // TODO : temporary fix for "big" media uploads on Jetpack connected site
+                // See https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/402
+                // Tried to upload a media that's too large (larger than the site's max_upload_filesize)
+                if (body.has("error")) {
+                    String error = body.getString("error");
+                    if ("invalid_hmac".equals(error)) {
+                        mediaError.type = MediaErrorType.REQUEST_TOO_LARGE;
+                    }
+                    mediaError.logMessage = error;
+                }
+            }
+        } catch (JSONException | IOException e) {
+            // no op
+            mediaError.logMessage = e.getMessage();
+        }
+        return mediaError;
+    }
+
+    private void notifyMediaPushed(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newPushedMediaAction(payload));
+    }
+
+    private void notifyMediaProgress(@NonNull MediaModel media, float progress) {
+        ProgressPayload payload = new ProgressPayload(media, progress, false, null);
+        mDispatcher.dispatch(UploadActionBuilder.newUploadedMediaAction(payload));
+    }
+
+    private void notifyMediaUploaded(@Nullable MediaModel media, @Nullable MediaError error) {
+        if (media != null) {
+            media.setUploadState(error == null ? MediaUploadState.UPLOADED : MediaUploadState.FAILED);
+            removeCallFromCurrentUploadsMap(media.getId());
+        }
+
+        ProgressPayload payload = new ProgressPayload(media, 1.f, error == null, error);
+        mDispatcher.dispatch(UploadActionBuilder.newUploadedMediaAction(payload));
+    }
+
+    private void notifyMediaListFetched(
+            @NonNull SiteModel site,
+            @NonNull List<MediaModel> media,
+            boolean loadedMore,
+            boolean canLoadMore,
+            @Nullable MimeType.Type mimeType) {
+        FetchMediaListResponsePayload payload = new FetchMediaListResponsePayload(site, media,
+                loadedMore, canLoadMore, mimeType);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaListAction(payload));
+    }
+
+    private void notifyMediaListFetched(
+            @NonNull SiteModel site,
+            @NonNull MediaError error,
+            @Nullable MimeType.Type mimeType) {
+        FetchMediaListResponsePayload payload = new FetchMediaListResponsePayload(site, error, mimeType);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaListAction(payload));
+    }
+
+    private void notifyMediaFetched(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaAction(payload));
+    }
+
+    private void notifyMediaDeleted(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newDeletedMediaAction(payload));
+    }
+
+    private void notifyMediaUploadCanceled(@NonNull MediaModel media) {
+        ProgressPayload payload = new ProgressPayload(media, 0.f, false, true);
+        mDispatcher.dispatch(MediaActionBuilder.newCanceledMediaUploadAction(payload));
+    }
+
+    //
+    // Utility methods
+    //
+
+    /**
+     * The current REST API call (v1.1) accepts 'title', 'description', 'caption', 'alt',
+     * and 'parent_id' for all media. Audio media also accepts 'artist' and 'album' attributes.
+     * <p>
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/1.1/post/sites/%24site/media/">documentation</a>
+     */
+    @NonNull
+    private Map<String, Object> getEditRequestParams(@NonNull final MediaModel media) {
+        MediaFields[] fieldsToUpdate = media.getFieldsToUpdate();
+
+        final Map<String, Object> params = new HashMap<>();
+        for (MediaFields field : fieldsToUpdate) {
+            switch (field) {
+                case PARENT_ID:
+                    if (media.getPostId() > 0) {
+                        params.put(MediaFields.PARENT_ID.getFieldName(), String.valueOf(media.getPostId()));
+                    }
+                    break;
+                case TITLE:
+                    if (!TextUtils.isEmpty(media.getTitle())) {
+                        params.put(MediaFields.TITLE.getFieldName(), media.getTitle());
+                    }
+                    break;
+                case DESCRIPTION:
+                    if (!TextUtils.isEmpty(media.getDescription())) {
+                        params.put(MediaFields.DESCRIPTION.getFieldName(), media.getDescription());
+                    }
+                    break;
+                case CAPTION:
+                    if (!TextUtils.isEmpty(media.getCaption())) {
+                        params.put(MediaFields.CAPTION.getFieldName(), media.getCaption());
+                    }
+                    break;
+                case ALT:
+                    if (!TextUtils.isEmpty(media.getAlt())) {
+                        params.put(MediaFields.ALT.getFieldName(), media.getAlt());
+                    }
+                    break;
+            }
+        }
+        return params;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaWPComRestResponse.java
new file mode 100644
index 00000000000..dcbd0d2da5b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/MediaWPComRestResponse.java
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.fluxc.network.Response;
+
+import java.util.List;
+
+/**
+ * Response to GET request for media items
+ * <p>
+ * @see <a href="https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/media/%24media_ID/">doc</a>
+ */
+@SuppressWarnings("NotNullFieldNotInitialized")
+public class MediaWPComRestResponse implements Response {
+    public static final String DELETED_STATUS = "deleted";
+
+    public static class MultipleMediaResponse {
+        @NonNull public List<MediaWPComRestResponse> media;
+    }
+
+    public static class Thumbnails {
+        @Nullable public String thumbnail;
+        @Nullable public String medium;
+        @Nullable public String large;
+        @Nullable public String fmt_std;
+    }
+
+    public long ID;
+    @NonNull public String date;
+    public long post_ID;
+    public long author_ID;
+    @NonNull public String URL;
+    @NonNull public String guid;
+    @NonNull public String file;
+    @NonNull public String extension;
+    @NonNull public String mime_type;
+    @NonNull public String title;
+    @NonNull public String caption;
+    @NonNull public String description;
+    @NonNull public String alt;
+    @Nullable public Thumbnails thumbnails;
+    public int height;
+    public int width;
+    public int length;
+    @Nullable public String videopress_guid;
+    public boolean videopress_processing_done;
+    @Nullable public String status;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/RestUploadRequestBody.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/RestUploadRequestBody.java
new file mode 100644
index 00000000000..f31a8022ba3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/RestUploadRequestBody.java
@@ -0,0 +1,103 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody;
+import org.wordpress.android.util.AppLog;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import okio.BufferedSink;
+import okio.Okio;
+
+/**
+ * Wrapper for {@link MultipartBody} that reports upload progress as body data is written.
+ * <p>
+ * A {@link ProgressListener} is required, use {@link MultipartBody} if progress is not needed.
+ * <p>
+ * @see <a href="http://stackoverflow.com/questions/35528751/okhttp-3-tracking-multipart-upload-progress">doc</a>
+ */
+public class RestUploadRequestBody extends BaseUploadRequestBody {
+    private static final String MEDIA_DATA_KEY = "media[0]";
+    private static final String MEDIA_ATTRIBUTES_KEY = "attrs[0]";
+    private static final String MEDIA_PARAM_FORMAT = MEDIA_ATTRIBUTES_KEY + "[%s]";
+
+    @NonNull private final MultipartBody mMultipartBody;
+
+    public RestUploadRequestBody(
+            @NonNull MediaModel media,
+            @NonNull Map<String, Object> params,
+            @NonNull ProgressListener listener) {
+        super(media, listener);
+        mMultipartBody = buildMultipartBody(params);
+    }
+
+    @Override
+    protected float getProgress(long bytesWritten) {
+        return (float) bytesWritten / contentLength();
+    }
+
+    @Override
+    public long contentLength() {
+        try {
+            return mMultipartBody.contentLength();
+        } catch (IOException e) {
+            AppLog.w(AppLog.T.MEDIA, "Error determining mMultipartBody content length: " + e);
+        }
+        return -1L;
+    }
+
+    @NonNull
+    @Override
+    public MediaType contentType() {
+        return mMultipartBody.contentType();
+    }
+
+    @Override
+    public void writeTo(@NonNull BufferedSink sink) throws IOException {
+        CountingSink countingSink = new CountingSink(sink);
+        BufferedSink bufferedSink = Okio.buffer(countingSink);
+        mMultipartBody.writeTo(bufferedSink);
+        bufferedSink.flush();
+    }
+
+    @NonNull
+    @SuppressWarnings("deprecation")
+    private MultipartBody buildMultipartBody(@NonNull Map<String, Object> params) {
+        MediaModel media = getMedia();
+        MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM);
+
+        // add media attributes
+        for (String key : params.keySet()) {
+            Object value = params.get(key);
+            if (value != null) {
+                builder.addFormDataPart(String.format(MEDIA_PARAM_FORMAT, key), value.toString());
+            }
+        }
+
+        // add media file data
+        String filePath = media.getFilePath();
+        String mimeType = media.getMimeType();
+        if (filePath != null && mimeType != null) {
+            File mediaFile = new File(filePath);
+            RequestBody body = RequestBody.create(MediaType.parse(mimeType), mediaFile);
+            String fileName = media.getFileName();
+            try {
+                fileName = URLEncoder.encode(media.getFileName(), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            builder.addFormDataPart(MEDIA_DATA_KEY, fileName, body);
+        }
+
+        return builder.build();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClient.kt
new file mode 100644
index 00000000000..65b6c742a75
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/media/wpv2/WPComV2MediaRestClient.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.media.wpv2
+
+import okhttp3.OkHttpClient
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.endpoint.WPAPIEndpoint
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.media.BaseWPV2MediaRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComNetwork
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class WPComV2MediaRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    coroutineEngine: CoroutineEngine,
+    @Named("regular") okHttpClient: OkHttpClient,
+    private val accessToken: AccessToken,
+    private val wpComNetwork: WPComNetwork
+) : BaseWPV2MediaRestClient(dispatcher, coroutineEngine, okHttpClient) {
+    override fun WPAPIEndpoint.getFullUrl(site: SiteModel): String = getWPComUrl(site.siteId)
+
+    override suspend fun getAuthorizationHeader(site: SiteModel): String = "Bearer ${accessToken.get()}"
+
+    override suspend fun <T:Any> executeGetGsonRequest(
+        site: SiteModel,
+        endpoint: WPAPIEndpoint,
+        params: Map<String, String>,
+        clazz: Class<T>
+    ): WPAPIResponse<T> {
+        val url = endpoint.getFullUrl(site)
+
+        val response = wpComNetwork.executeGetGsonRequest(
+            url = url,
+            clazz = clazz,
+            params = params,
+        )
+
+        return when(response) {
+            is WPComGsonRequestBuilder.Response.Success -> WPAPIResponse.Success(response.data)
+            is WPComGsonRequestBuilder.Response.Error -> WPAPIResponse.Error(
+                WPAPINetworkError(response.error, response.error.apiError)
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClient.kt
new file mode 100644
index 00000000000..c6ee41f9eed
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/FeatureFlagsRestClient.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import android.content.Context
+import android.os.Build
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class FeatureFlagsRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchFeatureFlags(payload: FeatureFlagsPayload): FeatureFlagsFetchedPayload {
+        // https://public-api.wordpress.com/wpcom/v2/mobile/feature-flagsdevice_id=12345&platform=android&build_number=570&marketing_version=15.1.1&identifier=com.jetpack.android
+        val url = WPCOMV2.mobile.feature_flags.url
+        val params = buildFeatureFlagsParams(payload)
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            params,
+            Map::class.java
+        )
+        return when (response) {
+            is Response.Success -> buildFeatureFlagsFetchedPayload(response.data)
+            is Response.Error -> FeatureFlagsFetchedPayload(response.error.toFeatureFlagsError())
+        }
+    }
+
+    private fun buildFeatureFlagsParams(payload: FeatureFlagsPayload) = mapOf(
+            "build_number" to payload.buildNumber,
+            "device_id" to payload.deviceId,
+            "identifier" to payload.identifier,
+            "marketing_version" to payload.marketingVersion,
+            "platform" to payload.platform,
+            "os_version" to payload.osVersion,
+    )
+
+    data class FeatureFlagsPayload(
+        val buildNumber: String,
+        val deviceId: String,
+        val identifier: String,
+        val marketingVersion: String,
+        val platform: String,
+        val osVersion: String = Build.VERSION.RELEASE,
+    )
+
+    private fun buildFeatureFlagsFetchedPayload(featureFlags: Map<*, *>?)
+        : FeatureFlagsFetchedPayload {
+        return FeatureFlagsFetchedPayload(featureFlags?.map { e ->
+                e.key.toString() to e.value.toString().toBoolean()
+            }?.toMap())
+    }
+}
+
+data class FeatureFlagsFetchedPayload (
+    val featureFlags: Map<String, Boolean>? = null
+) : Payload<FeatureFlagsError>() {
+    constructor(error: FeatureFlagsError) : this() {
+        this.error = error
+    }
+}
+
+class FeatureFlagsError(
+    val type: FeatureFlagsErrorType,
+    val message: String? = null
+) : OnChangedError
+
+enum class FeatureFlagsErrorType {
+    API_ERROR,
+    AUTH_ERROR,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    TIMEOUT,
+}
+
+fun WPComGsonNetworkError.toFeatureFlagsError(): FeatureFlagsError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> FeatureFlagsErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> FeatureFlagsErrorType.API_ERROR
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> FeatureFlagsErrorType.INVALID_RESPONSE
+        GenericErrorType.HTTP_AUTH_ERROR,
+        GenericErrorType.AUTHORIZATION_REQUIRED,
+        GenericErrorType.NOT_AUTHENTICATED -> FeatureFlagsErrorType.AUTH_ERROR
+        GenericErrorType.UNKNOWN -> GENERIC_ERROR
+        null -> GENERIC_ERROR
+    }
+    return FeatureFlagsError(type, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClient.kt
new file mode 100644
index 00000000000..aced2892975
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/JetpackMigrationRestClient.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload.Success
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class JetpackMigrationRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun migrationComplete(
+        errorHandler: (error: BaseNetworkError?) -> MigrationCompleteFetchedPayload,
+    ): MigrationCompleteFetchedPayload {
+        // https://public-api.wordpress.com/wpcom/v2/mobile/migration
+        val url = WPCOMV2.mobile.migration.url
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                mapOf(),
+                mapOf(),
+                JsonElement::class.java
+        )
+        return when (response) {
+            is Response.Success -> Success
+            is Response.Error -> errorHandler(response.error)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClient.kt
new file mode 100644
index 00000000000..343a2588daa
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobile/RemoteConfigRestClient.kt
@@ -0,0 +1,97 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobile
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.GsonRequest.getDefaultGsonBuilder
+import org.wordpress.android.fluxc.network.rest.NumberAwareMapDeserializer
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchRemoteConfig(): RemoteConfigFetchedPayload {
+        // https://public-api.wordpress.com/wpcom/v2/mobile/remote_config
+        val url = WPCOMV2.mobile.remote_config.url
+
+        // use custom GsonBuilder to support proper number serialisation from Maps
+        val customGsonBuilder = getDefaultGsonBuilder()
+            .registerTypeAdapter(Map::class.java, NumberAwareMapDeserializer())
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            mapOf(),
+            Map::class.java,
+            customGsonBuilder = customGsonBuilder
+        )
+
+        return when (response) {
+            is Response.Success -> buildRemoteConfigFetchedPayload(response.data)
+            is Response.Error -> RemoteConfigFetchedPayload(response.error.toRemoteConfigError())
+        }
+    }
+
+    private fun buildRemoteConfigFetchedPayload(featureFlags: Map<*, *>?)
+        : RemoteConfigFetchedPayload {
+        return RemoteConfigFetchedPayload(featureFlags?.map { e ->
+                e.key.toString() to e.value.toString()
+        }?.toMap())
+    }
+}
+
+data class RemoteConfigFetchedPayload (
+    val remoteConfig: Map<String, String>? = null
+) : Payload<RemoteConfigError>() {
+    constructor(error: RemoteConfigError) : this() {
+        this.error = error
+    }
+}
+
+class RemoteConfigError(
+    val type: RemoteConfigErrorType,
+    val message: String? = null
+) : OnChangedError
+
+enum class RemoteConfigErrorType {
+    API_ERROR,
+    GENERIC_ERROR,
+    INVALID_RESPONSE,
+    TIMEOUT,
+}
+
+fun WPComGsonNetworkError.toRemoteConfigError(): RemoteConfigError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> RemoteConfigErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> RemoteConfigErrorType.API_ERROR
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> RemoteConfigErrorType.INVALID_RESPONSE
+        GenericErrorType.UNKNOWN -> GENERIC_ERROR
+        else -> GENERIC_ERROR
+    }
+    return RemoteConfigError(type, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClient.kt
new file mode 100644
index 00000000000..ac093b61fa6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/mobilepay/MobilePayRestClient.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.mobilepay
+
+import android.content.Context
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class MobilePayRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    @Suppress("LongParameterList")
+    suspend fun createOrder(
+        productIdentifier: String,
+        priceInCents: Int,
+        currency: String,
+        purchaseToken: String,
+        appId: String,
+        siteId: Long,
+        customBaseUrl: String?,
+    ): CreateOrderResponse {
+        val url = if (customBaseUrl == null) {
+            WPCOMV2.iap.orders.url
+        } else {
+            "$customBaseUrl/wpcom/v2${WPCOMV2.iap.orders.endpoint}"
+        }
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = mapOf(
+                "site_id" to siteId,
+                "product_id" to productIdentifier,
+                "price" to priceInCents,
+                "currency" to currency,
+                "purchase_token" to purchaseToken,
+            ),
+            clazz = CreateOrderResponseType::class.java,
+            retryPolicy = DefaultRetryPolicy(TIMEOUT, 0, 1f),
+            headers = mapOf(APP_ID_HEADER to appId)
+        )
+        return when (response) {
+            is Response.Success -> CreateOrderResponse.Success(response.data.orderId)
+            is Response.Error -> CreateOrderResponse.Error(
+                response.error.toCreateOrderError(),
+                response.error.message
+            )
+        }
+    }
+
+    data class CreateOrderResponseType(
+        val orderId: Long
+    )
+
+    sealed class CreateOrderResponse {
+        data class Success(val orderId: Long) : CreateOrderResponse()
+        data class Error(
+            val type: CreateOrderErrorType,
+            val message: String? = null
+        ) : CreateOrderResponse()
+    }
+
+    enum class CreateOrderErrorType {
+        API_ERROR,
+        AUTH_ERROR,
+        GENERIC_ERROR,
+        INVALID_RESPONSE,
+        TIMEOUT,
+        NETWORK_ERROR
+    }
+
+    private fun WPComGsonRequest.WPComGsonNetworkError.toCreateOrderError() =
+        when (type) {
+            BaseRequest.GenericErrorType.TIMEOUT -> CreateOrderErrorType.TIMEOUT
+            BaseRequest.GenericErrorType.NO_CONNECTION,
+            BaseRequest.GenericErrorType.INVALID_SSL_CERTIFICATE,
+            BaseRequest.GenericErrorType.NETWORK_ERROR -> CreateOrderErrorType.NETWORK_ERROR
+            BaseRequest.GenericErrorType.SERVER_ERROR -> CreateOrderErrorType.API_ERROR
+            BaseRequest.GenericErrorType.PARSE_ERROR,
+            BaseRequest.GenericErrorType.NOT_FOUND,
+            BaseRequest.GenericErrorType.CENSORED,
+            BaseRequest.GenericErrorType.INVALID_RESPONSE -> CreateOrderErrorType.INVALID_RESPONSE
+            BaseRequest.GenericErrorType.HTTP_AUTH_ERROR,
+            BaseRequest.GenericErrorType.AUTHORIZATION_REQUIRED,
+            BaseRequest.GenericErrorType.NOT_AUTHENTICATED -> CreateOrderErrorType.AUTH_ERROR
+            BaseRequest.GenericErrorType.UNKNOWN -> CreateOrderErrorType.GENERIC_ERROR
+            null -> CreateOrderErrorType.GENERIC_ERROR
+        }
+
+    companion object {
+        private const val APP_ID_HEADER = "X-APP-ID"
+        private const val TIMEOUT = 120_000
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationApiResponse.kt
new file mode 100644
index 00000000000..6b851e53a3e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationApiResponse.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.model.notification.NotificationModel
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.FormattableMeta
+
+@Suppress("VariableNaming")
+class NotificationApiResponse : Response {
+    val id: Long? = null
+    val type: String? = null
+    val subtype: String? = null
+    val read: Int? = null
+    val note_hash: Long? = null
+    val noticon: String? = null
+    val timestamp: String? = null
+    val icon: String? = null
+    val url: String? = null
+    val title: String? = null
+    val subject: List<FormattableContent>? = null
+    val body: List<FormattableContent>? = null
+    val meta: FormattableMeta? = null
+
+    companion object {
+        fun notificationResponseToNotificationModel(
+            response: NotificationApiResponse
+        ): NotificationModel {
+            val noteType = response.type?.let {
+                NotificationModel.Kind.fromString(response.type)
+            } ?: NotificationModel.Kind.UNKNOWN
+            val noteSubType = response.subtype?.let {
+                NotificationModel.Subkind.fromString(response.subtype)
+            }
+            val isRead = response.read?.let { it == 1 } ?: false
+
+            return NotificationModel(
+                    noteId = 0,
+                    remoteNoteId = response.id ?: 0,
+                    remoteSiteId = response.meta?.ids?.site ?: 0L,
+                    noteHash = response.note_hash ?: 0L,
+                    type = noteType,
+                    subtype = noteSubType,
+                    read = isRead,
+                    icon = response.icon,
+                    noticon = response.noticon,
+                    timestamp = response.timestamp,
+                    url = response.url,
+                    title = response.title,
+                    body = response.body,
+                    subject = response.subject,
+                    meta = response.meta
+            )
+        }
+
+        fun getRemoteSiteId(response: NotificationApiResponse): Long? = response.meta?.ids?.site
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashApiResponse.kt
new file mode 100644
index 00000000000..7137ff4738e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashApiResponse.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.network.Response
+
+/**
+ * The response to fetching only the `id` and `note_hash` from the remote api endpoint
+ */
+@Suppress("VariableNaming")
+class NotificationHashApiResponse : Response {
+    var id: Long = 0
+    var note_hash: Long = 0
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashesApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashesApiResponse.kt
new file mode 100644
index 00000000000..ca42e54640c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationHashesApiResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("VariableNaming")
+class NotificationHashesApiResponse : Response {
+    val last_seen_time: Long? = null
+    val number: Int? = null
+    val notes: List<NotificationHashApiResponse>? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationReadApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationReadApiResponse.kt
new file mode 100644
index 00000000000..c3bce5406c5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationReadApiResponse.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.network.Response
+
+class NotificationReadApiResponse(val success: Boolean) : Response
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationRestClient.kt
new file mode 100644
index 00000000000..96d5f05ada2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationRestClient.kt
@@ -0,0 +1,417 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import android.content.Context
+import android.os.Build
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.NotificationActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.notification.NotificationModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.NotificationStore.DeviceRegistrationError
+import org.wordpress.android.fluxc.store.NotificationStore.DeviceRegistrationErrorType
+import org.wordpress.android.fluxc.store.NotificationStore.DeviceUnregistrationError
+import org.wordpress.android.fluxc.store.NotificationStore.DeviceUnregistrationErrorType
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationHashesResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.FetchNotificationsResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.MarkNotificationSeenResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.MarkNotificationsReadResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.NotificationAppKey
+import org.wordpress.android.fluxc.store.NotificationStore.NotificationError
+import org.wordpress.android.fluxc.store.NotificationStore.NotificationErrorType
+import org.wordpress.android.fluxc.store.NotificationStore.RegisterDeviceResponsePayload
+import org.wordpress.android.fluxc.store.NotificationStore.UnregisterDeviceResponsePayload
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.DeviceUtils
+import org.wordpress.android.util.PackageUtils
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class NotificationRestClient @Inject constructor(
+    private val appContext: Context?,
+    private val dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    companion object {
+        const val NOTIFICATION_DEFAULT_FIELDS = "id,type,read,body,subject,timestamp,meta,note_hash"
+        const val NOTIFICATION_SYNC_FIELDS = "id,note_hash"
+        const val NOTIFICATION_DEFAULT_NUMBER = 200
+        const val NOTIFICATION_DEFAULT_NUM_NOTE_ITEMS = 20
+    }
+
+    suspend fun registerDevice(
+        fcmToken: String,
+        appKey: NotificationAppKey,
+        uuid: String
+    ): RegisterDeviceResponsePayload {
+        val deviceName = DeviceUtils.getInstance().getDeviceName(appContext)
+
+        val request = wpComGsonRequestBuilder.syncPostRequest(
+            this,
+            WPCOMREST.devices.new_.urlV1,
+            mapOf(
+                "device_token" to fcmToken,
+                "device_family" to "android",
+                "app_secret_key" to appKey.value,
+                "device_name" to deviceName,
+                "device_model" to "${Build.MANUFACTURER} ${Build.MODEL}",
+                "app_version" to PackageUtils.getVersionName(appContext),
+                "version_code" to PackageUtils.getVersionCode(appContext).toString(),
+                "os_version" to Build.VERSION.RELEASE,
+                "device_uuid" to uuid
+            ),
+            body = null,
+            RegisterDeviceRestResponse::class.java
+        )
+        return when (request) {
+            is Success -> {
+                val id = request.data.id
+                if (id.isNullOrEmpty()) {
+                    RegisterDeviceResponsePayload(
+                        DeviceRegistrationError(DeviceRegistrationErrorType.MISSING_DEVICE_ID)
+                    )
+                } else {
+                    RegisterDeviceResponsePayload(id)
+                }
+            }
+
+            is Error -> {
+                RegisterDeviceResponsePayload(networkErrorToRegistrationError(request.error))
+            }
+        }
+    }
+
+    // region Device Registration
+    @Deprecated(
+        message = "EventBus is deprecated.",
+        ReplaceWith("registerDevice(fcmToken, appKey, uuid)")
+    )
+    fun registerDeviceForPushNotifications(
+        gcmToken: String,
+        appKey: NotificationAppKey,
+        uuid: String,
+        site: SiteModel? = null
+    ) {
+        val deviceName = DeviceUtils.getInstance().getDeviceName(appContext)
+        val params = listOfNotNull(
+            "device_token" to gcmToken,
+            "device_family" to "android",
+            "app_secret_key" to appKey.value,
+            "device_name" to deviceName,
+            "device_model" to "${Build.MANUFACTURER} ${Build.MODEL}",
+            "app_version" to PackageUtils.getVersionName(appContext),
+            "version_code" to PackageUtils.getVersionCode(appContext).toString(),
+            "os_version" to Build.VERSION.RELEASE,
+            "device_uuid" to uuid,
+            ("selected_blog_id" to site?.siteId.toString()).takeIf { site != null }
+        ).toMap()
+
+        val url = WPCOMREST.devices.new_.urlV1
+        val request = WPComGsonRequest.buildPostRequest(
+            url, params, RegisterDeviceRestResponse::class.java,
+            { response: RegisterDeviceRestResponse? ->
+                response?.let {
+                    if (!it.id.isNullOrEmpty()) {
+                        val payload = RegisterDeviceResponsePayload(it.id)
+                        dispatcher.dispatch(
+                            NotificationActionBuilder.newRegisteredDeviceAction(
+                                payload
+                            )
+                        )
+                    } else {
+                        val registrationError =
+                            DeviceRegistrationError(DeviceRegistrationErrorType.MISSING_DEVICE_ID)
+                        val payload = RegisterDeviceResponsePayload(registrationError)
+                        dispatcher.dispatch(
+                            NotificationActionBuilder.newRegisteredDeviceAction(
+                                payload
+                            )
+                        )
+                    }
+                } ?: run {
+                    AppLog.e(T.API, "Response for url $url with param $params is null: $response")
+                    val registrationError =
+                        DeviceRegistrationError(DeviceRegistrationErrorType.INVALID_RESPONSE)
+                    val payload = RegisterDeviceResponsePayload(registrationError)
+                    dispatcher.dispatch(NotificationActionBuilder.newRegisteredDeviceAction(payload))
+                }
+            },
+            { wpComError ->
+                val registrationError = networkErrorToRegistrationError(wpComError)
+                val payload = RegisterDeviceResponsePayload(registrationError)
+                dispatcher.dispatch(NotificationActionBuilder.newRegisteredDeviceAction(payload))
+            })
+        add(request)
+    }
+
+    fun unregisterDeviceForPushNotifications(deviceId: String) {
+        val url = WPCOMREST.devices.deviceId(deviceId).delete.urlV1
+        val request = WPComGsonRequest.buildPostRequest(
+            url, null, Any::class.java,
+            {
+                val payload = UnregisterDeviceResponsePayload()
+                dispatcher.dispatch(NotificationActionBuilder.newUnregisteredDeviceAction(payload))
+            },
+            { wpComError ->
+                val payload = UnregisterDeviceResponsePayload(
+                    DeviceUnregistrationError(
+                        DeviceUnregistrationErrorType.GENERIC_ERROR, wpComError.message
+                    )
+                )
+                dispatcher.dispatch(NotificationActionBuilder.newUnregisteredDeviceAction(payload))
+            })
+        add(request)
+    }
+    // endregion
+
+    /**
+     * Requests a fresh batch of notifications from the api containing only the fields "id" and "note_hash".
+     *
+     * API endpoint:
+     * https://developer.wordpress.com/docs/api/1/get/notifications/
+     */
+    fun fetchNotificationHashes() {
+        val url = WPCOMREST.notifications.urlV1_1
+        val params = mapOf(
+            "number" to NOTIFICATION_DEFAULT_NUMBER.toString(),
+            "num_note_items" to NOTIFICATION_DEFAULT_NUM_NOTE_ITEMS.toString(),
+            "fields" to NOTIFICATION_SYNC_FIELDS
+        )
+        val request =
+            WPComGsonRequest.buildGetRequest(url, params, NotificationHashesApiResponse::class.java,
+                { response: NotificationHashesApiResponse? ->
+                    // Create a map of remote id to note_hash
+                    val hashesMap: Map<Long, Long> =
+                        response?.notes?.map { it.id to it.note_hash }?.toMap() ?: emptyMap()
+                    val payload = FetchNotificationHashesResponsePayload(hashesMap)
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationHashesAction(
+                            payload
+                        )
+                    )
+                },
+                { networkError ->
+                    val payload = FetchNotificationHashesResponsePayload().apply {
+                        error = NotificationError(
+                            NotificationErrorType.fromString(networkError.apiError),
+                            networkError.message
+                        )
+                    }
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationHashesAction(
+                            payload
+                        )
+                    )
+                })
+        add(request)
+    }
+
+    /**
+     * Fetch the latest list of notifications.
+     *
+     * https://developer.wordpress.com/docs/api/1/get/notifications/
+     *
+     * @param remoteNoteIds Optional. A list of remote notification ids to be fetched from the remote api
+     */
+    fun fetchNotifications(remoteNoteIds: List<Long>? = null) {
+        val url = WPCOMREST.notifications.urlV1_1
+        val params = mutableMapOf(
+            "number" to NOTIFICATION_DEFAULT_NUMBER.toString(),
+            "num_note_items" to NOTIFICATION_DEFAULT_NUM_NOTE_ITEMS.toString(),
+            "fields" to NOTIFICATION_DEFAULT_FIELDS
+        )
+
+        remoteNoteIds?.let { if (it.isNotEmpty()) params["ids"] = it.joinToString() }
+
+        val request =
+            WPComGsonRequest.buildGetRequest(url, params, NotificationsApiResponse::class.java,
+                { response: NotificationsApiResponse? ->
+                    val lastSeenTime = response?.last_seen_time?.let {
+                        Date(it)
+                    }
+                    val notifications = response?.notes?.map {
+                        NotificationApiResponse.notificationResponseToNotificationModel(it)
+                    } ?: listOf()
+                    val payload = FetchNotificationsResponsePayload(notifications, lastSeenTime)
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationsAction(
+                            payload
+                        )
+                    )
+                },
+                { networkError ->
+                    val payload = FetchNotificationsResponsePayload().apply {
+                        error = NotificationError(
+                            NotificationErrorType.fromString(networkError.apiError),
+                            networkError.message
+                        )
+                    }
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationsAction(
+                            payload
+                        )
+                    )
+                })
+        add(request)
+    }
+
+    /**
+     * Fetch a single notification by its remote note_id.
+     *
+     * https://developer.wordpress.com/docs/api/1/get/notifications/%s
+     */
+    fun fetchNotification(remoteNoteId: Long) {
+        val url = WPCOMREST.notifications.note(remoteNoteId).urlV1_1
+        val params = mapOf(
+            "fields" to NOTIFICATION_DEFAULT_FIELDS
+        )
+        val request =
+            WPComGsonRequest.buildGetRequest(url, params, NotificationsApiResponse::class.java,
+                { response ->
+                    val notification = response?.notes?.firstOrNull()?.let {
+                        NotificationApiResponse.notificationResponseToNotificationModel(it)
+                    }
+                    val payload = FetchNotificationResponsePayload(notification)
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationAction(
+                            payload
+                        )
+                    )
+                },
+                { networkError ->
+                    val payload = FetchNotificationResponsePayload().apply {
+                        error = NotificationError(
+                            NotificationErrorType.fromString(networkError.apiError),
+                            networkError.message
+                        )
+                    }
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newFetchedNotificationAction(
+                            payload
+                        )
+                    )
+                })
+        add(request)
+    }
+
+    /**
+     * Send the timestamp of the last notification seen to update the last set of notifications seen
+     * on the server.
+     *
+     * https://developer.wordpress.com/docs/api/1/post/notifications/seen
+     */
+    fun markNotificationsSeen(timestamp: Long) {
+        val url = WPCOMREST.notifications.seen.urlV1_1
+        val params = mapOf("time" to timestamp.toString())
+        val request =
+            WPComGsonRequest.buildPostRequest(url, params, NotificationSeenApiResponse::class.java,
+                { response ->
+                    val payload = MarkNotificationSeenResponsePayload(
+                        response.success,
+                        response.last_seen_time
+                    )
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newMarkedNotificationsSeenAction(
+                            payload
+                        )
+                    )
+                },
+                { networkError ->
+                    val payload = MarkNotificationSeenResponsePayload().apply {
+                        error = NotificationError(
+                            NotificationErrorType.fromString(networkError.apiError),
+                            networkError.message
+                        )
+                    }
+                    dispatcher.dispatch(
+                        NotificationActionBuilder.newMarkedNotificationsSeenAction(
+                            payload
+                        )
+                    )
+                })
+        add(request)
+    }
+
+    /**
+     * Mark a notification as read
+     * Decrement the unread count for a notification. Key=note_ID, Value=decrement amount.
+     *
+     * https://developer.wordpress.com/docs/api/1/post/notifications/read/
+     */
+    suspend fun markNotificationRead(notifications: List<NotificationModel>): MarkNotificationsReadResponsePayload {
+        val url = WPCOMREST.notifications.read.urlV1_1
+        // "9999" Ensures the "read" count of the notification is decremented enough so the notification
+        // is marked read across all devices (just like WPAndroid)
+        val params = mutableMapOf<String, String>()
+        notifications.iterator().forEach { params["counts[${it.remoteNoteId}]"] = "9999" }
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            this,
+            url,
+            params,
+            null,
+            NotificationReadApiResponse::class.java
+        )
+        return when (response) {
+            is Success -> {
+                MarkNotificationsReadResponsePayload(notifications, response.data.success)
+            }
+
+            is Error -> {
+                MarkNotificationsReadResponsePayload().apply {
+                    error = NotificationError(
+                        NotificationErrorType.fromString(response.error.apiError),
+                        response.error.message
+                    )
+                }
+            }
+        }
+    }
+
+    private fun networkErrorToRegistrationError(wpComError: WPComGsonNetworkError): DeviceRegistrationError {
+        val orderErrorType = DeviceRegistrationErrorType.fromString(wpComError.apiError)
+        return DeviceRegistrationError(orderErrorType, wpComError.message)
+    }
+
+    suspend fun disableNotificationsFor(notificationSetting: List<SiteNotificationSettingDto>): Response<Unit> {
+        val url = WPCOMREST.me.notifications.settings.urlV1_1
+        val body = mutableMapOf<String, Any>()
+        body["blogs"] = notificationSetting
+        return wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = null,
+            body = body,
+            Unit::class.java
+        )
+    }
+
+    data class SiteNotificationSettingDto(
+        @SerializedName("blog_id") val siteId: Long,
+        @SerializedName("devices") val devices: List<DevicesDto>,
+    )
+
+    data class DevicesDto(
+        @SerializedName("device_id") val deviceId: String,
+        @SerializedName("new_comment") val newComment: Boolean,
+        @SerializedName("store_order") val storeOrder: Boolean,
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationSeenApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationSeenApiResponse.kt
new file mode 100644
index 00000000000..da9c73fa726
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationSeenApiResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("VariableNaming")
+class NotificationSeenApiResponse : Response {
+    val last_seen_time: Long? = null
+    val success: Boolean = false
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationsApiResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationsApiResponse.kt
new file mode 100644
index 00000000000..efa9cc20bd6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/NotificationsApiResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import org.wordpress.android.fluxc.network.Response
+
+@Suppress("VariableNaming")
+class NotificationsApiResponse : Response {
+    val last_seen_time: Long? = null
+    val number: Int? = null
+    val notes: List<NotificationApiResponse>? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/RegisterDeviceRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/RegisterDeviceRestResponse.kt
new file mode 100644
index 00000000000..923e3e8ca62
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/notifications/RegisterDeviceRestResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.notifications
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+class RegisterDeviceRestResponse : Response {
+    @SerializedName("ID")
+    val id: String? = null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClient.kt
new file mode 100644
index 00000000000..34664f3b325
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/planoffers/PlanOffersRestClient.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.planoffers
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.Feature
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient.PlanOffersResponse.Plan
+import org.wordpress.android.fluxc.store.PlanOffersStore.PlanOffersFetchedPayload
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PlanOffersRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPlanOffers(): PlanOffersFetchedPayload {
+        val url = WPCOMV2.plans.mobile.url
+
+        val params = mapOf<String, String>()
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                PlanOffersResponse::class.java,
+                enableCaching = false,
+                forced = true
+        )
+        return when (response) {
+            is Success -> {
+                val plans = response.data.plans
+                val features = response.data.features
+                buildPlanOffersPayload(plans, features)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val payload = PlanOffersFetchedPayload()
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    private fun buildPlanOffersPayload(
+        planResponses: List<Plan>?,
+        featureResponses: List<Feature>?
+    ): PlanOffersFetchedPayload {
+        return PlanOffersFetchedPayload(planResponses?.map { plan ->
+            val featureDetails = featureResponses?.filter { feature -> plan.features!!.contains(feature.id) }!!
+                    .map { filteredFeature ->
+                        PlanOffersModel.Feature(filteredFeature.id, filteredFeature.name, filteredFeature.description)
+                    }
+
+            PlanOffersModel(
+                    plan.products?.map { product -> product.plan_id },
+                    featureDetails,
+                    plan.name,
+                    plan.short_name,
+                    plan.tagline,
+                    plan.description,
+                    plan.icon
+            )
+        })
+    }
+
+    @Suppress("ConstructorParameterNaming")
+    data class PlanOffersResponse(
+        val groups: List<Group>?,
+        val plans: List<Plan>?,
+        val features: List<Feature>?
+    ) : Response {
+        data class Group(
+            val slug: String?,
+            val name: String
+        )
+
+        data class PlanId(
+            val plan_id: Int
+        )
+
+        data class Feature(
+            val id: String?,
+            val name: String?,
+            val description: String?
+        )
+
+        data class Plan(
+            val groups: List<String>?,
+            val products: List<PlanId>?,
+            val features: List<String>?,
+            val name: String?,
+            val short_name: String?,
+            val tagline: String?,
+            val description: String?,
+            val icon: String?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plans/PlansRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plans/PlansRestClient.kt
new file mode 100644
index 00000000000..91d9fa64647
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plans/PlansRestClient.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.plans
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.plans.full.Plan
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PlansRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPlans(): Response<Array<Plan>> {
+        val url = WPCOMREST.plans.urlV1_5
+        return wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            mapOf(),
+            Array<Plan>::class.java
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginJetpackTunnelRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginJetpackTunnelRestClient.kt
new file mode 100644
index 00000000000..76d5ec039c3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginJetpackTunnelRestClient.kt
@@ -0,0 +1,179 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.plugin
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.PluginActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WPAPI
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.plugin.PluginResponseModel
+import org.wordpress.android.fluxc.network.rest.wpapi.plugin.toDomainModel
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackTunnelGsonRequest
+import org.wordpress.android.fluxc.store.PluginStore
+import org.wordpress.android.fluxc.store.PluginStore.ConfigureSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.ConfiguredSitePluginPayload
+import org.wordpress.android.fluxc.store.PluginStore.FetchSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.FetchedSitePluginPayload
+import org.wordpress.android.fluxc.store.PluginStore.InstallSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.InstalledSitePluginPayload
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PluginJetpackTunnelRestClient @Inject constructor(
+    private val dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    /**
+     * Fetch a plugin's information from a site.
+     *
+     * @param [pluginName] This should use the value of the `plugin` key inside a plugin object as returned
+     * by the `GET wp/v2/plugins` endpoint. For example, for Jetpack, the correct value is `jetpack/jetpack`.
+     */
+    fun fetchPlugin(site: SiteModel, pluginName: String) {
+        val url = WPAPI.plugins.name(pluginName).urlV2
+
+        val request = JetpackTunnelGsonRequest.buildGetRequest(
+                url,
+                site.siteId,
+                emptyMap(),
+                PluginResponseModel::class.java,
+                { response: PluginResponseModel? ->
+                    response?.let {
+                        val payload = FetchedSitePluginPayload(
+                            it.toDomainModel(site.id)
+                        )
+                        dispatcher.dispatch(PluginActionBuilder.newFetchedSitePluginAction(payload))
+                    }
+                },
+                {
+                    val fetchError = FetchSitePluginError(
+                        it.type,
+                        it.message
+                    )
+                    val payload = FetchedSitePluginPayload(
+                        pluginName,
+                        fetchError
+                    )
+                    dispatcher.dispatch(PluginActionBuilder.newFetchedSitePluginAction(payload))
+                },
+                { request: WPComGsonRequest<*> -> add(request) }
+        )
+        add(request)
+    }
+
+    /**
+     * Install a plugin to a site.
+     *
+     * @param [pluginSlug] This should use the value of the plugin's URL slug on the plugin directory, in the form of
+     * https://wordpress.org/plugins/<slug>. For example, for Jetpack, the value is 'jetpack'.
+     */
+    fun installPlugin(site: SiteModel, pluginSlug: String) {
+        runInstallPlugin(
+            site,
+            pluginSlug,
+            mapOf("slug" to pluginSlug),
+            false
+        )
+    }
+
+    fun installJetpackOnIndividualPluginSite(site: SiteModel) {
+        runInstallPlugin(
+            site,
+            "jetpack",
+            mapOf("slug" to "jetpack", "status" to "active"),
+            true
+        )
+    }
+
+    private fun runInstallPlugin(
+        site: SiteModel,
+        pluginSlug: String,
+        body: Map<String, String>,
+        isJetpackIndividualPluginScenario: Boolean
+    ) {
+        val url = WPAPI.plugins.urlV2
+
+        val request = JetpackTunnelGsonRequest.buildPostRequest(
+                url,
+                site.siteId,
+                body,
+                PluginResponseModel::class.java,
+                { response: PluginResponseModel? ->
+                    response?.let {
+                        val payload = InstalledSitePluginPayload(
+                                site,
+                                it.toDomainModel(site.id)
+                        )
+                        dispatcher.dispatch(if (isJetpackIndividualPluginScenario) {
+                            PluginActionBuilder.newInstalledJpForIndividualPluginSiteAction(payload)
+                        } else {
+                            PluginActionBuilder.newInstalledSitePluginAction(payload)
+                        })
+                    }
+                },
+                { error ->
+                    val installError = InstallSitePluginError(error)
+                    if (
+                        isJetpackIndividualPluginScenario &&
+                        installError.type == PluginStore.InstallSitePluginErrorType.PLUGIN_ALREADY_INSTALLED
+                    ) {
+                        configurePlugin(site, "jetpack/jetpack", true)
+                    } else {
+                        val payload = InstalledSitePluginPayload(site, pluginSlug, installError)
+                        dispatcher.dispatch(if (isJetpackIndividualPluginScenario) {
+                            PluginActionBuilder.newInstalledJpForIndividualPluginSiteAction(payload)
+                        } else {
+                            PluginActionBuilder.newInstalledSitePluginAction(payload)
+                        })
+                    }
+                }
+        )
+        add(request)
+    }
+
+    /**
+     * Configure a plugin's status in a site. This supports making it 'active', or 'inactive'. The API also supports
+     * the 'network-active' status, but it is not supported yet here.
+     *
+     * @param [pluginName] This should use the value of the `plugin` key inside a plugin object as returned
+     * by the `GET wp/v2/plugins` endpoint. For example, for Jetpack, the correct value is `jetpack/jetpack`.
+     */
+    fun configurePlugin(site: SiteModel, pluginName: String, active: Boolean) {
+        val url = WPAPI.plugins.name(pluginName).urlV2
+        val body = mapOf(
+                "status" to if (active) "active" else "inactive"
+        )
+
+        val request = JetpackTunnelGsonRequest.buildPostRequest(
+                url,
+                site.siteId,
+                body,
+                PluginResponseModel::class.java,
+                { response: PluginResponseModel? ->
+                    response?.let {
+                        val payload = ConfiguredSitePluginPayload(
+                                site,
+                                it.toDomainModel(site.id)
+                        )
+                        dispatcher.dispatch(PluginActionBuilder.newConfiguredSitePluginAction(payload))
+                    }
+                },
+                { error ->
+                    val configurePluginError = ConfigureSitePluginError(error, active)
+
+                    val payload = ConfiguredSitePluginPayload(site, pluginName, configurePluginError)
+                    dispatcher.dispatch(PluginActionBuilder.newConfiguredSitePluginAction(payload))
+                }
+        )
+        add(request)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginRestClient.java
new file mode 100644
index 00000000000..2addd1d8822
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginRestClient.java
@@ -0,0 +1,228 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.plugin;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.PluginActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType;
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.plugin.PluginWPComRestResponse.FetchPluginsResponse;
+import org.wordpress.android.fluxc.store.PluginStore.ConfigureSitePluginError;
+import org.wordpress.android.fluxc.store.PluginStore.ConfiguredSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.DeleteSitePluginError;
+import org.wordpress.android.fluxc.store.PluginStore.DeletedSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.InstallSitePluginError;
+import org.wordpress.android.fluxc.store.PluginStore.InstalledSitePluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.PluginDirectoryError;
+import org.wordpress.android.fluxc.store.PluginStore.UpdateSitePluginError;
+import org.wordpress.android.fluxc.store.PluginStore.UpdatedSitePluginPayload;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class PluginRestClient extends BaseWPComRestClient {
+    @Inject public PluginRestClient(Context appContext, Dispatcher dispatcher,
+                            @Named("regular") RequestQueue requestQueue,
+                            AccessToken accessToken, UserAgent userAgent) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+    }
+
+    public void fetchSitePlugins(@NonNull final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).plugins.getUrlV1_2();
+        final WPComGsonRequest<FetchPluginsResponse> request = WPComGsonRequest.buildGetRequest(url, null,
+                FetchPluginsResponse.class,
+                new Listener<FetchPluginsResponse>() {
+                    @Override
+                    public void onResponse(FetchPluginsResponse response) {
+                        List<SitePluginModel> plugins = new ArrayList<>();
+                        if (response.plugins != null) {
+                            for (PluginWPComRestResponse pluginResponse : response.plugins) {
+                                plugins.add(pluginModelFromResponse(site, pluginResponse));
+                            }
+                        }
+                        FetchedPluginDirectoryPayload payload =
+                                new FetchedPluginDirectoryPayload(site, plugins);
+                        mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError networkError) {
+                        PluginDirectoryError directoryError = new PluginDirectoryError(
+                                networkError.apiError, networkError.message);
+                        FetchedPluginDirectoryPayload payload =
+                                new FetchedPluginDirectoryPayload(PluginDirectoryType.SITE, false, directoryError);
+                        mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void configureSitePlugin(@NonNull final SiteModel site, @NonNull final String pluginName,
+                                    @NonNull final String slug, boolean isActive, boolean isAutoUpdatesEnabled) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).plugins.name(getEncodedPluginName(pluginName)).getUrlV1_2();
+        Map<String, Object> params = new HashMap<>();
+        params.put("active", isActive);
+        params.put("autoupdate", isAutoUpdatesEnabled);
+        final WPComGsonRequest<PluginWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, params,
+                PluginWPComRestResponse.class,
+                new Listener<PluginWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PluginWPComRestResponse response) {
+                        SitePluginModel pluginFromResponse = pluginModelFromResponse(site, response);
+                        mDispatcher.dispatch(PluginActionBuilder.newConfiguredSitePluginAction(
+                                new ConfiguredSitePluginPayload(site, pluginFromResponse)));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError networkError) {
+                        ConfigureSitePluginError configurePluginError = new ConfigureSitePluginError(
+                                networkError.apiError, networkError.message);
+                        if (networkError.hasVolleyError() && networkError.volleyError.networkResponse != null) {
+                            configurePluginError.errorCode = networkError.volleyError.networkResponse.statusCode;
+                        }
+                        ConfiguredSitePluginPayload payload =
+                                new ConfiguredSitePluginPayload(site, pluginName, slug, configurePluginError);
+                        mDispatcher.dispatch(PluginActionBuilder.newConfiguredSitePluginAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void deleteSitePlugin(@NonNull final SiteModel site, @NonNull final String pluginName,
+                                 @NonNull final String slug) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).
+                plugins.name(getEncodedPluginName(pluginName)).delete.getUrlV1_2();
+        final WPComGsonRequest<PluginWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                PluginWPComRestResponse.class,
+                new Listener<PluginWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PluginWPComRestResponse response) {
+                        mDispatcher.dispatch(PluginActionBuilder.newDeletedSitePluginAction(
+                                new DeletedSitePluginPayload(site, slug, pluginName)));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError networkError) {
+                        DeletedSitePluginPayload payload = new DeletedSitePluginPayload(site, slug, pluginName);
+                        payload.error = new DeleteSitePluginError(networkError.apiError, networkError.message);
+                        mDispatcher.dispatch(PluginActionBuilder.newDeletedSitePluginAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void installSitePlugin(@NonNull final SiteModel site, final String pluginSlug) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).plugins.slug(pluginSlug).install.getUrlV1_2();
+        final WPComGsonRequest<PluginWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                PluginWPComRestResponse.class,
+                new Listener<PluginWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PluginWPComRestResponse response) {
+                        SitePluginModel pluginFromResponse = pluginModelFromResponse(site, response);
+                        mDispatcher.dispatch(PluginActionBuilder.newInstalledSitePluginAction(
+                                new InstalledSitePluginPayload(site, pluginFromResponse)));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError networkError) {
+                        InstallSitePluginError installPluginError = new InstallSitePluginError(
+                                networkError.apiError, networkError.message);
+                        if (networkError.hasVolleyError() && networkError.volleyError.networkResponse != null) {
+                            installPluginError.errorCode = networkError.volleyError.networkResponse.statusCode;
+                        }
+                        InstalledSitePluginPayload payload = new InstalledSitePluginPayload(site, pluginSlug,
+                                installPluginError);
+                        mDispatcher.dispatch(PluginActionBuilder.newInstalledSitePluginAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void updateSitePlugin(@NonNull final SiteModel site, @NonNull final String pluginName,
+                                 @NonNull final String slug) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).
+                plugins.name(getEncodedPluginName(pluginName)).update.getUrlV1_2();
+        final WPComGsonRequest<PluginWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                PluginWPComRestResponse.class,
+                new Listener<PluginWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PluginWPComRestResponse response) {
+                        SitePluginModel pluginFromResponse = pluginModelFromResponse(site, response);
+                        mDispatcher.dispatch(PluginActionBuilder.newUpdatedSitePluginAction(
+                                new UpdatedSitePluginPayload(site, pluginFromResponse)));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError networkError) {
+                        UpdateSitePluginError updatePluginError
+                                = new UpdateSitePluginError(networkError.apiError, networkError.message);
+                        UpdatedSitePluginPayload payload = new UpdatedSitePluginPayload(site, pluginName, slug,
+                                updatePluginError);
+                        mDispatcher.dispatch(PluginActionBuilder.newUpdatedSitePluginAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    private SitePluginModel pluginModelFromResponse(SiteModel siteModel, PluginWPComRestResponse response) {
+        SitePluginModel sitePluginModel = new SitePluginModel();
+        sitePluginModel.setLocalSiteId(siteModel.getId());
+        sitePluginModel.setName(response.name);
+        sitePluginModel.setDisplayName(StringEscapeUtils.unescapeHtml4(response.display_name));
+        sitePluginModel.setAuthorName(StringEscapeUtils.unescapeHtml4(response.author));
+        sitePluginModel.setAuthorUrl(response.author_url);
+        sitePluginModel.setDescription(StringEscapeUtils.unescapeHtml4(response.description));
+        sitePluginModel.setIsActive(response.active);
+        sitePluginModel.setIsAutoUpdateEnabled(response.autoupdate);
+        sitePluginModel.setPluginUrl(response.plugin_url);
+        sitePluginModel.setSlug(response.slug);
+        sitePluginModel.setVersion(response.version);
+        if (response.action_links != null) {
+            sitePluginModel.setSettingsUrl(response.action_links.settings);
+        }
+        return sitePluginModel;
+    }
+
+    private String getEncodedPluginName(String pluginName) {
+        try {
+            // We need to encode plugin name otherwise names like "akismet/akismet" would fail
+            return URLEncoder.encode(pluginName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return pluginName;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginWPComRestResponse.java
new file mode 100644
index 00000000000..8b550b5f05f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/plugin/PluginWPComRestResponse.java
@@ -0,0 +1,28 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.plugin;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class PluginWPComRestResponse {
+    public class FetchPluginsResponse {
+        public List<PluginWPComRestResponse> plugins;
+    }
+
+    public class ActionLinks {
+        @SerializedName("Settings")
+        public String settings;
+    }
+
+    public boolean active;
+    public String author;
+    public String author_url;
+    public boolean autoupdate;
+    public String description;
+    public String display_name;
+    public String name;
+    public String plugin_url;
+    public String slug;
+    public String version;
+    public ActionLinks action_links;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/GeoLocation.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/GeoLocation.java
new file mode 100644
index 00000000000..6df0780ccde
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/GeoLocation.java
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.post;
+
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalse;
+
+public class GeoLocation extends JsonObjectOrFalse {
+    public double latitude;
+    public double longitude;
+    public String address;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostParent.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostParent.java
new file mode 100644
index 00000000000..351edd766ac
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostParent.java
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.post;
+
+import org.wordpress.android.fluxc.network.rest.JsonObjectOrFalse;
+
+public class PostParent extends JsonObjectOrFalse {
+    public long ID;
+    public String type;
+    public String link;
+    public String title;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRemoteAutoSaveModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRemoteAutoSaveModel.kt
new file mode 100644
index 00000000000..a45ed8890b7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRemoteAutoSaveModel.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.post
+
+import com.google.gson.annotations.SerializedName
+
+data class PostRemoteAutoSaveModel(
+    @SerializedName("ID") val revisionId: Long?,
+    @SerializedName("post_ID") val remotePostId: Long?,
+    @SerializedName("modified") val modified: String?,
+    @SerializedName("preview_URL") val previewUrl: String?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRestClient.java
new file mode 100644
index 00000000000..e0f79c649e7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostRestClient.java
@@ -0,0 +1,879 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.post;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.PostActionBuilder;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.LikeModel.LikeType;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostsModel;
+import org.wordpress.android.fluxc.model.PublicizeSkipConnection;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.list.AuthorFilter;
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForRestSite;
+import org.wordpress.android.fluxc.model.post.PostLocation;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.fluxc.model.revisions.Diff;
+import org.wordpress.android.fluxc.model.revisions.DiffOperations;
+import org.wordpress.android.fluxc.model.revisions.RevisionModel;
+import org.wordpress.android.fluxc.model.revisions.RevisionsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikeWPComRestResponse.LikesWPComRestResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.common.LikesUtilsProvider;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostWPComRestResponse.PostMeta.PostData.PostAutoSave;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostWPComRestResponse.PostMetaData;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostWPComRestResponse.PostsResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.revisions.RevisionsResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.revisions.RevisionsResponse.DiffResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.revisions.RevisionsResponse.DiffResponsePart;
+import org.wordpress.android.fluxc.network.rest.wpcom.revisions.RevisionsResponse.RevisionResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.taxonomy.TermWPComRestResponse;
+import org.wordpress.android.fluxc.store.PostStore.DeletedPostPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostListResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostStatusResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchRevisionsResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchedPostLikesResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.PostDeleteActionType;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostListItem;
+import org.wordpress.android.fluxc.store.PostStore.RemoteAutoSavePostPayload;
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class PostRestClient extends BaseWPComRestClient {
+    LikesUtilsProvider mLikesUtilsProvider;
+
+    @Inject public PostRestClient(Context appContext,
+                                  Dispatcher dispatcher,
+                                  @Named("regular") RequestQueue requestQueue,
+                                  AccessToken accessToken,
+                                  UserAgent userAgent,
+                                  LikesUtilsProvider likesUtilsProvider) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+        mLikesUtilsProvider = likesUtilsProvider;
+    }
+
+    public void fetchPost(final PostModel post, final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).getUrlV1_1();
+
+        Map<String, String> params = new HashMap<>();
+
+        params.put("context", "edit");
+        params.put("meta", "autosave");
+
+        final WPComGsonRequest<PostWPComRestResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                PostWPComRestResponse.class,
+                new Listener<PostWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PostWPComRestResponse response) {
+                        PostModel fetchedPost = postResponseToPostModel(response);
+                        fetchedPost.setId(post.getId());
+                        fetchedPost.setLocalSiteId(site.getId());
+
+                        FetchPostResponsePayload payload = new FetchPostResponsePayload(fetchedPost, site);
+                        payload.post = fetchedPost;
+
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post (invalid post ID)
+                        FetchPostResponsePayload payload = new FetchPostResponsePayload(post, site);
+                        payload.error = new PostError(error.apiError, error.message);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void fetchPostLikes(
+            final long siteId,
+            final long remotePostId,
+            final boolean requestNextPage,
+            final int pageLength
+    ) {
+        String url = WPCOMREST.sites.site(siteId).posts.post(remotePostId).likes.getUrlV1_2();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("number", String.valueOf(pageLength));
+
+        if (requestNextPage) {
+            Map<String, String> pageOffsetParams = mLikesUtilsProvider.getPageOffsetParams(
+                    LikeType.POST_LIKE,
+                    siteId,
+                    remotePostId
+            );
+            if (pageOffsetParams != null) {
+                params.putAll(pageOffsetParams);
+            }
+        }
+
+        final WPComGsonRequest<LikesWPComRestResponse> request = WPComGsonRequest.buildGetRequest(
+                url, params, LikesWPComRestResponse.class,
+                new Listener<LikesWPComRestResponse>() {
+                    @Override
+                    public void onResponse(LikesWPComRestResponse response) {
+                        List<LikeModel> likes = mLikesUtilsProvider.likesResponseToLikeList(
+                                response,
+                                siteId,
+                                remotePostId,
+                                LikeType.POST_LIKE
+                        );
+
+                        FetchedPostLikesResponsePayload payload = new FetchedPostLikesResponsePayload(
+                                likes,
+                                siteId,
+                                remotePostId,
+                                requestNextPage,
+                                likes.size() >= pageLength
+                        );
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostLikesAction(payload));
+                    }
+                },
+
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        FetchedPostLikesResponsePayload payload = new FetchedPostLikesResponsePayload(
+                                siteId,
+                                remotePostId,
+                                requestNextPage,
+                                true
+                        );
+                        payload.error = new PostError(error.apiError, error.message);
+
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostLikesAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void fetchPostStatus(final PostModel post, final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).getUrlV1_1();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("fields", "status");
+        final WPComGsonRequest<PostWPComRestResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                PostWPComRestResponse.class,
+                new Listener<PostWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PostWPComRestResponse response) {
+                        FetchPostStatusResponsePayload payload = new FetchPostStatusResponsePayload(post, site);
+                        payload.remotePostStatus = response.getStatus();
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostStatusAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        FetchPostStatusResponsePayload payload = new FetchPostStatusResponsePayload(post, site);
+                        payload.error = new PostError(error.apiError, error.message);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostStatusAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void fetchPostList(final PostListDescriptorForRestSite listDescriptor, final long offset) {
+        String url = WPCOMREST.sites.site(listDescriptor.getSite().getSiteId()).posts.getUrlV1_1();
+
+        final int pageSize = listDescriptor.getConfig().getNetworkPageSize();
+        String fields = TextUtils.join(",", Arrays.asList("ID", "modified", "status", "meta"));
+        Map<String, String> params =
+                createFetchPostListParameters(false, offset, pageSize, listDescriptor.getStatusList(),
+                        listDescriptor.getAuthor(), fields, listDescriptor.getOrder().getValue(),
+                        listDescriptor.getOrderBy().getValue(), listDescriptor.getSearchQuery());
+
+        // We want to fetch only the minimal data required in order to save users' data
+        params.put("meta_fields", "autosave.modified");
+
+        final boolean loadedMore = offset > 0;
+
+        final WPComGsonRequest<PostsResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                PostsResponse.class,
+                new Listener<PostsResponse>() {
+                    @Override
+                    public void onResponse(PostsResponse response) {
+                        List<PostListItem> postListItems = new ArrayList<>(response.getPosts().size());
+                        for (PostWPComRestResponse postResponse : response.getPosts()) {
+                            String autoSaveModified = null;
+                            if (postResponse.getPostAutoSave() != null) {
+                                autoSaveModified = postResponse.getPostAutoSave().getModified();
+                            }
+                            postListItems
+                                    .add(new PostListItem(postResponse.getRemotePostId(), postResponse.getModified(),
+                                            postResponse.getStatus(), autoSaveModified));
+                        }
+                        // The API sometimes return wrong number of posts "found", so we also check if we get an empty
+                        // list in which case there would be no more posts to be fetched.
+                        boolean canLoadMore = postListItems.size() > 0
+                                              && response.getFound() > offset + postListItems.size();
+                        FetchPostListResponsePayload responsePayload =
+                                new FetchPostListResponsePayload(listDescriptor, postListItems, loadedMore,
+                                        canLoadMore, null);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostListAction(responsePayload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        PostError postError = new PostError(error.apiError, error.message);
+                        FetchPostListResponsePayload responsePayload =
+                                new FetchPostListResponsePayload(listDescriptor, Collections.<PostListItem>emptyList(),
+                                        loadedMore, false, postError);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostListAction(responsePayload));
+                    }
+                });
+        add(request);
+    }
+
+    public void fetchPosts(final SiteModel site, final boolean getPages, final List<PostStatus> statusList,
+                           final int offset, final int number) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.getUrlV1_1();
+
+        Map<String, String> params =
+                createFetchPostListParameters(getPages, offset, number, statusList, null, null, null, null, null);
+
+        final WPComGsonRequest<PostsResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                PostsResponse.class,
+                new Listener<PostsResponse>() {
+                    @Override
+                    public void onResponse(PostsResponse response) {
+                        List<PostModel> postArray = new ArrayList<>();
+                        PostModel post;
+                        for (PostWPComRestResponse postResponse : response.getPosts()) {
+                            post = postResponseToPostModel(postResponse);
+                            post.setLocalSiteId(site.getId());
+                            postArray.add(post);
+                        }
+
+                        boolean canLoadMore = postArray.size() == number;
+
+                        FetchPostsResponsePayload payload = new FetchPostsResponsePayload(new PostsModel(postArray),
+                                site, getPages, offset > 0, canLoadMore);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post_type (invalid post type, shouldn't happen)
+                        PostError postError = new PostError(error.apiError, error.message);
+                        FetchPostsResponsePayload payload = new FetchPostsResponsePayload(postError, getPages);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostsAction(payload));
+                    }
+                });
+        add(request);
+    }
+
+    public void pushPost(
+            final PostModel post,
+            final SiteModel site,
+            final boolean isFirstTimePublish,
+            final boolean shouldSkipConflictResolutionCheck,
+            final String lastModifiedForConflictResolution
+    ) {
+        String url;
+
+        if (post.isLocalDraft()) {
+            url = WPCOMREST.sites.site(site.getSiteId()).posts.new_.getUrlV1_2();
+        } else {
+            url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).getUrlV1_2();
+        }
+
+        Map<String, Object> body = postModelToParams(
+                post,
+                shouldSkipConflictResolutionCheck,
+                lastModifiedForConflictResolution
+        );
+
+        final WPComGsonRequest<PostWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, body,
+                PostWPComRestResponse.class,
+                new Listener<PostWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PostWPComRestResponse response) {
+                        PostModel uploadedPost = postResponseToPostModel(response);
+
+                        uploadedPost.setIsLocalDraft(false);
+                        uploadedPost.setIsLocallyChanged(false);
+                        uploadedPost.setId(post.getId());
+                        uploadedPost.setLocalSiteId(site.getId());
+
+                        RemotePostPayload payload = new RemotePostPayload(uploadedPost, site);
+                        payload.isFirstTimePublish = isFirstTimePublish;
+                        mDispatcher.dispatch(UploadActionBuilder.newPushedPostAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post (invalid post ID)
+                        // Note: Unlike XML-RPC, if an invalid term (category or tag) ID is specified, the server just
+                        // ignores it and creates/updates the post normally
+                        RemotePostPayload payload = new RemotePostPayload(post, site);
+                        payload.error = new PostError(error.apiError, error.message);
+                        mDispatcher.dispatch(UploadActionBuilder.newPushedPostAction(payload));
+                    }
+                }
+        );
+
+        request.addQueryParameter("context", "edit");
+        if (post.isLocalDraft()) request.addQueryParameter("for", "mobile");
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void remoteAutoSavePost(final @NonNull PostModel post, final @NonNull SiteModel site) {
+        String url =
+                WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).autosave.getUrlV1_1();
+
+        Map<String, Object> body = postModelToAutoSaveParams(post);
+
+        final WPComGsonRequest<PostRemoteAutoSaveModel> request = WPComGsonRequest.buildPostRequest(url, body,
+                PostRemoteAutoSaveModel.class,
+                new Listener<PostRemoteAutoSaveModel>() {
+                    @Override
+                    public void onResponse(PostRemoteAutoSaveModel response) {
+                        RemoteAutoSavePostPayload payload =
+                                new RemoteAutoSavePostPayload(post.getId(), post.getRemotePostId(), response, site);
+                        mDispatcher.dispatch(UploadActionBuilder.newRemoteAutoSavedPostAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post (invalid post ID)
+                        PostError postError = new PostError(error.apiError, error.message);
+                        RemoteAutoSavePostPayload payload =
+                                new RemoteAutoSavePostPayload(post.getId(), post.getRemotePostId(), postError);
+                        mDispatcher.dispatch(UploadActionBuilder.newRemoteAutoSavedPostAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    public void deletePost(final @NonNull PostModel post, final @NonNull SiteModel site,
+                           final @NonNull PostDeleteActionType postDeleteActionType) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).delete.getUrlV1_1();
+
+        final WPComGsonRequest<PostWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                PostWPComRestResponse.class,
+                new Listener<PostWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PostWPComRestResponse response) {
+                        PostModel deletedPost = postResponseToPostModel(response);
+                        deletedPost.setId(post.getId());
+                        deletedPost.setLocalSiteId(post.getLocalSiteId());
+
+                        DeletedPostPayload payload =
+                                new DeletedPostPayload(post, site, postDeleteActionType, deletedPost);
+                        mDispatcher.dispatch(PostActionBuilder.newDeletedPostAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post (invalid post ID)
+                        PostError deletePostError = new PostError(error.apiError, error.message);
+                        DeletedPostPayload payload =
+                                new DeletedPostPayload(post, site, postDeleteActionType, deletePostError);
+                        mDispatcher.dispatch(PostActionBuilder.newDeletedPostAction(payload));
+                    }
+                }
+        );
+
+        request.addQueryParameter("context", "edit");
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void restorePost(final PostModel post, final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).posts.post(post.getRemotePostId()).restore.getUrlV1_1();
+
+        final WPComGsonRequest<PostWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                PostWPComRestResponse.class,
+                new Listener<PostWPComRestResponse>() {
+                    @Override
+                    public void onResponse(PostWPComRestResponse response) {
+                        PostModel restoredPost = postResponseToPostModel(response);
+                        restoredPost.setId(post.getId());
+                        restoredPost.setLocalSiteId(post.getLocalSiteId());
+
+                        RemotePostPayload payload = new RemotePostPayload(restoredPost, site);
+                        mDispatcher.dispatch(PostActionBuilder.newRestoredPostAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        // Possible non-generic errors: 404 unknown_post (invalid post ID)
+                        RemotePostPayload payload = new RemotePostPayload(post, site);
+                        payload.error = new PostError(error.apiError, error.message);
+                        mDispatcher.dispatch(PostActionBuilder.newRestoredPostAction(payload));
+                    }
+                }
+        );
+
+        request.addQueryParameter("context", "edit");
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void fetchRevisions(final PostModel post, final SiteModel site) {
+        String url;
+        if (post.isPage()) {
+            url = WPCOMREST.sites.site(site.getSiteId()).page.post(post.getRemotePostId()).diffs.getUrlV1_1();
+        } else {
+            url = WPCOMREST.sites.site(site.getSiteId()).post.item(post.getRemotePostId()).diffs.getUrlV1_1();
+        }
+
+        final WPComGsonRequest<RevisionsResponse> request = WPComGsonRequest.buildGetRequest(url, null,
+                RevisionsResponse.class,
+                new Listener<RevisionsResponse>() {
+                    @Override
+                    public void onResponse(RevisionsResponse response) {
+                        FetchRevisionsResponsePayload payload;
+                        if (response == null) {
+                            payload = new FetchRevisionsResponsePayload(post, null);
+                            payload.error = new BaseNetworkError(GenericErrorType.INVALID_RESPONSE);
+                        } else {
+                            payload = new FetchRevisionsResponsePayload(
+                                post,
+                                revisionsResponseToRevisionsModel(response)
+                            );
+                        }
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedRevisionsAction(payload));
+                    }
+                },
+                new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        FetchRevisionsResponsePayload payload = new FetchRevisionsResponsePayload(post, null);
+                        payload.error = error;
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedRevisionsAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+
+    private PostModel postResponseToPostModel(PostWPComRestResponse from) {
+        PostModel post = new PostModel();
+        post.setRemotePostId(from.getRemotePostId());
+        post.setRemoteSiteId(from.getRemoteSiteId());
+        post.setLink(from.getUrl()); // Is this right?
+        post.setDateCreated(from.getDate());
+        post.setLastModified(from.getModified());
+        post.setRemoteLastModified(from.getModified());
+        post.setTitle(from.getTitle());
+        post.setContent(from.getContent());
+        post.setExcerpt(from.getExcerpt());
+        post.setSlug(from.getSlug());
+        post.setStatus(from.getStatus());
+        post.setPassword(from.getPassword());
+        post.setIsPage(from.getType().equals("page"));
+        post.setSticky(from.getSticky());
+
+        if (from.getAuthor() != null) {
+            post.setAuthorId(from.getAuthor().getId());
+            post.setAuthorDisplayName(StringEscapeUtils.unescapeHtml4(from.getAuthor().getName()));
+        }
+
+        if (from.getPostThumbnail() != null) {
+            post.setFeaturedImageId(from.getPostThumbnail().getId());
+        }
+
+        post.setPostFormat(from.getFormat());
+
+        if (from.getGeo() != null) {
+            post.setLatitude(from.getGeo().latitude);
+            post.setLongitude(from.getGeo().longitude);
+        }
+
+        List<PostMetaData> metaDataList = from.getMetadata();
+        if (metaDataList != null) {
+            final ArrayList<PostMetaData> publicizeSkipConnections = new ArrayList<>();
+            for (PostMetaData metaData : metaDataList) {
+                String key = metaData.getKey();
+                if (key != null && metaData.getValue() != null) {
+                    if (from.getGeo() == null) { // check geo values if post does not have them
+                        try {
+                            if (key.equals("geo_longitude")) {
+                                Object metaDataValue = metaData.getValue();
+                                if (metaDataValue instanceof String) {
+                                    post.setLongitude(Double.parseDouble(metaDataValue.toString()));
+                                }
+                            }
+                            if (key.equals("geo_latitude")) {
+                                Object metaDataValue = metaData.getValue();
+                                if (metaDataValue instanceof String) {
+                                    post.setLatitude(Double.parseDouble(metaDataValue.toString()));
+                                }
+                            }
+                        } catch (NumberFormatException nfe) {
+                            AppLog.w(T.POSTS, "Geo location found in wrong format in the post metadata.");
+                        }
+                    }
+
+                    if (key.equals("_jetpack_blogging_prompt_key")) {
+                        Object metaDataValue = metaData.getValue();
+                        if (metaDataValue instanceof String) {
+                            post.setAnsweredPromptId(Integer.parseInt(metaDataValue.toString()));
+                        }
+                    }
+
+                    if (key.equals("_wpas_mess")) {
+                        final Object metaDataValue = metaData.getValue();
+                        if (metaDataValue instanceof String) {
+                            post.setAutoShareMessage(metaDataValue.toString());
+                        }
+                        final long metaDataId = metaData.getId();
+                        if (metaDataId > 0) {
+                            post.setAutoShareId(metaDataId);
+                        }
+                    }
+
+                    // e.g. "_wpas_skip_publicize_12345"
+                    if (key.startsWith(PublicizeSkipConnection.METADATA_SKIP_PUBLICIZE_PREFIX)) {
+                        publicizeSkipConnections.add(metaData);
+                    }
+                }
+            }
+            post.setPublicizeSkipConnectionsJson(new Gson().toJson(publicizeSkipConnections));
+        }
+
+        if (from.getCategories() != null) {
+            List<Long> categoryIds = new ArrayList<>();
+            for (TermWPComRestResponse value : from.getCategories().values()) {
+                categoryIds.add(value.ID);
+            }
+            post.setCategoryIdList(categoryIds);
+        }
+
+        if (from.getTags() != null) {
+            List<String> tagNames = new ArrayList<>();
+            for (TermWPComRestResponse value : from.getTags().values()) {
+                tagNames.add(value.name);
+            }
+            post.setTagNameList(tagNames);
+        }
+
+        if (from.getPostAutoSave() != null) {
+            PostAutoSave autoSave = from.getPostAutoSave();
+            post.setAutoSaveRevisionId(autoSave.getRevisionId());
+            post.setAutoSaveModified(autoSave.getModified());
+            post.setRemoteAutoSaveModified(autoSave.getModified());
+            post.setAutoSavePreviewUrl(autoSave.getPreviewUrl());
+            post.setAutoSaveTitle(autoSave.getTitle());
+            post.setAutoSaveContent(autoSave.getContent());
+            post.setAutoSaveExcerpt(autoSave.getExcerpt());
+        }
+
+        if (from.getCapabilities() != null) {
+            post.setHasCapabilityPublishPost(from.getCapabilities().getPublishPost());
+            post.setHasCapabilityEditPost(from.getCapabilities().getEditPost());
+            post.setHasCapabilityDeletePost(from.getCapabilities().getDeletePost());
+        }
+
+        if (from.getParent() != null) {
+            post.setParentId(from.getParent().ID);
+            post.setParentTitle(from.getParent().title);
+        }
+
+        return post;
+    }
+
+    private Map<String, Object> postModelToParams(
+            PostModel post,
+            boolean shouldSkipConflictResolutionCheck,
+            @Nullable String lastModifiedForConflictResolution
+    ) {
+        Map<String, Object> params = new HashMap<>();
+
+        params.put("status", StringUtils.notNullStr(post.getStatus()));
+        params.put("title", StringUtils.notNullStr(post.getTitle()));
+        params.put("content", StringUtils.notNullStr(post.getContent()));
+        params.put("excerpt", StringUtils.notNullStr(post.getExcerpt()));
+        params.put("slug", StringUtils.notNullStr(post.getSlug()));
+
+        // Should only send "if_not_modified_since" when we want to run the conflict resolution check on the BE
+        // For instance, we have showed the conflict resolution dialog and the user wants to push their local changes;
+        // setting this field to true, would not add the modified date and won't trigger a check for latest version
+        // on the remote host.
+        if (!shouldSkipConflictResolutionCheck) {
+            String lastModified = (lastModifiedForConflictResolution != null)
+                    ? lastModifiedForConflictResolution
+                    : post.getLastModified();
+            params.put("if_not_modified_since", lastModified);
+        }
+
+        if (post.getAuthorId() > 0) {
+            params.put("author", String.valueOf(post.getAuthorId()));
+        }
+
+        if (!TextUtils.isEmpty(post.getDateCreated())) {
+            params.put("date", post.getDateCreated());
+        }
+
+        // We are not adding `lastModified` date to the params because that should be updated by the server when there
+        // is a change in the post. This is tested for both Calypso and WPAndroid on 08/21/2018 and verified that it's
+        // working as expected. I am only adding this note here to avoid a possible confusion about it in the future.
+
+        if (!post.isPage()) {
+            if (!TextUtils.isEmpty(post.getPostFormat())) {
+                params.put("format", post.getPostFormat());
+            }
+        } else {
+            params.put("type", "page");
+            params.put("parent", post.getParentId());
+        }
+
+        params.put("password", StringUtils.notNullStr(post.getPassword()));
+        params.put("sticky", post.getSticky());
+
+        // construct a json object with a `category` field holding a json array with the tags
+        JsonObject termsById = new JsonObject();
+        JsonArray categoryIds = new JsonArray();
+        for (Long categoryId : post.getCategoryIdList()) {
+            categoryIds.add(categoryId);
+        }
+        termsById.add("category", categoryIds);
+        // categories are transmitted via the `term_by_id.categories` field
+        params.put("terms_by_id", termsById);
+
+        // construct a json object with a `post_tag` field holding a json array with the tags
+        JsonArray tags = new JsonArray();
+        for (String tag : post.getTagNameList()) {
+            tags.add(tag);
+        }
+        JsonObject terms = new JsonObject();
+        terms.add("post_tag", tags);
+        // categories are transmitted via the `terms.post_tag` field
+        params.put("terms", terms);
+
+        if (post.hasFeaturedImage()) {
+            params.put("featured_image", post.getFeaturedImageId());
+        } else {
+            params.put("featured_image", "");
+        }
+
+        List<Map<String, Object>> metadata = new ArrayList<>();
+        if (post.getAnsweredPromptId() > 0) {
+            Map<String, Object> answeredPromptParams = new HashMap<>();
+            answeredPromptParams.put("key", "_jetpack_blogging_prompt_key");
+            answeredPromptParams.put("value", post.getAnsweredPromptId());
+            answeredPromptParams.put("operation", "update");
+            metadata.add(answeredPromptParams);
+        }
+
+        if (post.hasLocation()) {
+            // Location data was added to the post
+            PostLocation location = post.getLocation();
+
+            Map<String, Object> latitudeParams = new HashMap<>();
+            latitudeParams.put("key", "geo_latitude");
+            latitudeParams.put("value", location.getLatitude());
+            latitudeParams.put("operation", "update");
+
+            Map<String, Object> longitudeParams = new HashMap<>();
+            longitudeParams.put("key", "geo_longitude");
+            longitudeParams.put("value", location.getLongitude());
+            latitudeParams.put("operation", "update");
+
+            metadata.add(latitudeParams);
+            metadata.add(longitudeParams);
+        } else if (post.shouldDeleteLatitude() || post.shouldDeleteLongitude()) {
+            // The post used to have location data, but the user deleted it - clear location data on the server
+            if (post.shouldDeleteLatitude()) {
+                Map<String, Object> latitudeParams = new HashMap<>();
+                latitudeParams.put("key", "geo_latitude");
+                latitudeParams.put("operation", "delete");
+                metadata.add(latitudeParams);
+            }
+
+            if (post.shouldDeleteLongitude()) {
+                Map<String, Object> longitudeParams = new HashMap<>();
+                longitudeParams.put("key", "geo_longitude");
+                longitudeParams.put("operation", "delete");
+                metadata.add(longitudeParams);
+            }
+        }
+
+        if (post.getAutoShareMessage().length() > 0) {
+            Map<String, Object> autoShareMessageParams = new HashMap<>();
+            autoShareMessageParams.put("key", "_wpas_mess");
+            autoShareMessageParams.put("value", post.getAutoShareMessage());
+            if (post.getAutoShareId() > 0) {
+                autoShareMessageParams.put("id", post.getAutoShareId());
+            }
+            metadata.add(autoShareMessageParams);
+        }
+
+        if (post.getPublicizeSkipConnectionsJson().length() > 0) {
+            final List<PublicizeSkipConnection> publicizeSkipConnections = post.getPublicizeSkipConnectionsList();
+            if (publicizeSkipConnections.size() > 0) {
+                for (final PublicizeSkipConnection connection : publicizeSkipConnections) {
+                    if (connection.getKey() != null && !connection.getKey().isEmpty()
+                        && !connection.getId().isEmpty()
+                        && connection.getValue() != null && !connection.getValue().isEmpty()) {
+                        final Map<String, Object> publicizeSkipConnectionsMetadata = new HashMap<>();
+                        publicizeSkipConnectionsMetadata.put("key", connection.getKey());
+                        if (!connection.getId().equals("0")) {
+                            publicizeSkipConnectionsMetadata.put("id", connection.getId());
+                        }
+                        publicizeSkipConnectionsMetadata.put("value", connection.getValue());
+                        publicizeSkipConnectionsMetadata.put("operation", "update");
+                        metadata.add(publicizeSkipConnectionsMetadata);
+                    }
+                }
+            }
+        }
+
+        if (!metadata.isEmpty()) {
+            params.put("metadata", metadata);
+        }
+
+        return params;
+    }
+
+    private Map<String, Object> postModelToAutoSaveParams(PostModel post) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("title", StringUtils.notNullStr(post.getTitle()));
+        params.put("content", StringUtils.notNullStr(post.getContent()));
+        params.put("excerpt", StringUtils.notNullStr(post.getExcerpt()));
+        return params;
+    }
+
+    private RevisionsModel revisionsResponseToRevisionsModel(RevisionsResponse response) {
+        ArrayList<RevisionModel> revisions = new ArrayList<>();
+        for (DiffResponse diffResponse : response.getDiffs()) {
+            RevisionResponse revision = response.getRevisions().get(Integer.toString(diffResponse.getTo()));
+
+            ArrayList<Diff> titleDiffs = new ArrayList<>();
+            for (DiffResponsePart titleDiffPart : diffResponse.getDiff().getPost_title()) {
+                Diff diff = new Diff(DiffOperations.fromString(titleDiffPart.getOp()),
+                        titleDiffPart.getValue());
+                titleDiffs.add(diff);
+            }
+
+            ArrayList<Diff> contentDiffs = new ArrayList<>();
+            for (DiffResponsePart contentDiffPart : diffResponse.getDiff().getPost_content()) {
+                Diff diff = new Diff(DiffOperations.fromString(contentDiffPart.getOp()),
+                        contentDiffPart.getValue());
+                contentDiffs.add(diff);
+            }
+
+            RevisionModel revisionModel =
+                    new RevisionModel(
+                            revision.getId(),
+                            diffResponse.getFrom(),
+                            diffResponse.getDiff().getTotals().getAdd(),
+                            diffResponse.getDiff().getTotals().getDel(),
+                            revision.getPost_content(),
+                            revision.getPost_excerpt(),
+                            revision.getPost_title(),
+                            revision.getPost_date_gmt(),
+                            revision.getPost_modified_gmt(),
+                            revision.getPost_author(),
+                            titleDiffs,
+                            contentDiffs
+                    );
+            revisions.add(revisionModel);
+        }
+
+        return new RevisionsModel(revisions);
+    }
+
+    private Map<String, String> createFetchPostListParameters(final boolean getPages,
+                                                              final long offset,
+                                                              final int number,
+                                                              @Nullable final List<PostStatus> statusList,
+                                                              @Nullable AuthorFilter authorFilter,
+                                                              @Nullable final String fields,
+                                                              @Nullable final String order,
+                                                              @Nullable final String orderBy,
+                                                              @Nullable final String searchQuery) {
+        Map<String, String> params = new HashMap<>();
+
+        params.put("context", "edit");
+        params.put("meta", "autosave");
+        params.put("number", String.valueOf(number));
+
+        if (getPages) {
+            params.put("type", "page");
+        }
+
+        if (!TextUtils.isEmpty(order)) {
+            params.put("order", order);
+        }
+        if (!TextUtils.isEmpty(orderBy)) {
+            params.put("order_by", orderBy);
+        }
+        if (statusList != null && statusList.size() > 0) {
+            params.put("status", PostStatus.postStatusListToString(statusList));
+        }
+        if (!TextUtils.isEmpty(searchQuery)) {
+            params.put("search", searchQuery);
+        }
+        if (offset > 0) {
+            params.put("offset", String.valueOf(offset));
+        }
+
+        if (!TextUtils.isEmpty(fields)) {
+            params.put("fields", fields);
+        }
+
+        if (authorFilter instanceof AuthorFilter.SpecificAuthor) {
+            AuthorFilter.SpecificAuthor specificAuthor = (AuthorFilter.SpecificAuthor) authorFilter;
+            params.put("author", String.valueOf(specificAuthor.getAuthorId()));
+        }
+
+        return params;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostWPComRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostWPComRestResponse.kt
new file mode 100644
index 00000000000..22bedf2e152
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/post/PostWPComRestResponse.kt
@@ -0,0 +1,149 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.post
+
+import com.google.gson.Gson
+import com.google.gson.JsonIOException
+import com.google.gson.JsonSyntaxException
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken.BEGIN_ARRAY
+import com.google.gson.stream.JsonToken.BEGIN_OBJECT
+import com.google.gson.stream.JsonWriter
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostWPComRestResponse.PostMeta.PostData.PostAutoSave
+import org.wordpress.android.fluxc.network.rest.wpcom.taxonomy.TermWPComRestResponse
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.POSTS
+import java.io.IOException
+
+data class PostWPComRestResponse(
+    @SerializedName("ID") val remotePostId: Long = 0,
+    @SerializedName("site_ID") val remoteSiteId: Long = 0,
+    @SerializedName("date") val date: String? = null,
+    @SerializedName("modified") val modified: String? = null,
+    @SerializedName("title") val title: String? = null,
+    @SerializedName("URL") val url: String? = null,
+    @SerializedName("short_URL") val shortUrl: String? = null,
+    @SerializedName("content") val content: String? = null,
+    @SerializedName("excerpt") val excerpt: String? = null,
+    @SerializedName("slug") val slug: String? = null,
+    @SerializedName("guid") val guid: String? = null,
+    @SerializedName("status") val status: String? = null,
+    @SerializedName("sticky") val sticky: Boolean = false,
+    @SerializedName("password") val password: String? = null,
+    @SerializedName("parent") val parent: PostParent? = null,
+    @SerializedName("type") val type: String,
+    @SerializedName("featured_image") val featuredImage: String? = null,
+    @SerializedName("post_thumbnail") val postThumbnail: PostThumbnail? = null,
+    @SerializedName("format") val format: String? = null,
+    @SerializedName("geo") val geo: GeoLocation? = null,
+    @SerializedName("tags") val tags: Map<String, TermWPComRestResponse>? = null,
+    @SerializedName("categories") val categories: Map<String, TermWPComRestResponse>? = null,
+    @SerializedName("capabilities") val capabilities: Capabilities? = null,
+    @SerializedName("meta") val meta: PostMeta? = null,
+    @SerializedName("metadata") @JsonAdapter(MetaDataAdapterFactory::class) val metadata: List<PostMetaData>? = null,
+    @SerializedName("author") val author: Author? = null
+) {
+    data class PostsResponse(
+        @SerializedName("posts") val posts: List<PostWPComRestResponse>,
+        @SerializedName("found") val found: Int
+    )
+
+    data class PostThumbnail(
+        @SerializedName("ID") val id: Long = 0,
+        @SerializedName("URL") val url: String? = null,
+        @SerializedName("guid") val guid: String? = null,
+        @SerializedName("mime_type") val mimeType: String? = null,
+        @SerializedName("width") val width: Int = 0,
+        @SerializedName("height") val height: Int = 0
+    )
+
+    data class Capabilities(
+        @SerializedName("publish_post") val publishPost: Boolean = false,
+        @SerializedName("edit_post") val editPost: Boolean = false,
+        @SerializedName("delete_post") val deletePost: Boolean = false
+    )
+
+    data class PostMeta(@SerializedName("data") val data: PostData? = null) {
+        data class PostData(@SerializedName("autosave") val autoSave: PostAutoSave? = null) {
+            data class PostAutoSave(
+                @SerializedName("ID") val revisionId: Long = 0,
+                @SerializedName("modified") val modified: String? = null,
+                @SerializedName("preview_URL") val previewUrl: String? = null,
+                @SerializedName("title") val title: String? = null,
+                @SerializedName("content") val content: String? = null,
+                @SerializedName("excerpt") val excerpt: String? = null
+            )
+        }
+    }
+
+    data class PostMetaData(
+        @SerializedName("id") val id: Long = 0,
+        @SerializedName("key") val key: String? = null,
+        @SerializedName("value") val value: Any? = null
+    )
+
+    fun getPostAutoSave(): PostAutoSave? {
+        return meta?.data?.autoSave
+    }
+
+    data class Author(
+        @SerializedName("ID") val id: Long = 0,
+        @SerializedName("name") val name: String?
+    )
+
+    @Suppress("UNCHECKED_CAST")
+    class MetaDataAdapterFactory : TypeAdapterFactory {
+        override fun <T> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T> {
+            return MetaDataAdapter(gson) as TypeAdapter<T>
+        }
+    }
+
+    class MetaDataAdapter(private val gson: Gson) : TypeAdapter<List<PostMetaData>>() {
+        @Throws(IOException::class)
+        @Suppress("NestedBlockDepth", "TooGenericExceptionCaught")
+        override fun read(jsonReader: JsonReader): List<PostMetaData> {
+            val metaDataList = arrayListOf<PostMetaData>()
+
+            // Noticed several metadata formats in the json response like
+            // {"metadata”:[{“id”:”5”,”key”:”geo_latitude”,”value”:”28.6139391”}]}
+            // {"metadata”:[false]}, {"metadata":false},
+            // {"metadata":[{"id":"15","key":"switch_like_status","value":[0]}]}
+            // Returning only a list of PostMetaData type or empty list for other formats not needed currently.
+
+            when (jsonReader.peek()) {
+                BEGIN_ARRAY -> {
+                    jsonReader.beginArray()
+                    while (jsonReader.hasNext()) {
+                        if (BEGIN_OBJECT == jsonReader.peek()) {
+                            val type = object : TypeToken<PostMetaData>() {}.type
+                            try {
+                                metaDataList.add(gson.fromJson(jsonReader, type))
+                            } catch (ex: Exception) {
+                                when (ex) {
+                                    is JsonSyntaxException,
+                                    is JsonIOException -> {
+                                        AppLog.w(POSTS, "Error in post metadata json conversion: " + ex.message)
+                                        jsonReader.skipValue()
+                                    }
+                                    else -> Unit // Do nothing (ignore)
+                                }
+                            }
+                        } else {
+                            jsonReader.skipValue()
+                        }
+                    }
+                    jsonReader.endArray()
+                } else -> {
+                    jsonReader.skipValue()
+                }
+            }
+
+            return metaDataList
+        }
+
+        override fun write(out: JsonWriter?, value: List<PostMetaData>) = Unit // Do Nothing (ignore)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClient.kt
new file mode 100644
index 00000000000..02ad8299c5f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/products/ProductsRestClient.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.products
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.products.ProductsResponse
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ProductsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchProducts(type: String? = null): Response<ProductsResponse> {
+        val url = WPCOMREST.products.urlV1_1
+        return wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            mutableMapOf<String, String>().apply {
+                type?.let {
+                    put("type", it)
+                }
+            },
+            ProductsResponse::class.java
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClient.kt
new file mode 100644
index 00000000000..8863ce345d0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/qrcodeauth/QRCodeAuthRestClient.kt
@@ -0,0 +1,130 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class QRCodeAuthRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun validate(data: String, token: String): QRCodeAuthPayload<QRCodeAuthValidateResponse> {
+        val url = WPCOMV2.auth.qr_code.validate.url
+        val params = mapOf("data" to data, "token" to token)
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+            this,
+            url,
+            params,
+            null,
+            QRCodeAuthValidateResponse::class.java
+        )
+        return when (response) {
+            is Response.Success -> QRCodeAuthPayload(response.data)
+            is Response.Error -> QRCodeAuthPayload(response.error.toQrcodeError())
+        }
+    }
+
+    suspend fun authenticate(data: String, token: String): QRCodeAuthPayload<QRCodeAuthAuthenticateResponse> {
+        val url = WPCOMV2.auth.qr_code.authenticate.url
+        val params = mapOf("data" to data, "token" to token)
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                params,
+                null,
+                QRCodeAuthAuthenticateResponse::class.java
+        )
+        return when (response) {
+            is Response.Success -> QRCodeAuthPayload(response.data)
+            is Response.Error -> QRCodeAuthPayload(response.error.toQrcodeError())
+        }
+    }
+
+    data class QRCodeAuthValidateResponse(
+        @SerializedName("browser") val browser: String? = null,
+        @SerializedName("location") val location: String? = null,
+        @SerializedName("success") val success: Boolean? = null
+    )
+
+    data class QRCodeAuthAuthenticateResponse(
+        @SerializedName("authenticated") val authenticated: Boolean? = null
+    )
+}
+
+data class QRCodeAuthPayload<T>(
+    val response: T? = null
+) : Payload<QRCodeAuthError>() {
+    constructor(error: QRCodeAuthError) : this() {
+        this.error = error
+    }
+}
+
+class QRCodeAuthError(
+    val type: QRCodeAuthErrorType,
+    val message: String? = null
+) : OnChangedError
+
+enum class QRCodeAuthErrorType {
+    GENERIC_ERROR,
+    AUTHORIZATION_REQUIRED,
+    INVALID_RESPONSE,
+    REST_INVALID_PARAM,
+    DATA_INVALID,
+    API_ERROR,
+    TIMEOUT,
+    NOT_AUTHORIZED
+}
+
+fun WPComGsonNetworkError.toQrcodeError(): QRCodeAuthError {
+    val type = when (type) {
+        GenericErrorType.TIMEOUT -> QRCodeAuthErrorType.TIMEOUT
+        GenericErrorType.NO_CONNECTION,
+        GenericErrorType.SERVER_ERROR,
+        GenericErrorType.INVALID_SSL_CERTIFICATE,
+        GenericErrorType.NETWORK_ERROR -> QRCodeAuthErrorType.API_ERROR
+        GenericErrorType.PARSE_ERROR,
+        GenericErrorType.NOT_FOUND,
+        GenericErrorType.CENSORED,
+        GenericErrorType.INVALID_RESPONSE -> QRCodeAuthErrorType.INVALID_RESPONSE
+        GenericErrorType.HTTP_AUTH_ERROR,
+        GenericErrorType.AUTHORIZATION_REQUIRED,
+        GenericErrorType.NOT_AUTHENTICATED -> QRCodeAuthErrorType.AUTHORIZATION_REQUIRED
+        GenericErrorType.UNKNOWN -> {
+            when (apiError) {
+                QRCodeAuthErrorType.REST_INVALID_PARAM.name.lowercase() -> {
+                    QRCodeAuthErrorType.REST_INVALID_PARAM
+                }
+                QRCodeAuthErrorType.DATA_INVALID.name.lowercase() -> {
+                    QRCodeAuthErrorType.DATA_INVALID
+                }
+                QRCodeAuthErrorType.NOT_AUTHORIZED.name.lowercase() -> {
+                    QRCodeAuthErrorType.NOT_AUTHORIZED
+                }
+                else -> {
+                    QRCodeAuthErrorType.GENERIC_ERROR
+                }
+            }
+        }
+        null -> QRCodeAuthErrorType.GENERIC_ERROR
+    }
+    return QRCodeAuthError(type, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClient.kt
new file mode 100644
index 00000000000..dc0c31d5ec9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reactnative/ReactNativeWPComRestClient.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.reactnative
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ReactNativeWPComRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun getRequest(
+        url: String,
+        params: Map<String, String>,
+        successHandler: (data: JsonElement) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse,
+        enableCaching: Boolean = true
+    ): ReactNativeFetchResponse {
+        val response =
+                wpComGsonRequestBuilder.syncGetRequest(this, url, params, JsonElement::class.java, enableCaching)
+        return when (response) {
+            is Success -> successHandler(response.data)
+            is Error -> errorHandler(response.error)
+        }
+    }
+
+    suspend fun postRequest(
+        url: String,
+        params: Map<String, String>,
+        body: Map<String, Any>,
+        successHandler: (data: JsonElement) -> ReactNativeFetchResponse,
+        errorHandler: (BaseNetworkError) -> ReactNativeFetchResponse
+    ): ReactNativeFetchResponse {
+        val response =
+            wpComGsonRequestBuilder.syncPostRequest(this, url, params, body, JsonElement::class.java)
+        return when (response) {
+            is Success -> successHandler(response.data)
+            is Error -> errorHandler(response.error)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderRestClient.java
new file mode 100644
index 00000000000..83b0020983e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderRestClient.java
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.reader;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.ReaderActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComErrorListener;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.store.ReaderStore.ReaderError;
+import org.wordpress.android.fluxc.store.ReaderStore.ReaderErrorType;
+import org.wordpress.android.fluxc.store.ReaderStore.ReaderSearchSitesResponsePayload;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.UrlUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class ReaderRestClient extends BaseWPComRestClient {
+    @Inject public ReaderRestClient(Context appContext, Dispatcher dispatcher,
+                            @Named("regular") RequestQueue requestQueue,
+                            AccessToken accessToken,
+                            UserAgent userAgent) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+    }
+
+    public void searchReaderSites(@NonNull final String searchTerm,
+                                  final int count,
+                                  final int offset,
+                                  boolean excludeFollowed) {
+        String url = WPCOMREST.read.feed.getUrlV1_1();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("offset", Integer.toString(offset));
+        params.put("exclude_followed", Boolean.toString(excludeFollowed));
+        params.put("sort", "relevance");
+        params.put("number", Integer.toString(count));
+        params.put("meta", "site");
+        params.put("q", UrlUtils.urlEncode(searchTerm));
+
+        WPComGsonRequest request = WPComGsonRequest.buildGetRequest(url, params, ReaderSearchSitesResponse.class,
+                new Response.Listener<ReaderSearchSitesResponse>() {
+                    @Override
+                    public void onResponse(ReaderSearchSitesResponse response) {
+                        boolean canLoadMore = response.getSites().size() == count;
+                        ReaderSearchSitesResponsePayload payload =
+                                new ReaderSearchSitesResponsePayload(
+                                        response.getSites(),
+                                        searchTerm,
+                                        offset,
+                                        canLoadMore);
+                        mDispatcher.dispatch(ReaderActionBuilder.newReaderSearchedSitesAction(payload));
+                    }
+                }, new WPComErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
+                        AppLog.e(AppLog.T.MEDIA, "VolleyError searching reader sites: " + error);
+                        ReaderError readerError = new ReaderError(
+                                ReaderErrorType.fromBaseNetworkError(error), error.message);
+                        ReaderSearchSitesResponsePayload payload =
+                                new ReaderSearchSitesResponsePayload(readerError, searchTerm, offset);
+                        mDispatcher.dispatch(ReaderActionBuilder.newReaderSearchedSitesAction(payload));
+                    }
+                }
+        );
+        add(request);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesDeserializer.kt
new file mode 100644
index 00000000000..be0cabc778a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesDeserializer.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.reader
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import org.wordpress.android.fluxc.model.ReaderSiteModel
+import org.wordpress.android.fluxc.network.utils.getBoolean
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.network.utils.getJsonObject
+import org.wordpress.android.fluxc.network.utils.getLong
+import org.wordpress.android.fluxc.network.utils.getString
+import java.lang.reflect.Type
+
+class ReaderSearchSitesDeserializer : JsonDeserializer<ReaderSearchSitesResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): ReaderSearchSitesResponse {
+        val jsonObject = json.asJsonObject
+
+        val sites = jsonObject.getAsJsonArray("feeds").map {
+            val jsonFeed = it.asJsonObject
+            val site = ReaderSiteModel()
+            site.siteId = jsonFeed.getLong("blog_ID")
+            site.feedId = jsonFeed.getLong("feed_ID")
+            site.subscribeUrl = jsonFeed.getString("subscribe_URL")
+            site.subscriberCount = jsonFeed.getInt("subscribers_count")
+            site.url = jsonFeed.getString("URL")
+            site.title = jsonFeed.getString("title", unescapeHtml4 = true)
+
+            // parse the site meta data
+            val jsonSite = jsonFeed.getJsonObject("meta").getJsonObject("data").getJsonObject("site")
+            site.isFollowing = jsonSite.getBoolean("is_following")
+            site.description = jsonSite.getString("description", unescapeHtml4 = true)
+            site.iconUrl = jsonSite.getJsonObject("icon").getString("ico")
+
+            site
+        }
+
+        return ReaderSearchSitesResponse(sites)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesResponse.kt
new file mode 100644
index 00000000000..1d489d6a7c4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/reader/ReaderSearchSitesResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.reader
+
+import com.google.gson.annotations.JsonAdapter
+
+import org.wordpress.android.fluxc.model.ReaderSiteModel
+
+@JsonAdapter(ReaderSearchSitesDeserializer::class)
+class ReaderSearchSitesResponse(
+    val sites: List<ReaderSiteModel>
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/revisions/RevisionsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/revisions/RevisionsResponse.kt
new file mode 100644
index 00000000000..014bbaaf77b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/revisions/RevisionsResponse.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.revisions
+
+@Suppress("ConstructorParameterNaming")
+class RevisionsResponse(
+    val diffs: List<DiffResponse>,
+    val revisions: Map<String, RevisionResponse>
+) {
+    inner class DiffResponse(
+        val from: Int,
+        val to: Int,
+        val diff: DiffResponseContent
+    )
+
+    inner class DiffResponseContent(
+        val post_title: List<DiffResponsePart>,
+        val post_content: List<DiffResponsePart>,
+        val totals: DiffResponseTotals
+    )
+
+    inner class DiffResponsePart(
+        val op: String,
+        val value: String
+    )
+
+    inner class DiffResponseTotals(
+        val del: Int,
+        val add: Int
+    )
+
+    @Suppress("LongParameterList")
+    inner class RevisionResponse(
+        val post_date_gmt: String,
+        val post_modified_gmt: String,
+        val post_author: String,
+        val id: Int,
+        val post_content: String,
+        val post_excerpt: String,
+        val post_title: String
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/FetchScanHistoryResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/FetchScanHistoryResponse.kt
new file mode 100644
index 00000000000..82401d2dd02
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/FetchScanHistoryResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+
+data class FetchScanHistoryResponse(
+    @SerializedName("threats") val threats: List<Threat>?
+) : Response
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClient.kt
new file mode 100644
index 00000000000..5a8ecf625ff
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanRestClient.kt
@@ -0,0 +1,316 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Credentials
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.ScanProgressStatus
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel.FixStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatMapper
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.UNKNOWN
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.FixThreatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.FixThreatsStatusResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import org.wordpress.android.fluxc.store.ScanStore.FetchFixThreatsStatusResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryError
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryErrorType
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.FetchedScanStatePayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsErrorType
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusErrorType
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatError
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatErrorType
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartErrorType
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartResultPayload
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateErrorType
+import org.wordpress.android.fluxc.utils.NetworkErrorMapper
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ScanRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val threatMapper: ThreatMapper,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchScanState(site: SiteModel): FetchedScanStatePayload {
+        val url = WPCOMV2.sites.site(site.siteId).scan.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), ScanStateResponse::class.java)
+        return when (response) {
+            is Success -> {
+                buildScanStatePayload(response.data, site)
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        ScanStateErrorType.GENERIC_ERROR,
+                        ScanStateErrorType.INVALID_RESPONSE,
+                        ScanStateErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = ScanStateError(errorType, response.error.message)
+                FetchedScanStatePayload(error, site)
+            }
+        }
+    }
+
+    suspend fun startScan(site: SiteModel): ScanStartResultPayload {
+        val url = WPCOMV2.sites.site(site.siteId).scan.enqueue.url
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(this, url, mapOf(), null, ScanStartResponse::class.java)
+        return when (response) {
+            is Success -> {
+                if (response.data.success == false && response.data.error != null) {
+                    val error = ScanStartError(ScanStartErrorType.API_ERROR)
+                    ScanStartResultPayload(error, site)
+                } else {
+                    ScanStartResultPayload(site)
+                }
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        ScanStartErrorType.GENERIC_ERROR,
+                        ScanStartErrorType.INVALID_RESPONSE,
+                        ScanStartErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = ScanStartError(errorType, response.error.message)
+                ScanStartResultPayload(error, site)
+            }
+        }
+    }
+
+    suspend fun fixThreats(remoteSiteId: Long, threatIds: List<Long>): FixThreatsResultPayload {
+        val url = WPCOMV2.sites.site(remoteSiteId).alerts.fix.url
+        val params = buildFixThreatsRequestParams(threatIds)
+        val response = wpComGsonRequestBuilder.syncPostRequest(this, url, params, null, FixThreatsResponse::class.java)
+        return when (response) {
+            is Success -> {
+                if (response.data.ok == true) {
+                    FixThreatsResultPayload(remoteSiteId)
+                } else {
+                    val error = FixThreatsError(FixThreatsErrorType.API_ERROR)
+                    FixThreatsResultPayload(error, remoteSiteId)
+                }
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        FixThreatsErrorType.GENERIC_ERROR,
+                        FixThreatsErrorType.INVALID_RESPONSE,
+                        FixThreatsErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = FixThreatsError(errorType, response.error.message)
+                FixThreatsResultPayload(error, remoteSiteId)
+            }
+        }
+    }
+
+    private fun buildFixThreatsRequestParams(threatIds: List<Long>) = mutableMapOf<String, String>().apply {
+        threatIds.forEachIndexed { index, value ->
+            put("threat_ids[$index]", value.toString())
+        }
+    }
+
+    suspend fun ignoreThreat(remoteSiteId: Long, threatId: Long): IgnoreThreatResultPayload {
+        val url = WPCOMV2.sites.site(remoteSiteId).alerts.threat(threatId).url
+        val params = mapOf("ignore" to "true")
+        val response = wpComGsonRequestBuilder.syncPostRequest(this, url, params, null, Any::class.java)
+        return when (response) {
+            is Success -> IgnoreThreatResultPayload(remoteSiteId)
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        IgnoreThreatErrorType.GENERIC_ERROR,
+                        IgnoreThreatErrorType.INVALID_RESPONSE,
+                        IgnoreThreatErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = IgnoreThreatError(errorType, response.error.message)
+                IgnoreThreatResultPayload(error, remoteSiteId)
+            }
+        }
+    }
+
+    suspend fun fetchFixThreatsStatus(remoteSiteId: Long, threatIds: List<Long>): FetchFixThreatsStatusResultPayload {
+        val url = WPCOMV2.sites.site(remoteSiteId).alerts.fix.url
+        val params = buildFixThreatsRequestParams(threatIds)
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, params, FixThreatsStatusResponse::class.java)
+        return when (response) {
+            is Success -> {
+                if (response.data.ok == true) {
+                    buildFixThreatsStatusPayload(response.data, remoteSiteId)
+                } else {
+                    val error = FixThreatsStatusError(FixThreatsStatusErrorType.API_ERROR)
+                    FetchFixThreatsStatusResultPayload(remoteSiteId = remoteSiteId, error = error)
+                }
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        FixThreatsStatusErrorType.GENERIC_ERROR,
+                        FixThreatsStatusErrorType.INVALID_RESPONSE,
+                        FixThreatsStatusErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = FixThreatsStatusError(errorType, response.error.message)
+                FetchFixThreatsStatusResultPayload(remoteSiteId = remoteSiteId, error = error)
+            }
+        }
+    }
+
+    suspend fun fetchScanHistory(remoteSiteId: Long): FetchScanHistoryResultPayload {
+        val url = WPCOMV2.sites.site(remoteSiteId).scan.history.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), FetchScanHistoryResponse::class.java)
+        return when (response) {
+            is Success -> {
+                buildScanHistoryResultPayload(remoteSiteId, response.data)
+            }
+            is Error -> {
+                val errorType = NetworkErrorMapper.map(
+                        response.error,
+                        FetchScanHistoryErrorType.GENERIC_ERROR,
+                        FetchScanHistoryErrorType.INVALID_RESPONSE,
+                        FetchScanHistoryErrorType.AUTHORIZATION_REQUIRED
+                )
+                val error = FetchScanHistoryError(errorType, response.error.message)
+                FetchScanHistoryResultPayload(remoteSiteId = remoteSiteId, error = error)
+            }
+        }
+    }
+
+    @Suppress("ReturnCount")
+    private fun buildScanStatePayload(response: ScanStateResponse, site: SiteModel): FetchedScanStatePayload {
+        val state = State.fromValue(response.state) ?: return buildScanStateErrorPayload(
+                site,
+                ScanStateError(ScanStateErrorType.INVALID_RESPONSE, "Unknown scan state")
+        )
+        val (threatModels, isError, errorMsg) = mapThreatsToThreatModels(response.threats)
+        if (isError) {
+            return buildScanStateErrorPayload(site, ScanStateError(ScanStateErrorType.INVALID_RESPONSE, errorMsg))
+        }
+        val scanStateModel = ScanStateModel(
+            state = state,
+            reason = ScanStateModel.Reason.fromValue(response.reason),
+            threats = threatModels,
+            hasCloud = response.hasCloud ?: false,
+            credentials = response.credentials?.map {
+                Credentials(it.type, it.role, it.host, it.port, it.user, it.path, it.stillValid)
+            },
+            mostRecentStatus = response.mostRecentStatus?.let {
+                ScanProgressStatus(
+                    startDate = it.startDate,
+                    duration = it.duration ?: 0,
+                    progress = it.progress ?: 0,
+                    error = it.error ?: false,
+                    isInitial = it.isInitial ?: false
+                )
+            },
+            currentStatus = response.currentStatus?.let {
+                ScanProgressStatus(
+                    startDate = it.startDate,
+                    progress = it.progress ?: 0,
+                    isInitial = it.isInitial ?: false
+                )
+            },
+            hasValidCredentials = response.credentials?.firstOrNull()?.stillValid == true
+        )
+        return FetchedScanStatePayload(scanStateModel, site)
+    }
+
+    private fun mapThreatsToThreatModels(threats: List<Threat>?): Triple<List<ThreatModel>?, Boolean, String?> {
+        var isError = false
+        var errorMsg: String? = null
+        val threatModels = threats?.mapNotNull { threat ->
+            val threatModel = when {
+                threat.id == null -> {
+                    isError = true
+                    errorMsg = "Missing threat id"
+                    null
+                }
+                threat.signature == null -> {
+                    isError = true
+                    errorMsg = "Missing threat signature"
+                    null
+                }
+                threat.firstDetected == null -> {
+                    isError = true
+                    errorMsg = "Missing threat firstDetected"
+                    null
+                }
+                else -> {
+                    val threatStatus = ThreatStatus.fromValue(threat.status)
+                    if (threatStatus != UNKNOWN) {
+                        threatMapper.map(threat)
+                    } else {
+                        isError = true
+                        null
+                    }
+                }
+            }
+            threatModel
+        }
+        return Triple(threatModels, isError, errorMsg)
+    }
+
+    private fun buildScanHistoryResultPayload(
+        remoteSiteId: Long,
+        response: FetchScanHistoryResponse
+    ): FetchScanHistoryResultPayload {
+        val (threatModels, error) = mapThreatsToThreatModels(response.threats)
+        return if (error) {
+            FetchScanHistoryResultPayload(
+                    remoteSiteId,
+                    FetchScanHistoryError(FetchScanHistoryErrorType.INVALID_RESPONSE)
+            )
+        } else {
+            FetchScanHistoryResultPayload(remoteSiteId, threatModels)
+        }
+    }
+
+    private fun buildFixThreatsStatusPayload(
+        response: FixThreatsStatusResponse,
+        remoteSiteId: Long
+    ): FetchFixThreatsStatusResultPayload {
+        var error: FixThreatsStatusErrorType? = null
+        val fixThreatStatusModels = response.fixThreatsStatus?.mapNotNull {
+            if (it.id == null) {
+                error = FixThreatsStatusErrorType.MISSING_THREAT_ID
+                null
+            } else {
+                FixThreatStatusModel(id = it.id, status = FixStatus.fromValue(it.status))
+            }
+        } ?: emptyList()
+
+        return error?.let {
+            FetchFixThreatsStatusResultPayload(remoteSiteId = remoteSiteId, error = FixThreatsStatusError(it))
+        } ?: FetchFixThreatsStatusResultPayload(
+                remoteSiteId = remoteSiteId,
+                fixThreatStatusModels = fixThreatStatusModels
+        )
+    }
+
+    private fun buildScanStateErrorPayload(site: SiteModel, errorType: ScanStateError) =
+        FetchedScanStatePayload(errorType, site)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStartResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStartResponse.kt
new file mode 100644
index 00000000000..ad5eb260a79
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStartResponse.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class ScanStartResponse(
+    @SerializedName("error") val error: Error? = null,
+    @SerializedName("success") val success: Boolean?
+) : Response {
+    data class Error(
+        @SerializedName("error_data") val errorData: List<Any>?,
+        @SerializedName("errors") val errors: Errors?
+    )
+
+    data class Errors(
+        @SerializedName("vp_api_error") val vpApiError: List<String>?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStateResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStateResponse.kt
new file mode 100644
index 00000000000..48b2f729c97
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/ScanStateResponse.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import java.util.Date
+
+data class ScanStateResponse(
+    @SerializedName("state") val state: String,
+    @SerializedName("threats") val threats: List<Threat>?,
+    @SerializedName("credentials") val credentials: List<Credentials>?,
+    @SerializedName("reason") val reason: String?,
+    @SerializedName("has_cloud") val hasCloud: Boolean?,
+    @SerializedName("most_recent") val mostRecentStatus: ScanProgressStatus?,
+    @SerializedName("current") val currentStatus: ScanProgressStatus?
+) : Response {
+    data class Credentials(
+        @SerializedName("type") val type: String,
+        @SerializedName("role") val role: String,
+        @SerializedName("host") val host: String?,
+        @SerializedName("port") val port: Int?,
+        @SerializedName("user") val user: String?,
+        @SerializedName("path") val path: String?,
+        @SerializedName("still_valid") val stillValid: Boolean
+    )
+
+    data class ScanProgressStatus(
+        @SerializedName("duration") val duration: Int?,
+        @SerializedName("progress") val progress: Int?,
+        @SerializedName("error") val error: Boolean?,
+        @SerializedName("timestamp") val startDate: Date?,
+        @SerializedName("is_initial") val isInitial: Boolean?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsResponse.kt
new file mode 100644
index 00000000000..9d49d907d2b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsResponse.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class FixThreatsResponse(@SerializedName("ok") val ok: Boolean?) : Response
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusDeserializer.kt
new file mode 100644
index 00000000000..f6e027e833d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusDeserializer.kt
@@ -0,0 +1,54 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.FixThreatsStatusResponse.FixThreatStatus
+import java.lang.reflect.Type
+
+class FixThreatsStatusDeserializer : JsonDeserializer<List<FixThreatStatus>?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ) = if (context != null && json != null && json.isJsonObject) {
+        deserializeJson(json)
+    } else {
+        null
+    }
+
+    /**
+     * Input: { "39154018": {"status": "fixed" }} / { "39154018": {"error": "not_found" }}
+     * Output: [{ "id": 39154018, "status": "fixed" }] /  [{ "id": 39154018, "error": "not_found" }]
+     */
+    private fun deserializeJson(json: JsonElement) = mutableListOf<FixThreatStatus>().apply {
+        val inputJsonObject = json.asJsonObject
+        inputJsonObject.keySet().iterator().forEach { key ->
+            getFixThreatStatus(key, inputJsonObject)?.let { add(it) }
+        }
+    }.toList()
+
+    @Suppress("SwallowedException")
+    private fun getFixThreatStatus(key: String, inputJsonObject: JsonObject) =
+        inputJsonObject.get(key)?.takeIf { it.isJsonObject }?.asJsonObject?.let { threat ->
+            try {
+                FixThreatStatus(
+                    id = key.toLong(),
+                    status = threat.get(STATUS)?.asString,
+                    error = threat.get(ERROR)?.asString
+                )
+            } catch (ex: ClassCastException) {
+                null
+            } catch (ex: IllegalStateException) {
+                null
+            } catch (ex: NumberFormatException) {
+                null
+            }
+        }
+
+    companion object {
+        private const val STATUS = "status"
+        private const val ERROR = "error"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusResponse.kt
new file mode 100644
index 00000000000..f45f78ab25f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixThreatsStatusResponse.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class FixThreatsStatusResponse(
+    @SerializedName("ok") val ok: Boolean?,
+    @JsonAdapter(FixThreatsStatusDeserializer::class)
+    @SerializedName("threats") val fixThreatsStatus: List<FixThreatStatus>?
+) : Response {
+    data class FixThreatStatus(
+        @SerializedName("id") val id: Long?,
+        @SerializedName("status") val status: String?,
+        @SerializedName("error") val error: String?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixableDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixableDeserializer.kt
new file mode 100644
index 00000000000..dd57794d154
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/FixableDeserializer.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonSyntaxException
+import com.google.gson.reflect.TypeToken
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat.Fixable
+import java.lang.reflect.Type
+
+class FixableDeserializer : JsonDeserializer<Fixable?> {
+    @Suppress("SwallowedException")
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): Fixable? {
+        /**
+         * If a threat is not fixable, fixable is returned as a boolean (false).
+         * It is set to null in this case to avoid json parsing issue.
+         */
+        return if (context != null && json != null && json.isJsonObject) {
+            val fixableType = object : TypeToken<Fixable>() { }.type
+            val result: Fixable?
+            result = try {
+                context.deserialize(json, fixableType)
+            } catch (e: JsonSyntaxException) {
+                null
+            }
+            result
+        } else {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/RowsDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/RowsDeserializer.kt
new file mode 100644
index 00000000000..733ee2d0783
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/RowsDeserializer.kt
@@ -0,0 +1,80 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel.Row
+import java.lang.reflect.Type
+
+class RowsDeserializer : JsonDeserializer<List<Row>?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): List<Row>? {
+        return if (context != null && json != null && json.isJsonObject) {
+            /**
+             * Rows example:
+             * "rows": {
+             * "949": {
+             *   "id": 1849,
+             *   "description": "KiethAbare - 2019-01-20 18:41:40",
+             *   "url": "http://to.ht/bestforex48357\\n"
+             *   },
+             *   "950": {
+             *   "id": 1850,
+             *   "description": "KiethAbare - 2019-01-20 18:41:45",
+             *   "url": "http://to.ht/bestforex48357\\n"
+             *   }
+             * }
+             */
+            val rows: ArrayList<Row> = arrayListOf()
+
+            val rowsJsonObject = json.asJsonObject
+            rowsJsonObject.keySet().iterator().forEach { key ->
+                val row = getRow(key, rowsJsonObject)
+                row?.let { rows.add(it) }
+            }
+
+            if (rows.isNotEmpty()) {
+                rows.sortBy(Row::rowNumber)
+            }
+
+            return rows
+        } else {
+            null
+        }
+    }
+
+    @Suppress("SwallowedException")
+    private fun getRow(
+        key: String,
+        rowJsonObject: JsonObject
+    ): Row? {
+        return rowJsonObject.get(key)?.takeIf { it.isJsonObject }?.asJsonObject?.let { contents ->
+            try {
+                Row(
+                    rowNumber = key.toInt(),
+                    id = contents.get(ID)?.asInt ?: 0,
+                    description = contents.get(DESCRIPTION)?.asString,
+                    code = contents.get(CODE)?.asString,
+                    url = contents.get(URL)?.asString
+                )
+            } catch (ex: ClassCastException) {
+                null
+            } catch (ex: IllegalStateException) {
+                null
+            } catch (ex: NumberFormatException) {
+                null
+            }
+        }
+    }
+
+    companion object {
+        private const val ID = "id"
+        private const val DESCRIPTION = "description"
+        private const val CODE = "code"
+        private const val URL = "url"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/Threat.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/Threat.kt
new file mode 100644
index 00000000000..fe07d4ad0d1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/Threat.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel.Row
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext
+import java.util.Date
+
+data class Threat(
+    @SerializedName("id") val id: Long?,
+    @SerializedName("signature") val signature: String?,
+    @SerializedName("description") val description: String?,
+    @SerializedName("status") val status: String?,
+    @SerializedName("fixable") @JsonAdapter(FixableDeserializer::class) val fixable: Fixable?,
+    @SerializedName("extension") val extension: Extension?,
+    @SerializedName("first_detected") val firstDetected: Date?,
+    @SerializedName("fixed_on") val fixedOn: Date?,
+    @SerializedName("context") @JsonAdapter(ThreatContextDeserializer::class) val context: ThreatContext?,
+    @SerializedName("filename") val fileName: String?,
+    @SerializedName("diff") val diff: String?,
+    @SerializedName("rows") @JsonAdapter(RowsDeserializer::class) val rows: List<Row>?
+) {
+    data class Fixable(
+        @SerializedName("file") val file: String?,
+        @SerializedName("fixer") val fixer: String?,
+        @SerializedName("target") val target: String?
+    )
+
+    data class Extension(
+        @SerializedName("type") val type: String?,
+        @SerializedName("slug") val slug: String?,
+        @SerializedName("name") val name: String?,
+        @SerializedName("version") val version: String?,
+        @SerializedName("isPremium") val isPremium: Boolean?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/ThreatContextDeserializer.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/ThreatContextDeserializer.kt
new file mode 100644
index 00000000000..38c50591341
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/scan/threat/ThreatContextDeserializer.kt
@@ -0,0 +1,139 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.scan.threat
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext.ContextLine
+import java.lang.reflect.Type
+
+class ThreatContextDeserializer : JsonDeserializer<ThreatContext?> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): ThreatContext? {
+        return if (context != null && json != null) {
+            /**
+             *  Threat context obj can either be:
+             * - a key, value map
+             * - an empty string
+             * - not present
+             */
+            when {
+                json.isJsonObject -> {
+                    getThreatContext(json)
+                }
+                json.isJsonPrimitive && json.asJsonPrimitive.isString -> {
+                    ThreatContext(emptyList())
+                }
+                else -> {
+                    null
+                }
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun getThreatContext(json: JsonElement): ThreatContext? {
+        /**
+         * ThreatContext example:
+         * 3: start test
+         * 4: VIRUS_SIG
+         * 5: end test
+         * marks: 4: [0, 9]
+         */
+        var threatContext: ThreatContext? = null
+
+        val threatContextJsonObject = json.asJsonObject
+
+        val marks = threatContextJsonObject.get(MARKS)
+        val marksJsonObject = if (marks?.isJsonObject == true) marks.asJsonObject else null
+
+        val lines: ArrayList<ContextLine> = arrayListOf()
+        threatContextJsonObject.keySet().iterator().forEach { key ->
+            if (key != MARKS) {
+                val contextLine = getContextLine(threatContextJsonObject, marksJsonObject, key)
+                contextLine?.let { lines.add(it) }
+            }
+        }
+        if (lines.isNotEmpty()) {
+            lines.sortBy(ContextLine::lineNumber)
+            threatContext = ThreatContext(lines)
+        }
+
+        return threatContext
+    }
+
+    private fun getContextLine(
+        threatContextJsonObject: JsonObject,
+        marksJsonObject: JsonObject? = null,
+        key: String
+    ): ContextLine? {
+        var contextLine: ContextLine? = null
+
+        val lineNumber = try {
+            key.toInt()
+        } catch (ex: NumberFormatException) {
+            return null
+        }
+
+        val contentsForKey = threatContextJsonObject.get(key)
+        val contentsStringForKey = if (
+            contentsForKey?.isJsonPrimitive == true &&
+            contentsForKey.asJsonPrimitive?.isString == true
+        ) contentsForKey.asString else null
+
+        contentsStringForKey?.let {
+            contextLine = ContextLine(
+                lineNumber = lineNumber,
+                contents = it,
+                highlights = getHighlightsFromMarks(marksJsonObject?.get(key))
+            )
+        }
+        return contextLine
+    }
+
+    private fun getHighlightsFromMarks(marksForKey: JsonElement?): List<Pair<Int, Int>>? {
+        val marksJsonArrayForKey = if (marksForKey?.isJsonArray == true) marksForKey.asJsonArray else null
+        return marksJsonArrayForKey?.let { getHighlightsFromMarksArray(it) }
+    }
+
+    private fun getHighlightsFromMarksArray(marksForKeyArray: JsonArray): ArrayList<Pair<Int, Int>>? {
+        var highlights: ArrayList<Pair<Int, Int>>? = null
+
+        for (rangeArrayJsonElement in marksForKeyArray) {
+            val selectionRange = getSelectionRange(rangeArrayJsonElement)
+            selectionRange?.let { range ->
+                if (highlights == null) {
+                    highlights = arrayListOf()
+                }
+                highlights?.add(range)
+            }
+        }
+
+        return highlights
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun getSelectionRange(rangeArrayJsonElement: JsonElement): Pair<Int, Int>? {
+        return try {
+            val startIndex = rangeArrayJsonElement.asJsonArray.get(0).asInt
+            val endIndex = rangeArrayJsonElement.asJsonArray.get(1).asInt
+            Pair(startIndex, endIndex)
+        } catch (ex: ClassCastException) {
+            null
+        } catch (ex: IllegalStateException) {
+            null
+        } catch (ex: IndexOutOfBoundsException) {
+            null
+        }
+    }
+
+    companion object {
+        private const val MARKS = "marks"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AllDomainsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AllDomainsResponse.kt
new file mode 100644
index 00000000000..8b2f8353e43
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AllDomainsResponse.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.util.DateTimeUtils
+import java.lang.reflect.Type
+import java.util.Date
+
+data class AllDomainsResponse(val domains: List<AllDomainsDomain>)
+
+data class AllDomainsDomain(
+    @SerializedName("domain")
+    val domain: String? = null,
+    @SerializedName("blog_id")
+    val blogId: Long = 0,
+    @SerializedName("blog_name")
+    val blogName: String? = null,
+    @SerializedName("type")
+    val type: String? = null,
+    @SerializedName("is_domain_only_site")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val isDomainOnlySite: Boolean = false,
+    @SerializedName("is_wpcom_staging_domain")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val isWpcomStagingDomain: Boolean = false,
+    @SerializedName("has_registration")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val hasRegistration: Boolean = false,
+    @SerializedName("registration_date")
+    @JsonAdapter(AllDomainsDateAdapter::class)
+    val registrationDate: Date? = null,
+    @SerializedName("expiry")
+    @JsonAdapter(AllDomainsDateAdapter::class)
+    val expiry: Date? = null,
+    @SerializedName("wpcom_domain")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val wpcomDomain: Boolean = false,
+    @SerializedName("current_user_is_owner")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val currentUserIsOwner: Boolean = false,
+    @SerializedName("site_slug")
+    val siteSlug: String? = null,
+    @SerializedName("domain_status")
+    val domainStatus: DomainStatus? = null,
+)
+
+data class DomainStatus(
+    @SerializedName("status")
+    val status: String? = null,
+    @SerializedName("status_type")
+    @JsonAdapter(StatusTypeAdapter::class)
+    val statusType: StatusType? = null,
+    @SerializedName("status_weight")
+    val statusWeight: Long? = 0,
+    @SerializedName("action_required")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val actionRequired: Boolean? = false,
+)
+
+enum class StatusType(private val stringValue: String) {
+    SUCCESS("success"),
+    NEUTRAL("neutral"),
+    ALERT("alert"),
+    WARNING("warning"),
+    ERROR("error"),
+    UNKNOWN("unknown");
+
+    override fun toString() = stringValue
+
+    companion object {
+        fun fromString(string: String): StatusType {
+            for (item in values()) {
+                if (item.stringValue == string) {
+                    return item
+                }
+            }
+            return UNKNOWN
+        }
+    }
+}
+
+internal class StatusTypeAdapter : JsonDeserializer<StatusType> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): StatusType {
+        val jsonPrimitive = json.asJsonPrimitive
+        return when {
+            jsonPrimitive.isString -> StatusType.fromString(jsonPrimitive.asString)
+            else -> StatusType.UNKNOWN
+        }
+    }
+}
+
+internal class AllDomainsDateAdapter : JsonDeserializer<Date?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Date? {
+        val jsonPrimitive = json.asJsonPrimitive
+        return when {
+            jsonPrimitive.isString -> DateTimeUtils.dateUTCFromIso8601(jsonPrimitive.asString)
+            else -> null
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferEligibilityCheckResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferEligibilityCheckResponse.java
new file mode 100644
index 00000000000..b6a74fb4c7a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferEligibilityCheckResponse.java
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import com.google.gson.annotations.SerializedName;
+
+public class AutomatedTransferEligibilityCheckResponse {
+    @SerializedName("is_eligible")
+    public boolean isEligible;
+    public EligibilityError[] errors;
+
+    class EligibilityError {
+        public String code;
+        public String message;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferStatusResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferStatusResponse.java
new file mode 100644
index 00000000000..7874717ae1b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/AutomatedTransferStatusResponse.java
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import com.google.gson.annotations.SerializedName;
+
+public class AutomatedTransferStatusResponse {
+    public String status;
+    @SerializedName("step")
+    public int currentStep;
+    @SerializedName("total")
+    public int totalSteps;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BlockLayoutsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BlockLayoutsResponse.kt
new file mode 100644
index 00000000000..c979da907f9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BlockLayoutsResponse.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+import org.wordpress.android.fluxc.network.Response
+
+data class BlockLayoutsResponse(
+    val layouts: List<GutenbergLayout>,
+    val categories: List<GutenbergLayoutCategory>
+) : Response
+
+@Parcelize
+data class GutenbergLayout(
+    val slug: String,
+    val title: String,
+    val preview: String,
+    @SerializedName("preview_tablet") val previewTablet: String,
+    @SerializedName("preview_mobile") val previewMobile: String,
+    val content: String,
+    @SerializedName("demo_url") val demoUrl: String,
+    val categories: List<GutenbergLayoutCategory>
+) : Parcelable
+
+@Parcelize
+data class GutenbergLayoutCategory(
+    val slug: String,
+    val title: String,
+    val description: String,
+    val emoji: String?
+) : Parcelable
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt
new file mode 100644
index 00000000000..4a71d07772e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
+import java.util.Locale
+
+internal class BooleanTypeAdapter : JsonDeserializer<Boolean?> {
+    @Suppress("VariableNaming") private val TRUE_STRINGS: Set<String> = HashSet(listOf("true", "1", "yes"))
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Boolean {
+        val jsonPrimitive = json.asJsonPrimitive
+        return when {
+            jsonPrimitive.isBoolean -> jsonPrimitive.asBoolean
+            jsonPrimitive.isNumber -> jsonPrimitive.asNumber.toInt() == 1
+            jsonPrimitive.isString -> TRUE_STRINGS.contains(jsonPrimitive.asString.toLowerCase(
+                Locale.getDefault()
+            ))
+            else -> false
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ConnectSiteInfoResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ConnectSiteInfoResponse.java
new file mode 100644
index 00000000000..c719d44566b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ConnectSiteInfoResponse.java
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class ConnectSiteInfoResponse implements Response {
+    public boolean exists;
+    public boolean isWordPress;
+    public boolean hasJetpack;
+    public boolean isJetpackActive;
+    public boolean isJetpackConnected;
+    public boolean isWordPressDotCom; // CHECKSTYLE IGNORE
+    public String urlAfterRedirects;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DesignatePrimaryDomainResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DesignatePrimaryDomainResponse.kt
new file mode 100644
index 00000000000..3f7685afdfd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DesignatePrimaryDomainResponse.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+data class DesignatePrimaryDomainResponse(val success: Boolean)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainAvailabilityResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainAvailabilityResponse.kt
new file mode 100644
index 00000000000..25cbc7282be
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainAvailabilityResponse.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+@Suppress("ConstructorParameterNaming")
+class DomainAvailabilityResponse(
+    val product_id: Int?,
+    val product_slug: String?,
+    val domain_name: String?,
+    val status: String?,
+    val mappable: String?,
+    val cost: String?,
+    val supports_privacy: Boolean = false
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainPriceResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainPriceResponse.kt
new file mode 100644
index 00000000000..3ab96b313b7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainPriceResponse.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+@Suppress("ConstructorParameterNaming")
+data class DomainPriceResponse(
+    val is_premium: Boolean = false,
+    val product_id: Int?,
+    val product_slug: String?,
+    val cost: String?,
+    val raw_price: Double?,
+    val currency_code: String?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainSuggestionResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainSuggestionResponse.java
new file mode 100644
index 00000000000..045f0d61299
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainSuggestionResponse.java
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class DomainSuggestionResponse implements Response {
+    public String cost;
+    public String domain_name;
+    public boolean is_free;
+    public boolean is_premium;
+    public boolean supports_privacy;
+
+    public int product_id;
+    public String product_slug;
+    public String vendor;
+    public float relevance;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainsResponse.kt
new file mode 100644
index 00000000000..88bb727a5bd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/DomainsResponse.kt
@@ -0,0 +1,152 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.JsonElement
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
+
+data class DomainsResponse(val domains: List<Domain>)
+
+data class Domain(
+    @SerializedName("a_records_required_for_mapping")
+    val aRecordsRequiredForMapping: List<String>? = null,
+    @SerializedName("auto_renewal_date")
+    val autoRenewalDate: String? = null,
+    @SerializedName("auto_renewing")
+    @JsonAdapter(BooleanTypeAdapter::class)
+    val autoRenewing: Boolean = false,
+    @SerializedName("blog_id")
+    val blogId: Long = 0,
+    @SerializedName("bundled_plan_subscription_id")
+    val bundledPlanSubscriptionId: String? = null,
+    @SerializedName("can_set_as_primary")
+    val canSetAsPrimary: Boolean = false,
+    @SerializedName("connection_mode")
+    val connectionMode: String? = null,
+    @SerializedName("contact_info_disclosed")
+    val contactInfoDisclosed: Boolean = false,
+    @SerializedName("contact_info_disclosure_available")
+    val contactInfoDisclosureAvailable: Boolean = false,
+    @SerializedName("current_user_can_add_email")
+    val currentUserCanAddEmail: Boolean = false,
+    @SerializedName("current_user_can_create_site_from_domain_only")
+    val currentUserCanCreateSiteFromDomainOnly: Boolean = false,
+    @SerializedName("current_user_can_manage")
+    val currentUserCanManage: Boolean = false,
+    @SerializedName("current_user_cannot_add_email_reason")
+    val currentUserCannotAddEmailReason: JsonElement? = null,
+    @SerializedName("domain")
+    val domain: String? = null,
+    @SerializedName("domain_locking_available")
+    val domainLockingAvailable: Boolean = false,
+    @SerializedName("domain_registration_agreement_url")
+    val domainRegistrationAgreementUrl: String? = null,
+    @SerializedName("email_forwards_count")
+    val emailForwardsCount: Int = 0,
+    @SerializedName("expired")
+    val expired: Boolean = false,
+    @SerializedName("expiry")
+    val expiry: String? = null,
+    @SerializedName("expiry_soon")
+    val expirySoon: Boolean = false,
+    @SerializedName("google_apps_subscription")
+    val googleAppsSubscription: GoogleAppsSubscription? = null,
+    @SerializedName("has_private_registration")
+    val hasPrivateRegistration: Boolean = false,
+    @SerializedName("has_registration")
+    val hasRegistration: Boolean = false,
+    @SerializedName("has_wpcom_nameservers")
+    val hasWpcomNameservers: Boolean = false,
+    @SerializedName("has_zone")
+    val hasZone: Boolean = false,
+    @SerializedName("is_eligible_for_inbound_transfer")
+    val isEligibleForInboundTransfer: Boolean = false,
+    @SerializedName("is_locked")
+    val isLocked: Boolean = false,
+    @SerializedName("is_pending_icann_verification")
+    val isPendingIcannVerification: Boolean = false,
+    @SerializedName("is_premium")
+    val isPremium: Boolean = false,
+    @SerializedName("is_redeemable")
+    val isRedeemable: Boolean = false,
+    @SerializedName("is_renewable")
+    val isRenewable: Boolean = false,
+    @SerializedName("is_subdomain")
+    val isSubdomain: Boolean = false,
+    @SerializedName("is_whois_editable")
+    val isWhoisEditable: Boolean = false,
+    @SerializedName("is_wpcom_staging_domain")
+    val isWpcomStagingDomain: Boolean = false,
+    @SerializedName("manual_transfer_required")
+    val manualTransferRequired: Boolean = false,
+    @SerializedName("new_registration")
+    val newRegistration: Boolean = false,
+    @SerializedName("owner")
+    val owner: String? = null,
+    @SerializedName("partner_domain")
+    val partnerDomain: Boolean = false,
+    @SerializedName("pending_registration")
+    val pendingRegistration: Boolean = false,
+    @SerializedName("pending_registration_time")
+    val pendingRegistrationTime: String? = null,
+    @SerializedName("pending_transfer")
+    val pendingTransfer: Boolean = false,
+    @SerializedName("pending_whois_update")
+    val pendingWhoisUpdate: Boolean = false,
+    @SerializedName("points_to_wpcom")
+    val pointsToWpcom: Boolean = false,
+    @SerializedName("primary_domain")
+    val primaryDomain: Boolean = false,
+    @SerializedName("privacy_available")
+    val privacyAvailable: Boolean = false,
+    @SerializedName("private_domain")
+    val privateDomain: Boolean = false,
+    @SerializedName("product_slug")
+    val productSlug: String? = null,
+    @SerializedName("redeemable_until")
+    val redeemableUntil: String? = null,
+    @SerializedName("registrar")
+    val registrar: String? = null,
+    @SerializedName("registration_date")
+    val registrationDate: String? = null,
+    @SerializedName("renewable_until")
+    val renewableUntil: String? = null,
+    @SerializedName("ssl_status")
+    val sslStatus: String? = null,
+    @SerializedName("subdomain_part")
+    val subdomainPart: String? = null,
+    @SerializedName("subscription_id")
+    val subscriptionId: String? = null,
+    @SerializedName("supports_domain_connect")
+    val supportsDomainConnect: Boolean = false,
+    @SerializedName("supports_gdpr_consent_management")
+    val supportsGdprConsentManagement: Boolean = false,
+    @SerializedName("supports_transfer_approval")
+    val supportsTransferApproval: Boolean = false,
+    @SerializedName("titan_mail_subscription")
+    val titanMailSubscription: TitanMailSubscription? = null,
+    @SerializedName("tld_maintenance_end_time")
+    val tldMaintenanceEndTime: Int = 0,
+    @SerializedName("transfer_away_eligible_at")
+    val transferAwayEligibleAt: String? = null,
+    @SerializedName("transfer_lock_on_whois_update_optional")
+    val transferLockOnWhoisUpdateOptional: Boolean = false,
+    @SerializedName("type")
+    val type: String? = null,
+    @SerializedName("whois_update_unmodifiable_fields")
+    val whoisUpdateUnmodifiableFields: List<String>? = null,
+    @SerializedName("wpcom_domain")
+    val wpcomDomain: Boolean = false
+)
+
+data class GoogleAppsSubscription(
+    @SerializedName("status")
+    val status: String? = null
+)
+
+data class TitanMailSubscription(
+    @SerializedName("is_eligible_for_introductory_offer")
+    val isEligibleForIntroductoryOffer: Boolean = false,
+    @SerializedName("status")
+    val status: String? = null
+)
+
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ExportSiteResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ExportSiteResponse.java
new file mode 100644
index 00000000000..7f8e9a05afa
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/ExportSiteResponse.java
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+public class ExportSiteResponse {
+    public String status;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/InitiateAutomatedTransferResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/InitiateAutomatedTransferResponse.java
new file mode 100644
index 00000000000..6d43820b811
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/InitiateAutomatedTransferResponse.java
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import com.google.gson.annotations.SerializedName;
+
+public class InitiateAutomatedTransferResponse {
+    public String status;
+    public boolean success;
+    @SerializedName("transfer_id")
+    public int transferId;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackCapabilitiesResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackCapabilitiesResponse.kt
new file mode 100644
index 00000000000..abd1493348c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackCapabilitiesResponse.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class JetpackCapabilitiesResponse(
+    @SerializedName("capabilities") val capabilities: List<String>?
+) : Response
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackSocialResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackSocialResponse.kt
new file mode 100644
index 00000000000..5c711758749
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/JetpackSocialResponse.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.network.Response
+
+data class JetpackSocialResponse(
+    @SerializedName("is_share_limit_enabled") val isShareLimitEnabled: Boolean?,
+    @SerializedName("to_be_publicized_count") val toBePublicizedCount: Int?,
+    @SerializedName("share_limit") val shareLimit: Int?,
+    @SerializedName("publicized_count") val publicizedCount: Int?,
+    @SerializedName("shared_posts_count") val sharedPostsCount: Int?,
+    @SerializedName("shares_remaining") val sharesRemaining: Int?,
+    @SerializedName("is_enhanced_publishing_enabled") val isEnhancedPublishingEnabled: Boolean?,
+    @SerializedName("is_social_image_generator_enabled") val isSocialImageGeneratorEnabled: Boolean?,
+) : Response
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/NewSiteResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/NewSiteResponse.java
new file mode 100644
index 00000000000..380afb7280f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/NewSiteResponse.java
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class NewSiteResponse implements Response {
+    public boolean success;
+    public BlogDetails blog_details;
+    public String error;
+    public String message;
+
+    public static class BlogDetails {
+        public String url;
+        public String blogid;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PlansResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PlansResponse.kt
new file mode 100644
index 00000000000..1284f5e73f2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PlansResponse.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.JsonAdapter
+import org.wordpress.android.fluxc.model.PlanModel
+import org.wordpress.android.fluxc.network.utils.getBoolean
+import org.wordpress.android.fluxc.network.utils.getString
+import java.lang.reflect.Type
+
+@JsonAdapter(PlansDeserializer::class)
+class PlansResponse(val plansList: List<PlanModel>)
+
+class PlansDeserializer : JsonDeserializer<PlansResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): PlansResponse {
+        val jsonObject = json.asJsonObject
+        val planModels = ArrayList<PlanModel>()
+        jsonObject.entrySet().forEach { (key, value) ->
+            val planJsonObj = value.asJsonObject
+            val productSlug = planJsonObj.getString("product_slug")
+            val productName = planJsonObj.getString("product_name")
+            val productId = key.toIntOrNull()
+
+            // 'current_plan' and 'has_domain_credit' attributes might be missing,
+            // consider them as false, if they are missing
+            val isCurrentPlan = planJsonObj.getBoolean("current_plan")
+            val hasDomainCredit = planJsonObj.getBoolean("has_domain_credit")
+            planModels.add(PlanModel(productId, productSlug, productName, isCurrentPlan, hasDomainCredit))
+        }
+        return PlansResponse(planModels)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PostFormatsResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PostFormatsResponse.java
new file mode 100644
index 00000000000..0ab81775d01
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PostFormatsResponse.java
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import java.util.Map;
+
+public class PostFormatsResponse {
+    public Map<String, String> formats;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookie.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookie.kt
new file mode 100644
index 00000000000..211d257d704
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookie.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val MILLIS = 1000
+
+@Singleton
+class PrivateAtomicCookie
+@Inject constructor(private val preferenceUtils: PreferenceUtilsWrapper) {
+    private val gson: Gson by lazy {
+        val builder = GsonBuilder()
+        builder.create()
+    }
+
+    companion object {
+        private const val PRIVATE_ATOMIC_COOKIE_PREF_KEY = "PRIVATE_ATOMIC_COOKIE_PREF_KEY"
+        private const val COOKIE_EXPIRATION_THRESHOLD = 6 * 60 * 60 // 6 hours
+    }
+
+    private var cookie: AtomicCookie? = null
+
+    init {
+        val rawCookie = preferenceUtils.getFluxCPreferences().getString(PRIVATE_ATOMIC_COOKIE_PREF_KEY, null)
+        cookie = gson.fromJson(rawCookie, AtomicCookie::class.java)
+    }
+
+    fun isCookieRefreshRequired(): Boolean {
+        return isExpiringSoon()
+    }
+
+    private fun isExpiringSoon(): Boolean {
+        return if (!exists()) {
+            true
+        } else {
+            try {
+                val cookieExpiration: Long = cookie!!.expires.toLong()
+                val currentTime = (System.currentTimeMillis() / MILLIS)
+                currentTime + COOKIE_EXPIRATION_THRESHOLD >= cookieExpiration
+            } catch (e: NumberFormatException) {
+                // we ran into a situation where cookie!!.expires contained "false" resulting
+                // in an exception attempting to convert it to a long
+                false
+            }
+        }
+    }
+
+    fun exists(): Boolean {
+        return cookie != null
+    }
+
+    fun isExpired(): Boolean {
+        if (!exists()) {
+            return true
+        }
+        val cookieExpiration: Long = cookie!!.expires.toLong()
+        val currentTime = (System.currentTimeMillis() / MILLIS)
+
+        return currentTime >= cookieExpiration
+    }
+
+    fun getExpirationDateEpoch(): String {
+        return cookie!!.expires
+    }
+
+    fun getCookieContent(): String {
+        return getName() + "=" + getValue()
+    }
+
+    fun getName(): String {
+        return cookie!!.name
+    }
+
+    fun getValue(): String {
+        return cookie!!.value
+    }
+
+    fun getDomain(): String {
+        return cookie!!.domain
+    }
+
+    fun getPath(): String {
+        return cookie!!.path
+    }
+
+    fun set(siteCookie: AtomicCookie?) {
+        cookie = siteCookie
+        preferenceUtils.getFluxCPreferences().edit().putString(PRIVATE_ATOMIC_COOKIE_PREF_KEY, gson.toJson(siteCookie))
+                .apply()
+    }
+
+    fun clearCookie() {
+        cookie = null
+        preferenceUtils.getFluxCPreferences().edit().remove(PRIVATE_ATOMIC_COOKIE_PREF_KEY).apply()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookieResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookieResponse.kt
new file mode 100644
index 00000000000..fb61d555078
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/PrivateAtomicCookieResponse.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+class PrivateAtomicCookieResponse(
+    val url: String,
+    val cookies: List<AtomicCookie>
+)
+
+class AtomicCookie(
+    val expires: String,
+    val path: String,
+    val domain: String,
+    val name: String,
+    val value: String
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/QuickStartCompletedResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/QuickStartCompletedResponse.java
new file mode 100644
index 00000000000..f5466901c2b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/QuickStartCompletedResponse.java
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import com.google.gson.annotations.SerializedName;
+
+public class QuickStartCompletedResponse {
+    @SerializedName("success")
+    public boolean success;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteEditorsResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteEditorsResponse.java
new file mode 100644
index 00000000000..9debd293bc1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteEditorsResponse.java
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class SiteEditorsResponse implements Response {
+    public String editor_mobile;
+    public String editor_web;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClient.kt
new file mode 100644
index 00000000000..daafb13314b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteHomepageRestClient.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteHomepageSettings
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SiteHomepageRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun updateHomepage(
+        site: SiteModel,
+        homepageSettings: SiteHomepageSettings
+    ): Response<UpdateHomepageResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).homepage.urlV1_1
+        val body = mutableMapOf(
+                "is_page_on_front" to (homepageSettings.showOnFront == ShowOnFront.PAGE).toString()
+        )
+        if (homepageSettings is StaticPage) {
+            if (homepageSettings.pageOnFrontId > -1) {
+                body["page_on_front_id"] = homepageSettings.pageOnFrontId.toString()
+            }
+            if (homepageSettings.pageForPostsId > -1) {
+                body["page_for_posts_id"] = homepageSettings.pageForPostsId.toString()
+            }
+        }
+        return wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                UpdateHomepageResponse::class.java
+        )
+    }
+
+    data class UpdateHomepageResponse(
+        @SerializedName("is_page_on_front") val isPageOnFront: Boolean,
+        @SerializedName("page_on_front_id") val pageOnFrontId: Long?,
+        @SerializedName("page_for_posts_id") val pageForPostsId: Long?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt
new file mode 100644
index 00000000000..aecc5cdb862
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt
@@ -0,0 +1,1290 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import android.content.Context
+import android.text.TextUtils
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import com.google.gson.reflect.TypeToken
+import org.apache.commons.text.StringEscapeUtils
+import org.json.JSONException
+import org.json.JSONObject
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.JetpackCapability
+import org.wordpress.android.fluxc.model.RoleModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.SitesModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AppSecrets
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteWPComRestResponse.SitesResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.UserRoleWPComRestResponse.UserRolesResponse
+import org.wordpress.android.fluxc.store.SiteStore.AccessCookieErrorType
+import org.wordpress.android.fluxc.store.SiteStore.AutomatedTransferEligibilityResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.AutomatedTransferError
+import org.wordpress.android.fluxc.store.SiteStore.AutomatedTransferStatusResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload
+import org.wordpress.android.fluxc.store.SiteStore.DeleteSiteError
+import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorForAllSitesResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.DesignatePrimaryDomainError
+import org.wordpress.android.fluxc.store.SiteStore.DesignatePrimaryDomainErrorType
+import org.wordpress.android.fluxc.store.SiteStore.DesignatedPrimaryDomainPayload
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityError
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityErrorType
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityStatus
+import org.wordpress.android.fluxc.store.SiteStore.DomainMappabilityStatus
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedCountriesError
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedCountriesErrorType
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedCountriesResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedStatesError
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedStatesErrorType
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedStatesResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedBlockLayoutsResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedEditorsPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedJetpackCapabilitiesPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPlansPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPostFormatsPayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPrivateAtomicCookiePayload
+import org.wordpress.android.fluxc.store.SiteStore.FetchedUserRolesPayload
+import org.wordpress.android.fluxc.store.SiteStore.InitiateAutomatedTransferResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.JetpackCapabilitiesError
+import org.wordpress.android.fluxc.store.SiteStore.JetpackCapabilitiesErrorType
+import org.wordpress.android.fluxc.store.SiteStore.NewSiteError
+import org.wordpress.android.fluxc.store.SiteStore.NewSiteErrorType
+import org.wordpress.android.fluxc.store.SiteStore.PlansError
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsError
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType
+import org.wordpress.android.fluxc.store.SiteStore.PrivateAtomicCookieError
+import org.wordpress.android.fluxc.store.SiteStore.QuickStartCompletedResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.QuickStartError
+import org.wordpress.android.fluxc.store.SiteStore.QuickStartErrorType
+import org.wordpress.android.fluxc.store.SiteStore.SiteEditorsError
+import org.wordpress.android.fluxc.store.SiteStore.SiteEditorsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteStore.SiteError
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.INVALID_SITE
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.UNAUTHORIZED
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.UNKNOWN_SITE
+import org.wordpress.android.fluxc.store.SiteStore.SiteFilter
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.BLOCK_SEARCH_ENGINE
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.COMING_SOON
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PRIVATE
+import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PUBLIC
+import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainError
+import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainErrorType.EMPTY_RESULTS
+import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsResponsePayload
+import org.wordpress.android.fluxc.store.SiteStore.UserRolesError
+import org.wordpress.android.fluxc.store.SiteStore.UserRolesErrorType
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.SiteUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import org.wordpress.android.util.StringUtils
+import org.wordpress.android.util.UrlUtils
+import java.io.UnsupportedEncodingException
+import java.net.URI
+import java.net.URLEncoder
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.math.max
+
+@Suppress("LargeClass")
+@Singleton
+class SiteRestClient @Inject constructor(
+    appContext: Context?,
+    dispatcher: Dispatcher?,
+    @Named("regular") requestQueue: RequestQueue?,
+    private val appSecrets: AppSecrets,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val coroutineEngine: CoroutineEngine,
+    accessToken: AccessToken?,
+    userAgent: UserAgent?
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    data class NewSiteResponsePayload(
+        val newSiteRemoteId: Long = 0,
+        val siteUrl: String? = null,
+        val dryRun: Boolean = false
+    ) : Payload<NewSiteError>()
+
+    data class DeleteSiteResponsePayload(val site: SiteModel? = null) : Payload<DeleteSiteError>()
+
+    class ExportSiteResponsePayload : Payload<BaseNetworkError>()
+    data class IsWPComResponsePayload(
+        val url: String,
+        val isWPCom: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    data class FetchWPComSiteResponsePayload(
+        val checkedUrl: String,
+        val site: SiteModel? = null
+    ) : Payload<SiteError>()
+
+    /**
+     *  Fetches the user's sites from WPCom.
+     *  Since the V1.2 endpoint doesn't return the plan features, we will handle the fetch by following two
+     *  different approaches:
+     *  1. If we don't need any filtering, then we'll simply use the v1.1 endpoint which includes the features.
+     *  2. If we have some filters, then we'll send two requests: the first one to the v1.2 endpoint to fetch sites
+     *     And the second one to the /me/sites/features to fetch the features separately, the combine the results.
+     */
+    @Suppress("ComplexMethod")
+    suspend fun fetchSites(filters: List<SiteFilter?>, filterJetpackConnectedPackageSite: Boolean): SitesModel {
+        val useV2Endpoint = filters.isNotEmpty()
+        val params = getFetchSitesParams(filters)
+        val url = WPCOMREST.me.sites.let { if (useV2Endpoint) it.urlV1_2 else it.urlV1_1 }
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, params, SitesResponse::class.java)
+
+        val siteFeatures = if (useV2Endpoint) {
+            fetchSitesFeatures().let {
+                if (it is Error) {
+                    val result = SitesModel()
+                    result.error = it.error
+                    return result
+                }
+                (it as Success).data
+            }
+        } else null
+
+        return when (response) {
+            is Success -> {
+                val siteArray = mutableListOf<SiteModel>()
+                val jetpackCPSiteArray = mutableListOf<SiteModel>()
+                for (siteResponse in response.data.sites) {
+                    val siteModel = siteResponseToSiteModel(siteResponse)
+
+                    siteFeatures?.get(siteModel.siteId)?.let {
+                        siteModel.planActiveFeatures = it.joinToString(",")
+                    }
+
+                    if (siteModel.isJetpackCPConnected) jetpackCPSiteArray.add(siteModel)
+                    // see https://github.com/wordpress-mobile/WordPress-Android/issues/15540#issuecomment-993752880
+                    if (filterJetpackConnectedPackageSite && siteModel.isJetpackCPConnected) continue
+                    siteArray.add(siteModel)
+                }
+                SitesModel(siteArray, jetpackCPSiteArray)
+            }
+
+            is Error -> {
+                val payload = SitesModel(emptyList())
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    private suspend fun fetchSitesFeatures(): Response<Map<Long, List<String>>> {
+        val url = WPCOMREST.me.sites.features.urlV1_1
+        return wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = emptyMap(),
+            clazz = SitesFeaturesRestResponse::class.java
+        ).let {
+            when (it) {
+                is Success -> Success(it.data.features.mapValues { it.value.active })
+                is Error -> Error(it.error)
+            }
+        }
+    }
+
+    private fun getFetchSitesParams(filters: List<SiteFilter?>): Map<String, String> {
+        val params = mutableMapOf<String, String>()
+        if (filters.isNotEmpty()) params[FILTERS] = TextUtils.join(",", filters)
+        params[FIELDS] = SITE_FIELDS
+        return params
+    }
+
+    suspend fun fetchSite(site: SiteModel): SiteModel {
+        val params = mutableMapOf<String, String>()
+        params[FIELDS] = SITE_FIELDS
+        val url = WPCOMREST.sites.urlV1_1 + site.siteId
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, params, SiteWPComRestResponse::class.java)
+        return when (response) {
+            is Success -> {
+                val newSite = siteResponseToSiteModel(response.data)
+                // local ID is not copied into the new model, let's make sure it is
+                // otherwise the call that updates the DB can add a new row?
+                if (site.id > 0) {
+                    newSite.id = site.id
+                }
+                newSite
+            }
+            is Error -> {
+                val payload = SiteModel()
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    /**
+     * Calls the API at https://public-api.wordpress.com/rest/v1.1/sites/new/ to create a new site
+     * @param siteName The domain of the site
+     * @param siteTitle The title of the site
+     * @param language The language of the site
+     * @param timeZoneId The timezone of the site
+     * @param visibility The visibility of the site (public or private)
+     * @param segmentId The segment that the site belongs to
+     * @param siteDesign The design template of the site
+     * @param isComingSoon The "coming soon" flag, which hides the site content from the public
+     * @param dryRun If set to true the call only validates the parameters passed
+     *
+     * The domain of the site is generated with the following logic:
+     *
+     * 1. If the [siteName] is provided it is used as a domain
+     * 2. If the [siteName] is not provided the [siteTitle] is passed and the API generates the domain from it
+     * 3. If neither the [siteName] or the [siteTitle] is passed the api generates a domain of the form siteXXXXXX
+     *
+     * In the cases 2 and 3 two extra parameters are passed:
+     * - `options.site_creation_flow` with value `with-design-picker`
+     * - `find_available_url` with value `1`
+     *
+     * @return the response of the API call  as [NewSiteResponsePayload]
+     */
+    @Suppress("ComplexMethod", "LongParameterList")
+    suspend fun newSite(
+        siteName: String?,
+        siteTitle: String?,
+        language: String,
+        timeZoneId: String?,
+        visibility: SiteVisibility,
+        segmentId: Long?,
+        siteDesign: String?,
+        findAvailableUrl: Boolean?,
+        dryRun: Boolean,
+        siteCreationFlow: String? = null
+    ): NewSiteResponsePayload {
+        val url = WPCOMREST.sites.new_.urlV1_1
+        val body = mutableMapOf<String, Any>()
+        val options = mutableMapOf<String, Any>()
+
+        body["lang_id"] = language
+
+        determineVisibility(visibility, body, options)
+
+        body["validate"] = if (dryRun) "1" else "0"
+        body["client_id"] = appSecrets.appId
+        body["client_secret"] = appSecrets.appSecret
+        findAvailableUrl?.let { body["find_available_url"] = it.toString() }
+
+        if (siteTitle != null) {
+            body["blog_title"] = siteTitle
+        }
+        body["blog_name"] = siteName ?: siteTitle ?: ""
+        siteName ?: run {
+            body["find_available_url"] = "1"
+            options["site_creation_flow"] = "with-design-picker"
+        }
+
+        if (segmentId != null) {
+            options["site_segment"] = segmentId
+        }
+        if (siteDesign != null) {
+            options["template"] = siteDesign
+        }
+        if (timeZoneId != null) {
+            options["timezone_string"] = timeZoneId
+        }
+        if (siteCreationFlow != null) {
+            options["site_creation_flow"] = siteCreationFlow
+        }
+
+        // Add site options if available
+        if (options.isNotEmpty()) {
+            body["options"] = options
+        }
+
+        // Disable retries and increase timeout for site creation (it can sometimes take a long time to complete)
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                NewSiteResponse::class.java,
+                DefaultRetryPolicy(NEW_SITE_TIMEOUT_MS, 0, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)
+        )
+        return when (response) {
+            is Success -> {
+                var siteId: Long = 0
+                if (response.data.blog_details != null) {
+                    try {
+                        siteId = response.data.blog_details.blogid.toLong()
+                    } catch (e: NumberFormatException) {
+                        // No op: In dry run mode, returned newSiteRemoteId is "Array"
+                    }
+                }
+                NewSiteResponsePayload(siteId, response.data.blog_details?.url, dryRun)
+            }
+            is Error -> {
+                volleyErrorToAccountResponsePayload(response.error.volleyError, dryRun)
+            }
+        }
+    }
+
+    private fun determineVisibility(
+        visibility: SiteVisibility,
+        body: MutableMap<String, Any>,
+        options: MutableMap<String, Any>
+    ) {
+        when (visibility) {
+            PRIVATE, BLOCK_SEARCH_ENGINE, PUBLIC -> {
+                body["public"] = visibility.value().toString()
+            }
+
+            COMING_SOON -> {
+                body["public"] = BLOCK_SEARCH_ENGINE.value().toString()
+                options["wpcom_public_coming_soon"] = "1"
+            }
+        }
+    }
+
+    suspend fun launchSite(site: SiteModel) : Response<Unit>{
+        val url = WPCOMV2.sites.site(site.siteId).launch.url
+        return wpComGsonRequestBuilder.syncPostRequest(
+            restClient = this,
+            url = url,
+            params = mapOf(),
+            body = mapOf("site" to site.siteId),
+            Unit::class.java
+        )
+    }
+
+    fun fetchSiteEditors(site: SiteModel) {
+        val params = mutableMapOf<String, String>()
+        val url = WPCOMV2.sites.site(site.siteId).gutenberg.url
+        val request = WPComGsonRequest.buildGetRequest(url, params,
+                SiteEditorsResponse::class.java,
+                { response ->
+                    if (response != null) {
+                        val payload = FetchedEditorsPayload(site, response.editor_web, response.editor_mobile)
+                        mDispatcher.dispatch(SiteActionBuilder.newFetchedSiteEditorsAction(payload))
+                    } else {
+                        AppLog.e(API, "Received empty response to /sites/\$site/gutenberg for " + site.url)
+                        val payload = FetchedEditorsPayload(site, "", "")
+                        payload.error = SiteEditorsError(GENERIC_ERROR)
+                        mDispatcher.dispatch(SiteActionBuilder.newFetchedSiteEditorsAction(payload))
+                    }
+                }
+        ) {
+            val payload = FetchedEditorsPayload(site, "", "")
+            payload.error = SiteEditorsError(GENERIC_ERROR)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedSiteEditorsAction(payload))
+        }
+        add(request)
+    }
+
+    fun designateMobileEditor(site: SiteModel, mobileEditorName: String) {
+        val params = mutableMapOf<String, Any>()
+        val url = WPCOMV2.sites.site(site.siteId).gutenberg.url
+        params["editor"] = mobileEditorName
+        params["platform"] = "mobile"
+        val request = WPComGsonRequest
+                .buildPostRequest(url, params, SiteEditorsResponse::class.java,
+                        { response ->
+                            val payload = FetchedEditorsPayload(site, response.editor_web, response.editor_mobile)
+                            mDispatcher.dispatch(SiteActionBuilder.newFetchedSiteEditorsAction(payload))
+                        }
+                ) {
+                    val payload = FetchedEditorsPayload(site, "", "")
+                    payload.error = SiteEditorsError(GENERIC_ERROR)
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedSiteEditorsAction(payload))
+                }
+        add(request)
+    }
+
+    fun designateMobileEditorForAllSites(mobileEditorName: String, setOnlyIfEmpty: Boolean) {
+        val params = mutableMapOf<String, Any>()
+        val url = WPCOMV2.me.gutenberg.url
+        params["editor"] = mobileEditorName
+        params["platform"] = "mobile"
+        if (setOnlyIfEmpty) {
+            params["set_only_if_empty"] = "true"
+        }
+        // Else, omit the "set_only_if_empty" parameters.
+        // There is an issue in the API implementation. It only checks
+        // for "set_only_if_empty" presence but don't check for its value.
+        add(
+                WPComGsonRequest
+                        .buildPostRequest<Map<String, String>>(url, params, MutableMap::class.java,
+                                { response ->
+                                    val payload = DesignateMobileEditorForAllSitesResponsePayload(response)
+                                    mDispatcher.dispatch(
+                                            SiteActionBuilder.newDesignatedMobileEditorForAllSitesAction(payload)
+                                    )
+                                },
+                                {
+                                    val payload = DesignateMobileEditorForAllSitesResponsePayload(null)
+                                    payload.error = SiteEditorsError(GENERIC_ERROR)
+                                    mDispatcher.dispatch(
+                                            SiteActionBuilder.newDesignatedMobileEditorForAllSitesAction(payload)
+                                    )
+                                })
+        )
+    }
+
+    suspend fun fetchPostFormats(site: SiteModel): FetchedPostFormatsPayload {
+        val url = WPCOMREST.sites.site(site.siteId).post_formats.urlV1_1
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), PostFormatsResponse::class.java)
+        return when (response) {
+            is Success -> {
+                val postFormats = SiteUtils.getValidPostFormatsOrNull(response.data.formats)
+                if (postFormats != null) {
+                    FetchedPostFormatsPayload(
+                            site,
+                            postFormats
+                    )
+                } else {
+                    val payload = FetchedPostFormatsPayload(site, emptyList())
+                    payload.error = PostFormatsError(PostFormatsErrorType.INVALID_RESPONSE)
+                    payload
+                }
+            }
+            is Error -> {
+                val payload = FetchedPostFormatsPayload(site, emptyList())
+                payload.error = PostFormatsError(PostFormatsErrorType.GENERIC_ERROR)
+                payload
+            }
+        }
+    }
+
+    @Suppress("ForbiddenComment")
+    fun fetchUserRoles(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).roles.urlV1_1
+        val request = WPComGsonRequest.buildGetRequest(url, null,
+                UserRolesResponse::class.java,
+                { response ->
+                    val roleArray = mutableListOf<RoleModel>()
+                    for (roleResponse in response.roles) {
+                        val roleModel = RoleModel()
+                        roleModel.name = roleResponse.name
+                        roleModel.displayName = StringEscapeUtils.unescapeHtml4(roleResponse.display_name)
+                        roleArray.add(roleModel)
+                    }
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newFetchedUserRolesAction(
+                                    FetchedUserRolesPayload(
+                                            site,
+                                            roleArray
+                                    )
+                            )
+                    )
+                }
+        ) {
+            val payload = FetchedUserRolesPayload(site, emptyList())
+            // TODO: what other kind of error could we get here?
+            payload.error = UserRolesError(UserRolesErrorType.GENERIC_ERROR)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedUserRolesAction(payload))
+        }
+        add(request)
+    }
+
+    fun fetchPlans(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).plans.urlV1_3
+        val request = WPComGsonRequest.buildGetRequest(url, null, PlansResponse::class.java,
+                { response ->
+                    val plans = response.plansList
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newFetchedPlansAction(FetchedPlansPayload(site, plans))
+                    )
+                }
+        ) { error ->
+            val plansError = PlansError(error.apiError, error.message)
+            val payload = FetchedPlansPayload(site, plansError)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedPlansAction(payload))
+        }
+        add(request)
+    }
+
+    fun deleteSite(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).delete.urlV1_1
+        val request = WPComGsonRequest.buildPostRequest(url, null,
+                SiteWPComRestResponse::class.java,
+                {
+                    val payload = DeleteSiteResponsePayload(site)
+                    mDispatcher.dispatch(SiteActionBuilder.newDeletedSiteAction(payload))
+                }
+        ) { error ->
+            val payload = DeleteSiteResponsePayload(site)
+            payload.error = DeleteSiteError(error.apiError, error.message)
+            mDispatcher.dispatch(SiteActionBuilder.newDeletedSiteAction(payload))
+        }
+        add(request)
+    }
+
+    fun exportSite(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).exports.start.urlV1_1
+        val request = WPComGsonRequest.buildPostRequest(url, null,
+                ExportSiteResponse::class.java,
+                {
+                    val payload = ExportSiteResponsePayload()
+                    mDispatcher.dispatch(SiteActionBuilder.newExportedSiteAction(payload))
+                }
+        ) { error ->
+            val payload = ExportSiteResponsePayload()
+            payload.error = error
+            mDispatcher.dispatch(SiteActionBuilder.newExportedSiteAction(payload))
+        }
+        add(request)
+    }
+
+    @Suppress("LongParameterList")
+    fun suggestDomains(
+        query: String,
+        quantity: Int,
+        vendor: String?,
+        onlyWordpressCom: Boolean?,
+        includeWordpressCom: Boolean?,
+        includeDotBlogSubdomain: Boolean?,
+        segmentId: Long?,
+        tlds: String?
+    ) {
+        val url = WPCOMREST.domains.suggestions.urlV1_1
+        val params = mutableMapOf<String, String>()
+        params["query"] = query
+        params["quantity"] = quantity.toString()
+        if (vendor != null) {
+            params["vendor"] = vendor
+        }
+        if (onlyWordpressCom != null) {
+            params["only_wordpressdotcom"] = onlyWordpressCom.toString() // CHECKSTYLE IGNORE
+        }
+        if (includeWordpressCom != null) {
+            params["include_wordpressdotcom"] = includeWordpressCom.toString() // CHECKSTYLE IGNORE
+        }
+        if (includeDotBlogSubdomain != null) {
+            params["include_dotblogsubdomain"] = includeDotBlogSubdomain.toString()
+        }
+        if (segmentId != null) {
+            params["segment_id"] = segmentId.toString()
+        }
+        if (tlds != null) {
+            params["tlds"] = tlds
+        }
+        val request = WPComGsonRequest.buildGetRequest<List<DomainSuggestionResponse>>(url, params,
+                object : TypeToken<List<DomainSuggestionResponse>>() {}.type,
+                { response ->
+                    val payload = SuggestDomainsResponsePayload(
+                            query,
+                            response
+                    )
+                    mDispatcher.dispatch(SiteActionBuilder.newSuggestedDomainsAction(payload))
+                },
+                { error ->
+                    val suggestDomainError = SuggestDomainError(error.apiError, error.message)
+                    if (suggestDomainError.type === EMPTY_RESULTS) {
+                        // Empty results is not an actual error, the API should return 200 for it
+                        val payload = SuggestDomainsResponsePayload(query, emptyList())
+                        mDispatcher.dispatch(SiteActionBuilder.newSuggestedDomainsAction(payload))
+                    } else {
+                        val payload = SuggestDomainsResponsePayload(query, suggestDomainError)
+                        mDispatcher.dispatch(SiteActionBuilder.newSuggestedDomainsAction(payload))
+                    }
+                }
+        )
+        add(request)
+    }
+
+    @Suppress("LongParameterList")
+    fun fetchWpComBlockLayouts(
+        site: SiteModel,
+        supportedBlocks: List<String?>?,
+        previewWidth: Float?,
+        previewHeight: Float?,
+        scale: Float?,
+        isBeta: Boolean?
+    ) {
+        val url = WPCOMV2.sites.site(site.siteId).block_layouts.url
+        fetchBlockLayouts(site, url, supportedBlocks, previewWidth, previewHeight, scale, isBeta)
+    }
+
+    @Suppress("LongParameterList")
+    fun fetchSelfHostedBlockLayouts(
+        site: SiteModel,
+        supportedBlocks: List<String?>?,
+        previewWidth: Float?,
+        previewHeight: Float?,
+        scale: Float?,
+        isBeta: Boolean?
+    ) {
+        val url = WPCOMV2.common_block_layouts.url
+        fetchBlockLayouts(site, url, supportedBlocks, previewWidth, previewHeight, scale, isBeta)
+    }
+
+    @Suppress("LongParameterList")
+    private fun fetchBlockLayouts(
+        site: SiteModel,
+        url: String,
+        supportedBlocks: List<String?>?,
+        previewWidth: Float?,
+        previewHeight: Float?,
+        scale: Float?,
+        isBeta: Boolean?
+    ) {
+        val params = mutableMapOf<String, String>()
+        if (supportedBlocks != null && supportedBlocks.isNotEmpty()) {
+            params["supported_blocks"] = TextUtils.join(",", supportedBlocks)
+        }
+        if (previewWidth != null) {
+            params["preview_width"] = String.format(Locale.US, "%.1f", previewWidth)
+        }
+        if (previewHeight != null) {
+            params["preview_height"] = String.format(Locale.US, "%.1f", previewHeight)
+        }
+        if (scale != null) {
+            params["scale"] = String.format(Locale.US, "%.1f", scale)
+        }
+        params["type"] = "mobile"
+        if (isBeta != null) {
+            params["is_beta"] = isBeta.toString()
+        }
+        val request = WPComGsonRequest.buildGetRequest(url, params,
+                BlockLayoutsResponse::class.java,
+                { (layouts, categories) ->
+                    val payload = FetchedBlockLayoutsResponsePayload(
+                            site, layouts,
+                            categories
+                    )
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedBlockLayoutsAction(payload))
+                }
+        ) { error ->
+            val siteErrorType = when (error.apiError) {
+                "unauthorized" -> UNAUTHORIZED
+                "unknown_blog" -> UNKNOWN_SITE
+                else -> SiteErrorType.GENERIC_ERROR
+            }
+            val siteError = SiteError(siteErrorType, error.message)
+            val payload = FetchedBlockLayoutsResponsePayload(site, siteError)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedBlockLayoutsAction(payload))
+        }
+        add(request)
+    }
+
+    // Unauthenticated network calls
+    fun fetchConnectSiteInfo(siteUrl: String) {
+        coroutineEngine.launch(AppLog.T.API, this, "fetchConnectSiteInfo") {
+            fetchConnectSiteInfoSync(siteUrl).let { payload ->
+                mDispatcher.dispatch(SiteActionBuilder.newFetchedConnectSiteInfoAction(payload))
+            }
+        }
+    }
+
+    @Suppress("SwallowedException")
+    suspend fun fetchConnectSiteInfoSync(siteUrl: String): ConnectSiteInfoPayload {
+        fun ConnectSiteInfoResponse.toConnectSiteInfoPayload(url: String): ConnectSiteInfoPayload {
+            return ConnectSiteInfoPayload(
+                url,
+                exists,
+                isWordPress,
+                hasJetpack,
+                isJetpackActive,
+                isJetpackConnected,
+                isWordPressDotCom, // CHECKSTYLE IGNORE
+                urlAfterRedirects
+            )
+        }
+
+        // Get a proper URI to reliably retrieve the scheme.
+        val uri: URI = try {
+            URI.create(UrlUtils.addUrlSchemeIfNeeded(siteUrl, false))
+        } catch (e: IllegalArgumentException) {
+            val siteError = SiteError(INVALID_SITE)
+            return ConnectSiteInfoPayload(siteUrl, siteError)
+        }
+
+        val params = mutableMapOf<String, String>()
+        params["url"] = uri.toString()
+
+        // Make the call.
+        val url = WPCOMREST.connect.site_info.urlV1_1
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = params,
+            clazz = ConnectSiteInfoResponse::class.java
+        )
+
+        return when (response) {
+            is Error -> {
+                val siteErrorType = when (response.error.apiError) {
+                    "connection_disabled" -> SiteErrorType.WPCOM_SITE_SUSPENDED
+                    else -> INVALID_SITE
+                }
+
+                ConnectSiteInfoPayload(siteUrl, SiteError(siteErrorType))
+            }
+            is Success -> {
+                response.data.toConnectSiteInfoPayload(siteUrl)
+            }
+        }
+    }
+
+    @Suppress("SwallowedException")
+    fun fetchWPComSiteByUrl(siteUrl: String) {
+        val sanitizedUrl: String
+        try {
+            val uri = URI.create(UrlUtils.addUrlSchemeIfNeeded(siteUrl, false))
+            sanitizedUrl = URLEncoder.encode(UrlUtils.removeScheme(uri.toString()), "UTF-8")
+        } catch (e: IllegalArgumentException) {
+            val payload = FetchWPComSiteResponsePayload(siteUrl)
+            payload.error = SiteError(INVALID_SITE)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedWpcomSiteByUrlAction(payload))
+            return
+        } catch (e: UnsupportedEncodingException) {
+            // This should be impossible (it means an Android device without UTF-8 support)
+            throw IllegalStateException(e)
+        }
+        val requestUrl = WPCOMREST.sites.siteUrl(sanitizedUrl).urlV1_1
+        val request = WPComGsonRequest.buildGetRequest(requestUrl, null,
+                SiteWPComRestResponse::class.java,
+                { response ->
+                    val payload = FetchWPComSiteResponsePayload(siteUrl, siteResponseToSiteModel(response))
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedWpcomSiteByUrlAction(payload))
+                }
+        ) { error ->
+            val payload = FetchWPComSiteResponsePayload(siteUrl)
+            val siteErrorType = when (error.apiError) {
+                "unauthorized" -> UNAUTHORIZED
+                "unknown_blog" -> UNKNOWN_SITE
+                else -> SiteErrorType.GENERIC_ERROR
+            }
+            payload.error = SiteError(siteErrorType)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedWpcomSiteByUrlAction(payload))
+        }
+        addUnauthedRequest(request)
+    }
+
+    fun checkUrlIsWPCom(testedUrl: String) {
+        val url = WPCOMREST.sites.urlV1_1 + testedUrl
+        val request = WPComGsonRequest.buildGetRequest(url, null,
+                SiteWPComRestResponse::class.java,
+                {
+                    val payload = IsWPComResponsePayload(testedUrl, true)
+                    mDispatcher.dispatch(SiteActionBuilder.newCheckedIsWpcomUrlAction(payload))
+                }
+        ) { error ->
+            val payload = IsWPComResponsePayload(testedUrl)
+            if ("unauthorized" != error.apiError && "unknown_blog" != error.apiError) {
+                payload.error = error
+            }
+            mDispatcher.dispatch(SiteActionBuilder.newCheckedIsWpcomUrlAction(payload))
+        }
+        addUnauthedRequest(request)
+    }
+
+    /**
+     * Performs an HTTP GET call to v1.3 /domains/$domainName/is-available/ endpoint. Upon receiving a response
+     * (success or error) a [SiteAction.CHECKED_DOMAIN_AVAILABILITY] action is dispatched with a
+     * payload of type [DomainAvailabilityResponsePayload].
+     *
+     * [DomainAvailabilityResponsePayload.isError] can be used to check the request result.
+     */
+    fun checkDomainAvailability(domainName: String) {
+        val url = WPCOMREST.domains.domainName(domainName).is_available.urlV1_3
+        val request = WPComGsonRequest.buildGetRequest(url, null, DomainAvailabilityResponse::class.java,
+                { response ->
+                    val payload = responseToDomainAvailabilityPayload(response)
+                    mDispatcher.dispatch(SiteActionBuilder.newCheckedDomainAvailabilityAction(payload))
+                }
+        ) { error -> // Domain availability API should always return a response for a valid,
+            // authenticated user. Therefore, only GENERIC_ERROR is identified here.
+            val domainAvailabilityError = DomainAvailabilityError(
+                    DomainAvailabilityErrorType.GENERIC_ERROR, error.message
+            )
+            val payload = DomainAvailabilityResponsePayload(domainAvailabilityError)
+            mDispatcher.dispatch(SiteActionBuilder.newCheckedDomainAvailabilityAction(payload))
+        }
+        add(request)
+    }
+
+    /**
+     * Performs an HTTP GET call to v1.1 /domains/supported-states/$countryCode endpoint. Upon receiving a response
+     * (success or error) a [SiteAction.FETCHED_DOMAIN_SUPPORTED_STATES] action is dispatched with a
+     * payload of type [DomainSupportedStatesResponsePayload].
+     *
+     * [DomainSupportedStatesResponsePayload.isError] can be used to check the request result.
+     */
+    fun fetchSupportedStates(countryCode: String) {
+        val url = WPCOMREST.domains.supported_states.countryCode(countryCode).urlV1_1
+        val request = WPComGsonRequest.buildGetRequest<List<SupportedStateResponse>>(url, null,
+                object : TypeToken<List<SupportedStateResponse>>() {}.type,
+                { response ->
+                    val payload = DomainSupportedStatesResponsePayload(response)
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedDomainSupportedStatesAction(payload))
+                },
+                { error ->
+                    val domainSupportedStatesError = DomainSupportedStatesError(
+                            DomainSupportedStatesErrorType.fromString(error.apiError), error.message
+                    )
+                    val payload = DomainSupportedStatesResponsePayload(domainSupportedStatesError)
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedDomainSupportedStatesAction(payload))
+                })
+        add(request)
+    }
+
+    /**
+     * Performs an HTTP GET call to v1.1 /domains/supported-countries/ endpoint. Upon receiving a response
+     * (success or error) a [SiteAction.FETCHED_DOMAIN_SUPPORTED_COUNTRIES] action is dispatched with a
+     * payload of type [DomainSupportedCountriesResponsePayload].
+     *
+     * [DomainSupportedCountriesResponsePayload.isError] can be used to check the request result.
+     */
+    fun fetchSupportedCountries() {
+        val url = WPCOMREST.domains.supported_countries.urlV1_1
+        val request = WPComGsonRequest.buildGetRequest<List<SupportedCountryResponse>>(url, null,
+                object : TypeToken<List<SupportedCountryResponse>>() {}.type,
+                { response ->
+                    val payload = DomainSupportedCountriesResponsePayload(response)
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newFetchedDomainSupportedCountriesAction(payload)
+                    )
+                },
+                { error -> // Supported Countries API should always return a response for a valid,
+                    // authenticated user. Therefore, only GENERIC_ERROR is identified here.
+                    val domainSupportedCountriesError = DomainSupportedCountriesError(
+                            DomainSupportedCountriesErrorType.GENERIC_ERROR,
+                            error.message
+                    )
+                    val payload = DomainSupportedCountriesResponsePayload(domainSupportedCountriesError)
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newFetchedDomainSupportedCountriesAction(payload)
+                    )
+                })
+        add(request)
+    }
+
+    suspend fun fetchAllDomains(noWpCom: Boolean = true, resolveStatus: Boolean = true): Response<AllDomainsResponse> {
+        val url = WPCOMREST.all_domains.urlV1_1
+        val params = mapOf(
+            "no_wpcom" to noWpCom.toString(),
+            "resolve_status" to resolveStatus.toString()
+        )
+        return wpComGsonRequestBuilder.syncGetRequest(this, url, params, AllDomainsResponse::class.java)
+    }
+    suspend fun fetchSiteDomains(site: SiteModel): Response<DomainsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).domains.urlV1_1
+        return wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), DomainsResponse::class.java)
+    }
+
+    suspend fun fetchSitePlans(site: SiteModel): Response<PlansResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).plans.urlV1_3
+        return wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), PlansResponse::class.java)
+    }
+
+    suspend fun fetchDomainPrice(domainName: String): Response<DomainPriceResponse> {
+        val url = WPCOMREST.domains.domainName(domainName).price.urlV1_1
+        return wpComGsonRequestBuilder.syncGetRequest(this, url, mapOf(), DomainPriceResponse::class.java)
+    }
+
+    fun designatePrimaryDomain(site: SiteModel, domain: String) {
+        val url = WPCOMREST.sites.site(site.siteId).domains.primary.urlV1_1
+        val params = mutableMapOf<String, Any>()
+        params["domain"] = domain
+        val request = WPComGsonRequest
+                .buildPostRequest(url, params, DesignatePrimaryDomainResponse::class.java,
+                        { (success) ->
+                            mDispatcher.dispatch(
+                                    SiteActionBuilder.newDesignatedPrimaryDomainAction(
+                                            DesignatedPrimaryDomainPayload(site, success)
+                                    )
+                            )
+                        }
+                ) { networkError ->
+                    val error = DesignatePrimaryDomainError(
+                            DesignatePrimaryDomainErrorType.GENERIC_ERROR, networkError.message
+                    )
+                    val payload = DesignatedPrimaryDomainPayload(site, false)
+                    payload.error = error
+                    mDispatcher.dispatch(SiteActionBuilder.newDesignatedPrimaryDomainAction(payload))
+                }
+        add(request)
+    }
+
+    // Automated Transfers
+    fun checkAutomatedTransferEligibility(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).automated_transfers.eligibility.urlV1_1
+        val request = WPComGsonRequest
+                .buildGetRequest(url, null, AutomatedTransferEligibilityCheckResponse::class.java,
+                        { response ->
+                            val strErrorCodes = mutableListOf<String>()
+                            if (response.errors != null) {
+                                for (eligibilityError in response.errors) {
+                                    strErrorCodes.add(eligibilityError.code)
+                                }
+                            }
+                            mDispatcher.dispatch(
+                                    SiteActionBuilder.newCheckedAutomatedTransferEligibilityAction(
+                                            AutomatedTransferEligibilityResponsePayload(
+                                                    site, response.isEligible,
+                                                    strErrorCodes
+                                            )
+                                    )
+                            )
+                        }
+                ) { networkError ->
+                    val payloadError = AutomatedTransferError(
+                            networkError.apiError, networkError.message
+                    )
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newCheckedAutomatedTransferEligibilityAction(
+                                    AutomatedTransferEligibilityResponsePayload(site, payloadError)
+                            )
+                    )
+                }
+        add(request)
+    }
+
+    fun initiateAutomatedTransfer(site: SiteModel, pluginSlugToInstall: String) {
+        val url = WPCOMREST.sites.site(site.siteId).automated_transfers.initiate.urlV1_1
+        val params = mutableMapOf<String, Any>()
+        params["plugin"] = pluginSlugToInstall
+        val request = WPComGsonRequest
+                .buildPostRequest(url, params, InitiateAutomatedTransferResponse::class.java,
+                        { response ->
+                            val payload = InitiateAutomatedTransferResponsePayload(
+                                    site, pluginSlugToInstall,
+                                    response.success
+                            )
+                            mDispatcher.dispatch(SiteActionBuilder.newInitiatedAutomatedTransferAction(payload))
+                        }
+                ) { networkError ->
+                    val payload = InitiateAutomatedTransferResponsePayload(site, pluginSlugToInstall)
+                    payload.error = AutomatedTransferError(networkError.apiError, networkError.message)
+                    mDispatcher.dispatch(SiteActionBuilder.newInitiatedAutomatedTransferAction(payload))
+                }
+        add(request)
+    }
+
+    fun checkAutomatedTransferStatus(site: SiteModel) {
+        val url = WPCOMREST.sites.site(site.siteId).automated_transfers.status.urlV1_1
+        val request = WPComGsonRequest
+                .buildGetRequest(url, null, AutomatedTransferStatusResponse::class.java,
+                        { response ->
+                            mDispatcher.dispatch(
+                                    SiteActionBuilder.newCheckedAutomatedTransferStatusAction(
+                                            AutomatedTransferStatusResponsePayload(
+                                                    site, response.status,
+                                                    response.currentStep, response.totalSteps
+                                            )
+                                    )
+                            )
+                        }
+                ) { networkError ->
+                    val error = AutomatedTransferError(
+                            networkError.apiError, networkError.message
+                    )
+                    mDispatcher.dispatch(
+                            SiteActionBuilder.newCheckedAutomatedTransferStatusAction(
+                                    AutomatedTransferStatusResponsePayload(site, error)
+                            )
+                    )
+                }
+        add(request)
+    }
+
+    fun completeQuickStart(site: SiteModel, variant: String) {
+        val url = WPCOMREST.sites.site(site.siteId).mobile_quick_start.urlV1_1
+        val params = mutableMapOf<String, Any>()
+        params["variant"] = variant
+        val request = WPComGsonRequest
+                .buildPostRequest(url, params, QuickStartCompletedResponse::class.java,
+                        { response ->
+                            mDispatcher.dispatch(
+                                    SiteActionBuilder.newCompletedQuickStartAction(
+                                            QuickStartCompletedResponsePayload(site, response.success)
+                                    )
+                            )
+                        }
+                ) { networkError ->
+                    val error = QuickStartError(
+                            QuickStartErrorType.GENERIC_ERROR, networkError.message
+                    )
+                    val payload = QuickStartCompletedResponsePayload(site, false)
+                    payload.error = error
+                    mDispatcher.dispatch(SiteActionBuilder.newCompletedQuickStartAction(payload))
+                }
+        add(request)
+    }
+
+    fun fetchAccessCookie(site: SiteModel) {
+        val params = mutableMapOf<String, String>()
+        val url = WPCOMV2.sites.site(site.siteId).atomic_auth_proxy.read_access_cookies.url
+        val request = WPComGsonRequest.buildGetRequest(url, params,
+                PrivateAtomicCookieResponse::class.java,
+                { response ->
+                    if (response != null) {
+                        mDispatcher.dispatch(
+                                SiteActionBuilder
+                                        .newFetchedPrivateAtomicCookieAction(
+                                                FetchedPrivateAtomicCookiePayload(site, response)
+                                        )
+                        )
+                    } else {
+                        AppLog.e(API, "Failed to fetch private atomic cookie for " + site.url)
+                        val payload = FetchedPrivateAtomicCookiePayload(
+                                site, null
+                        )
+                        payload.error = PrivateAtomicCookieError(
+                                AccessCookieErrorType.INVALID_RESPONSE, "Empty response"
+                        )
+                        mDispatcher.dispatch(SiteActionBuilder.newFetchedPrivateAtomicCookieAction(payload))
+                    }
+                }
+        ) { error ->
+            val cookieError = PrivateAtomicCookieError(
+                    AccessCookieErrorType.GENERIC_ERROR, error.message
+            )
+            val payload = FetchedPrivateAtomicCookiePayload(site, null)
+            payload.error = cookieError
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedPrivateAtomicCookieAction(payload))
+        }
+        add(request)
+    }
+
+    fun fetchJetpackCapabilities(remoteSiteId: Long) {
+        val params = mutableMapOf<String, String>()
+        val url = WPCOMV2.sites.site(remoteSiteId).rewind.capabilities.url
+        val request = WPComGsonRequest.buildGetRequest(url, params,
+                JetpackCapabilitiesResponse::class.java,
+                { response ->
+                    if (response?.capabilities != null) {
+                        val payload = responseToJetpackCapabilitiesPayload(remoteSiteId, response)
+                        mDispatcher.dispatch(SiteActionBuilder.newFetchedJetpackCapabilitiesAction(payload))
+                    } else {
+                        AppLog.e(API, "Failed to fetch jetpack capabilities for site with id: $remoteSiteId")
+                        val error = JetpackCapabilitiesError(
+                                JetpackCapabilitiesErrorType.GENERIC_ERROR,
+                                "Empty response"
+                        )
+                        val payload = FetchedJetpackCapabilitiesPayload(remoteSiteId, error)
+                        mDispatcher.dispatch(SiteActionBuilder.newFetchedJetpackCapabilitiesAction(payload))
+                    }
+                }
+        ) { error ->
+            val jetpackError = JetpackCapabilitiesError(JetpackCapabilitiesErrorType.GENERIC_ERROR, error.message)
+            val payload = FetchedJetpackCapabilitiesPayload(remoteSiteId, jetpackError)
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedJetpackCapabilitiesAction(payload))
+        }
+        add(request)
+    }
+
+    suspend fun fetchJetpackSocial(remoteSiteId: Long): Response<JetpackSocialResponse> {
+        val url = WPCOMV2.sites.site(remoteSiteId).jetpack_social.url
+        return wpComGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            params = mapOf(),
+            clazz = JetpackSocialResponse::class.java
+        )
+    }
+
+    @Suppress("LongMethod", "ComplexMethod")
+    private fun siteResponseToSiteModel(from: SiteWPComRestResponse): SiteModel {
+        val site = SiteModel()
+        site.siteId = from.ID
+        site.url = from.URL
+        site.name = StringEscapeUtils.unescapeHtml4(from.name)
+        site.description = StringEscapeUtils.unescapeHtml4(from.description)
+        site.setIsJetpackConnected(from.jetpack && from.jetpack_connection)
+        site.setIsJetpackInstalled(from.jetpack)
+        site.setIsJetpackCPConnected(from.jetpack_connection && !from.jetpack)
+        site.setIsVisible(from.visible)
+        site.setIsPrivate(from.is_private)
+        site.setIsComingSoon(from.is_coming_soon)
+        site.organizationId = from.organization_id
+        // Depending of user's role, options could be "hidden", for instance an "Author" can't read site options.
+        if (from.options != null) {
+            site.setIsFeaturedImageSupported(from.options.featured_images_enabled)
+            site.setIsVideoPressSupported(from.options.videopress_enabled)
+            site.setIsAutomatedTransfer(from.options.is_automated_transfer)
+            site.setIsWpComStore(from.options.is_wpcom_store)
+            site.publishedStatus = from.options.blog_public
+            site.hasWooCommerce = from.options.woocommerce_is_active
+            site.adminUrl = from.options.admin_url
+            site.loginUrl = from.options.login_url
+            site.timezone = from.options.gmt_offset
+            site.frameNonce = from.options.frame_nonce
+            site.unmappedUrl = from.options.unmapped_url
+            site.jetpackVersion = from.options.jetpack_version
+            site.softwareVersion = from.options.software_version
+            site.setIsWPComAtomic(from.options.is_wpcom_atomic)
+            site.setIsWpForTeamsSite(from.options.is_wpforteams_site)
+            site.showOnFront = from.options.show_on_front
+            site.pageOnFront = from.options.page_on_front
+            site.pageForPosts = from.options.page_for_posts
+            site.canBlaze = from.options.can_blaze
+            site.setIsPublicizePermanentlyDisabled(from.options.publicize_permanently_disabled)
+            if (from.options.active_modules != null) {
+                site.activeModules = from.options.active_modules.joinToString(",")
+            }
+            from.options.jetpack_connection_active_plugins?.let {
+                site.activeJetpackConnectionPlugins = it.joinToString(",")
+            }
+            try {
+                site.maxUploadSize = java.lang.Long.valueOf(from.options.max_upload_size)
+            } catch (e: NumberFormatException) {
+                // Do nothing - the value probably wasn't set ('false'), but we don't want to overwrite any existing
+                // value we stored earlier, as /me/sites/ and /sites/$site/ can return different responses for this
+            }
+
+            // Set the memory limit for media uploads on the site. Normally, this is just WP_MAX_MEMORY_LIMIT,
+            // but it's possible for a site to have its php memory_limit > WP_MAX_MEMORY_LIMIT, and have
+            // WP_MEMORY_LIMIT == memory_limit, in which WP_MEMORY_LIMIT reflects the real limit for media uploads.
+            val wpMemoryLimit = StringUtils.stringToLong(from.options.wp_memory_limit)
+            val wpMaxMemoryLimit = StringUtils.stringToLong(from.options.wp_max_memory_limit)
+            if (wpMemoryLimit > 0 || wpMaxMemoryLimit > 0) {
+                // Only update the value if we received one from the server - otherwise, the original value was
+                // probably not set ('false'), but we don't want to overwrite any existing value we stored earlier,
+                // as /me/sites/ and /sites/$site/ can return different responses for this
+                site.memoryLimit = max(wpMemoryLimit, wpMaxMemoryLimit)
+            }
+
+            val bloggingPromptsSettings = from.options.blogging_prompts_settings
+
+            bloggingPromptsSettings?.let {
+                site.setIsBloggingPromptsOptedIn(it.prompts_reminders_opted_in)
+                site.setIsBloggingPromptsCardOptedIn(it.prompts_card_opted_in)
+                site.setIsPotentialBloggingSite(it.is_potential_blogging_site)
+                site.setIsBloggingReminderOnMonday(it.reminders_days["monday"] ?: false)
+                site.setIsBloggingReminderOnTuesday(it.reminders_days["tuesday"] ?: false)
+                site.setIsBloggingReminderOnWednesday(it.reminders_days["wednesday"] ?: false)
+                site.setIsBloggingReminderOnThursday(it.reminders_days["thursday"] ?: false)
+                site.setIsBloggingReminderOnFriday(it.reminders_days["friday"] ?: false)
+                site.setIsBloggingReminderOnSaturday(it.reminders_days["saturday"] ?: false)
+                site.setIsBloggingReminderOnSunday(it.reminders_days["sunday"] ?: false)
+                try {
+                    site.bloggingReminderHour = it.reminders_time.split(".")[0].toInt()
+                    site.bloggingReminderMinute = it.reminders_time.split(".")[1].toInt()
+                } catch (ex: NumberFormatException) {
+                    AppLog.e(API, "Received malformed blogging reminder time: " + ex.message)
+                }
+            }
+        }
+        if (from.plan != null) {
+            try {
+                site.planId = java.lang.Long.valueOf(from.plan.product_id)
+            } catch (e: NumberFormatException) {
+                // VIP sites return a String plan ID ('vip') rather than a number
+                if (from.plan.product_id == "vip") {
+                    site.planId = SiteModel.VIP_PLAN_ID
+                }
+            }
+            site.planShortName = from.plan.product_name_short
+            site.planProductSlug = from.plan.product_slug
+            site.hasFreePlan = from.plan.is_free
+        }
+        if (from.capabilities != null) {
+            site.hasCapabilityEditPages = from.capabilities.edit_pages
+            site.hasCapabilityEditPosts = from.capabilities.edit_posts
+            site.hasCapabilityEditOthersPosts = from.capabilities.edit_others_posts
+            site.hasCapabilityEditOthersPages = from.capabilities.edit_others_pages
+            site.hasCapabilityDeletePosts = from.capabilities.delete_posts
+            site.hasCapabilityDeleteOthersPosts = from.capabilities.delete_others_posts
+            site.hasCapabilityEditThemeOptions = from.capabilities.edit_theme_options
+            site.hasCapabilityEditUsers = from.capabilities.edit_users
+            site.hasCapabilityListUsers = from.capabilities.list_users
+            site.hasCapabilityManageCategories = from.capabilities.manage_categories
+            site.hasCapabilityManageOptions = from.capabilities.manage_options
+            site.hasCapabilityActivateWordads = from.capabilities.activate_wordads
+            site.hasCapabilityPromoteUsers = from.capabilities.promote_users
+            site.hasCapabilityPublishPosts = from.capabilities.publish_posts
+            site.hasCapabilityUploadFiles = from.capabilities.upload_files
+            site.hasCapabilityDeleteUser = from.capabilities.delete_user
+            site.hasCapabilityRemoveUsers = from.capabilities.remove_users
+            site.hasCapabilityViewStats = from.capabilities.view_stats
+        }
+        if (from.quota != null) {
+            site.spaceAvailable = from.quota.space_available
+            site.spaceAllowed = from.quota.space_allowed
+            site.spaceUsed = from.quota.space_used
+            site.spacePercentUsed = from.quota.percent_used
+        }
+        if (from.icon != null) {
+            site.iconUrl = from.icon.img
+        }
+        if (from.meta != null) {
+            if (from.meta.links != null) {
+                site.xmlRpcUrl = from.meta.links.xmlrpc
+            }
+        }
+        if (from.zendesk_site_meta != null) {
+            site.zendeskPlan = from.zendesk_site_meta.plan
+            site.zendeskAddOns = from.zendesk_site_meta.addon
+                    ?.let { TextUtils.join(",", from.zendesk_site_meta.addon) } ?: ""
+        }
+        // Only set the isWPCom flag for "pure" WPCom sites
+        if (!from.jetpack_connection) {
+            site.setIsWPCom(true)
+        }
+        site.origin = SiteModel.ORIGIN_WPCOM_REST
+        site.planActiveFeatures = (from.plan?.features?.active?.joinToString(",")).orEmpty()
+        site.wasEcommerceTrial = from.was_ecommerce_trial
+        site.setIsSingleUserSite(from.single_user_site)
+        return site
+    }
+
+    @Suppress("SwallowedException")
+    private fun volleyErrorToAccountResponsePayload(
+        error: VolleyError,
+        dryRun: Boolean = false
+    ): NewSiteResponsePayload {
+        val payload = NewSiteResponsePayload(dryRun = dryRun)
+        payload.error = NewSiteError(NewSiteErrorType.GENERIC_ERROR, "")
+        if (error.networkResponse != null && error.networkResponse.data != null) {
+            val jsonString = String(error.networkResponse.data)
+            try {
+                val errorObj = JSONObject(jsonString)
+                payload.error = NewSiteError(
+                        NewSiteErrorType.fromString((errorObj["error"] as String)),
+                        (errorObj["message"] as String)
+                )
+            } catch (e: JSONException) {
+                // Do nothing (keep default error)
+            }
+        }
+        return payload
+    }
+
+    private fun responseToDomainAvailabilityPayload(
+        response: DomainAvailabilityResponse
+    ): DomainAvailabilityResponsePayload {
+        val status = DomainAvailabilityStatus.fromString(response.status!!)
+        val mappable = DomainMappabilityStatus.fromString(response.mappable!!)
+        val supportsPrivacy = response.supports_privacy
+        return DomainAvailabilityResponsePayload(status, mappable, supportsPrivacy)
+    }
+
+    private fun responseToJetpackCapabilitiesPayload(
+        remoteSiteId: Long,
+        response: JetpackCapabilitiesResponse
+    ): FetchedJetpackCapabilitiesPayload {
+        val capabilities = mutableListOf<JetpackCapability>()
+        for (item in response.capabilities ?: listOf()) {
+            capabilities.add(JetpackCapability.fromString(item))
+        }
+        return FetchedJetpackCapabilitiesPayload(remoteSiteId, capabilities)
+    }
+
+    companion object {
+        private const val NEW_SITE_TIMEOUT_MS = 90000
+        private const val SITE_FIELDS = "ID,URL,name,description,jetpack,jetpack_connection,visible,is_private," +
+                "options,plan,capabilities,quota,icon,meta,zendesk_site_meta,organization_id," +
+                "was_ecommerce_trial,single_user_site"
+        private const val FIELDS = "fields"
+        private const val FILTERS = "filters"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteWPComRestResponse.java
new file mode 100644
index 00000000000..e0f9e00989b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteWPComRestResponse.java
@@ -0,0 +1,129 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.fluxc.network.Response;
+
+import java.util.List;
+import java.util.Map;
+
+public class SiteWPComRestResponse implements Response {
+    public static class SitesResponse {
+        public List<SiteWPComRestResponse> sites;
+    }
+
+    public static class Options {
+        public boolean videopress_enabled;
+        public boolean featured_images_enabled;
+        public boolean is_automated_transfer;
+        public boolean is_wpcom_atomic;
+        public boolean is_wpcom_store;
+        public boolean woocommerce_is_active;
+        public boolean is_wpforteams_site;
+        public String admin_url;
+        public String login_url;
+        public String gmt_offset;
+        public String frame_nonce;
+        public String unmapped_url;
+        public String max_upload_size;
+        public String wp_max_memory_limit;
+        public String wp_memory_limit;
+        public String jetpack_version;
+        public String software_version;
+        public String show_on_front;
+        public long page_on_front;
+        public long page_for_posts;
+        public boolean publicize_permanently_disabled;
+        public List<String> active_modules;
+        public List<String> jetpack_connection_active_plugins;
+        public BloggingPromptsSettings blogging_prompts_settings;
+        public int blog_public;
+        public boolean can_blaze;
+    }
+
+    public static class Plan {
+        public String product_id;
+        public String product_name_short;
+        public String product_slug;
+        public boolean is_free;
+        @Nullable public Features features;
+    }
+
+    public class Features {
+        @Nullable public List<String> active;
+    }
+
+    public static class Capabilities {
+        public boolean edit_pages;
+        public boolean edit_posts;
+        public boolean edit_others_posts;
+        public boolean edit_others_pages;
+        public boolean delete_posts;
+        public boolean delete_others_posts;
+        public boolean edit_theme_options;
+        public boolean edit_users;
+        public boolean list_users;
+        public boolean manage_categories;
+        public boolean manage_options;
+        public boolean activate_wordads;
+        public boolean promote_users;
+        public boolean publish_posts;
+        public boolean upload_files;
+        public boolean delete_user;
+        public boolean remove_users;
+        public boolean view_stats;
+    }
+
+    public static class Quota {
+        public long space_allowed;
+        public long space_used;
+        public double percent_used;
+        public long space_available;
+    }
+
+    public static class Icon {
+        public String img;
+    }
+
+
+    public static class Meta {
+        public static class Links {
+            public String xmlrpc;
+        }
+
+        public Links links;
+    }
+
+    public class ZendeskSiteMeta {
+        public String plan;
+        public List<String> addon;
+    }
+
+    public class BloggingPromptsSettings {
+        public boolean prompts_card_opted_in;
+        public boolean prompts_reminders_opted_in;
+        public boolean is_potential_blogging_site;
+        public Map<String, Boolean> reminders_days;
+        public String reminders_time;
+    }
+
+    public long ID;
+    public String URL;
+    public String name;
+    public String description;
+    public boolean jetpack;
+    public boolean jetpack_connection;
+    public boolean visible;
+    public boolean is_private;
+    public boolean is_coming_soon;
+    public int organization_id;
+    public Options options;
+    public Capabilities capabilities;
+    public Plan plan;
+    public Icon icon;
+    public Meta meta;
+    public Quota quota;
+    public ZendeskSiteMeta zendesk_site_meta;
+    public boolean was_ecommerce_trial;
+    public boolean single_user_site;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SitesFeaturesRestResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SitesFeaturesRestResponse.kt
new file mode 100644
index 00000000000..08141ef536b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SitesFeaturesRestResponse.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+data class SitesFeaturesRestResponse(
+    val features: Map<Long, SiteFeatures>
+)
+
+data class SiteFeatures(
+    val active: List<String>
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedCountryResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedCountryResponse.kt
new file mode 100644
index 00000000000..96b3af64960
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedCountryResponse.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+class SupportedCountryResponse(
+    val code: String?,
+    val name: String?
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedStateResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedStateResponse.kt
new file mode 100644
index 00000000000..f006b3950bc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SupportedStateResponse.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class SupportedStateResponse(
+    val code: String?,
+    val name: String?
+) : Parcelable
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/UserRoleWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/UserRoleWPComRestResponse.java
new file mode 100644
index 00000000000..ce5d707e2e6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/UserRoleWPComRestResponse.java
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site;
+
+import java.util.List;
+
+public class UserRoleWPComRestResponse {
+    public class UserRolesResponse {
+        public List<UserRoleWPComRestResponse> roles;
+    }
+    public String name;
+    public String display_name;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClient.kt
new file mode 100644
index 00000000000..d07b8f5e550
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/XPostsRestClient.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.site
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+private const val CACHE_TIME_TO_LIVE = 60 * 1000 // 1 minute
+
+@Singleton
+class XPostsRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    dispatcher: Dispatcher,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetch(site: SiteModel): WPComGsonRequestBuilder.Response<Array<XPostSiteModel>> {
+        val url = WPCOMV2.sites.site(site.siteId).xposts.url
+        return wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                mapOf("decode_html" to "true"),
+                Array<XPostSiteModel>::class.java,
+                true,
+                CACHE_TIME_TO_LIVE
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/AllTimeInsightsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/AllTimeInsightsRestClient.kt
new file mode 100644
index 00000000000..65ff26a7cc2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/AllTimeInsightsRestClient.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class AllTimeInsightsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchAllTimeInsights(site: SiteModel, forced: Boolean): FetchStatsPayload<AllTimeResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.urlV1_1
+
+        val params = mapOf<String, String>()
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                AllTimeResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class AllTimeResponse(
+        @SerializedName("date") val date: Date? = null,
+        @SerializedName("stats") val stats: StatsResponse?
+    ) {
+        data class StatsResponse(
+            @SerializedName("visitors") val visitors: Int?,
+            @SerializedName("views") val views: Int?,
+            @SerializedName("posts") val posts: Int?,
+            @SerializedName("views_best_day") val viewsBestDay: String?,
+            @SerializedName("views_best_day_total") val viewsBestDayTotal: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/CommentsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/CommentsRestClient.kt
new file mode 100644
index 00000000000..921a2916daf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/CommentsRestClient.kt
@@ -0,0 +1,78 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class CommentsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchTopComments(
+        site: SiteModel,
+        forced: Boolean
+    ): FetchStatsPayload<CommentsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.comments.urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                emptyMap(),
+                CommentsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class CommentsResponse(
+        @SerializedName("date") val date: String?,
+        @SerializedName("monthly_comments") val monthlyComments: Int?,
+        @SerializedName("total_comments") val totalComments: Int?,
+        @SerializedName("most_active_day") val mostActiveDay: String?,
+        @SerializedName("authors") val authors: List<Author>?,
+        @SerializedName("posts") val posts: List<Post>?
+    ) {
+        data class Author(
+            @SerializedName("name") val name: String?,
+            @SerializedName("link") val link: String?,
+            @SerializedName("gravatar") val gravatar: String?,
+            @SerializedName("comments") val comments: Int?
+        )
+
+        data class Post(
+            @SerializedName("name") val name: String?,
+            @SerializedName("link") val link: String?,
+            @SerializedName("id") val id: Long?,
+            @SerializedName("comments") val comments: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/FollowersRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/FollowersRestClient.kt
new file mode 100644
index 00000000000..2c5fc6a87e1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/FollowersRestClient.kt
@@ -0,0 +1,106 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class FollowersRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchFollowers(
+        site: SiteModel,
+        type: FollowerType,
+        page: Int,
+        pageSize: Int,
+        forced: Boolean
+    ): FetchStatsPayload<FollowersResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.followers.urlV1_1
+
+        val params = mutableMapOf(
+                "type" to type.path,
+                "max" to pageSize.toString()
+        )
+
+        if (page > 1) {
+            params["page"] = page.toString()
+        }
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                FollowersResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    enum class FollowerType(val path: String) {
+        ALL("all"), EMAIL("email"), WP_COM("wpcom")
+    }
+
+    data class FollowersResponse(
+        @SerializedName("page") val page: Int?,
+        @SerializedName("pages") val pages: Int?,
+        @SerializedName("total") val total: Int?,
+        @SerializedName("total_email") val totalEmail: Int?,
+        @SerializedName("total_wpcom") val totalWpCom: Int?,
+        @SerializedName("subscribers") val subscribers: List<FollowerResponse>
+
+    ) {
+        data class FollowerResponse(
+            @SerializedName("label") val label: String?,
+            @SerializedName("avatar") val avatar: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("date_subscribed") val dateSubscribed: Date?,
+            @SerializedName("follow_data") val followData: FollowData?
+        )
+    }
+
+    data class FollowData(
+        @SerializedName("type") val type: String?,
+        @SerializedName("params") val params: FollowParams?
+    ) {
+        data class FollowParams(
+            @SerializedName("follow-text") val followText: String?,
+            @SerializedName("following-text") val followingText: String?,
+            @SerializedName("following-hover-text") val followingHoverText: String?,
+            @SerializedName("is_following") val isFollowing: Boolean?,
+            @SerializedName("blog_id") val blogId: String?,
+            @SerializedName("site_id") val siteId: String?,
+            @SerializedName("stats-source") val statsSource: String?,
+            @SerializedName("blog_domain") val blogDomain: String?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/LatestPostInsightsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/LatestPostInsightsRestClient.kt
new file mode 100644
index 00000000000..8864c0b6326
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/LatestPostInsightsRestClient.kt
@@ -0,0 +1,137 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class LatestPostInsightsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchLatestPostForInsights(site: SiteModel, forced: Boolean): FetchStatsPayload<PostsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).posts.urlV1_1
+        val params = mapOf(
+                "order_by" to "date",
+                "number" to "1",
+                "type" to "post",
+                "fields" to "ID,title,URL,discussion,like_count,date,featured_image"
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                PostsResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    suspend fun fetchPostStats(
+        site: SiteModel,
+        postId: Long,
+        forced: Boolean
+    ): FetchStatsPayload<PostStatsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.post.item(postId).urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                mapOf(),
+                PostStatsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class PostsResponse(
+        @SerializedName("found") val postsFound: Int? = 0,
+        @SerializedName("posts") val posts: List<PostResponse> = listOf()
+    ) {
+        data class PostResponse(
+            @SerializedName("ID") val id: Long,
+            @SerializedName("title") val title: String?,
+            @SerializedName("date") val date: Date?,
+            @SerializedName("URL") val url: String?,
+            @SerializedName("like_count") val likeCount: Int?,
+            @SerializedName("discussion") val discussion: Discussion?,
+            @SerializedName("featured_image") val featuredImage: String?
+        ) {
+            data class Discussion(
+                @SerializedName("comment_count") val commentCount: Int?
+            )
+        }
+    }
+
+    data class PostStatsResponse(
+        @SerializedName("highest_month") val highestMonth: Int = 0,
+        @SerializedName("highest_day_average") val highestDayAverage: Int = 0,
+        @SerializedName("highest_week_average") val highestWeekAverage: Int = 0,
+        @SerializedName("views") val views: Int?,
+        @SerializedName("date") val date: String? = null,
+        @SerializedName("data") val data: List<List<String>>?,
+        @SerializedName("fields") val fields: List<String>?,
+        @SerializedName("weeks") val weeks: List<Week>,
+        @SerializedName("years") val years: Map<Int, Year>,
+        @SerializedName("averages") val averages: Map<Int, Average>
+
+    ) {
+        data class Year(
+            @SerializedName("months") val months: Map<Int, Int>,
+            @SerializedName("total") val total: Int?
+        )
+
+        data class Week(
+            @SerializedName("average") val average: Int?,
+            @SerializedName("total") val total: Int?,
+            @SerializedName("days") val days: List<Day>
+        )
+
+        data class Day(
+            @SerializedName("day") val day: String,
+            @SerializedName("count") val count: Int?
+        )
+
+        data class Average(
+            @SerializedName("months") val months: Map<Int, Int>,
+            @SerializedName("overall") val overall: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClient.kt
new file mode 100644
index 00000000000..25f5e159c8c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/MostPopularRestClient.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class MostPopularRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchMostPopularInsights(site: SiteModel, forced: Boolean): FetchStatsPayload<MostPopularResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.insights.urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                mapOf(),
+                MostPopularResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class MostPopularResponse(
+        @SerializedName("highest_day_of_week") val highestDayOfWeek: Int?,
+        @SerializedName("highest_hour") val highestHour: Int?,
+        @SerializedName("highest_day_percent") val highestDayPercent: Double?,
+        @SerializedName("highest_hour_percent") val highestHourPercent: Double?,
+        @SerializedName("years") val yearInsightResponses: List<YearInsightsResponse>?
+    ) {
+        data class YearInsightsResponse(
+            @SerializedName("avg_comments") val avgComments: Double?,
+            @SerializedName("avg_images") val avgImages: Double?,
+            @SerializedName("avg_likes") val avgLikes: Double?,
+            @SerializedName("avg_words") val avgWords: Double?,
+            @SerializedName("total_comments") val totalComments: Int,
+            @SerializedName("total_images") val totalImages: Int,
+            @SerializedName("total_likes") val totalLikes: Int,
+            @SerializedName("total_posts") val totalPosts: Int,
+            @SerializedName("total_words") val totalWords: Int,
+            @SerializedName("year") val year: String
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClient.kt
new file mode 100644
index 00000000000..778b28fdbe3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PostingActivityRestClient.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+private const val MAX_ITEMS = 3000
+
+@Singleton
+class PostingActivityRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPostingActivity(
+        site: SiteModel,
+        startDay: Day,
+        endDay: Day,
+        forced: Boolean
+    ): FetchStatsPayload<PostingActivityResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.streak.urlV1_1
+        val params = mapOf(
+                "startDate" to statsUtils.getFormattedDate(startDay),
+                "endDate" to statsUtils.getFormattedDate(endDay),
+                "gmtOffset" to 0.toString(),
+                "max" to MAX_ITEMS.toString()
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                PostingActivityResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class PostingActivityResponse(
+        @SerializedName("streak") val streak: Streaks?,
+        @SerializedName("data") val data: Map<Long, Int>?
+    ) {
+        data class Streaks(
+            @SerializedName("long") val longStreak: Streak?,
+            @SerializedName("current") val currentStreak: Streak?
+        )
+
+        data class Streak(
+            @SerializedName("start") val start: String?,
+            @SerializedName("end") val end: String?,
+            @SerializedName("length") val length: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PublicizeRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PublicizeRestClient.kt
new file mode 100644
index 00000000000..a8d8cdc2961
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/PublicizeRestClient.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PublicizeRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPublicizeData(
+        site: SiteModel,
+        forced: Boolean
+    ): FetchStatsPayload<PublicizeResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.publicize.urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                emptyMap(),
+                PublicizeResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class PublicizeResponse(
+        @SerializedName("services") val services: List<Service>
+    ) {
+        data class Service(
+            @SerializedName("service") val service: String,
+            @SerializedName("followers") val followers: Int
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClient.kt
new file mode 100644
index 00000000000..b4e2cd8c432
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/SummaryRestClient.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SummaryRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchSummary(site: SiteModel, forced: Boolean): FetchStatsPayload<SummaryResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.summary.urlV1_1
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            mapOf(),
+            SummaryResponse::class.java,
+            enableCaching = false,
+            forced = forced
+        )
+        return when (response) {
+            is Success -> FetchStatsPayload(response.data)
+            is Error -> FetchStatsPayload(response.error.toStatsError())
+        }
+    }
+
+    data class SummaryResponse(
+        @SerializedName("likes") val likes: Int?,
+        @SerializedName("comments") val comments: Int?,
+        @SerializedName("followers") val followers: Int?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TagsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TagsRestClient.kt
new file mode 100644
index 00000000000..da535d92c7a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TagsRestClient.kt
@@ -0,0 +1,75 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class TagsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchTags(
+        site: SiteModel,
+        max: Int,
+        forced: Boolean
+    ): FetchStatsPayload<TagsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.tags.urlV1_1
+
+        val params = mapOf(
+                "max" to max.toString()
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                TagsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class TagsResponse(
+        @SerializedName("date") val date: String?,
+        @SerializedName("tags") val tags: List<TagsGroup>
+    ) {
+        data class TagsGroup(
+            @SerializedName("views") val views: Long?,
+            @SerializedName("tags") val tags: List<TagResponse>
+        ) {
+            data class TagResponse(
+                @SerializedName("name") val name: String?,
+                @SerializedName("type") val type: String?,
+                @SerializedName("link") val link: String?
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TodayInsightsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TodayInsightsRestClient.kt
new file mode 100644
index 00000000000..7581836d8e9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/insights/TodayInsightsRestClient.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.insights
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import org.wordpress.android.fluxc.utils.SiteUtils
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class TodayInsightsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchTimePeriodStats(
+        site: SiteModel,
+        period: StatsGranularity,
+        forced: Boolean
+    ): FetchStatsPayload<VisitResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.visits.urlV1_1
+
+        val params = mapOf(
+                "unit" to period.toString(),
+                "quantity" to "1",
+                "date" to statsUtils.getFormattedDate(timeZone = SiteUtils.getNormalizedTimezone(site.timezone))
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                VisitResponse::class.java,
+                enableCaching = true,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class VisitResponse(
+        @SerializedName("date") val date: String?,
+        @SerializedName("unit") val unit: String?,
+        @SerializedName("fields") val fields: List<String>,
+        @SerializedName("data") val data: List<List<String>>
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/EmailsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/EmailsRestClient.kt
new file mode 100644
index 00000000000..77a90d952c9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/EmailsRestClient.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class EmailsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchEmailsSummary(
+        site: SiteModel,
+        quantity: Int,
+        sortField: SortField,
+        forced: Boolean
+    ): FetchStatsPayload<EmailsSummaryResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.emails.summary.urlV1_1
+
+        val params = mapOf(
+            "quantity" to quantity.toString(),
+            "sort_field" to sortField.toString(),
+            "sort_order" to "desc"
+        )
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            params,
+            EmailsSummaryResponse::class.java,
+            enableCaching = false,
+            forced = forced
+        )
+        return when (response) {
+            is Success -> FetchStatsPayload(response.data)
+            is Error -> FetchStatsPayload(response.error.toStatsError())
+        }
+    }
+
+    enum class SortField(val sortField: String) { POST_ID("post_id"), OPENS("opens") }
+
+    data class EmailsSummaryResponse(@SerializedName("posts") val posts: List<Post>) {
+        data class Post(
+            @SerializedName("id") val id: Long?,
+            @SerializedName("href") val href: String?,
+            @SerializedName("title") val title: String?,
+            @SerializedName("opens") val opens: Int?,
+            @SerializedName("clicks") val clicks: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClient.kt
new file mode 100644
index 00000000000..8b3460ffdcd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/subscribers/SubscribersRestClient.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SubscribersRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchSubscribers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        quantity: Int,
+        date: String,
+        forced: Boolean
+    ): FetchStatsPayload<SubscribersResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.subscribers.urlV1_1
+
+        val params = mapOf("unit" to granularity.toString(), "quantity" to quantity.toString(), "date" to date)
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+            this,
+            url,
+            params,
+            SubscribersResponse::class.java,
+            enableCaching = false,
+            forced = forced
+        )
+        return when (response) {
+            is Success -> FetchStatsPayload(response.data)
+            is Error -> FetchStatsPayload(response.error.toStatsError())
+        }
+    }
+
+    data class SubscribersResponse(
+        @SerializedName("date") val date: String?,
+        @SerializedName("unit") val unit: String?,
+        @SerializedName("fields") val fields: List<String>?,
+        @SerializedName("data") val data: List<List<*>?>?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClient.kt
new file mode 100644
index 00000000000..07f3171d378
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/AuthorsRestClient.kt
@@ -0,0 +1,109 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class AuthorsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val gson: Gson,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchAuthors(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<AuthorsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.top_authors.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to itemsToLoad.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                AuthorsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                response.data.groups.values.forEach { it.authors.forEach { group -> group.build(gson) } }
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class AuthorsResponse(
+        @SerializedName("period") val statsGranularity: String?,
+        @SerializedName("days") val groups: Map<String, Groups>
+    ) {
+        data class Groups(
+            @SerializedName("other_views") val otherViews: Int?,
+            @SerializedName("authors") val authors: List<Author>
+        )
+
+        @Suppress("DataClassShouldBeImmutable")
+        data class Author(
+            @SerializedName("name") val name: String?,
+            @SerializedName("views") var views: Int?,
+            @SerializedName("avatar") val avatarUrl: String?,
+            @SerializedName("posts") val posts: JsonElement?,
+            @SerializedName("mappedPosts") var mappedPosts: List<Post>? = null
+        ) {
+            fun build(gson: Gson) {
+                when (this.posts) {
+                    is JsonArray -> this.mappedPosts = this.posts.map {
+                        gson.fromJson<Post>(
+                                it,
+                                Post::class.java
+                        )
+                    }
+                    is JsonObject -> this.views = this.posts.getInt("views")
+                }
+            }
+        }
+
+        data class Post(
+            @SerializedName("id") val postId: String?,
+            @SerializedName("title") val title: String?,
+            @SerializedName("views") val views: Int?,
+            @SerializedName("url") val url: String?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClient.kt
new file mode 100644
index 00000000000..2c153f60158
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ClicksRestClient.kt
@@ -0,0 +1,113 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ClicksRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val gson: Gson,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchClicks(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        pageSize: Int,
+        forced: Boolean
+    ): FetchStatsPayload<ClicksResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.clicks.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to pageSize.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                ClicksResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                response.data.groups.values.forEach {
+                    it.clicks.forEach { group ->
+                        group.build(gson)
+                    }
+                }
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class ClicksResponse(
+        @SerializedName("period") val granularity: String?,
+        @SerializedName("days") val groups: Map<String, Groups>
+    ) {
+        data class Groups(
+            @SerializedName("other_clicks") val otherClicks: Int?,
+            @SerializedName("total_clicks") val totalClicks: Int?,
+            @SerializedName("clicks") val clicks: List<ClickGroup>
+        )
+
+        @Suppress("DataClassShouldBeImmutable")
+        data class ClickGroup(
+            @SerializedName("group") val groupId: String?,
+            @SerializedName("name") val name: String?,
+            @SerializedName("icon") val icon: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("views") val views: Int?,
+            @SerializedName("children") val children: JsonElement?,
+            @SerializedName("clicks") var clicks: List<Click>? = null
+        ) {
+            fun build(gson: Gson) {
+                when (this.children) {
+                    is JsonArray -> this.clicks = this.children.map {
+                        gson.fromJson<Click>(
+                                it,
+                                Click::class.java
+                        )
+                    }
+                }
+            }
+        }
+
+        data class Click(
+            @SerializedName("name") val name: String?,
+            @SerializedName("icon") val icon: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("views") val views: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClient.kt
new file mode 100644
index 00000000000..ba3e40d333a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/CountryViewsRestClient.kt
@@ -0,0 +1,87 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class CountryViewsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchCountryViews(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<CountryViewsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.country_views.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to itemsToLoad.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                CountryViewsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class CountryViewsResponse(
+        @SerializedName("country-info") val countryInfo: Map<String, CountryInfo>,
+        @SerializedName("days") val days: Map<String, Day>
+    ) {
+        data class Day(
+            @SerializedName("other_views") val otherViews: Int?,
+            @SerializedName("total_views") val totalViews: Int?,
+            @SerializedName("views") val views: List<CountryView>
+        )
+
+        data class CountryView(
+            @SerializedName("country_code") val countryCode: String?,
+            @SerializedName("views") val views: Int?
+        )
+
+        data class CountryInfo(
+            @SerializedName("flag_icon") val flagIcon: String?,
+            @SerializedName("flat_flag_icon") val flatFlagIcon: String?,
+            @SerializedName("map_region") val mapRegion: String?,
+            @SerializedName("country_full") val countryFull: String?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClient.kt
new file mode 100644
index 00000000000..aceeeae7a15
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/FileDownloadsRestClient.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class FileDownloadsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val gson: Gson,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchFileDownloads(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<FileDownloadsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.file_downloads.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "num" to itemsToLoad.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                FileDownloadsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class FileDownloadsResponse(
+        @SerializedName("period") val statsGranularity: String?,
+        @SerializedName("date") val date: String?,
+        @SerializedName("days") val groups: Map<String, Group>
+    ) {
+        data class Group(
+            @SerializedName("other_downloads") val otherDownloads: Int?,
+            @SerializedName("total_downloads") val totalDownloads: Int?,
+            @SerializedName("files") val files: List<File>
+        )
+
+        data class File(
+            @SerializedName("filename") val filename: String?,
+            @SerializedName("downloads") val downloads: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClient.kt
new file mode 100644
index 00000000000..6faf5fbe9aa
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/PostAndPageViewsRestClient.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class PostAndPageViewsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchPostAndPageViews(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        pageSize: Int,
+        forced: Boolean
+    ): FetchStatsPayload<PostAndPageViewsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.top_posts.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to pageSize.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                PostAndPageViewsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class PostAndPageViewsResponse(
+        @SerializedName("date") val date: Date? = null,
+        @SerializedName("days") val days: Map<String, ViewsResponse>,
+        @SerializedName("period") val statsGranularity: String?
+    ) {
+        data class ViewsResponse(
+            @SerializedName("postviews") val postViews: List<PostViewsResponse>,
+            @SerializedName("total_views") val totalViews: Int?
+        ) {
+            data class PostViewsResponse(
+                @SerializedName("id") val id: Long?,
+                @SerializedName("title") val title: String?,
+                @SerializedName("type") val type: String?,
+                @SerializedName("href") val href: String?,
+                @SerializedName("views") val views: Int?
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClient.kt
new file mode 100644
index 00000000000..575983af3c9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/ReferrersRestClient.kt
@@ -0,0 +1,204 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse.Referrer
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse.ReferrerGroup
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.StatsStore.ReportReferrerAsSpamPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ReferrersRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val gson: Gson,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchReferrers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        pageSize: Int,
+        forced: Boolean
+    ): FetchStatsPayload<ReferrersResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.referrers.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to pageSize.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                UnparsedReferrersResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                val firstGroup = response.data.dataForPeriod.values.firstOrNull()
+                val parsedGroups = firstGroup?.unparsedReferrerGroups?.map {
+                    it.parse(gson)
+                } ?: listOf()
+                FetchStatsPayload(
+                        ReferrersResponse(
+                                response.data.statsGranularity,
+                                firstGroup?.otherViews,
+                                firstGroup?.totalViews,
+                                parsedGroups
+                        )
+                )
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    suspend fun reportReferrerAsSpam(
+        site: SiteModel,
+        domain: String
+    ): ReportReferrerAsSpamPayload<ReportReferrerAsSpamResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.referrers.spam.new_.urlV1_1
+        val params = mapOf(
+                "domain" to domain
+        )
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                params,
+                null,
+                ReportReferrerAsSpamResponse::class.java
+        )
+        return when (response) {
+            is Success -> {
+                ReportReferrerAsSpamPayload(response.data)
+            }
+            is Error -> {
+                ReportReferrerAsSpamPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    suspend fun unreportReferrerAsSpam(
+        site: SiteModel,
+        domain: String
+    ): ReportReferrerAsSpamPayload<ReportReferrerAsSpamResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.referrers.spam.delete.urlV1_1
+        val params = mapOf(
+                "domain" to domain
+        )
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                params,
+                null,
+                ReportReferrerAsSpamResponse::class.java
+        )
+        return when (response) {
+            is Success -> {
+                ReportReferrerAsSpamPayload(response.data)
+            }
+            is Error -> {
+                ReportReferrerAsSpamPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class UnparsedReferrersResponse(
+        @SerializedName("period") val statsGranularity: String?,
+        @SerializedName("days") val dataForPeriod: Map<String, PeriodData>
+    ) {
+        data class PeriodData(
+            @SerializedName("other_views") val otherViews: Int?,
+            @SerializedName("total_views") val totalViews: Int?,
+            @SerializedName("groups") val unparsedReferrerGroups: List<UnparsedReferrerGroup>
+        )
+
+        data class UnparsedReferrerGroup(
+            @SerializedName("group") val group: String?,
+            @SerializedName("name") val name: String?,
+            @SerializedName("icon") val icon: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("total") val total: Int?,
+            @SerializedName("results") val results: JsonElement?
+        ) {
+            fun parse(gson: Gson): ReferrerGroup {
+                var referrers: List<Referrer>? = null
+                var views: Int? = null
+                when (this.results) {
+                    is JsonArray -> referrers = this.results.map {
+                        gson.fromJson(
+                                it,
+                                Referrer::class.java
+                        )
+                    }
+                    is JsonObject -> views = this.results.getInt("views")
+                }
+                return ReferrerGroup(group, name, icon, url, total, referrers, views, false)
+            }
+        }
+    }
+
+    data class ReferrersResponse(
+        val statsGranularity: String?,
+        val otherViews: Int?,
+        val totalViews: Int?,
+        val referrerGroups: List<ReferrerGroup>
+    ) {
+        data class ReferrerGroup(
+            val group: String?,
+            val name: String?,
+            val icon: String?,
+            val url: String?,
+            val total: Int?,
+            val referrers: List<Referrer>? = null,
+            val views: Int? = null,
+            val markedAsSpam: Boolean
+        )
+
+        data class Referrer(
+            @SerializedName("group") val group: String?,
+            @SerializedName("name") val name: String?,
+            @SerializedName("icon") val icon: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("views") val views: Int?,
+            @SerializedName("child") val children: List<Child>?,
+            @SerializedName("markedAsSpam") val markedAsSpam: Boolean
+        )
+
+        data class Child(
+            @SerializedName("url") val url: String?
+        )
+    }
+
+    class ReportReferrerAsSpamResponse(val success: Boolean) : Response
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClient.kt
new file mode 100644
index 00000000000..88eca6d693f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/SearchTermsRestClient.kt
@@ -0,0 +1,81 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SearchTermsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchSearchTerms(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<SearchTermsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.search_terms.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to itemsToLoad.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                SearchTermsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class SearchTermsResponse(
+        @SerializedName("period") val granularity: String?,
+        @SerializedName("days") val days: Map<String, Day>
+    ) {
+        data class Day(
+            @SerializedName("encrypted_search_terms") val encryptedSearchTerms: Int?,
+            @SerializedName("other_search_terms") val otherSearchTerms: Int?,
+            @SerializedName("total_search_terms") val totalSearchTimes: Int?,
+            @SerializedName("search_terms") val searchTerms: List<SearchTerm>
+        )
+
+        data class SearchTerm(
+            @SerializedName("term") val term: String?,
+            @SerializedName("views") val views: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtils.kt
new file mode 100644
index 00000000000..125efd8e088
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/StatsUtils.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.utils.CurrentDateUtils
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+import javax.inject.Inject
+
+const val DATE_FORMAT_DAY = "yyyy-MM-dd"
+
+class StatsUtils
+@Inject constructor(private val currentDateUtils: CurrentDateUtils) {
+    fun getFormattedDate(date: Date? = null, timeZone: TimeZone? = null): String {
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT)
+        timeZone?.let {
+            dateFormat.timeZone = timeZone
+        }
+        return dateFormat.format(date ?: currentDateUtils.getCurrentDate())
+    }
+
+    fun getFormattedDate(day: Day): String {
+        val calendar = Calendar.getInstance()
+        calendar.set(day.year, day.month, day.day)
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT)
+        return dateFormat.format(calendar.time)
+    }
+
+    fun fromFormattedDate(date: String): Date? {
+        if (date.isEmpty()) {
+            return null
+        }
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_DAY, Locale.ROOT)
+        return dateFormat.parse(date)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClient.kt
new file mode 100644
index 00000000000..94900c8631f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VideoPlaysRestClient.kt
@@ -0,0 +1,84 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class VideoPlaysRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent,
+    val gson: Gson,
+    private val statsUtils: StatsUtils
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchVideoPlays(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<VideoPlaysResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.video_plays.urlV1_1
+        val params = mapOf(
+                "period" to granularity.toString(),
+                "max" to itemsToLoad.toString(),
+                "date" to statsUtils.getFormattedDate(date)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                VideoPlaysResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class VideoPlaysResponse(
+        @SerializedName("period") val granularity: String?,
+        @SerializedName("days") val days: Map<String, Days>
+    ) {
+        data class Days(
+            @SerializedName("other_plays") val otherPlays: Int?,
+            @SerializedName("total_plays") val totalPlays: Int?,
+            @SerializedName("plays") val plays: List<Play>
+        )
+
+        data class Play(
+            @SerializedName("post_id") val postId: String?,
+            @SerializedName("title") val title: String?,
+            @SerializedName("url") val url: String?,
+            @SerializedName("plays") val plays: Int?
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClient.kt
new file mode 100644
index 00000000000..24c95f8ffc6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stats/time/VisitAndViewsRestClient.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stats.time
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.annotations.SerializedName
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.store.StatsStore.FetchStatsPayload
+import org.wordpress.android.fluxc.store.toStatsError
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class VisitAndViewsRestClient
+@Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String,
+        itemsToLoad: Int,
+        forced: Boolean
+    ): FetchStatsPayload<VisitsAndViewsResponse> {
+        val url = WPCOMREST.sites.site(site.siteId).stats.visits.urlV1_1
+        val params = mapOf(
+                "unit" to granularity.toString(),
+                "quantity" to itemsToLoad.toString(),
+                "date" to date
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                VisitsAndViewsResponse::class.java,
+                enableCaching = false,
+                forced = forced
+        )
+        return when (response) {
+            is Success -> {
+                FetchStatsPayload(response.data)
+            }
+            is Error -> {
+                FetchStatsPayload(response.error.toStatsError())
+            }
+        }
+    }
+
+    data class VisitsAndViewsResponse(
+        @SerializedName("date") val date: String?,
+        @SerializedName("fields") val fields: List<String>?,
+        @SerializedName("data") val data: List<List<String>?>?,
+        @SerializedName("unit") val unit: String?
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/SearchStockMediaResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/SearchStockMediaResponse.kt
new file mode 100644
index 00000000000..0d47f60d80d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/SearchStockMediaResponse.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stockmedia
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.JsonAdapter
+import org.wordpress.android.fluxc.model.StockMediaModel
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.network.utils.getJsonObject
+import org.wordpress.android.fluxc.network.utils.getString
+import java.lang.reflect.Type
+
+/**
+ * Response to GET request to search for stock media item
+ */
+@JsonAdapter(SearchStockMediaDeserializer::class)
+class SearchStockMediaResponse(
+    val found: Int,
+    val nextPage: Int,
+    val canLoadMore: Boolean,
+    val media: List<StockMediaModel>
+)
+
+private class SearchStockMediaDeserializer : JsonDeserializer<SearchStockMediaResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): SearchStockMediaResponse {
+        val jsonObject = json.asJsonObject
+        val found = jsonObject.getInt("found")
+        val mediaList = jsonObject.getAsJsonArray("media")?.map { getStockMedia(it.asJsonObject) } ?: ArrayList()
+        val jsonMeta = jsonObject.getJsonObject("meta")
+        return try {
+            val nextPage = jsonMeta.getInt("next_page")
+            SearchStockMediaResponse(found, nextPage, true, mediaList)
+        } catch (e: NumberFormatException) {
+            // note that "next_page" will be "false" rather than an int if this is the last page
+            SearchStockMediaResponse(found, 0, false, mediaList)
+        }
+    }
+
+    private fun getStockMedia(jsonMedia: JsonObject): StockMediaModel {
+        val media = StockMediaModel()
+        media.name = jsonMedia.getString("name", unescapeHtml4 = true)
+        media.title = jsonMedia.getString("title", unescapeHtml4 = true)
+        media.date = jsonMedia.getString("date")
+        media.extension = jsonMedia.getString("extension")
+        media.file = jsonMedia.getString("file")
+        media.guid = jsonMedia.getString("guid")
+        media.height = jsonMedia.getInt("height")
+        media.id = jsonMedia.getString("ID")
+        media.type = jsonMedia.getString("type")
+        media.url = jsonMedia.getString("URL")
+        media.width = jsonMedia.getInt("width")
+
+        jsonMedia.get("thumbnails")?.let {
+            val jsonThumbnails = it.asJsonObject
+            media.thumbnail = jsonThumbnails.getString("thumbnail")
+            media.largeThumbnail = jsonThumbnails.getString("large")
+            media.mediumThumbnail = jsonThumbnails.getString("medium")
+            media.postThumbnail = jsonThumbnails.getString("post_thumbnail")
+        }
+        return media
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/StockMediaRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/StockMediaRestClient.kt
new file mode 100644
index 00000000000..25ae6ba3ebf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/stockmedia/StockMediaRestClient.kt
@@ -0,0 +1,126 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.stockmedia
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaResponseUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaWPComRestResponse.MultipleMediaResponse
+import org.wordpress.android.fluxc.store.MediaStore.UploadStockMediaError
+import org.wordpress.android.fluxc.store.MediaStore.UploadStockMediaErrorType
+import org.wordpress.android.fluxc.store.MediaStore.UploadedStockMediaPayload
+import org.wordpress.android.fluxc.store.StockMediaStore.FetchedStockMediaListPayload
+import org.wordpress.android.fluxc.store.StockMediaStore.StockMediaError
+import org.wordpress.android.fluxc.store.StockMediaStore.StockMediaErrorType
+import org.wordpress.android.fluxc.store.StockMediaUploadItem
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MEDIA
+import org.wordpress.android.util.StringUtils
+import org.wordpress.android.util.UrlUtils
+import java.util.HashMap
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class StockMediaRestClient @Inject constructor(
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    private val mediaResponseUtils: MediaResponseUtils,
+    dispatcher: Dispatcher,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    /**
+     * Gets a list of stock media items matching a query string
+     */
+    suspend fun searchStockMedia(searchTerm: String, page: Int, pageSize: Int): FetchedStockMediaListPayload {
+        val url = WPCOMREST.meta.external_media.pexels.urlV1_1
+        val params = mapOf(
+                "number" to pageSize.toString(),
+                "page_handle" to page.toString(),
+                "source" to "pexels",
+                "search" to UrlUtils.urlEncode(searchTerm)
+        )
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                SearchStockMediaResponse::class.java
+        )
+        return when (response) {
+            is Success -> {
+                val data = response.data
+                FetchedStockMediaListPayload(
+                        data.media,
+                        searchTerm,
+                        data.nextPage,
+                        data.canLoadMore
+                )
+            }
+            is Error -> {
+                val error = response.error
+                AppLog.e(MEDIA, "VolleyError Fetching stock media: $error")
+                val mediaError = StockMediaError(StockMediaErrorType.fromBaseNetworkError(), error.message)
+                FetchedStockMediaListPayload(mediaError, searchTerm)
+            }
+        }
+    }
+    /**
+     * Gets a list of stock media items matching a query string
+     */
+
+    suspend fun uploadStockMedia(
+        site: SiteModel,
+        stockMediaList: List<StockMediaUploadItem>
+    ): UploadedStockMediaPayload {
+        val url = WPCOMREST.sites.site(site.siteId).external_media_upload.urlV1_1
+        val jsonBody = JsonArray()
+        for (stockMedia in stockMediaList) {
+            val json = JsonObject()
+            json.addProperty("url", StringUtils.notNullStr(stockMedia.url))
+            json.addProperty("name", StringUtils.notNullStr(stockMedia.name))
+            json.addProperty("title", StringUtils.notNullStr(stockMedia.title))
+            jsonBody.add(json.toString())
+        }
+        val body: MutableMap<String, Any> = HashMap()
+        body["service"] = "pexels"
+        body["external_ids"] = jsonBody
+
+        val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                MultipleMediaResponse::class.java
+        )
+        return when (response) {
+            is Success -> {
+                val mediaList: List<MediaModel> = mediaResponseUtils.getMediaListFromRestResponse(
+                        response.data,
+                        site.id
+                )
+                UploadedStockMediaPayload(site, mediaList)
+            }
+            is Error -> {
+                val error = response.error
+                AppLog.e(MEDIA, "VolleyError uploading stock media: $error")
+                val mediaError = UploadStockMediaError(
+                        UploadStockMediaErrorType.fromNetworkError(error), error.message
+                )
+                UploadedStockMediaPayload(site, mediaError)
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TaxonomyRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TaxonomyRestClient.java
new file mode 100644
index 00000000000..3e4f79b0e52
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TaxonomyRestClient.java
@@ -0,0 +1,191 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.taxonomy;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.RequestQueue;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.TaxonomyActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST.SitesEndpoint.SiteEndpoint.TaxonomiesEndpoint;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.model.TermsModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.taxonomy.TermWPComRestResponse.TermsResponse;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermsResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.RemoteTermPayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.TaxonomyError;
+import org.wordpress.android.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class TaxonomyRestClient extends BaseWPComRestClient {
+    @Inject public TaxonomyRestClient(
+            Context appContext,
+            Dispatcher dispatcher,
+            @Named("regular") RequestQueue requestQueue,
+            AccessToken accessToken,
+            UserAgent userAgent) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+    }
+
+    public void fetchTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        final String taxonomy = term.getTaxonomy();
+        final String slug = term.getSlug();
+        String url = WPCOMREST.sites.site(site.getSiteId()).taxonomies.taxonomy(taxonomy).terms.slug(slug).getUrlV1_1();
+
+        final WPComGsonRequest<TermWPComRestResponse> request = WPComGsonRequest.buildGetRequest(url, null,
+                TermWPComRestResponse.class,
+                response -> {
+                    TermModel fetchedTerm = termResponseToTermModel(
+                            term.getId(),
+                            site.getId(),
+                            taxonomy,
+                            response);
+                    FetchTermResponsePayload payload = new FetchTermResponsePayload(fetchedTerm, site);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors: 400 invalid_taxonomy
+                    TaxonomyError taxonomyError = new TaxonomyError(error.apiError, error.message);
+                    FetchTermResponsePayload payload = new FetchTermResponsePayload(term, site);
+                    payload.error = taxonomyError;
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermAction(payload));
+                });
+        add(request);
+    }
+
+    public void fetchTerms(@NonNull final SiteModel site, @NonNull final String taxonomyName) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).taxonomies.taxonomy(taxonomyName).terms.getUrlV1_1();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("number", "1000");
+
+        final WPComGsonRequest<TermsResponse> request = WPComGsonRequest.buildGetRequest(url, params,
+                TermsResponse.class,
+                response -> {
+                    List<TermModel> termArray = new ArrayList<>();
+                    TermModel term;
+                    for (TermWPComRestResponse termResponse : response.terms) {
+                        term = termResponseToTermModel(
+                                0,
+                                site.getId(),
+                                taxonomyName,
+                                termResponse);
+                        termArray.add(term);
+                    }
+
+                    FetchTermsResponsePayload payload = new FetchTermsResponsePayload(new TermsModel(termArray),
+                            site, taxonomyName);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermsAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors: 400 invalid_taxonomy
+                    TaxonomyError taxonomyError = new TaxonomyError(error.apiError, error.message);
+                    FetchTermsResponsePayload payload = new FetchTermsResponsePayload(taxonomyError, taxonomyName);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermsAction(payload));
+                });
+        add(request);
+    }
+
+    public void pushTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        final String taxonomy = term.getTaxonomy();
+        TaxonomiesEndpoint endpoint = WPCOMREST.sites.site(site.getSiteId()).taxonomies;
+        String url = term.getRemoteTermId() > 0
+                ? endpoint.taxonomy(taxonomy).terms.slug(term.getSlug()).getUrlV1_1() // update existing term
+                : endpoint.taxonomy(taxonomy).terms.new_.getUrlV1_1(); // upload new term
+
+        Map<String, Object> body = termModelToParams(term);
+
+        final WPComGsonRequest<TermWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, body,
+                TermWPComRestResponse.class,
+                response -> {
+                    TermModel uploadedTerm = termResponseToTermModel(
+                            term.getId(),
+                            site.getId(),
+                            taxonomy,
+                            response);
+                    RemoteTermPayload payload = new RemoteTermPayload(uploadedTerm, site);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newPushedTermAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors: 400 invalid_taxonomy, 409 duplicate
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    payload.error = new TaxonomyError(error.apiError, error.message);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newPushedTermAction(payload));
+                });
+
+        request.addQueryParameter("context", "edit");
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void deleteTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        final String taxonomy = term.getTaxonomy();
+        String url = WPCOMREST.sites.site(site.getSiteId()).taxonomies.taxonomy(taxonomy).terms
+                .slug(term.getSlug()).delete.getUrlV1_1();
+
+        final WPComGsonRequest<TermWPComRestResponse> request = WPComGsonRequest.buildPostRequest(url, null,
+                TermWPComRestResponse.class,
+                response -> {
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newDeletedTermAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors: 400 invalid_taxonomy, 409 duplicate
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    payload.error = new TaxonomyError(error.apiError, error.message);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newDeletedTermAction(payload));
+                });
+
+        request.disableRetries();
+        add(request);
+    }
+
+    @NonNull
+    private TermModel termResponseToTermModel(
+            int termId,
+            int siteId,
+            @NonNull String taxonomy,
+            @NonNull TermWPComRestResponse from) {
+        return new TermModel(
+                termId,
+                siteId,
+                from.ID,
+                taxonomy,
+                StringEscapeUtils.unescapeHtml4(from.name),
+                from.slug,
+                StringEscapeUtils.unescapeHtml4(from.description),
+                from.parent,
+                from.post_count
+        );
+    }
+
+    @NonNull
+    private Map<String, Object> termModelToParams(@NonNull TermModel term) {
+        Map<String, Object> body = new HashMap<>();
+
+        body.put("name", term.getName());
+        body.put("description", StringUtils.notNullStr(term.getDescription()));
+        body.put("parent", String.valueOf(term.getParentRemoteId()));
+
+        return body;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TermWPComRestResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TermWPComRestResponse.java
new file mode 100644
index 00000000000..6cf7eded22b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/taxonomy/TermWPComRestResponse.java
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.taxonomy;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.fluxc.network.Response;
+
+import java.util.List;
+
+@SuppressWarnings("NotNullFieldNotInitialized")
+public class TermWPComRestResponse implements Response {
+    public static class TermsResponse {
+        @NonNull public List<TermWPComRestResponse> terms;
+    }
+
+    public long ID;
+    @NonNull public String name;
+    @NonNull public String slug;
+    @NonNull public String description;
+    public int post_count;
+    public long parent;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/JetpackThemeResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/JetpackThemeResponse.java
new file mode 100644
index 00000000000..136baaf1ab8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/JetpackThemeResponse.java
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+@SuppressWarnings({"WeakerAccess", "NotNullFieldNotInitialized"})
+public class JetpackThemeResponse {
+    public static class JetpackThemeListResponse {
+        @NonNull public List<JetpackThemeResponse> themes;
+        public int count;
+    }
+
+    @NonNull public String id;
+    @NonNull public String screenshot;
+    @NonNull public String name;
+    @NonNull public String theme_uri;
+    @NonNull public String description;
+    @NonNull public String author;
+    @NonNull public String author_uri;
+    @NonNull public String version;
+    public boolean active;
+    public boolean autoupdate;
+    public boolean autoupdate_translation;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/StarterDesignsResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/StarterDesignsResponse.kt
new file mode 100644
index 00000000000..5f8cb8c8a7e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/StarterDesignsResponse.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+import org.wordpress.android.fluxc.network.Response
+
+data class StarterDesignsResponse(
+    val designs: List<StarterDesign>,
+    val categories: List<StarterDesignCategory>
+) : Response
+
+@Parcelize
+data class StarterDesign(
+    val slug: String,
+    val title: String,
+    @SerializedName("segment_id") val segmentId: Long?,
+    val categories: List<StarterDesignCategory>,
+    @SerializedName("demo_url") val demoUrl: String,
+    val theme: String?,
+    val group: List<String>,
+    val preview: String,
+    @SerializedName("preview_tablet") val previewTablet: String,
+    @SerializedName("preview_mobile") val previewMobile: String
+) : Parcelable
+
+@Parcelize
+data class StarterDesignCategory(
+    val slug: String,
+    val title: String,
+    val description: String,
+    val emoji: String?
+) : Parcelable
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeCoroutineRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeCoroutineRestClient.kt
new file mode 100644
index 00000000000..dbf350e3a01
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeCoroutineRestClient.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme
+
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ThemeCoroutineRestClient @Inject constructor(
+    private val wpApiGsonRequestBuilder: WPAPIGsonRequestBuilder,
+    dispatcher: Dispatcher,
+    @Named("custom-ssl") requestQueue: RequestQueue,
+    userAgent: UserAgent
+) : BaseWPAPIRestClient(dispatcher, requestQueue, userAgent) {
+    suspend fun fetchThemeDemoPages(
+        themeDemoUrl: String
+    ): ThemeDemoDataWPAPIPayload<Array<DemoPageResponse>> {
+        val url = themeDemoUrl + WP_DEMO_THEME_PAGES_URL
+        val response = wpApiGsonRequestBuilder.syncGetRequest(
+            restClient = this,
+            url = url,
+            clazz = Array<DemoPageResponse>::class.java,
+            params = mapOf("per_page" to MAX_NUMBER_OF_DEMO_PAGES.toString()),
+        )
+        return when (response) {
+            is WPAPIResponse.Success -> ThemeDemoDataWPAPIPayload(response.data)
+            is WPAPIResponse.Error -> ThemeDemoDataWPAPIPayload(response.error)
+        }
+    }
+
+    data class ThemeDemoDataWPAPIPayload<T>(
+        val result: T?
+    ) : Payload<BaseNetworkError?>() {
+        constructor(error: BaseNetworkError) : this(null) {
+            this.error = error
+        }
+    }
+
+    companion object {
+        private const val MAX_NUMBER_OF_DEMO_PAGES = 30
+        private const val WP_DEMO_THEME_PAGES_URL = "/wp-json/wp/v2/pages"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeDemoPageResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeDemoPageResponse.kt
new file mode 100644
index 00000000000..4574de19eec
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeDemoPageResponse.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme
+
+data class DemoPageResponse(
+    val link: String,
+    val slug: String,
+    val title: PageTitle,
+)
+
+data class PageTitle(
+    val rendered: String,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeRestClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeRestClient.java
new file mode 100644
index 00000000000..c5a61b0a042
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeRestClient.java
@@ -0,0 +1,342 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.ThemeActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.ThemeModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.JetpackThemeResponse.JetpackThemeListResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.WPComThemeResponse.WPComThemeListResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.WPComThemeResponse.WPComThemeMobileFriendlyTaxonomy;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.WPComThemeResponse.WPComThemeTaxonomies;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedCurrentThemePayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedSiteThemesPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedStarterDesignsPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.FetchedWpComThemesPayload;
+import org.wordpress.android.fluxc.store.ThemeStore.SiteThemePayload;
+import org.wordpress.android.fluxc.store.ThemeStore.ThemesError;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class ThemeRestClient extends BaseWPComRestClient {
+    private static final String WPCOM_MOBILE_FRIENDLY_TAXONOMY_SLUG = "mobile-friendly";
+    private static final String THEME_TYPE_EXTERNAL = "managed-external";
+
+    @Inject public ThemeRestClient(
+            Context appContext,
+            Dispatcher dispatcher,
+            @Named("regular") RequestQueue requestQueue,
+            AccessToken accessToken,
+            UserAgent userAgent) {
+        super(appContext, dispatcher, requestQueue, accessToken, userAgent);
+    }
+
+    /**
+     * [Undocumented!] Endpoint: v1.1/sites/$siteId/themes/$themeId/delete
+     */
+    public void deleteTheme(@NonNull final SiteModel site, @NonNull final ThemeModel theme) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).themes.theme(theme.getThemeId()).delete.getUrlV1_1();
+        add(WPComGsonRequest.buildPostRequest(url, null, JetpackThemeResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to Jetpack theme deletion request.");
+                    ThemeModel responseTheme = createThemeFromJetpackResponse(response);
+                    responseTheme.setId(theme.getId());
+                    SiteThemePayload payload = new SiteThemePayload(site, responseTheme);
+                    mDispatcher.dispatch(ThemeActionBuilder.newDeletedThemeAction(payload));
+                }, error -> {
+                    AppLog.d(AppLog.T.API, "Received error response to Jetpack theme deletion request.");
+                    SiteThemePayload payload = new SiteThemePayload(site, theme);
+                    payload.error = new ThemesError(error.apiError, error.message);
+                    mDispatcher.dispatch(ThemeActionBuilder.newDeletedThemeAction(payload));
+                }));
+    }
+
+    /**
+     * [Undocumented!] Endpoint: v1.1/sites/$siteId/themes/$themeId/install
+     */
+    public void installTheme(@NonNull final SiteModel site, @NonNull final ThemeModel theme) {
+        String themeId = theme.getThemeId();
+        if (!site.isWPComAtomic()) {
+            themeId = getThemeIdWithWpComSuffix(theme);
+        }
+        String url = WPCOMREST.sites.site(site.getSiteId()).themes.theme(themeId).install.getUrlV1_1();
+        add(WPComGsonRequest.buildPostRequest(url, null, JetpackThemeResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to Jetpack theme installation request.");
+                    ThemeModel responseTheme = createThemeFromJetpackResponse(response);
+                    SiteThemePayload payload = new SiteThemePayload(site, responseTheme);
+                    mDispatcher.dispatch(ThemeActionBuilder.newInstalledThemeAction(payload));
+                }, error -> {
+                    AppLog.d(AppLog.T.API, "Received error response to Jetpack theme installation request.");
+                    SiteThemePayload payload = new SiteThemePayload(site, theme);
+                    payload.error = new ThemesError(error.apiError, error.message);
+                    mDispatcher.dispatch(ThemeActionBuilder.newInstalledThemeAction(payload));
+                }));
+    }
+
+    /**
+     * Endpoint: v1.1/sites/$siteId/themes/mine
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/themes/mine/">Documentation</a>
+     */
+    public void activateTheme(@NonNull final SiteModel site, @NonNull final ThemeModel theme) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).themes.mine.getUrlV1_1();
+        Map<String, Object> params = new HashMap<>();
+        params.put("theme", theme.getThemeId());
+
+        add(WPComGsonRequest.buildPostRequest(url, params, WPComThemeResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to theme activation request.");
+                    SiteThemePayload payload = new SiteThemePayload(site, theme);
+                    payload.theme.setActive(StringUtils.equals(theme.getThemeId(), response.id));
+                    mDispatcher.dispatch(ThemeActionBuilder.newActivatedThemeAction(payload));
+                }, error -> {
+                    AppLog.d(AppLog.T.API, "Received error response to theme activation request.");
+                    SiteThemePayload payload = new SiteThemePayload(site, theme);
+                    payload.error = new ThemesError(error.apiError, error.message);
+                    mDispatcher.dispatch(ThemeActionBuilder.newActivatedThemeAction(payload));
+                }));
+    }
+
+    /**
+     * [Undocumented!] Endpoint: v1.2/themes
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/1.1/get/themes/">Previous version</a>
+     */
+    public void fetchWpComThemes(@Nullable String filter, int resultsLimit) {
+        String url = WPCOMREST.themes.getUrlV1_2();
+        Map<String, String> params = new HashMap<>();
+        params.put("number", String.valueOf(resultsLimit));
+        if (filter != null) {
+            params.put("filter", filter);
+        }
+        add(WPComGsonRequest.buildGetRequest(url, params, WPComThemeListResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to WP.com themes fetch request.");
+                    List<ThemeModel> themes = createThemeListFromArrayResponse(response);
+                    FetchedWpComThemesPayload payload = new FetchedWpComThemesPayload(themes);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedWpComThemesAction(payload));
+                }, error -> {
+                    AppLog.e(AppLog.T.API, "Received error response to WP.com themes fetch request.");
+                    ThemesError themeError = new ThemesError(error.apiError, error.message);
+                    FetchedWpComThemesPayload payload = new FetchedWpComThemesPayload(themeError);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedWpComThemesAction(payload));
+                }));
+    }
+
+    /**
+     * Endpoint:  v2/common-starter-site-designs
+     */
+    public void fetchStarterDesigns(
+            @Nullable Float previewWidth,
+            @Nullable Float previewHeight,
+            @Nullable Float scale,
+            @Nullable String[] groups) {
+        Map<String, String> params = new HashMap<>();
+        params.put("type", "mobile");
+        if (previewWidth != null) {
+            params.put("preview_width", String.format(Locale.US, "%.1f", previewWidth));
+        }
+        if (previewHeight != null) {
+            params.put("preview_height", String.format(Locale.US, "%.1f", previewHeight));
+        }
+        if (scale != null) {
+            params.put("scale", String.format(Locale.US, "%.1f", scale));
+        }
+        if (groups != null && groups.length > 0) {
+            params.put("group", TextUtils.join(",", groups));
+        }
+        String url = WPCOMV2.common_starter_site_designs.getUrl();
+        add(WPComGsonRequest.buildGetRequest(url, params, StarterDesignsResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to WP.com starter designs fetch request.");
+                    FetchedStarterDesignsPayload payload =
+                            new FetchedStarterDesignsPayload(response.getDesigns(), response.getCategories());
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedStarterDesignsAction(payload));
+                }, error -> {
+                    AppLog.e(AppLog.T.API, "Received error response to WP.com starter designs fetch request.");
+                    ThemesError themeError = new ThemesError(error.apiError, error.message);
+                    FetchedStarterDesignsPayload payload = new FetchedStarterDesignsPayload(themeError);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedStarterDesignsAction(payload));
+                }));
+    }
+
+    /**
+     * [Undocumented!] Endpoint: v1/sites/$siteId/themes
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/themes/">Similar endpoint</a>
+     */
+    public void fetchJetpackInstalledThemes(@NonNull final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).themes.getUrlV1();
+        add(WPComGsonRequest.buildGetRequest(url, null, JetpackThemeListResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to Jetpack installed themes fetch request.");
+                    List<ThemeModel> themes = createThemeListFromJetpackResponse(response);
+                    FetchedSiteThemesPayload payload = new FetchedSiteThemesPayload(site, themes);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedInstalledThemesAction(payload));
+                }, error -> {
+                    AppLog.e(AppLog.T.API, "Received error response to Jetpack installed themes fetch request.");
+                    ThemesError themeError = new ThemesError(error.apiError, error.message);
+                    FetchedSiteThemesPayload payload = new FetchedSiteThemesPayload(site, themeError);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedInstalledThemesAction(payload));
+                }));
+    }
+
+    /**
+     * Endpoint: v1.1/sites/$siteId/themes/mine; same endpoint for both Jetpack and WP.com sites!
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/1.1/get/sites/%24site/themes/mine/">Documentation</a>
+     */
+    public void fetchCurrentTheme(@NonNull final SiteModel site) {
+        String url = WPCOMREST.sites.site(site.getSiteId()).themes.mine.getUrlV1_1();
+        add(WPComGsonRequest.buildGetRequest(url, null, WPComThemeResponse.class,
+                response -> {
+                    AppLog.d(AppLog.T.API, "Received response to current theme fetch request.");
+                    ThemeModel responseTheme = createThemeFromWPComResponse(response);
+                    FetchedCurrentThemePayload payload = new FetchedCurrentThemePayload(site, responseTheme);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedCurrentThemeAction(payload));
+                }, error -> {
+                    AppLog.e(AppLog.T.API, "Received error response to current theme fetch request.");
+                    ThemesError themeError = new ThemesError(error.apiError, error.message);
+                    FetchedCurrentThemePayload payload = new FetchedCurrentThemePayload(site, themeError);
+                    mDispatcher.dispatch(ThemeActionBuilder.newFetchedCurrentThemeAction(payload));
+                }));
+    }
+
+    @NonNull
+    private static ThemeModel createThemeFromWPComResponse(@NonNull WPComThemeResponse response) {
+        boolean free = response.theme_tier == null || response.theme_tier.slug == null
+                       || response.theme_tier.slug.equalsIgnoreCase("free");
+        String priceText = null;
+        if (!free) {
+            priceText = response.price;
+        }
+        boolean isExternalTheme = false;
+        if (response.theme_type != null) {
+            isExternalTheme = response.theme_type.equals(THEME_TYPE_EXTERNAL);
+        }
+        return new ThemeModel(
+                response.id,
+                response.name,
+                response.description,
+                response.slug,
+                response.version,
+                response.author,
+                response.author_uri,
+                response.theme_uri,
+                response.theme_type,
+                response.screenshot,
+                response.demo_uri,
+                response.download_uri,
+                response.stylesheet,
+                priceText,
+                isExternalTheme,
+                free,
+                getMobileFriendlyCategorySlug(response.taxonomies)
+        );
+    }
+
+    @Nullable
+    private static String getMobileFriendlyCategorySlug(@Nullable WPComThemeTaxonomies taxonomies) {
+        // detect the mobile-friendly category slug if there
+        if (taxonomies != null && taxonomies.theme_mobile_friendly != null) {
+            String category = null;
+            for (WPComThemeMobileFriendlyTaxonomy taxonomy : taxonomies.theme_mobile_friendly) {
+                // The server response has two taxonomies defined here. One is named "mobile-friendly" and the other is
+                //  a more specific category the theme belongs to. We're only interested in the specific one here so,
+                //  ignore the "mobile-friendly" one.
+                if (taxonomy.slug.equals(WPCOM_MOBILE_FRIENDLY_TAXONOMY_SLUG)) {
+                    continue;
+                }
+
+                category = taxonomy.slug;
+
+                // we got the category slug so, no need to continue looping
+                break;
+            }
+            return category;
+        }
+        return null;
+    }
+
+    @NonNull
+    private static ThemeModel createThemeFromJetpackResponse(@NonNull JetpackThemeResponse response) {
+        // the screenshot field in Jetpack responses does not contain a protocol so we'll prepend 'https'
+        String screenshotUrl = response.screenshot;
+        if (screenshotUrl.startsWith("//")) {
+            screenshotUrl = "https:" + screenshotUrl;
+        }
+        return new ThemeModel(
+                response.id,
+                response.name,
+                response.description,
+                response.version,
+                response.author,
+                response.author_uri,
+                response.theme_uri,
+                screenshotUrl,
+                response.active,
+                response.autoupdate,
+                response.autoupdate_translation
+        );
+    }
+
+    @NonNull
+    private static List<ThemeModel> createThemeListFromArrayResponse(@NonNull WPComThemeListResponse response) {
+        final List<ThemeModel> themeList = new ArrayList<>();
+        for (WPComThemeResponse item : response.themes) {
+            themeList.add(createThemeFromWPComResponse(item));
+        }
+        return themeList;
+    }
+
+    /**
+     * Creates a list of ThemeModels from the Jetpack /v1/sites/$siteId/themes REST response.
+     */
+    @NonNull
+    private static List<ThemeModel> createThemeListFromJetpackResponse(@NonNull JetpackThemeListResponse response) {
+        final List<ThemeModel> themeList = new ArrayList<>();
+        for (JetpackThemeResponse item : response.themes) {
+            themeList.add(createThemeFromJetpackResponse(item));
+        }
+        return themeList;
+    }
+
+    /**
+     * Must provide theme slug with -wpcom suffix to install a WP.com theme on a Jetpack site.
+     *
+     * @see <a href="https://developer.wordpress.com/docs/api/console/">Documentation</a>
+     */
+    @NonNull
+    private String getThemeIdWithWpComSuffix(@NonNull ThemeModel theme) {
+        if (theme.getThemeId().endsWith("-wpcom")) {
+            return theme.getThemeId();
+        }
+
+        return theme.getThemeId() + "-wpcom";
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/WPComThemeResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/WPComThemeResponse.java
new file mode 100644
index 00000000000..d06870cccc3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/WPComThemeResponse.java
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.theme;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+@SuppressWarnings({"WeakerAccess", "NotNullFieldNotInitialized"})
+public class WPComThemeResponse {
+    public static class WPComThemeListResponse {
+        @NonNull public List<WPComThemeResponse> themes;
+    }
+
+    public static class WPComThemeMobileFriendlyTaxonomy {
+        @NonNull public String name;
+        @NonNull public String slug;
+    }
+
+    public static class WPComThemeTaxonomies {
+        @SerializedName("theme_mobile-friendly")
+        @Nullable public WPComThemeMobileFriendlyTaxonomy[] theme_mobile_friendly;
+    }
+
+    public static class WPComThemeTier {
+        @Nullable public String slug;
+        @Nullable public String feature;
+        @Nullable public String platform;
+    }
+
+    @NonNull public String id;
+    @Nullable public String slug;
+    @Nullable public String stylesheet;
+    @NonNull public String name;
+    @Nullable public String author;
+    @Nullable public String author_uri;
+    @Nullable public String theme_uri;
+    @Nullable public String demo_uri;
+    @Nullable public String version;
+    @NonNull public String screenshot;
+    @Nullable public String theme_type;
+    @NonNull public String description;
+    @Nullable public String download_uri;
+    @Nullable public String price;
+    @Nullable public WPComThemeTaxonomies taxonomies;
+    @Nullable public WPComThemeTier theme_tier;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/SupportedDomainCountry.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/SupportedDomainCountry.kt
new file mode 100644
index 00000000000..3d6cb72f070
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/SupportedDomainCountry.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.transactions
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class SupportedDomainCountry(
+    val code: String,
+    val name: String
+) : Parcelable
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsRestClient.kt
new file mode 100644
index 00000000000..b2cb8c1231a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/transactions/TransactionsRestClient.kt
@@ -0,0 +1,157 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.transactions
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMREST
+import org.wordpress.android.fluxc.model.DomainContactModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.TransactionsStore.CreatedShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.FetchedSupportedCountriesPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.RedeemShoppingCartError
+import org.wordpress.android.fluxc.store.TransactionsStore.RedeemedShoppingCartPayload
+import org.wordpress.android.fluxc.store.TransactionsStore.TransactionErrorType
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class TransactionsRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    companion object {
+        const val domainCreditPaymentMethod = "WPCOM_Billing_WPCOM"
+    }
+
+    suspend fun fetchSupportedCountries(): FetchedSupportedCountriesPayload {
+        val url = WPCOMREST.me.transactions.supported_countries.urlV1_1
+
+        return when (val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                emptyMap(),
+                Array<SupportedDomainCountry>::class.java
+        )) {
+            is Success -> {
+                FetchedSupportedCountriesPayload(response.data)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val payload = FetchedSupportedCountriesPayload()
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    suspend fun createShoppingCart(
+        site: SiteModel?,
+        domainProductId: Int,
+        domainName: String,
+        isDomainPrivacyProtectionEnabled: Boolean,
+        isTemporary: Boolean,
+        planProductId: Int? = null
+    ): CreatedShoppingCartPayload {
+        val url = site?.let { WPCOMREST.me.shopping_cart.site(it.siteId).urlV1_1 }
+            ?: WPCOMREST.me.shopping_cart.no_site.urlV1_1
+
+        val domainProduct = mapOf(
+                "product_id" to domainProductId,
+                "meta" to domainName,
+                "extra" to PrivacyExtra(isDomainPrivacyProtectionEnabled)
+        )
+
+        var products = arrayOf(domainProduct)
+
+        planProductId?.let {
+            val planProduct = mapOf("product_id" to it)
+            products += planProduct
+        }
+
+        val body = mapOf(
+                "temporary" to isTemporary,
+                "products" to products
+        )
+
+        return when (val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                CreateShoppingCartResponse::class.java
+        )) {
+            is Success -> {
+                CreatedShoppingCartPayload(response.data)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val payload = CreatedShoppingCartPayload()
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    suspend fun redeemCartUsingCredits(
+        cartResponse: CreateShoppingCartResponse,
+        domainContactInformation: DomainContactModel
+    ): RedeemedShoppingCartPayload {
+        val url = WPCOMREST.me.transactions.urlV1_1
+
+        val paymentMethod = mapOf(
+                "payment_method" to domainCreditPaymentMethod
+        )
+
+        val body = mapOf(
+                "domain_details" to domainContactInformation,
+                "cart" to cartResponse,
+                "payment" to paymentMethod
+        )
+
+        return when (val response = wpComGsonRequestBuilder.syncPostRequest(
+                this,
+                url,
+                null,
+                body,
+                CreateShoppingCartResponse::class.java
+        )) {
+            is Success -> {
+                RedeemedShoppingCartPayload(true)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val payload = RedeemedShoppingCartPayload(false)
+                payload.error = RedeemShoppingCartError(
+                        TransactionErrorType.fromString(response.error.apiError),
+                        response.error.message
+                )
+                payload
+            }
+        }
+    }
+
+    private data class PrivacyExtra(val privacy: Boolean)
+
+    @Suppress("ConstructorParameterNaming")
+    data class CreateShoppingCartResponse(
+        val blog_id: Int,
+        val cart_key: String?,
+        val products: List<Product>?
+    ) : Response {
+        data class Product(
+            val product_id: Int,
+            val meta: String?,
+            val extra: Extra
+        )
+
+        data class Extra(val privacy: Boolean)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/vertical/VerticalRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/vertical/VerticalRestClient.kt
new file mode 100644
index 00000000000..e7bc7df4992
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/vertical/VerticalRestClient.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.vertical
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.vertical.VerticalSegmentModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.store.VerticalStore.FetchSegmentsError
+import org.wordpress.android.fluxc.store.VerticalStore.FetchedSegmentsPayload
+import org.wordpress.android.fluxc.store.VerticalStore.VerticalErrorType.GENERIC_ERROR
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+private class FetchSegmentsResponse : ArrayList<VerticalSegmentModel>()
+
+@Singleton
+class VerticalRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchSegments(): FetchedSegmentsPayload {
+        val url = WPCOMV2.segments.url
+        val response = wpComGsonRequestBuilder.syncGetRequest(this, url, emptyMap(), FetchSegmentsResponse::class.java)
+        return when (response) {
+            is Success -> FetchedSegmentsPayload(response.data)
+            is Error -> FetchedSegmentsPayload(FetchSegmentsError(GENERIC_ERROR))
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/whatsnew/WhatsNewRestClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/whatsnew/WhatsNewRestClient.kt
new file mode 100644
index 00000000000..a2c6300c377
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/whatsnew/WhatsNewRestClient.kt
@@ -0,0 +1,108 @@
+package org.wordpress.android.fluxc.network.rest.wpcom.whatsnew
+
+import android.content.Context
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel.WhatsNewAnnouncementFeature
+import org.wordpress.android.fluxc.network.Response
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpcom.BaseWPComRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken
+import org.wordpress.android.fluxc.network.rest.wpcom.whatsnew.WhatsNewRestClient.WhatsNewResponse.Announcement
+import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewAppId
+import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewFetchedPayload
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class WhatsNewRestClient @Inject constructor(
+    dispatcher: Dispatcher,
+    private val wpComGsonRequestBuilder: WPComGsonRequestBuilder,
+    appContext: Context?,
+    @Named("regular") requestQueue: RequestQueue,
+    accessToken: AccessToken,
+    userAgent: UserAgent
+) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) {
+    suspend fun fetchWhatsNew(versionName: String, appId: WhatsNewAppId): WhatsNewFetchedPayload {
+        val url = WPCOMV2.mobile.feature_announcements.url
+
+        val params = mapOf(
+                "app_id" to appId.id.toString(),
+                "app_version" to versionName
+        )
+
+        val response = wpComGsonRequestBuilder.syncGetRequest(
+                this,
+                url,
+                params,
+                WhatsNewResponse::class.java,
+                enableCaching = false,
+                forced = true
+        )
+
+        return when (response) {
+            is Success -> {
+                val announcements = response.data.announcements
+                buildWhatsNewPayload(announcements)
+            }
+            is WPComGsonRequestBuilder.Response.Error -> {
+                val payload = WhatsNewFetchedPayload()
+                payload.error = response.error
+                payload
+            }
+        }
+    }
+
+    private fun buildWhatsNewPayload(
+        announcements: List<Announcement>?
+    ): WhatsNewFetchedPayload {
+        return WhatsNewFetchedPayload(announcements?.map { announce ->
+            WhatsNewAnnouncementModel(
+                    appVersionName = announce.appVersionName,
+                    announcementVersion = announce.announcementVersion,
+                    minimumAppVersion = announce.minimumAppVersion,
+                    maximumAppVersion = announce.maximumAppVersion,
+                    appVersionTargets = announce.appVersionTargets ?: emptyList(),
+                    detailsUrl = announce.detailsUrl,
+                    isLocalized = announce.isLocalized,
+                    responseLocale = announce.responseLocale,
+                    features = announce.features.map {
+                        WhatsNewAnnouncementFeature(
+                                title = it.title,
+                                subtitle = it.subtitle,
+                                iconBase64 = it.iconBase64,
+                                iconUrl = it.iconUrl
+                        )
+                    }
+            )
+        })
+    }
+
+    data class WhatsNewResponse(
+        val announcements: List<Announcement>?
+    ) : Response {
+        data class Announcement(
+            val appVersionName: String,
+            val announcementVersion: Int,
+            val minimumAppVersion: String,
+            val maximumAppVersion: String,
+            val appVersionTargets: List<String>?,
+            val detailsUrl: String,
+            val isLocalized: Boolean,
+            val responseLocale: String,
+            val features: List<Feature>
+        )
+
+        data class Feature(
+            val title: String,
+            val subtitle: String,
+            val iconBase64: String,
+            val iconUrl: String
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/CurrentDateUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/CurrentDateUtils.kt
new file mode 100644
index 00000000000..692904dbcf2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/CurrentDateUtils.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.network.utils
+
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
+
+class CurrentDateUtils
+@Inject constructor() {
+    fun getCurrentDate() = Date()
+    fun getCurrentCalendar() = Calendar.getInstance()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonExt.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonExt.kt
new file mode 100644
index 00000000000..6d3e92f461a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonExt.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.network.utils
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+// Convert an object of type T to type R
+inline fun <T, reified R> T.convert(): R {
+    val gson = Gson()
+    val json = gson.toJson(this)
+    return gson.fromJson(json, object : TypeToken<R>() {}.type)
+}
+
+// Convert an object to a Map
+fun <T> T.toMap(): Map<String, Any> {
+    return convert()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonObjectExtensions.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonObjectExtensions.kt
new file mode 100644
index 00000000000..f876327080e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/JsonObjectExtensions.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.fluxc.network.utils
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import org.apache.commons.text.StringEscapeUtils
+
+fun JsonObject?.getString(property: String, unescapeHtml4: Boolean = false): String? {
+    val str = checkAndGet(property)?.asString
+    return if (unescapeHtml4) {
+        StringEscapeUtils.unescapeHtml4(str)
+    } else str
+}
+
+fun JsonObject?.getBoolean(property: String, defaultValue: Boolean = false) =
+        checkAndGet(property)?.asBoolean ?: defaultValue
+
+fun JsonObject?.getInt(property: String, defaultValue: Int = 0): Int = checkAndGet(property)?.asInt ?: defaultValue
+
+fun JsonObject?.getLong(property: String, defaultValue: Long = 0L) =
+        checkAndGet(property)?.asLong ?: defaultValue
+
+fun JsonObject?.getJsonObject(property: String): JsonObject? {
+    val obj = checkAndGet(property)
+    return if (obj?.isJsonObject == true) obj.asJsonObject else null
+}
+
+private fun JsonObject?.checkAndGet(property: String): JsonElement? {
+    return if (this?.has(property) == true) {
+        val jsonElement = this.get(property)
+        if (jsonElement.isJsonNull) {
+            null
+        } else {
+            jsonElement
+        }
+    } else null
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/StatsGranularity.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/StatsGranularity.kt
new file mode 100644
index 00000000000..db3bb02619f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/utils/StatsGranularity.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.network.utils
+
+enum class StatsGranularity(private val value: String) {
+    DAYS("day"),
+    WEEKS("week"),
+    MONTHS("month"),
+    YEARS("year");
+
+    override fun toString(): String {
+        return value
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/BaseWPOrgAPIClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/BaseWPOrgAPIClient.java
new file mode 100644
index 00000000000..a65cc30a204
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/BaseWPOrgAPIClient.java
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.network.wporg;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.OnAuthFailedListener;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+
+public abstract class BaseWPOrgAPIClient {
+    private final RequestQueue mRequestQueue;
+    private final Dispatcher mDispatcher;
+    private UserAgent mUserAgent;
+
+    private OnAuthFailedListener mOnAuthFailedListener;
+
+    public BaseWPOrgAPIClient(Dispatcher dispatcher, RequestQueue requestQueue,
+                              UserAgent userAgent) {
+        mDispatcher = dispatcher;
+        mRequestQueue = requestQueue;
+        mUserAgent = userAgent;
+        mOnAuthFailedListener = new OnAuthFailedListener() {
+            @Override
+            public void onAuthFailed(AuthenticateErrorPayload authError) {
+                mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateErrorAction(authError));
+            }
+        };
+    }
+
+    protected Request add(WPOrgAPIGsonRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    private BaseRequest setRequestAuthParams(BaseRequest request) {
+        request.setOnAuthFailedListener(mOnAuthFailedListener);
+        request.setUserAgent(mUserAgent.getUserAgent());
+        return request;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/WPOrgAPIGsonRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/WPOrgAPIGsonRequest.java
new file mode 100644
index 00000000000..0404ba0643e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/WPOrgAPIGsonRequest.java
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.network.wporg;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.Response.Listener;
+
+import org.wordpress.android.fluxc.network.rest.GsonRequest;
+
+import java.util.Map;
+
+public class WPOrgAPIGsonRequest<T> extends GsonRequest<T> {
+    public WPOrgAPIGsonRequest(int method, String url, Map<String, String> params, Map<String, Object> body,
+                               Class<T> clazz, Listener<T> listener, BaseErrorListener errorListener) {
+        super(method, params, body, url, clazz, null, listener, errorListener);
+        // If it's a GET request, add the parameters to the URL
+        if (method == Method.GET) {
+            addQueryParameters(params);
+        }
+    }
+
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        return error;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/FetchPluginDirectoryResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/FetchPluginDirectoryResponse.java
new file mode 100644
index 00000000000..7f5b32f8f1a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/FetchPluginDirectoryResponse.java
@@ -0,0 +1,61 @@
+package org.wordpress.android.fluxc.network.wporg.plugin;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@JsonAdapter(FetchPluginDirectoryResponseDeserializer.class)
+public class FetchPluginDirectoryResponse {
+    public FetchPluginDirectoryResponseInfo info;
+    public List<WPOrgPluginResponse> plugins;
+
+    FetchPluginDirectoryResponse() {
+        info = new FetchPluginDirectoryResponseInfo();
+    }
+}
+
+class FetchPluginDirectoryResponseDeserializer implements JsonDeserializer<FetchPluginDirectoryResponse> {
+    @Override
+    public FetchPluginDirectoryResponse deserialize(JsonElement json, Type typeOfT,
+                                                    JsonDeserializationContext context) throws JsonParseException {
+        JsonObject jsonObject = json.getAsJsonObject();
+        FetchPluginDirectoryResponse response = new FetchPluginDirectoryResponse();
+        if (jsonObject.has("info")) {
+            response.info = context.deserialize(jsonObject.get("info"), FetchPluginDirectoryResponseInfo.class);
+        }
+        if (jsonObject.has("plugins")) {
+            JsonElement pluginsEl = jsonObject.get("plugins");
+            if (pluginsEl.isJsonArray()) {
+                JsonArray pluginsJsonArray = pluginsEl.getAsJsonArray();
+                Type collectionType = new TypeToken<List<WPOrgPluginResponse>>(){}.getType();
+                response.plugins = context.deserialize(pluginsJsonArray, collectionType);
+            } else if (pluginsEl.isJsonObject()) {
+                JsonObject pluginsJsonObject = pluginsEl.getAsJsonObject();
+                response.plugins = new ArrayList<>();
+                for (Map.Entry<String, JsonElement> entry : pluginsJsonObject.entrySet()) {
+                    WPOrgPluginResponse pluginResponse = context.deserialize(entry.getValue(),
+                            WPOrgPluginResponse.class);
+                    if (pluginResponse != null) {
+                        response.plugins.add(pluginResponse);
+                    }
+                }
+            }
+        }
+        return response;
+    }
+}
+
+class FetchPluginDirectoryResponseInfo {
+    public int page;
+    public int pages;
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/PluginWPOrgClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/PluginWPOrgClient.java
new file mode 100644
index 00000000000..0fad4691d57
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/PluginWPOrgClient.java
@@ -0,0 +1,259 @@
+package org.wordpress.android.fluxc.network.wporg.plugin;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.Request.Method;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.PluginActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.WPCOMV2;
+import org.wordpress.android.fluxc.generated.endpoint.WPORGAPI;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType;
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseErrorListener;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.wporg.BaseWPOrgAPIClient;
+import org.wordpress.android.fluxc.network.wporg.WPOrgAPIGsonRequest;
+import org.wordpress.android.fluxc.store.PluginStore.FetchWPOrgPluginError;
+import org.wordpress.android.fluxc.store.PluginStore.FetchWPOrgPluginErrorType;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedPluginDirectoryPayload;
+import org.wordpress.android.fluxc.store.PluginStore.FetchedWPOrgPluginPayload;
+import org.wordpress.android.fluxc.store.PluginStore.PluginDirectoryError;
+import org.wordpress.android.fluxc.store.PluginStore.PluginDirectoryErrorType;
+import org.wordpress.android.fluxc.store.PluginStore.SearchedPluginDirectoryPayload;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class PluginWPOrgClient extends BaseWPOrgAPIClient {
+    private static final int FETCH_PLUGIN_DIRECTORY_PAGE_SIZE = 50;
+    private final Dispatcher mDispatcher;
+
+    @Inject public PluginWPOrgClient(Dispatcher dispatcher,
+                                     @Named("regular") RequestQueue requestQueue,
+                                     UserAgent userAgent) {
+        super(dispatcher, requestQueue, userAgent);
+        mDispatcher = dispatcher;
+    }
+
+    public void fetchPluginDirectory(final PluginDirectoryType directoryType, int page) {
+        if (directoryType == PluginDirectoryType.FEATURED) {
+            // This check is not really necessary currently - but defensive programming ftw
+            fetchFeaturedPlugins();
+            return;
+        }
+        String url = WPORGAPI.plugins.info.version("1.1").getUrl();
+        final boolean loadMore = page > 1;
+        final Map<String, String> params = getCommonPluginDirectoryParams(page);
+        params.put("request[browse]", directoryType.toString());
+        final WPOrgAPIGsonRequest<FetchPluginDirectoryResponse> request =
+                new WPOrgAPIGsonRequest<>(Method.GET, url, params, null, FetchPluginDirectoryResponse.class,
+                        new Listener<FetchPluginDirectoryResponse>() {
+                            @Override
+                            public void onResponse(FetchPluginDirectoryResponse response) {
+                                FetchedPluginDirectoryPayload payload;
+                                if (response != null) {
+                                    boolean canLoadMore = response.info.page < response.info.pages;
+                                    List<WPOrgPluginModel> wpOrgPlugins = wpOrgPluginListFromResponse(response);
+                                    payload = new FetchedPluginDirectoryPayload(directoryType, wpOrgPlugins,
+                                            loadMore, canLoadMore, response.info.page);
+                                } else {
+                                    PluginDirectoryError directoryError = new PluginDirectoryError(
+                                            PluginDirectoryErrorType.EMPTY_RESPONSE, null);
+                                    payload = new FetchedPluginDirectoryPayload(directoryType, loadMore,
+                                            directoryError);
+                                }
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                            }
+                        },
+                        new BaseErrorListener() {
+                            @Override
+                            public void onErrorResponse(@NonNull BaseNetworkError networkError) {
+                                PluginDirectoryError directoryError = new PluginDirectoryError(
+                                        PluginDirectoryErrorType.GENERIC_ERROR, networkError.message);
+                                FetchedPluginDirectoryPayload payload =
+                                        new FetchedPluginDirectoryPayload(directoryType, loadMore, directoryError);
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                            }
+                        }
+                );
+        add(request);
+    }
+
+    public void fetchFeaturedPlugins() {
+        String url = WPCOMV2.plugins.featured.getUrl();
+        final WPOrgAPIGsonRequest<WPOrgPluginResponse[]> request =
+                new WPOrgAPIGsonRequest<>(Method.GET, url, null, null, WPOrgPluginResponse[].class,
+                        new Listener<WPOrgPluginResponse[]>() {
+                            @Override
+                            public void onResponse(WPOrgPluginResponse[] response) {
+                                FetchedPluginDirectoryPayload payload;
+                                List<WPOrgPluginModel> wpOrgPlugins = new ArrayList<>();
+                                if (response != null) {
+                                    for (WPOrgPluginResponse wpOrgPluginResponse : response) {
+                                        wpOrgPlugins.add(wpOrgPluginFromResponse(wpOrgPluginResponse));
+                                    }
+                                }
+                                payload = new FetchedPluginDirectoryPayload(PluginDirectoryType.FEATURED, wpOrgPlugins,
+                                        false, false, 1);
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                            }
+                        },
+                        new BaseErrorListener() {
+                            @Override
+                            public void onErrorResponse(@NonNull BaseNetworkError networkError) {
+                                PluginDirectoryError directoryError = new PluginDirectoryError(
+                                        PluginDirectoryErrorType.GENERIC_ERROR, networkError.message);
+                                FetchedPluginDirectoryPayload payload =
+                                        new FetchedPluginDirectoryPayload(PluginDirectoryType.FEATURED, false,
+                                                directoryError);
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(payload));
+                            }
+                        }
+                );
+        add(request);
+    }
+
+    public void fetchWPOrgPlugin(final String pluginSlug) {
+        String url = WPORGAPI.plugins.info.version("1.0").slug(pluginSlug).getUrl();
+        Map<String, String> params = new HashMap<>();
+        params.put("fields", "banners,icons");
+        final WPOrgAPIGsonRequest<WPOrgPluginResponse> request =
+                new WPOrgAPIGsonRequest<>(Method.GET, url, params, null, WPOrgPluginResponse.class,
+                        new Listener<WPOrgPluginResponse>() {
+                            @Override
+                            public void onResponse(WPOrgPluginResponse response) {
+                                if (response == null) {
+                                    FetchWPOrgPluginError error = new FetchWPOrgPluginError(
+                                            FetchWPOrgPluginErrorType.EMPTY_RESPONSE);
+                                    mDispatcher.dispatch(PluginActionBuilder.newFetchedWporgPluginAction(
+                                            new FetchedWPOrgPluginPayload(pluginSlug, error)));
+                                    return;
+                                }
+                                if (!TextUtils.isEmpty(response.getErrorMessage())) {
+                                    // Plugin does not exist error returned with success code
+                                    FetchWPOrgPluginError error = new FetchWPOrgPluginError(
+                                            FetchWPOrgPluginErrorType.PLUGIN_DOES_NOT_EXIST);
+                                    mDispatcher.dispatch(PluginActionBuilder.newFetchedWporgPluginAction(
+                                            new FetchedWPOrgPluginPayload(pluginSlug, error)));
+                                    return;
+                                }
+                                WPOrgPluginModel wpOrgPluginModel = wpOrgPluginFromResponse(response);
+                                FetchedWPOrgPluginPayload payload =
+                                        new FetchedWPOrgPluginPayload(pluginSlug, wpOrgPluginModel);
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedWporgPluginAction(payload));
+                            }
+                        },
+                        new BaseErrorListener() {
+                            @Override
+                            public void onErrorResponse(@NonNull BaseNetworkError networkError) {
+                                FetchWPOrgPluginError error = new FetchWPOrgPluginError(
+                                        FetchWPOrgPluginErrorType.GENERIC_ERROR);
+                                mDispatcher.dispatch(PluginActionBuilder.newFetchedWporgPluginAction(
+                                        new FetchedWPOrgPluginPayload(pluginSlug, error)));
+                            }
+                        }
+                );
+        add(request);
+    }
+
+    public void searchPluginDirectory(@Nullable final SiteModel site, final String searchTerm, final int page) {
+        String url = WPORGAPI.plugins.info.version("1.1").getUrl();
+        final Map<String, String> params = getCommonPluginDirectoryParams(page);
+        params.put("request[search]", searchTerm);
+        final WPOrgAPIGsonRequest<FetchPluginDirectoryResponse> request =
+                new WPOrgAPIGsonRequest<>(Method.GET, url, params, null, FetchPluginDirectoryResponse.class,
+                        new Listener<FetchPluginDirectoryResponse>() {
+                            @Override
+                            public void onResponse(FetchPluginDirectoryResponse response) {
+                                SearchedPluginDirectoryPayload payload =
+                                        new SearchedPluginDirectoryPayload(site, searchTerm, page);
+                                if (response != null) {
+                                    payload.canLoadMore = response.info.page < response.info.pages;
+                                    payload.plugins = wpOrgPluginListFromResponse(response);
+                                } else {
+                                    payload.error = new PluginDirectoryError(
+                                            PluginDirectoryErrorType.EMPTY_RESPONSE, null);
+                                }
+                                mDispatcher.dispatch(PluginActionBuilder.newSearchedPluginDirectoryAction(payload));
+                            }
+                        },
+                        new BaseErrorListener() {
+                            @Override
+                            public void onErrorResponse(@NonNull BaseNetworkError networkError) {
+                                SearchedPluginDirectoryPayload payload =
+                                        new SearchedPluginDirectoryPayload(site, searchTerm, page);
+                                payload.error = new PluginDirectoryError(
+                                        PluginDirectoryErrorType.GENERIC_ERROR, networkError.message);
+                                mDispatcher.dispatch(PluginActionBuilder.newSearchedPluginDirectoryAction(payload));
+                            }
+                        }
+                );
+        add(request);
+    }
+
+    private Map<String, String> getCommonPluginDirectoryParams(int page) {
+        Map<String, String> params = new HashMap<>();
+        params.put("action", "query_plugins");
+        params.put("request[page]", String.valueOf(page));
+        params.put("request[per_page]", String.valueOf(FETCH_PLUGIN_DIRECTORY_PAGE_SIZE));
+        params.put("request[fields][banners]", String.valueOf(1));
+        params.put("request[fields][compatibility]", String.valueOf(1));
+        params.put("request[fields][icons]", String.valueOf(1));
+        params.put("request[fields][requires]", String.valueOf(1));
+        params.put("request[fields][sections]", String.valueOf(0));
+        params.put("request[fields][tested]", String.valueOf(0));
+        return params;
+    }
+
+    private List<WPOrgPluginModel> wpOrgPluginListFromResponse(@NonNull FetchPluginDirectoryResponse response) {
+        List<WPOrgPluginModel> pluginList = new ArrayList<>();
+        if (response.plugins != null) {
+            for (WPOrgPluginResponse wpOrgPluginResponse : response.plugins) {
+                pluginList.add(wpOrgPluginFromResponse(wpOrgPluginResponse));
+            }
+        }
+        return pluginList;
+    }
+
+    private WPOrgPluginModel wpOrgPluginFromResponse(WPOrgPluginResponse response) {
+        WPOrgPluginModel wpOrgPluginModel = new WPOrgPluginModel();
+        wpOrgPluginModel.setAuthorAsHtml(response.getAuthorAsHtml());
+        wpOrgPluginModel.setBanner(response.getBanner());
+        wpOrgPluginModel.setDescriptionAsHtml(response.getDescriptionAsHtml());
+        wpOrgPluginModel.setFaqAsHtml(response.getFaqAsHtml());
+        wpOrgPluginModel.setHomepageUrl(response.getHomepageUrl());
+        wpOrgPluginModel.setIcon(response.getIcon());
+        wpOrgPluginModel.setInstallationInstructionsAsHtml(response.getInstallationInstructionsAsHtml());
+        wpOrgPluginModel.setLastUpdated(response.getLastUpdated());
+        wpOrgPluginModel.setDisplayName(StringEscapeUtils.unescapeHtml4(response.getName()));
+        wpOrgPluginModel.setRating(response.getRating());
+        wpOrgPluginModel.setRequiredWordPressVersion(response.getRequiredWordPressVersion());
+        wpOrgPluginModel.setSlug(response.getSlug());
+        wpOrgPluginModel.setVersion(response.getVersion());
+        wpOrgPluginModel.setWhatsNewAsHtml(response.getWhatsNewAsHtml());
+        wpOrgPluginModel.setDownloadCount(response.getDownloadCount());
+        wpOrgPluginModel.setNumberOfRatings(response.getNumberOfRatings());
+        wpOrgPluginModel.setNumberOfRatingsOfOne(response.getNumberOfRatingsOfOne());
+        wpOrgPluginModel.setNumberOfRatingsOfTwo(response.getNumberOfRatingsOfTwo());
+        wpOrgPluginModel.setNumberOfRatingsOfThree(response.getNumberOfRatingsOfThree());
+        wpOrgPluginModel.setNumberOfRatingsOfFour(response.getNumberOfRatingsOfFour());
+        wpOrgPluginModel.setNumberOfRatingsOfFive(response.getNumberOfRatingsOfFive());
+        return wpOrgPluginModel;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/WPOrgPluginResponse.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/WPOrgPluginResponse.kt
new file mode 100644
index 00000000000..cc3f330e596
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/wporg/plugin/WPOrgPluginResponse.kt
@@ -0,0 +1,105 @@
+package org.wordpress.android.fluxc.network.wporg.plugin
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.JsonAdapter
+import org.wordpress.android.fluxc.network.utils.getInt
+import org.wordpress.android.fluxc.network.utils.getJsonObject
+import org.wordpress.android.fluxc.network.utils.getString
+import java.lang.reflect.Type
+
+@JsonAdapter(WPOrgPluginDeserializer::class)
+class WPOrgPluginResponse(
+    val authorAsHtml: String? = null,
+    val banner: String? = null,
+    val homepageUrl: String? = null,
+    val icon: String? = null,
+    val lastUpdated: String? = null,
+    val name: String? = null,
+    val rating: String? = null,
+    val requiredWordPressVersion: String? = null,
+    val slug: String? = null,
+    val version: String? = null,
+    val downloadCount: Int = 0,
+
+    // Sections,
+    val descriptionAsHtml: String? = null,
+    val faqAsHtml: String? = null,
+    val installationInstructionsAsHtml: String? = null,
+    val whatsNewAsHtml: String? = null,
+
+    // Ratings,
+    val numberOfRatings: Int = 0,
+    val numberOfRatingsOfOne: Int = 0,
+    val numberOfRatingsOfTwo: Int = 0,
+    val numberOfRatingsOfThree: Int = 0,
+    val numberOfRatingsOfFour: Int = 0,
+    val numberOfRatingsOfFive: Int = 0,
+    val errorMessage: String? = null
+)
+
+private class WPOrgPluginDeserializer : JsonDeserializer<WPOrgPluginResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): WPOrgPluginResponse {
+        val jsonObject = json.asJsonObject
+
+        val errorMessage = jsonObject.getString("error")
+        // Response has an error instead of the plugin information
+        if (!errorMessage.isNullOrEmpty()) {
+            return WPOrgPluginResponse(errorMessage = errorMessage)
+        }
+        val sections = jsonObject.getJsonObject("sections")
+        val ratings = jsonObject.getJsonObject("ratings")
+        return WPOrgPluginResponse(
+                authorAsHtml = jsonObject.getString("author"),
+                banner = getBannerFromJson(jsonObject),
+                downloadCount = jsonObject.getInt("downloaded"),
+                icon = getIconFromJson(jsonObject),
+                homepageUrl = jsonObject.getString("homepage"),
+                lastUpdated = jsonObject.getString("last_updated"),
+                name = jsonObject.getString("name"),
+                rating = jsonObject.getString("rating"),
+                requiredWordPressVersion = jsonObject.getString("requires"),
+                slug = jsonObject.getString("slug"),
+                version = jsonObject.getString("version"),
+
+                // sections
+                descriptionAsHtml = sections.getString("description"),
+                faqAsHtml = sections.getString("faq"),
+                installationInstructionsAsHtml = sections.getString("installation"),
+                whatsNewAsHtml = sections.getString("changelog"),
+
+                // Ratings
+                numberOfRatings = jsonObject.getInt("num_ratings"),
+                numberOfRatingsOfOne = ratings.getInt("1"),
+                numberOfRatingsOfTwo = ratings.getInt("2"),
+                numberOfRatingsOfThree = ratings.getInt("3"),
+                numberOfRatingsOfFour = ratings.getInt("4"),
+                numberOfRatingsOfFive = ratings.getInt("5")
+        )
+    }
+
+    private fun getBannerFromJson(jsonObject: JsonObject): String? {
+        val banners = jsonObject.getJsonObject("banners")
+        banners.getString("high")?.let { bannerUrlHigh ->
+            // When high version is not available API returns `false` instead of `null`
+            if (!bannerUrlHigh.equals("false", ignoreCase = true)) {
+                return bannerUrlHigh
+            }
+        }
+        // High version wasn't available
+        return banners.getString("low")
+    }
+
+    private fun getIconFromJson(jsonObject: JsonObject): String? {
+        val icons = jsonObject.getJsonObject("icons")
+        return icons.getString("2x") ?: icons.getString("1x")
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/BaseXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/BaseXMLRPCClient.java
new file mode 100644
index 00000000000..9aca41e7303
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/BaseXMLRPCClient.java
@@ -0,0 +1,85 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.OnAuthFailedListener;
+import org.wordpress.android.fluxc.network.BaseRequest.OnParseErrorListener;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.discovery.DiscoveryRequest;
+import org.wordpress.android.fluxc.network.discovery.DiscoveryXMLRPCRequest;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError;
+
+public abstract class BaseXMLRPCClient {
+    private final RequestQueue mRequestQueue;
+    protected final Dispatcher mDispatcher;
+    protected UserAgent mUserAgent;
+    protected HTTPAuthManager mHTTPAuthManager;
+
+    protected OnAuthFailedListener mOnAuthFailedListener;
+    protected OnParseErrorListener mOnParseErrorListener;
+
+    public BaseXMLRPCClient(Dispatcher dispatcher, RequestQueue requestQueue, UserAgent userAgent,
+                            HTTPAuthManager httpAuthManager) {
+        mRequestQueue = requestQueue;
+        mDispatcher = dispatcher;
+        mUserAgent = userAgent;
+        mHTTPAuthManager = httpAuthManager;
+        mOnAuthFailedListener = new OnAuthFailedListener() {
+            @Override
+            public void onAuthFailed(AuthenticateErrorPayload authError) {
+                mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateErrorAction(authError));
+            }
+        };
+        mOnParseErrorListener = new OnParseErrorListener() {
+            @Override
+            public void onParseError(OnUnexpectedError event) {
+                mDispatcher.emitChange(event);
+            }
+        };
+    }
+
+    protected Request add(XMLRPCRequest request) {
+        if (request.shouldCache() && request.shouldForceUpdate()) {
+            mRequestQueue.getCache().invalidate(request.mUri.toString(), true);
+        }
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    protected Request add(DiscoveryRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    protected Request add(DiscoveryXMLRPCRequest request) {
+        return mRequestQueue.add(setRequestAuthParams(request));
+    }
+
+    private BaseRequest setRequestAuthParams(BaseRequest request) {
+        request.setOnAuthFailedListener(mOnAuthFailedListener);
+        request.setOnParseErrorListener(mOnParseErrorListener);
+        request.setUserAgent(mUserAgent.getUserAgent());
+        request.setHTTPAuthHeaderOnMatchingURL(mHTTPAuthManager);
+        return request;
+    }
+
+    protected void reportParseError(Object response, String xmlrpcUrl, Class clazz) {
+        if (response == null) return;
+
+        try {
+            clazz.cast(response);
+        } catch (ClassCastException e) {
+            OnUnexpectedError onUnexpectedError = new OnUnexpectedError(e,
+                    "XML-RPC response parse error: " + e.getMessage());
+            if (xmlrpcUrl != null) {
+                onUnexpectedError.addExtra(OnUnexpectedError.KEY_URL, xmlrpcUrl);
+            }
+            onUnexpectedError.addExtra(OnUnexpectedError.KEY_RESPONSE, response.toString());
+            mOnParseErrorListener.onParseError(onUnexpectedError);
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCException.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCException.java
new file mode 100644
index 00000000000..057ac89b8c8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCException.java
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+public class XMLRPCException extends Exception {
+    private static final long serialVersionUID = 7499675036625522379L;
+
+    public XMLRPCException(Exception e) {
+        super(e);
+    }
+
+    public XMLRPCException(String string) {
+        super(string);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCFault.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCFault.java
new file mode 100644
index 00000000000..38a8ca3f2a9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCFault.java
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+public class XMLRPCFault extends XMLRPCException {
+    private static final long serialVersionUID = 5676562456612956519L;
+    private String mFaultString;
+    private int mFaultCode;
+
+    public XMLRPCFault(String faultString, int faultCode) {
+        super(faultString);
+        this.mFaultString = faultString;
+        this.mFaultCode = faultCode;
+    }
+
+    public String getFaultString() {
+        return mFaultString;
+    }
+
+    public int getFaultCode() {
+        return mFaultCode;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequest.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequest.java
new file mode 100644
index 00000000000..d4b7df59079
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequest.java
@@ -0,0 +1,170 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+import android.util.Xml;
+
+import androidx.annotation.NonNull;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.NetworkResponse;
+import com.android.volley.ParseError;
+import com.android.volley.Response;
+import com.android.volley.Response.Listener;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.HttpHeaderParser;
+
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticateErrorPayload;
+import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType;
+import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.util.List;
+
+
+// TODO: Would be great to use generics / return POJO or model direclty (see GSON code?)
+public class XMLRPCRequest extends BaseRequest<Object> {
+    private static final String PROTOCOL_CHARSET = "utf-8";
+    private static final String PROTOCOL_CONTENT_TYPE = String.format("text/xml; charset=%s", PROTOCOL_CHARSET);
+
+    private final Listener<? super Object[]> mListener;
+    private final XMLRPC mMethod;
+    private final Object[] mParams;
+    private final XmlSerializer mSerializer = Xml.newSerializer();
+
+    public enum XmlRpcErrorType {
+        NOT_SET,
+        METHOD_NOT_ALLOWED,
+        UNABLE_TO_READ_SITE,
+        AUTH_REQUIRED
+    }
+
+    public XMLRPCRequest(@NonNull String url, XMLRPC method, List<Object> params, Listener<? super Object[]> listener,
+                         BaseErrorListener errorListener) {
+        super(Method.POST, url, errorListener);
+        addHeader("Accept", "*/*");
+        mListener = listener;
+        mMethod = method;
+        // First params are always username/password
+        mParams = (params == null ? null : params.toArray());
+    }
+
+    @Override
+    protected void deliverResponse(Object response) {
+        deliverResponse(mListener, response);
+    }
+
+    @Override
+    protected Response<Object> parseNetworkResponse(NetworkResponse response) {
+        try {
+            String data = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
+            InputStream is = new ByteArrayInputStream(data.getBytes(Charset.forName("UTF-8")));
+            Object obj = XMLSerializerUtils.deserialize(XMLSerializerUtils.scrubXmlResponse(is));
+            return Response.success(obj, createCacheEntry(response));
+        } catch (XMLRPCFault e) {
+            return Response.error(new VolleyError(e));
+        } catch (UnsupportedEncodingException e) {
+            return Response.error(new ParseError(e));
+        } catch (IOException e) {
+            AppLog.e(T.API, "Can't deserialize XMLRPC response", e);
+            return Response.error(new ParseError(e));
+        } catch (XmlPullParserException e) {
+            AppLog.e(T.API, "Can't deserialize XMLRPC response", e);
+            return Response.error(new ParseError(e));
+        } catch (XMLRPCException e) {
+            AppLog.e(T.API, "Can't deserialize XMLRPC response", e);
+            return Response.error(new ParseError(e));
+        }
+    }
+
+    @Override
+    public String getBodyContentType() {
+        return PROTOCOL_CONTENT_TYPE;
+    }
+
+    @Override
+    public byte[] getBody() throws AuthFailureError {
+        try {
+            StringWriter stringWriter = XMLSerializerUtils.serialize(mSerializer, mMethod, mParams);
+            return stringWriter.toString().getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            AppLog.e(T.API, "Can't encode XMLRPC request", e);
+        } catch (IOException e) {
+            AppLog.e(T.API, "Can't serialize XMLRPC request", e);
+        }
+        return null;
+    }
+
+    @Override
+    public BaseNetworkError deliverBaseNetworkError(@NonNull BaseNetworkError error) {
+        AuthenticateErrorPayload payload = new AuthenticateErrorPayload(AuthenticationErrorType.GENERIC_ERROR);
+        // XMLRPC errors are not managed in the layer below (BaseRequest), so check them here:
+        if (error.hasVolleyError() && error.volleyError.getCause() instanceof XMLRPCFault) {
+            XMLRPCFault xmlrpcFault = (XMLRPCFault) error.volleyError.getCause();
+            if (xmlrpcFault.getFaultCode() == 401) {
+                error.type = GenericErrorType.AUTHORIZATION_REQUIRED; // Augmented error
+                payload.error.type = AuthenticationErrorType.AUTHORIZATION_REQUIRED;
+            } else if (xmlrpcFault.getFaultCode() == 403) {
+                error.type = GenericErrorType.NOT_AUTHENTICATED; // Augmented error
+                payload.error.type = AuthenticationErrorType.NOT_AUTHENTICATED;
+            } else if (xmlrpcFault.getFaultCode() == 404) {
+                error.type = GenericErrorType.NOT_FOUND; // Augmented error
+            }
+            error.message = xmlrpcFault.getMessage();
+        }
+
+        // TODO: mOnAuthFailedListener should not be called here and the class/callback should de renamed to something
+        // like "onLowNetworkLevelError"
+        switch (error.type) {
+            case HTTP_AUTH_ERROR:
+                payload.error.type = AuthenticationErrorType.HTTP_AUTH_ERROR;
+                payload.error.xmlRpcErrorType = XmlRpcErrorType.AUTH_REQUIRED;
+                break;
+            case INVALID_SSL_CERTIFICATE:
+                payload.error.type = AuthenticationErrorType.INVALID_SSL_CERTIFICATE;
+                break;
+            default:
+                break;
+        }
+
+        if (payload.error.type != AuthenticationErrorType.GENERIC_ERROR) {
+            mOnAuthFailedListener.onAuthFailed(payload);
+        }
+
+        return error;
+    }
+
+    /**
+     * Helper method to capture the Listener's wildcard parameter type and use it to cast the response before
+     * calling {@code onResponse()}.
+     */
+    private <K> void deliverResponse(final Listener<K> listener, Object rawResponse) {
+        // The XMLRPCSerializer always returns an Object - it's up to the client making the request to know whether
+        // it's really an Object[] (i.e., when requesting a list of values from the API).
+        // We've already restricted the Listener parameterization to Object and Object[], so we know this is returning
+        // a 'safe' type - but it's still up to the client to know if an Object or an Object[] is the expected response.
+        // So, we're matching the parsed response to the Listener parameter we were given, trusting that the network
+        // client knows what it's doing
+        @SuppressWarnings("unchecked") K response = (K) rawResponse;
+        try {
+            listener.onResponse(response);
+        } catch (ClassCastException e) {
+            // If we aren't returning the type the client was expecting, treat this as an API response parse error
+            OnUnexpectedError onUnexpectedError = new OnUnexpectedError(e,
+                    "API response parse error: " + e.getMessage());
+            onUnexpectedError.addExtra(OnUnexpectedError.KEY_URL, getUrl());
+            onUnexpectedError.addExtra(OnUnexpectedError.KEY_RESPONSE, response.toString());
+            mOnParseErrorListener.onParseError(onUnexpectedError);
+            listener.onResponse(null);
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequestBuilder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequestBuilder.kt
new file mode 100644
index 00000000000..8759c0f07d3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCRequestBuilder.kt
@@ -0,0 +1,96 @@
+package org.wordpress.android.fluxc.network.xmlrpc
+
+import com.android.volley.Response.Listener
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Success
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+
+@Singleton
+class XMLRPCRequestBuilder @Inject constructor() {
+    /**
+     * Creates a new GET request.
+     * @param url the request URL
+     * @param method XMLRPC method
+     * @param params the parameters to append to the request URL
+     * @param listener the success listener
+     * @param errorListener the error listener
+     */
+    @Suppress("LongParameterList", "SwallowedException")
+    fun <T> buildGetRequest(
+        url: String,
+        method: XMLRPC,
+        params: List<Any>,
+        clazz: Class<T>,
+        listener: (T) -> Unit,
+        errorListener: (BaseNetworkError) -> Unit
+    ): XMLRPCRequest {
+        return XMLRPCRequest(
+            url,
+            method,
+            params,
+            // **Do not** convert it to lambda! See https://youtrack.jetbrains.com/issue/KT-51868
+            @Suppress("RedundantSamConstructor")
+            Listener<Any> { obj: Any? ->
+                if (obj == null) {
+                    errorListener.invoke(BaseNetworkError(INVALID_RESPONSE))
+                }
+                try {
+                    clazz.cast(obj)?.let { listener(it) }
+                } catch (e: ClassCastException) {
+                    errorListener.invoke(
+                        BaseNetworkError(
+                            INVALID_RESPONSE,
+                            XmlRpcErrorType.UNABLE_TO_READ_SITE
+                        )
+                    )
+                }
+            },
+            errorListener
+        )
+    }
+
+    /**
+     * Creates a new GET request.
+     * @param restClient rest client that handles the request
+     * @param url the request URL
+     * @param method XMLRPC method
+     * @param params the parameters to append to the request URL
+     */
+    suspend fun <T> syncGetRequest(
+        restClient: BaseXMLRPCClient,
+        url: String,
+        method: XMLRPC,
+        params: List<Any>,
+        clazz: Class<T>,
+        enableCaching: Boolean = false,
+        cacheTimeToLive: Int = BaseRequest.DEFAULT_CACHE_LIFETIME,
+        forced: Boolean = false
+    ) = suspendCancellableCoroutine<Response<T>> { cont ->
+        val request = buildGetRequest(url, method, params, clazz, {
+            cont.resume(Success(it))
+        }, {
+            cont.resume(Error(it))
+        })
+        cont.invokeOnCancellation { request.cancel() }
+        if (enableCaching) {
+            request.enableCaching(cacheTimeToLive)
+        }
+        if (forced) {
+            request.setShouldForceUpdate()
+        }
+        restClient.add(request)
+    }
+
+    sealed class Response<T> {
+        data class Success<T>(val data: T) : Response<T>()
+        data class Error<T>(val error: BaseNetworkError) : Response<T>()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCSerializer.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCSerializer.java
new file mode 100644
index 00000000000..11c7f96b667
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCSerializer.java
@@ -0,0 +1,291 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Xml;
+
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.StringUtils;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SimpleTimeZone;
+
+public class XMLRPCSerializer {
+    // Writes to /dev/null
+    private static class NullOutputStream extends OutputStream {
+        @Override
+        public void write(int b) throws IOException {
+        }
+    }
+
+    public static final String TAG_NAME = "name";
+    public static final String TAG_MEMBER = "member";
+    public static final String TAG_VALUE = "value";
+    public static final String TAG_DATA = "data";
+
+    public static final String TYPE_INT = "int";
+    public static final String TYPE_I4 = "i4";
+    public static final String TYPE_I8 = "i8";
+    public static final String TYPE_DOUBLE = "double";
+    public static final String TYPE_BOOLEAN = "boolean";
+    public static final String TYPE_STRING = "string";
+    public static final String TYPE_DATE_TIME_ISO8601 = "dateTime.iso8601";
+    public static final String TYPE_BASE64 = "base64";
+    public static final String TYPE_ARRAY = "array";
+    public static final String TYPE_STRUCT = "struct";
+
+    static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HH:mm:ss", Locale.US);
+    static Calendar cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"));
+
+    private static final XmlSerializer SERIALIZE_TESTER;
+
+    static {
+        SERIALIZE_TESTER = Xml.newSerializer();
+        try {
+            SERIALIZE_TESTER.setOutput(new NullOutputStream(), "UTF-8");
+        } catch (IllegalArgumentException e) {
+            AppLog.e(T.API, "IllegalArgumentException setting test serializer output stream", e);
+        } catch (IllegalStateException e) {
+            AppLog.e(T.API, "IllegalStateException setting test serializer output stream", e);
+        } catch (IOException e) {
+            AppLog.e(T.API, "IOException setting test serializer output stream", e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void serialize(XmlSerializer serializer, Object object) throws IOException {
+        // check for scalar types:
+        if (object instanceof Integer || object instanceof Short || object instanceof Byte) {
+            serializer.startTag(null, TYPE_I4).text(object.toString()).endTag(null, TYPE_I4);
+        } else if (object instanceof Long) {
+            // Note Long should be represented by a TYPE_I8 but the WordPress end point doesn't support <i8> tag
+            // Long usually represents IDs, so we convert them to string
+            serializer.startTag(null, TYPE_STRING).text(object.toString()).endTag(null, TYPE_STRING);
+            AppLog.w(T.API, "long type could be misinterpreted when sent to the WordPress XMLRPC end point");
+        } else if (object instanceof Double || object instanceof Float) {
+            serializer.startTag(null, TYPE_DOUBLE).text(object.toString()).endTag(null, TYPE_DOUBLE);
+        } else if (object instanceof Boolean) {
+            Boolean bool = (Boolean) object;
+            String boolStr = bool.booleanValue() ? "1" : "0";
+            serializer.startTag(null, TYPE_BOOLEAN).text(boolStr).endTag(null, TYPE_BOOLEAN);
+        } else if (object instanceof String) {
+            serializer.startTag(null, TYPE_STRING).text(makeValidInputString((String) object))
+                    .endTag(null, TYPE_STRING);
+        } else if (object instanceof Date || object instanceof Calendar) {
+            Date date = (Date) object;
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd'T'HH:mm:ss", Locale.US);
+            simpleDateFormat.setCalendar(cal);
+            String sDate = simpleDateFormat.format(date);
+            serializer.startTag(null, TYPE_DATE_TIME_ISO8601).text(sDate).endTag(null, TYPE_DATE_TIME_ISO8601);
+        } else if (object instanceof byte[]) {
+            String value;
+            try {
+                value = Base64.encodeToString((byte[]) object, Base64.DEFAULT);
+                serializer.startTag(null, TYPE_BASE64).text(value).endTag(null, TYPE_BASE64);
+            } catch (OutOfMemoryError e) {
+                throw new IOException("Out of memory");
+            }
+//        } else if (object instanceof MediaFile) {
+//            // convert media file binary to base64
+//            serializer.startTag(null, "base64");
+//            MediaFile mediaFile = (MediaFile) object;
+//            InputStream inStream = new DataInputStream(new FileInputStream(mediaFile.getFilePath()));
+//            byte[] buffer = new byte[3600];//you must use a 24bit multiple
+//            int length = -1;
+//            String chunk = null;
+//            while ((length = inStream.read(buffer)) > 0) {
+//                chunk = Base64.encodeToString(buffer, 0, length, Base64.DEFAULT);
+//                serializer.text(chunk);
+//            }
+//            inStream.close();
+//            serializer.endTag(null, "base64");
+        } else if (object instanceof List<?>) {
+            serializer.startTag(null, TYPE_ARRAY).startTag(null, TAG_DATA);
+            List<Object> list = (List<Object>) object;
+            Iterator<Object> iter = list.iterator();
+            while (iter.hasNext()) {
+                Object o = iter.next();
+                serializer.startTag(null, TAG_VALUE);
+                serialize(serializer, o);
+                serializer.endTag(null, TAG_VALUE);
+            }
+            serializer.endTag(null, TAG_DATA).endTag(null, TYPE_ARRAY);
+        } else if (object instanceof Object[]) {
+            serializer.startTag(null, TYPE_ARRAY).startTag(null, TAG_DATA);
+            Object[] objects = (Object[]) object;
+            for (int i = 0; i < objects.length; i++) {
+                Object o = objects[i];
+                serializer.startTag(null, TAG_VALUE);
+                serialize(serializer, o);
+                serializer.endTag(null, TAG_VALUE);
+            }
+            serializer.endTag(null, TAG_DATA).endTag(null, TYPE_ARRAY);
+        } else if (object instanceof Map) {
+            serializer.startTag(null, TYPE_STRUCT);
+            Map<String, Object> map = (Map<String, Object>) object;
+            Iterator<Entry<String, Object>> iter = map.entrySet().iterator();
+            while (iter.hasNext()) {
+                Entry<String, Object> entry = iter.next();
+                String key = entry.getKey();
+                Object value = entry.getValue();
+
+                serializer.startTag(null, TAG_MEMBER);
+                serializer.startTag(null, TAG_NAME).text(key).endTag(null, TAG_NAME);
+                serializer.startTag(null, TAG_VALUE);
+                serialize(serializer, value);
+                serializer.endTag(null, TAG_VALUE);
+                serializer.endTag(null, TAG_MEMBER);
+            }
+            serializer.endTag(null, TYPE_STRUCT);
+        } else {
+            throw new IOException("Cannot serialize " + object);
+        }
+    }
+
+    public static String makeValidInputString(final String input) throws IOException {
+        if (TextUtils.isEmpty(input)) {
+            return "";
+        }
+
+        if (SERIALIZE_TESTER == null) {
+            return input;
+        }
+
+        try {
+            // try to encode the string as-is, 99.9% of the time it's OK
+            SERIALIZE_TESTER.text(input);
+            return input;
+        } catch (IllegalArgumentException e) {
+            // There are characters outside the XML unicode charset as specified by the XML 1.0 standard
+            // See http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char
+            AppLog.d(T.API, "There are characters outside the XML unicode charset as specified"
+                    + " by the XML 1.0 standard");
+        }
+
+        // We need to do the following things:
+        // 1. Replace surrogates with HTML Entity.
+        // 2. Replace emoji with their textual versions (if available on WP)
+        // 3. Try to serialize the resulting string.
+        // 4. If it fails again, strip characters that are not allowed in XML 1.0
+
+        final String noEmojiString = StringUtils.replaceUnicodeSurrogateBlocksWithHTMLEntities(input);
+        try {
+            SERIALIZE_TESTER.text(noEmojiString);
+            return noEmojiString;
+        } catch (IllegalArgumentException e) {
+            AppLog.w(T.API, "noEmojiString still contains characters outside the XML unicode charset as specified"
+                    + " by the XML 1.0 standard");
+            return StringUtils.stripNonValidXMLCharacters(noEmojiString);
+        }
+    }
+
+    public static Object deserialize(XmlPullParser parser) throws XmlPullParserException, IOException,
+            NumberFormatException {
+        parser.require(XmlPullParser.START_TAG, null, TAG_VALUE);
+
+        parser.nextTag();
+        String typeNodeName = parser.getName();
+
+        Object obj;
+        if (typeNodeName.equals(TYPE_INT) || typeNodeName.equals(TYPE_I4)) {
+            String value = parser.nextText();
+            try {
+                obj = Integer.parseInt(value);
+            } catch (NumberFormatException nfe) {
+                AppLog.w(T.API, "Server replied with an invalid 4 bytes int value, trying to parse it as 8 bytes long");
+                obj = Long.parseLong(value);
+            }
+        } else if (typeNodeName.equals(TYPE_I8)) {
+            String value = parser.nextText();
+            obj = Long.parseLong(value);
+        } else if (typeNodeName.equals(TYPE_DOUBLE)) {
+            String value = parser.nextText();
+            obj = Double.parseDouble(value);
+        } else if (typeNodeName.equals(TYPE_BOOLEAN)) {
+            String value = parser.nextText();
+            obj = value.equals("1") ? Boolean.TRUE : Boolean.FALSE;
+        } else if (typeNodeName.equals(TYPE_STRING)) {
+            obj = parser.nextText();
+        } else if (typeNodeName.equals(TYPE_DATE_TIME_ISO8601)) {
+            dateFormat.setCalendar(cal);
+            String value = parser.nextText();
+            try {
+                obj = dateFormat.parseObject(value);
+            } catch (ParseException e) {
+                AppLog.e(T.API, "Can't parse Date:" + value, e);
+                obj = value;
+            }
+        } else if (typeNodeName.equals(TYPE_BASE64)) {
+            String value = parser.nextText();
+            BufferedReader reader = new BufferedReader(new StringReader(value));
+            String line;
+            StringBuffer sb = new StringBuffer();
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+            }
+            obj = Base64.decode(sb.toString(), Base64.DEFAULT);
+        } else if (typeNodeName.equals(TYPE_ARRAY)) {
+            parser.nextTag(); // TAG_DATA (<data>)
+            parser.require(XmlPullParser.START_TAG, null, TAG_DATA);
+
+            parser.nextTag();
+            List<Object> list = new ArrayList<Object>();
+            while (parser.getName().equals(TAG_VALUE)) {
+                list.add(deserialize(parser));
+                parser.nextTag();
+            }
+            parser.require(XmlPullParser.END_TAG, null, TAG_DATA);
+            parser.nextTag(); // TAG_ARRAY (</array>)
+            parser.require(XmlPullParser.END_TAG, null, TYPE_ARRAY);
+            obj = list.toArray();
+        } else if (typeNodeName.equals(TYPE_STRUCT)) {
+            parser.nextTag();
+            Map<String, Object> map = new HashMap<String, Object>();
+            while (parser.getName().equals(TAG_MEMBER)) {
+                String memberName = null;
+                Object memberValue = null;
+                while (true) {
+                    parser.nextTag();
+                    String name = parser.getName();
+                    if (name.equals(TAG_NAME)) {
+                        memberName = parser.nextText();
+                    } else if (name.equals(TAG_VALUE)) {
+                        memberValue = deserialize(parser);
+                    } else {
+                        break;
+                    }
+                }
+                if (memberName != null && memberValue != null) {
+                    map.put(memberName, memberValue);
+                }
+                parser.require(XmlPullParser.END_TAG, null, TAG_MEMBER);
+                parser.nextTag();
+            }
+            parser.require(XmlPullParser.END_TAG, null, TYPE_STRUCT);
+            obj = map;
+        } else {
+            throw new IOException("Cannot deserialize " + parser.getName());
+        }
+        parser.nextTag(); // TAG_VALUE (</value>)
+        parser.require(XmlPullParser.END_TAG, null, TAG_VALUE);
+        return obj;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCUtils.java
new file mode 100644
index 00000000000..f7daa898803
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLRPCUtils.java
@@ -0,0 +1,76 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+import androidx.annotation.NonNull;
+
+import org.wordpress.android.util.MapUtils;
+
+import java.util.Date;
+import java.util.Map;
+
+public class XMLRPCUtils {
+    /**
+     * Get value from a deserialized XMLRPC Map response
+     */
+    @NonNull
+    public static <T> T safeGetMapValue(@NonNull Map<?, ?> map, T defaultValue) {
+        return safeGetMapValue(map, "value", defaultValue);
+    }
+
+    @NonNull
+    public static <T> T safeGetMapValue(@NonNull Map<?, ?> map, String key, T defaultValue) {
+        if (!map.containsKey(key)) {
+            return defaultValue;
+        }
+
+        // The XML deserializer returns a narrow set of values, and they're all matched exactly below.
+        // None of them are parameterizable, and we'll throw an exception below if any unexpected type is given
+        // Given those constraints, it's safe to ignore this warning
+        @SuppressWarnings("unchecked")
+        Class<T> clazz = (Class<T>) defaultValue.getClass();
+
+        Object result;
+        if (defaultValue instanceof String) {
+            result = MapUtils.getMapStr(map, key);
+        } else if (defaultValue instanceof Boolean) {
+            result = MapUtils.getMapBool(map, key);
+        } else if (defaultValue instanceof Integer) {
+            result = MapUtils.getMapInt(map, key, (Integer) defaultValue);
+        } else if (defaultValue instanceof Long) {
+            result = MapUtils.getMapLong(map, key, (Long) defaultValue);
+        } else if (defaultValue instanceof Float) {
+            result = MapUtils.getMapFloat(map, key, (Float) defaultValue);
+        } else if (defaultValue instanceof Double) {
+            result = MapUtils.getMapDouble(map, key, (Double) defaultValue);
+        } else if (clazz == Date.class) {
+            // Matching clazz specifically here to exclude subclasses of Date from being passed as default value
+            // (Date is the only non-final type the XML-RPC deserializer returns - instanceof is safe for the rest)
+            // clazz will have the exact value of the runtime class of defaultValue, and if we allow subclasses (by
+            // using instanceof), we will end up trying to cast, e.g., a Date object from the map to a Time
+            result = map.get(key);
+        } else {
+            // The XML-RPC deserializer only returns the above types. Any other type passed for the default value
+            // will cause the default value to be returned 100% of the time, regardless of whether the value is set
+            // in the map or not
+            // Instead, make it obvious that an impossible type was given as the default value
+            throw new RuntimeException("Invalid type: " + clazz.getName() + ". Expected "
+                    + "String, boolean, int, long, float, double, or Date.");
+        }
+
+        if (result != null) {
+            return clazz.cast(result);
+        }
+
+        return defaultValue;
+    }
+
+    public static <T> T safeGetNestedMapValue(@NonNull Map<?, ?> map, String key, T defaultValue) {
+        if (!map.containsKey(key)) {
+            return defaultValue;
+        }
+        Object objectMap = map.get(key);
+        if (!(objectMap instanceof Map)) {
+            return defaultValue;
+        }
+        return safeGetMapValue((Map<?, ?>) objectMap, defaultValue);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLSerializerUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLSerializerUtils.java
new file mode 100644
index 00000000000..34636650139
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/XMLSerializerUtils.java
@@ -0,0 +1,122 @@
+package org.wordpress.android.fluxc.network.xmlrpc;
+
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class XMLSerializerUtils {
+    private static final String TAG_METHOD_CALL = "methodCall";
+    private static final String TAG_METHOD_NAME = "methodName";
+    private static final String TAG_METHOD_RESPONSE = "methodResponse";
+    private static final String TAG_PARAMS = "params";
+    private static final String TAG_PARAM = "param";
+    private static final String TAG_FAULT = "fault";
+    private static final String TAG_FAULT_CODE = "faultCode";
+    private static final String TAG_FAULT_STRING = "faultString";
+
+    private static final int MAX_SCRUB_CHARACTERS = 5000;
+
+    public static StringWriter serialize(XmlSerializer serializer, XMLRPC method, Object[] params)
+            throws IOException {
+        StringWriter bodyWriter = new StringWriter();
+        serializer.setOutput(bodyWriter);
+
+        serializer.startDocument(null, null);
+        serializer.startTag(null, TAG_METHOD_CALL);
+        // set method name
+        serializer.startTag(null, TAG_METHOD_NAME).text(method.toString()).endTag(null, TAG_METHOD_NAME);
+        if (params != null && params.length != 0) {
+            // set method params
+            serializer.startTag(null, TAG_PARAMS);
+            for (int i = 0; i < params.length; i++) {
+                serializer.startTag(null, TAG_PARAM).startTag(null, XMLRPCSerializer.TAG_VALUE);
+                XMLRPCSerializer.serialize(serializer, params[i]);
+                serializer.endTag(null, XMLRPCSerializer.TAG_VALUE).endTag(null, TAG_PARAM);
+            }
+            serializer.endTag(null, TAG_PARAMS);
+        }
+        serializer.endTag(null, TAG_METHOD_CALL);
+        serializer.endDocument();
+
+        return bodyWriter;
+    }
+
+    public static Object deserialize(InputStream is)
+            throws IOException, XmlPullParserException, XMLRPCException {
+        // setup pull parser
+        XmlPullParser pullParser = XmlPullParserFactory.newInstance().newPullParser();
+        pullParser.setInput(is, "UTF-8");
+
+        // lets start pulling...
+        pullParser.nextTag();
+        pullParser.require(XmlPullParser.START_TAG, null, TAG_METHOD_RESPONSE);
+
+        pullParser.nextTag(); // either TAG_PARAMS (<params>) or TAG_FAULT (<fault>)
+        String tag = pullParser.getName();
+        if (tag.equals(TAG_PARAMS)) {
+            // normal response
+            pullParser.nextTag(); // TAG_PARAM (<param>)
+            pullParser.require(XmlPullParser.START_TAG, null, TAG_PARAM);
+            pullParser.nextTag(); // TAG_VALUE (<value>)
+            // no parser.require() here since its called in XMLRPCSerializer.deserialize() below
+            // deserialize result
+            return XMLRPCSerializer.deserialize(pullParser);
+        } else if (tag.equals(TAG_FAULT)) {
+            // fault response
+            pullParser.nextTag(); // TAG_VALUE (<value>)
+            // no parser.require() here since its called in XMLRPCSerializer.deserialize() below
+            // deserialize fault result
+            Map<?, ?> map = (Map<?, ?>) XMLRPCSerializer.deserialize(pullParser);
+            String faultString = XMLRPCUtils.safeGetMapValue(map, TAG_FAULT_STRING, "");
+            int faultCode = XMLRPCUtils.safeGetMapValue(map, TAG_FAULT_CODE, 0);
+            throw new XMLRPCFault(faultString, faultCode);
+        } else {
+            throw new XMLRPCException("Bad tag <" + tag + "> in XMLRPC response - neither <params> nor <fault>");
+        }
+    }
+
+    public static InputStream scrubXmlResponse(InputStream is) throws IOException {
+        // Many WordPress configs can output junk before the xml response (php warnings for example), this cleans it.
+        int bomCheck = -1;
+        int stopper = 0;
+        while ((bomCheck = is.read()) != -1 && stopper <= MAX_SCRUB_CHARACTERS) {
+            stopper++;
+            String snippet = "";
+            // 60 == '<' character
+            if (bomCheck == 60) {
+                for (int i = 0; i < 4; i++) {
+                    byte[] chunk = new byte[1];
+                    int numRead = is.read(chunk);
+                    if (numRead > 0) {
+                        snippet += new String(chunk, "UTF-8");
+                    }
+                }
+                if (snippet.equals("?xml")) {
+                    // it's all good, add xml tag back and start parsing
+                    String start = "<" + snippet;
+                    List<InputStream> streams = Arrays.asList(new ByteArrayInputStream(start.getBytes()), is);
+                    is = new SequenceInputStream(Collections.enumeration(streams));
+                    break;
+                } else {
+                    // keep searching...
+                    List<InputStream> streams = Arrays.asList(new ByteArrayInputStream(snippet.getBytes()), is);
+                    is = new SequenceInputStream(Collections.enumeration(streams));
+                }
+            }
+        }
+
+        return is;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentXMLRPCClient.java
new file mode 100644
index 00000000000..0de4d2ccc46
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentXMLRPCClient.java
@@ -0,0 +1,343 @@
+package org.wordpress.android.fluxc.network.xmlrpc.comment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.CommentActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.CommentStatus;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCUtils;
+import org.wordpress.android.fluxc.store.CommentStore.CommentError;
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentResponsePayload;
+import org.wordpress.android.fluxc.utils.CommentErrorUtils;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class CommentXMLRPCClient extends BaseXMLRPCClient {
+    @Inject public CommentXMLRPCClient(
+            Dispatcher dispatcher,
+            @Named("custom-ssl") RequestQueue requestQueue,
+            UserAgent userAgent,
+            HTTPAuthManager httpAuthManager) {
+        super(dispatcher, requestQueue, userAgent, httpAuthManager);
+    }
+
+    public void fetchComments(
+            @NonNull final SiteModel site,
+            final int number,
+            final int offset,
+            @NonNull final CommentStatus status) {
+        List<Object> params = new ArrayList<>(4);
+        Map<String, Object> commentParams = new HashMap<>();
+        commentParams.put("number", number);
+        commentParams.put("offset", offset);
+        if (status != CommentStatus.ALL) {
+            commentParams.put("status", getXMLRPCCommentStatus(status));
+        }
+
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(commentParams);
+        final XMLRPCRequest request = new XMLRPCRequest(
+                site.getXmlRpcUrl(), XMLRPC.GET_COMMENTS, params,
+                (Listener<Object>) response -> {
+                    List<CommentModel> comments = commentsResponseToCommentList(response, site);
+                    FetchCommentsResponsePayload payload = new FetchCommentsResponsePayload(
+                            comments, site, number, offset, status
+                    );
+                    mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentsAction(payload));
+                },
+                error -> mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentsAction(
+                        CommentErrorUtils.commentErrorToFetchCommentsPayload(error, site))));
+        add(request);
+    }
+
+    public void pushComment(
+            @NonNull final SiteModel site,
+            @NonNull final CommentModel comment) {
+        List<Object> params = new ArrayList<>(5);
+        Map<String, Object> commentParams = new HashMap<>();
+        commentParams.put("content", comment.getContent());
+        commentParams.put("date", comment.getDatePublished());
+        String status = getXMLRPCCommentStatus(CommentStatus.fromString(comment.getStatus()));
+        commentParams.put("status", status);
+
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(comment.getRemoteCommentId());
+        params.add(commentParams);
+        final XMLRPCRequest request = new XMLRPCRequest(
+                site.getXmlRpcUrl(), XMLRPC.EDIT_COMMENT, params,
+                (Listener<Object>) response -> {
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+                    mDispatcher.dispatch(CommentActionBuilder.newPushedCommentAction(payload));
+                },
+                error -> mDispatcher.dispatch(CommentActionBuilder.newPushedCommentAction(
+                        CommentErrorUtils.commentErrorToPushCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void fetchComment(
+            @NonNull final SiteModel site,
+            long remoteCommentId,
+            @Nullable final CommentModel comment) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(remoteCommentId);
+        final XMLRPCRequest request = new XMLRPCRequest(
+                site.getXmlRpcUrl(), XMLRPC.GET_COMMENT, params,
+                (Listener<Object>) response -> {
+                    CommentModel updatedComment = commentResponseToComment(response, site);
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(updatedComment);
+                    mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentAction(payload));
+                },
+                error -> mDispatcher.dispatch(CommentActionBuilder.newFetchedCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    public void deleteComment(
+            @NonNull final SiteModel site,
+            long remoteCommentId,
+            @Nullable final CommentModel comment) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(remoteCommentId);
+        final XMLRPCRequest request = new XMLRPCRequest(
+                site.getXmlRpcUrl(), XMLRPC.DELETE_COMMENT, params,
+                (Listener<Object>) response -> {
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+                    if (comment != null) {
+                        // This is ugly but the XMLRPC response doesn't contain any info about the update comment.
+                        // So we're copying the logic here: if the comment status was "trash" before and the delete
+                        // call is successful, then we want to delete this comment. Setting the "deleted" status
+                        // will ensure the comment is deleted in the CommentStore.
+                        if (CommentStatus.TRASH.toString().equals(comment.getStatus())) {
+                            comment.setStatus(CommentStatus.DELETED.toString());
+                        } else {
+                            comment.setStatus(CommentStatus.TRASH.toString());
+                        }
+                    }
+                    mDispatcher.dispatch(CommentActionBuilder.newDeletedCommentAction(payload));
+                },
+                error -> mDispatcher.dispatch(CommentActionBuilder.newDeletedCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    /**
+     * Create a new reply to a Comment
+     */
+    public void createNewReply(
+            @NonNull final SiteModel site,
+            @NonNull final CommentModel comment,
+            @NonNull final CommentModel reply) {
+        // Comment parameters
+        Map<String, Object> replyParams = new HashMap<>(5);
+
+        // Reply parameters
+        replyParams.put("content", reply.getContent());
+
+        // Use remote comment id as reply comment parent
+        replyParams.put("comment_parent", comment.getRemoteCommentId());
+
+        if (reply.getAuthorName() != null) {
+            replyParams.put("author", reply.getAuthorName());
+        }
+        if (reply.getAuthorUrl() != null) {
+            replyParams.put("author_url", reply.getAuthorUrl());
+        }
+        if (reply.getAuthorEmail() != null) {
+            replyParams.put("author_email", reply.getAuthorEmail());
+        }
+
+        newComment(site, comment.getRemotePostId(), reply, comment.getRemoteCommentId(), replyParams);
+    }
+
+    /**
+     * Create a new comment to a Post
+     */
+    public void createNewComment(
+            @NonNull final SiteModel site,
+            @NonNull final PostModel post,
+            @NonNull final CommentModel comment) {
+        // Comment parameters
+        Map<String, Object> commentParams = new HashMap<>(5);
+        commentParams.put("content", comment.getContent());
+        if (comment.getParentId() != 0) {
+            commentParams.put("comment_parent", comment.getParentId());
+        }
+        if (comment.getAuthorName() != null) {
+            commentParams.put("author", comment.getAuthorName());
+        }
+        if (comment.getAuthorUrl() != null) {
+            commentParams.put("author_url", comment.getAuthorUrl());
+        }
+        if (comment.getAuthorEmail() != null) {
+            commentParams.put("author_email", comment.getAuthorEmail());
+        }
+        newComment(site, post.getRemotePostId(), comment, comment.getParentId(), commentParams);
+    }
+
+    // Private methods
+
+    private void newComment(
+            @NonNull final SiteModel site,
+            long remotePostId,
+            @NonNull final CommentModel comment,
+            final long parentId,
+            @NonNull Map<String, Object> commentParams) {
+        List<Object> params = new ArrayList<>(5);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(remotePostId);
+        params.add(commentParams);
+        final XMLRPCRequest request = new XMLRPCRequest(
+                site.getXmlRpcUrl(), XMLRPC.NEW_COMMENT, params,
+                (Listener<Object>) response -> {
+                    RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+                    comment.setParentId(parentId);
+                    if (response instanceof Integer) {
+                        comment.setRemoteCommentId((int) response);
+                    } else {
+                        payload.error = new CommentError(CommentErrorType.GENERIC_ERROR, "");
+                    }
+                    mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(payload));
+                },
+                error -> mDispatcher.dispatch(CommentActionBuilder.newCreatedNewCommentAction(
+                        CommentErrorUtils.commentErrorToFetchCommentPayload(error, comment))));
+        add(request);
+    }
+
+    @NonNull
+    private String getXMLRPCCommentStatus(@NonNull CommentStatus status) {
+        switch (status) {
+            case APPROVED:
+                return "approve";
+            case UNAPPROVED:
+                return "hold";
+            case SPAM:
+                return "spam";
+            case TRASH:
+                return "trash";
+            // Defaults (don't exist in XMLRPC)
+            default:
+            case DELETED:
+            case ALL:
+            case UNSPAM:
+            case UNTRASH:
+            case UNREPLIED:
+                return "approve";
+        }
+    }
+
+    @NonNull
+    @SuppressWarnings("DuplicateBranchesInSwitch")
+    private CommentStatus getCommentStatusFromXMLRPCStatusString(@NonNull String stringStatus) {
+        switch (stringStatus) {
+            case "approve":
+                return CommentStatus.APPROVED;
+            case "hold":
+                return CommentStatus.UNAPPROVED;
+            case "spam":
+                return CommentStatus.SPAM;
+            case "trash":
+                return CommentStatus.TRASH;
+            default: // Defaults (don't exist in XMLRPC)
+                return CommentStatus.APPROVED;
+        }
+    }
+
+    @NonNull
+    private List<CommentModel> commentsResponseToCommentList(
+            @NonNull Object response,
+            @NonNull SiteModel site) {
+        List<CommentModel> comments = new ArrayList<>();
+        if (!(response instanceof Object[])) {
+            return comments;
+        }
+        Object[] responseArray = (Object[]) response;
+        for (Object commentObject : responseArray) {
+            CommentModel commentModel = commentResponseToComment(commentObject, site);
+            if (commentModel != null) {
+                comments.add(commentModel);
+            }
+        }
+        return comments;
+    }
+
+    @Nullable
+    private CommentModel commentResponseToComment(
+            @NonNull Object commentObject,
+            @NonNull SiteModel site) {
+        if (!(commentObject instanceof HashMap)) {
+            return null;
+        }
+        HashMap<?, ?> commentMap = (HashMap<?, ?>) commentObject;
+        CommentModel comment = new CommentModel();
+
+        comment.setRemoteCommentId(XMLRPCUtils.safeGetMapValue(commentMap, "comment_id", 0L));
+        comment.setLocalSiteId(site.getId());
+        comment.setRemoteSiteId(site.getSelfHostedSiteId());
+        String stringStatus = XMLRPCUtils.safeGetMapValue(commentMap, "status", "approve");
+        comment.setStatus(getCommentStatusFromXMLRPCStatusString(stringStatus).toString());
+        Date datePublished = XMLRPCUtils.safeGetMapValue(commentMap, "date_created_gmt", new Date());
+        comment.setDatePublished(DateTimeUtils.iso8601UTCFromDate(datePublished));
+        comment.setPublishedTimestamp(DateTimeUtils.timestampFromIso8601(comment.getDatePublished()));
+        comment.setContent(XMLRPCUtils.safeGetMapValue(commentMap, "content", ""));
+        comment.setUrl(XMLRPCUtils.safeGetMapValue(commentMap, "link", ""));
+
+        // Parent
+        comment.setParentId(XMLRPCUtils.safeGetMapValue(commentMap, "parent", 0L));
+        if (comment.getParentId() > 0) {
+            comment.setParentId(comment.getParentId());
+            comment.setHasParent(true);
+        } else {
+            comment.setHasParent(false);
+        }
+
+        // Author
+        comment.setAuthorUrl(XMLRPCUtils.safeGetMapValue(commentMap, "author_url", ""));
+        comment.setAuthorName(StringEscapeUtils.unescapeHtml4(XMLRPCUtils.safeGetMapValue(commentMap, "author", "")));
+        comment.setAuthorEmail(XMLRPCUtils.safeGetMapValue(commentMap, "author_email", ""));
+        // TODO: comment.setAuthorProfileImageUrl(); - get the hash from the email address?
+
+        // Post
+        comment.setRemotePostId(XMLRPCUtils.safeGetMapValue(commentMap, "post_id", 0L));
+        comment.setPostTitle(StringEscapeUtils.unescapeHtml4(XMLRPCUtils.safeGetMapValue(commentMap,
+                "post_title", "")));
+
+        return comment;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentsXMLRPCClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentsXMLRPCClient.kt
new file mode 100644
index 00000000000..0a762fc5be2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/comment/CommentsXMLRPCClient.kt
@@ -0,0 +1,296 @@
+package org.wordpress.android.fluxc.network.xmlrpc.comment
+
+import com.android.volley.RequestQueue
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.CommentStatus.SPAM
+import org.wordpress.android.fluxc.model.CommentStatus.TRASH
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.HTTPAuthManager
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.common.comments.CommentsApiPayload
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.persistence.comments.CommentEntityList
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.utils.CommentErrorUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Suppress("LongParameterList", "TooManyFunctions")
+@Singleton
+class CommentsXMLRPCClient @Inject constructor(
+    dispatcher: Dispatcher?,
+    @Named("custom-ssl") requestQueue: RequestQueue?,
+    userAgent: UserAgent?,
+    httpAuthManager: HTTPAuthManager?,
+    private val commentErrorUtilsWrapper: CommentErrorUtilsWrapper,
+    private val xmlrpcRequestBuilder: XMLRPCRequestBuilder,
+    private val commentsMapper: CommentsMapper
+) : BaseXMLRPCClient(dispatcher, requestQueue, userAgent, httpAuthManager) {
+    suspend fun fetchCommentsPage(
+        site: SiteModel,
+        number: Int,
+        offset: Int,
+        status: CommentStatus
+    ): CommentsApiPayload<CommentEntityList> {
+        val params: MutableList<Any> = ArrayList()
+
+        val commentParams = mutableMapOf<String, Any>(
+                "number" to number,
+                "offset" to offset
+        )
+
+        if (status != CommentStatus.ALL) {
+            commentParams["status"] = getXMLRPCCommentStatus(status)
+        }
+
+        params.add(site.selfHostedSiteId)
+        params.add(site.notNullUserName())
+        params.add(site.notNullPassword())
+        params.add(commentParams)
+
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.xmlRpcUrl,
+                method = XMLRPC.GET_COMMENTS,
+                params = params,
+                clazz = Array<Any>::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentXmlRpcDTOToEntityList(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun pushComment(site: SiteModel, comment: CommentEntity): CommentsApiPayload<CommentEntity> {
+        val commentParams = mutableMapOf<String, Any?>(
+                "content" to comment.content,
+                "date" to comment.datePublished,
+                "status" to getXMLRPCCommentStatus(CommentStatus.fromString(comment.status))
+        )
+
+        return updateCommentFields(site, comment, commentParams)
+    }
+
+    suspend fun updateEditComment(site: SiteModel, comment: CommentEntity): CommentsApiPayload<CommentEntity> {
+        val commentParams = mutableMapOf<String, Any?>(
+                "content" to comment.content,
+                "author" to comment.authorName,
+                "author_email" to comment.authorEmail,
+                "author_url" to comment.authorUrl
+        )
+
+        return updateCommentFields(site, comment, commentParams)
+    }
+
+    private suspend fun updateCommentFields(
+        site: SiteModel,
+        comment: CommentEntity,
+        commentParams: Map<String, Any?>
+    ): CommentsApiPayload<CommentEntity> {
+        val params: MutableList<Any> = ArrayList()
+
+        params.add(site.selfHostedSiteId)
+        params.add(site.notNullUserName())
+        params.add(site.notNullPassword())
+        params.add(comment.remoteCommentId)
+        params.add(commentParams)
+
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.xmlRpcUrl,
+                method = XMLRPC.EDIT_COMMENT,
+                params = params,
+                clazz = Any::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(comment)
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun fetchComment(site: SiteModel, remoteCommentId: Long): CommentsApiPayload<CommentEntity> {
+        val params: MutableList<Any> = ArrayList()
+
+        params.add(site.selfHostedSiteId)
+        params.add(site.notNullUserName())
+        params.add(site.notNullPassword())
+        params.add(remoteCommentId)
+
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.xmlRpcUrl,
+                method = XMLRPC.GET_COMMENT,
+                params = params,
+                clazz = Map::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                CommentsApiPayload(commentsMapper.commentXmlRpcDTOToEntity(response.data, site))
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun deleteComment(site: SiteModel, remoteCommentId: Long): CommentsApiPayload<CommentEntity?> {
+        val params: MutableList<Any> = ArrayList()
+
+        params.add(site.selfHostedSiteId)
+        params.add(site.notNullUserName())
+        params.add(site.notNullPassword())
+        params.add(remoteCommentId)
+
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.xmlRpcUrl,
+                method = XMLRPC.DELETE_COMMENT,
+                params = params,
+                clazz = Any::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                // This is ugly but the XMLRPC response doesn't contain any info about the updated comment.
+                CommentsApiPayload(null)
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error))
+            }
+        }
+    }
+
+    suspend fun createNewReply(
+        site: SiteModel,
+        comment: CommentEntity,
+        reply: CommentEntity
+    ): CommentsApiPayload<CommentEntity> {
+        val commentParams = mutableMapOf<String, Any?>(
+                "content" to reply.content,
+                "comment_parent" to comment.remoteCommentId
+        )
+
+        if (reply.authorName != null) {
+            commentParams["author"] = reply.authorName
+        }
+
+        if (reply.authorUrl != null) {
+            commentParams["author_url"] = reply.authorUrl
+        }
+
+        if (reply.authorEmail != null) {
+            commentParams["author_email"] = reply.authorEmail
+        }
+
+        return newComment(site, comment.remotePostId, reply, comment.remoteCommentId, commentParams)
+    }
+
+    suspend fun createNewComment(
+        site: SiteModel,
+        remotePostId: Long,
+        comment: CommentEntity
+    ): CommentsApiPayload<CommentEntity> {
+        val commentParams = mutableMapOf<String, Any?>(
+                "content" to comment.content
+        )
+
+        if (comment.parentId != 0L) {
+            commentParams["comment_parent"] = comment.parentId
+        }
+        if (comment.authorName != null) {
+            commentParams["author"] = comment.authorName
+        }
+        if (comment.authorUrl != null) {
+            commentParams["author_url"] = comment.authorUrl
+        }
+        if (comment.authorEmail != null) {
+            commentParams["author_email"] = comment.authorEmail
+        }
+
+        return newComment(site, remotePostId, comment, comment.parentId, commentParams)
+    }
+
+    private suspend fun newComment(
+        site: SiteModel,
+        remotePostId: Long,
+        comment: CommentEntity,
+        parentId: Long,
+        commentParams: Map<String, Any?>
+    ): CommentsApiPayload<CommentEntity> {
+        val params: MutableList<Any> = ArrayList()
+
+        params.add(site.selfHostedSiteId)
+        params.add(site.notNullUserName())
+        params.add(site.notNullPassword())
+        params.add(remotePostId)
+        params.add(commentParams)
+
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                restClient = this,
+                url = site.xmlRpcUrl,
+                method = XMLRPC.NEW_COMMENT,
+                params = params,
+                clazz = Any::class.java
+        )
+
+        return when (response) {
+            is Success -> {
+                if (response.data is Int) {
+                    val newComment = comment.copy(
+                            parentId = parentId,
+                            remoteCommentId = response.data.toLong()
+                    )
+                    CommentsApiPayload(newComment)
+                } else {
+                    val newComment = comment.copy(parentId = parentId)
+                    CommentsApiPayload(CommentError(GENERIC_ERROR, ""), newComment)
+                }
+            }
+            is Error -> {
+                CommentsApiPayload(commentErrorUtilsWrapper.networkToCommentError(response.error), comment)
+            }
+        }
+    }
+
+    private fun getXMLRPCCommentStatus(status: CommentStatus): String {
+        return when (status) {
+            APPROVED -> "approve"
+            UNAPPROVED -> "hold"
+            SPAM -> "spam"
+            TRASH -> "trash"
+            else -> "approve"
+        }
+    }
+
+    // This functions are part of a containment fix to avoid a crash happening in the Jetpack app for My Site > Comments
+    // on self-hosted sites not having the full Jetpack plugin but only one of the standalone plugins (like the
+    // jetpack backup plugin). This only avoids the crash allowing the relevant error to be displayed.
+    // For sites like those, the full rest api is not available but the username and password are actually null as well.
+    // This creates some not consistent behaviours in various areas of the app that needs a more broad fix and review
+    // (more details in the internal p2 post and comments pe8j1f-V-p2); numbers of such cases are pretty low actually
+    // and this fix prioritizes the mentioned crash.
+    private fun SiteModel.notNullUserName() = this.username ?: ""
+    private fun SiteModel.notNullPassword() = this.password ?: ""
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/MediaXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/MediaXMLRPCClient.java
new file mode 100644
index 00000000000..6d4d75ea7bf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/MediaXMLRPCClient.java
@@ -0,0 +1,721 @@
+package org.wordpress.android.fluxc.network.xmlrpc.media;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+import com.android.volley.VolleyError;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.generated.MediaActionBuilder;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody.ProgressListener;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.HTTPAuthModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCException;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCFault;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLSerializerUtils;
+import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListResponsePayload;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.MediaStore.MediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+import org.wordpress.android.fluxc.utils.MimeType;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.DateTimeUtils;
+import org.wordpress.android.util.MapUtils;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+@Singleton
+public class MediaXMLRPCClient extends BaseXMLRPCClient implements ProgressListener {
+    private static final String[] REQUIRED_UPLOAD_RESPONSE_FIELDS = {
+            "attachment_id", "parent", "title", "caption", "description", "thumbnail", "date_created_gmt", "link"};
+
+    @NonNull private final OkHttpClient mOkHttpClient;
+    // this will hold which media is being uploaded by which call, in order to be able
+    // to monitor multiple uploads
+    @NonNull private final ConcurrentHashMap<Integer, Call> mCurrentUploadCalls = new ConcurrentHashMap<>();
+
+    @Inject public MediaXMLRPCClient(
+            Dispatcher dispatcher,
+            @Named("custom-ssl") RequestQueue requestQueue,
+            @NonNull @Named("custom-ssl") OkHttpClient okHttpClient,
+            UserAgent userAgent,
+            HTTPAuthManager httpAuthManager) {
+        super(dispatcher, requestQueue, userAgent, httpAuthManager);
+        mOkHttpClient = okHttpClient;
+    }
+
+    @Override
+    public void onProgress(@NonNull MediaModel media, float progress) {
+        if (mCurrentUploadCalls.containsKey(media.getId())) {
+            notifyMediaProgress(media, Math.min(progress, 0.99f));
+        }
+    }
+
+    public void pushMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "Pushed media is null";
+            notifyMediaPushed(site, null, error);
+            return;
+        }
+
+        List<Object> params = getBasicParams(site, media);
+        params.add(getEditMediaFields(media));
+        add(new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.EDIT_POST, params,
+                (Listener<Object>) response -> {
+                    // response should be a boolean indicating result of push request
+                    if (!(response instanceof Boolean) || !(Boolean) response) {
+                        String message = "could not parse XMLRPC.EDIT_MEDIA response: " + response;
+                        AppLog.w(T.MEDIA, message);
+                        MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                        error.logMessage = message;
+                        notifyMediaPushed(site, media, error);
+                        return;
+                    }
+
+                    // success!
+                    AppLog.i(T.MEDIA, "Media updated on remote: " + media.getTitle());
+                    notifyMediaPushed(site, media, null);
+                },
+                error -> {
+                    String errorMessage = "error response to XMLRPC.EDIT_MEDIA request: " + error;
+                    AppLog.e(T.MEDIA, errorMessage);
+                    if (is404Response(error)) {
+                        AppLog.e(T.MEDIA, "media does not exist, no need to report error");
+                        notifyMediaPushed(site, media, null);
+                    } else {
+                        MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                        mediaError.message = error.message;
+                        mediaError.logMessage = errorMessage;
+                        notifyMediaPushed(site, media, mediaError);
+                    }
+                }));
+    }
+
+    /**
+     * @see <a href="https://codex.wordpress.org/XML-RPC_WordPress_API/Media#wp.uploadFile">documentation</a>
+     */
+    public void uploadMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        URL xmlrpcUrl;
+        try {
+            xmlrpcUrl = new URL(site.getXmlRpcUrl());
+        } catch (MalformedURLException e) {
+            AppLog.w(T.MEDIA, "bad XMLRPC URL for site: " + site.getXmlRpcUrl());
+            return;
+        }
+
+        if (media == null || media.getId() == 0) {
+            // we can't have a MediaModel without an ID - otherwise we can't keep track of them.
+            MediaError error = new MediaError(MediaErrorType.INVALID_ID);
+            if (media == null) {
+                error.logMessage = "XMLRPC: media is null on upload";
+            } else {
+                error.logMessage = "XMLRPC: media ID is 0 on upload";
+            }
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        if (!MediaUtils.canReadFile(media.getFilePath())) {
+            MediaError error = new MediaError(MediaErrorType.FS_READ_PERMISSION_DENIED);
+            error.logMessage = "XMLRPC: cannot read file on upload";
+            notifyMediaUploaded(media, error);
+            return;
+        }
+
+        XmlrpcUploadRequestBody requestBody = new XmlrpcUploadRequestBody(media, this, site);
+        HttpUrl.Builder urlBuilder = new HttpUrl.Builder()
+                .scheme(xmlrpcUrl.getProtocol())
+                .host(xmlrpcUrl.getHost())
+                .encodedPath(xmlrpcUrl.getPath())
+                .username(site.getUsername())
+                .password(site.getPassword());
+        if (xmlrpcUrl.getPort() > 0) {
+            urlBuilder.port(xmlrpcUrl.getPort());
+        }
+        HttpUrl url = urlBuilder.build();
+
+        // Use the HTTP Auth Manager to check if we need HTTP Auth for this url
+        HTTPAuthModel httpAuthModel = mHTTPAuthManager.getHTTPAuthModel(xmlrpcUrl.toString());
+        String authString = null;
+        if (httpAuthModel != null) {
+            String creds = String.format("%s:%s", httpAuthModel.getUsername(), httpAuthModel.getPassword());
+            authString = "Basic " + Base64.encodeToString(creds.getBytes(), Base64.NO_WRAP);
+        }
+
+        Builder builder = new Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .addHeader("User-Agent", mUserAgent.toString())
+                .addHeader("Accept", "*/*");
+
+        if (authString != null) {
+            // Add the authorization header
+            builder.addHeader("Authorization", authString);
+        }
+        Request request = builder.build();
+
+        Call call = mOkHttpClient.newCall(request);
+        mCurrentUploadCalls.put(media.getId(), call);
+
+        AppLog.d(T.MEDIA, "starting upload for: " + media.getId());
+        call.enqueue(new Callback() {
+            @Override
+            @SuppressWarnings("rawtypes")
+            public void onResponse(@NonNull Call call, @NonNull Response response) {
+                if (response.code() == HttpURLConnection.HTTP_OK) {
+                    // HTTP_OK code doesn't mean the upload is successful, XML-RPC API returns code 200 with an
+                    // xml field "faultCode" on error.
+                    try {
+                        Map responseMap = getMapFromUploadResponse(response);
+                        if (responseMap != null) {
+                            AppLog.d(T.MEDIA, "media upload successful, local id=" + media.getId());
+                            if (isDeprecatedUploadResponse(responseMap)) {
+                                media.setMediaId(MapUtils.getMapLong(responseMap, "id"));
+                                // Upload media response only has `type, id, file, url` fields whereas we need
+                                // `parent, title, caption, description, videopress_shortcode, thumbnail,
+                                // date_created_gmt, link, width, height` fields, so we need to make a fetch for them
+                                // This only applies to WordPress sites running versions older than WordPress 4.4
+                                fetchMedia(site, media, true);
+                            } else {
+                                MediaModel responseMedia = getMediaFromXmlrpcResponse(responseMap);
+                                if (responseMedia != null) {
+                                    // Retain local IDs
+                                    responseMedia.setId(media.getId());
+                                    responseMedia.setLocalSiteId(site.getId());
+                                    responseMedia.setLocalPostId(media.getLocalPostId());
+                                    responseMedia.setMarkedLocallyAsFeatured(media.getMarkedLocallyAsFeatured());
+
+                                    notifyMediaUploaded(responseMedia, null);
+                                } else {
+                                    String message = "could not parse Upload media response, ID: " + media.getMediaId();
+                                    AppLog.w(T.MEDIA, message);
+                                    MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                                    error.logMessage = "XMLRPC: " + message;
+                                    notifyMediaUploaded(media, error);
+                                }
+                            }
+                        } else {
+                            String message = "error uploading media - malformed response: " + response.message();
+                            AppLog.w(T.MEDIA, message);
+                            MediaError error = new MediaError(MediaErrorType.PARSE_ERROR, response.message());
+                            error.logMessage = "XMLRPC: " + message;
+                            notifyMediaUploaded(media, error);
+                        }
+                    } catch (XMLRPCException fault) {
+                        MediaError mediaError = getMediaErrorFromXMLRPCException(fault);
+                        String message = "media upload failed with error: " + mediaError.message;
+                        AppLog.w(T.MEDIA, message);
+                        mediaError.logMessage = "XMLRPC: " + message;
+                        notifyMediaUploaded(media, mediaError);
+                    }
+                } else {
+                    AppLog.e(T.MEDIA, "error uploading media: " + response.message());
+                    MediaError error = new MediaError(MediaErrorType.fromHttpStatusCode(response.code()));
+                    error.message = response.message();
+                    error.logMessage = "XMLRPC: error uploading media";
+                    error.statusCode = response.code();
+                    notifyMediaUploaded(media, error);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                AppLog.w(T.MEDIA, "media upload failed: " + e);
+                if (!mCurrentUploadCalls.containsKey(media.getId())) {
+                    // This call has already been removed from the in-progress list - probably because it was cancelled
+                    // In that case this has already been handled and there's nothing to do
+                    return;
+                }
+
+                MediaError error = MediaError.fromIOException(e);
+                error.logMessage = "XMLRPC: " + e.getMessage();
+                notifyMediaUploaded(media, error);
+            }
+        });
+    }
+
+    /**
+     * @see <a href="https://codex.wordpress.org/XML-RPC_WordPress_API/Media#wp.getMediaLibrary">documentation</a>
+     */
+    public void fetchMediaList(
+            @NonNull final SiteModel site,
+            final int number,
+            final int offset,
+            @Nullable final MimeType.Type mimeType) {
+        List<Object> params = getBasicParams(site, null);
+        Map<String, Object> queryParams = new HashMap<>();
+        queryParams.put("number", number);
+        if (offset > 0) {
+            queryParams.put("offset", offset);
+        }
+        if (mimeType != null) {
+            queryParams.put("mime_type", mimeType.getValue());
+        }
+        params.add(queryParams);
+
+        add(new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_MEDIA_LIBRARY, params,
+                response -> {
+                    List<MediaModel> mediaList = getMediaListFromXmlrpcResponse(response, site.getId());
+                    AppLog.v(T.MEDIA, "Fetched media list for site via XMLRPC.GET_MEDIA_LIBRARY");
+                    boolean canLoadMore = mediaList.size() == number;
+                    notifyMediaListFetched(site, mediaList, offset > 0, canLoadMore, mimeType);
+                },
+                error -> {
+                    String message = "XMLRPC.GET_MEDIA_LIBRARY error response:";
+                    AppLog.e(T.MEDIA, message, error.volleyError);
+                    MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                    mediaError.logMessage = "XMLRPC: " + message;
+                    notifyMediaListFetched(site, mediaError, mimeType);
+                }));
+    }
+
+    public void fetchMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        fetchMedia(site, media, false);
+    }
+
+    /**
+     * @see <a href="https://codex.wordpress.org/XML-RPC_WordPress_API/Media#wp.getMediaItem">documentation</a>
+     */
+    @SuppressWarnings("rawtypes")
+    private void fetchMedia(
+            @NonNull final SiteModel site,
+            @Nullable final MediaModel media,
+            final boolean isFreshUpload) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "XMLRPC: empty media on fetchMedia";
+            if (isFreshUpload) {
+                notifyMediaUploaded(null, error);
+            } else {
+                notifyMediaFetched(site, null, error);
+            }
+            return;
+        }
+
+        List<Object> params = getBasicParams(site, media);
+        add(new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_MEDIA_ITEM, params,
+                (Listener<Object>) response -> {
+                    AppLog.v(T.MEDIA, "Fetched media for site via XMLRPC.GET_MEDIA_ITEM");
+                    MediaModel responseMedia = getMediaFromXmlrpcResponse((HashMap) response);
+                    if (responseMedia != null) {
+                        AppLog.v(T.MEDIA, "Fetched media with remoteId= " + media.getMediaId()
+                                          + " localId=" + media.getId());
+                        // Retain local IDs
+                        responseMedia.setId(media.getId());
+                        responseMedia.setLocalSiteId(site.getId());
+                        responseMedia.setLocalPostId(media.getLocalPostId());
+                        responseMedia.setMarkedLocallyAsFeatured(media.getMarkedLocallyAsFeatured());
+
+                        if (isFreshUpload) {
+                            notifyMediaUploaded(responseMedia, null);
+                        } else {
+                            notifyMediaFetched(site, responseMedia, null);
+                        }
+                    } else {
+                        String message = "could not parse Fetch media response, ID: " + media.getMediaId();
+                        AppLog.w(T.MEDIA, message);
+                        MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                        error.logMessage = "XMLRPC: " + message;
+                        if (isFreshUpload) {
+                            notifyMediaUploaded(media, error);
+                        } else {
+                            notifyMediaFetched(site, media, error);
+                        }
+                    }
+                },
+                error -> {
+                    String message = "XMLRPC.GET_MEDIA_ITEM error response: " + error;
+                    AppLog.e(T.MEDIA, message);
+                    if (isFreshUpload) {
+                        // we tried to fetch a media that's just uploaded but failed, so we should return
+                        // an upload error and not a fetch error as initially parsing the upload response failed
+                        MediaError mediaError = new MediaError(MediaErrorType.PARSE_ERROR);
+                        mediaError.logMessage = "XMLRPC: " + message;
+                        notifyMediaUploaded(media, mediaError);
+                    } else {
+                        MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                        mediaError.logMessage = "XMLRPC: " + message;
+                        notifyMediaFetched(site, media, mediaError);
+                    }
+                }));
+    }
+
+    public void deleteMedia(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        if (media == null) {
+            // caller may be expecting a notification
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "XMLRPC: empty media on delete";
+            notifyMediaDeleted(site, null, error);
+            return;
+        }
+
+        List<Object> params = getBasicParams(site, media);
+        add(new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.DELETE_POST, params,
+                (Listener<Object>) response -> {
+                    // response should be a boolean indicating result of push request
+                    if (!(response instanceof Boolean) || !(Boolean) response) {
+                        String message = "could not parse XMLRPC.DELETE_MEDIA response: " + response;
+                        AppLog.w(T.MEDIA, message);
+                        MediaError error = new MediaError(MediaErrorType.PARSE_ERROR);
+                        error.logMessage = "XMLRPC: " + message;
+                        notifyMediaDeleted(site, media, error);
+                        return;
+                    }
+
+                    AppLog.v(T.MEDIA, "Successful response from XMLRPC.DELETE_MEDIA");
+                    notifyMediaDeleted(site, media, null);
+                },
+                error -> {
+                    String message = "Error response from XMLRPC.DELETE_MEDIA:" + error;
+                    AppLog.e(T.MEDIA, message);
+                    MediaError mediaError = new MediaError(MediaErrorType.fromBaseNetworkError(error));
+                    mediaError.logMessage = "XMLRPC: " + message;
+                    notifyMediaDeleted(site, media, mediaError);
+                }));
+    }
+
+    public void cancelUpload(@Nullable final MediaModel media) {
+        if (media == null) {
+            MediaError error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+            error.logMessage = "XMLRPC: empty media on cancel upload";
+            notifyMediaUploaded(null, error);
+            return;
+        }
+
+        // cancel in-progress upload if necessary
+        Call correspondingCall = mCurrentUploadCalls.get(media.getId());
+        if (correspondingCall != null && correspondingCall.isExecuted() && !correspondingCall.isCanceled()) {
+            AppLog.d(T.MEDIA, "Canceled in-progress upload: " + media.getFileName());
+            removeCallFromCurrentUploadsMap(media.getId());
+            correspondingCall.cancel();
+
+            // report the upload was successfully cancelled
+            notifyMediaUploadCanceled(media);
+        }
+    }
+
+    private void removeCallFromCurrentUploadsMap(int id) {
+        mCurrentUploadCalls.remove(id);
+        AppLog.d(T.MEDIA, "mediaXMLRPCClient: removed id: " + id + " from current uploads, remaining: "
+                          + mCurrentUploadCalls.size());
+    }
+
+    //
+    // Helper methods to dispatch media actions
+    //
+
+    private void notifyMediaPushed(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newPushedMediaAction(payload));
+    }
+
+    private void notifyMediaProgress(@NonNull MediaModel media, float progress) {
+        ProgressPayload payload = new ProgressPayload(media, progress, false, null);
+        mDispatcher.dispatch(UploadActionBuilder.newUploadedMediaAction(payload));
+    }
+
+    private void notifyMediaUploaded(@Nullable MediaModel media, @Nullable MediaError error) {
+        if (media != null) {
+            media.setUploadState(error == null ? MediaUploadState.UPLOADED : MediaUploadState.FAILED);
+            removeCallFromCurrentUploadsMap(media.getId());
+        }
+
+        ProgressPayload payload = new ProgressPayload(media, 1.f, error == null, error);
+        mDispatcher.dispatch(UploadActionBuilder.newUploadedMediaAction(payload));
+    }
+
+    private void notifyMediaListFetched(
+            @NonNull SiteModel site,
+            @NonNull List<MediaModel> media,
+            boolean loadedMore,
+            boolean canLoadMore,
+            @Nullable MimeType.Type mimeType) {
+        FetchMediaListResponsePayload payload = new FetchMediaListResponsePayload(site, media,
+                loadedMore, canLoadMore, mimeType);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaListAction(payload));
+    }
+
+    private void notifyMediaListFetched(
+            @NonNull SiteModel site,
+            @NonNull MediaError error,
+            @Nullable MimeType.Type mimeType) {
+        FetchMediaListResponsePayload payload = new FetchMediaListResponsePayload(site, error, mimeType);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaListAction(payload));
+    }
+
+    private void notifyMediaFetched(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newFetchedMediaAction(payload));
+    }
+
+    private void notifyMediaDeleted(
+            @NonNull SiteModel site,
+            @Nullable MediaModel media,
+            @Nullable MediaError error) {
+        MediaPayload payload = new MediaPayload(site, media, error);
+        mDispatcher.dispatch(MediaActionBuilder.newDeletedMediaAction(payload));
+    }
+
+    private void notifyMediaUploadCanceled(@NonNull MediaModel media) {
+        ProgressPayload payload = new ProgressPayload(media, 0.f, false, true);
+        mDispatcher.dispatch(MediaActionBuilder.newCanceledMediaUploadAction(payload));
+    }
+
+    //
+    // Utility methods
+    //
+
+    // media list responses should be of type Object[] with each media item in the array represented by a HashMap
+    @NonNull
+    @SuppressWarnings("rawtypes")
+    private List<MediaModel> getMediaListFromXmlrpcResponse(@NonNull Object[] response, int localSiteId) {
+        List<MediaModel> responseMedia = new ArrayList<>();
+        for (Object mediaObject : response) {
+            if (!(mediaObject instanceof HashMap)) {
+                continue;
+            }
+            MediaModel media = getMediaFromXmlrpcResponse((HashMap) mediaObject);
+            if (media != null) {
+                media.setLocalSiteId(localSiteId);
+                responseMedia.add(media);
+            }
+        }
+        return responseMedia;
+    }
+
+    @Nullable
+    @SuppressWarnings("rawtypes")
+    private MediaModel getMediaFromXmlrpcResponse(@NonNull Map response) {
+        if (response.isEmpty()) {
+            return null;
+        }
+
+        String link = MapUtils.getMapStr(response, "link");
+        String fileExtension = MediaUtils.getExtension(link);
+        Map metadataMap = null;
+        if (response.get("metadata") instanceof Map) {
+            metadataMap = (Map) response.get("metadata");
+        }
+        return new MediaModel(
+                0,
+                MapUtils.getMapLong(response, "attachment_id"),
+                MapUtils.getMapLong(response, "parent"),
+                0,
+                "",
+                DateTimeUtils.iso8601UTCFromDate(MapUtils.getMapDate(response, "date_created_gmt")),
+                link,
+                MapUtils.getMapStr(response, "thumbnail"),
+                MediaUtils.getFileName(link),
+                fileExtension,
+                MediaUtils.getMimeTypeForExtension(fileExtension),
+                StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(response, "title")),
+                StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(response, "caption")),
+                StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(response, "description")),
+                "",
+                metadataMap != null ? MapUtils.getMapInt(metadataMap, "width") : 0,
+                metadataMap != null ? MapUtils.getMapInt(metadataMap, "height") : 0,
+                0,
+                MapUtils.getMapStr(response, "videopress_shortcode"),
+                false,
+                MediaUploadState.UPLOADED,
+                metadataMap != null ? getFileUrlForSize(link, metadataMap, "medium") : null,
+                metadataMap != null ? getFileUrlForSize(link, metadataMap, "medium_large") : null,
+                metadataMap != null ? getFileUrlForSize(link, metadataMap, "large") : null,
+                false
+        );
+    }
+
+    @Nullable
+    @SuppressWarnings("rawtypes")
+    private String getFileUrlForSize(
+            @NonNull String mediaUrl,
+            @NonNull Map metadataMap,
+            @NonNull String size) {
+        if (TextUtils.isEmpty(mediaUrl) || !mediaUrl.contains("/")) {
+            return null;
+        }
+
+        String fileName = getFileForSize(metadataMap, size);
+        if (TextUtils.isEmpty(fileName)) {
+            return null;
+        }
+
+        // make sure the path to the original image is a valid path to a file
+        if (mediaUrl.lastIndexOf("/") + 1 >= mediaUrl.length()) {
+            return null;
+        }
+
+        String baseURL = mediaUrl.substring(0, mediaUrl.lastIndexOf("/") + 1);
+        return baseURL + fileName;
+    }
+
+    @Nullable
+    @SuppressWarnings("rawtypes")
+    private String getFileForSize(
+            @NonNull Map metadataMap,
+            @NonNull String size) {
+        Object sizesObject = metadataMap.get("sizes");
+        if (sizesObject instanceof Map) {
+            Map sizesMap = (Map) sizesObject;
+            Object requestedSizeObject = sizesMap.get(size);
+            if (requestedSizeObject instanceof Map) {
+                Map requestedSizeMap = (Map) requestedSizeObject;
+                return MapUtils.getMapStr(requestedSizeMap, "file");
+            }
+        }
+        return null;
+    }
+
+    @NonNull
+    private MediaError getMediaErrorFromXMLRPCException(@NonNull XMLRPCException exception) {
+        MediaError mediaError = new MediaError(MediaErrorType.GENERIC_ERROR);
+        mediaError.message = exception.getLocalizedMessage();
+        mediaError.logMessage = exception.getMessage();
+        if (exception instanceof XMLRPCFault) {
+            switch (((XMLRPCFault) exception).getFaultCode()) {
+                case 401:
+                    mediaError.type = MediaErrorType.XMLRPC_OPERATION_NOT_ALLOWED;
+                    break;
+                case 403:
+                    mediaError.type = MediaErrorType.NOT_AUTHENTICATED;
+                    break;
+                case 404:
+                    mediaError.type = MediaErrorType.NOT_FOUND;
+                    break;
+                case 500:
+                    mediaError.type = MediaErrorType.XMLRPC_UPLOAD_ERROR;
+                    break;
+            }
+        }
+        return mediaError;
+    }
+
+    @Nullable
+    @SuppressWarnings("rawtypes")
+    private static Map getMapFromUploadResponse(@NonNull Response response) throws XMLRPCException {
+        try {
+            ResponseBody responseBody = response.body();
+            if (responseBody == null) {
+                AppLog.e(T.MEDIA, "Failed to parse XMLRPC.wpUploadFile response - body was empty: " + response);
+                return null;
+            }
+            String data = new String(responseBody.bytes(), StandardCharsets.UTF_8);
+            InputStream is = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
+            Object responseObject = XMLSerializerUtils.deserialize(XMLSerializerUtils.scrubXmlResponse(is));
+            if (responseObject instanceof Map) {
+                return (Map) responseObject;
+            }
+        } catch (IOException | XmlPullParserException e) {
+            AppLog.e(T.MEDIA, "Failed to parse XMLRPC.wpUploadFile response: " + response);
+            return null;
+        }
+        return null;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static boolean isDeprecatedUploadResponse(@NonNull Map responseMap) {
+        for (String requiredResponseField : REQUIRED_UPLOAD_RESPONSE_FIELDS) {
+            if (!responseMap.containsKey(requiredResponseField)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Nullable
+    private Map<String, Object> getEditMediaFields(@Nullable final MediaModel media) {
+        if (media == null) {
+            return null;
+        }
+        Map<String, Object> mediaFields = new HashMap<>();
+        mediaFields.put("post_title", media.getTitle());
+        mediaFields.put("post_content", media.getDescription());
+        mediaFields.put("post_excerpt", media.getCaption());
+        return mediaFields;
+    }
+
+    private boolean is404Response(@NonNull BaseNetworkError error) {
+        if (error.isGeneric() && error.type == BaseRequest.GenericErrorType.NOT_FOUND) {
+            return true;
+        }
+
+        if (error.hasVolleyError() && error.volleyError != null) {
+            VolleyError volleyError = error.volleyError;
+            if (volleyError.networkResponse != null
+                && volleyError.networkResponse.statusCode == HttpURLConnection.HTTP_NOT_FOUND) {
+                return true;
+            }
+
+            if (volleyError.getCause() instanceof XMLRPCFault) {
+                return ((XMLRPCFault) volleyError.getCause()).getFaultCode() == HttpURLConnection.HTTP_NOT_FOUND;
+            }
+        }
+
+        return false;
+    }
+
+    @NonNull
+    private List<Object> getBasicParams(@NonNull final SiteModel site, @Nullable final MediaModel media) {
+        List<Object> params = new ArrayList<>();
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        if (media != null) {
+            params.add(media.getMediaId());
+        }
+        return params;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/XmlrpcUploadRequestBody.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/XmlrpcUploadRequestBody.java
new file mode 100644
index 00000000000..e36f52b4b7c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/media/XmlrpcUploadRequestBody.java
@@ -0,0 +1,133 @@
+package org.wordpress.android.fluxc.network.xmlrpc.media;
+
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+
+import okhttp3.MediaType;
+import okio.BufferedSink;
+import okio.Okio;
+
+public class XmlrpcUploadRequestBody extends BaseUploadRequestBody {
+    private static final MediaType MEDIA_TYPE = MediaType.parse("text/xml; charset=utf-8");
+
+    /**
+     * Expected XML content for wp.uploadFile method. Base64 encoded file should be inserted between
+     * #PREPEND_XML_FORMAT and #APPEND_XML
+     */
+    private static final String PREPEND_XML_FORMAT =
+            "<?xml version=\"1.0\"?><methodCall><methodName>wp.uploadFile</methodName><params>"
+            + "<param><value><int>%d</int></value></param>" // siteId
+            + "<param><value><string>%s</string></value></param>" // username
+            + "<param><value><string>%s</string></value></param>" // password
+            + "<param><value><struct>" // data
+            + "<member><name>name</name><value><string>%s</string></value></member>" // name
+            + "<member><name>type</name><value><string>%s</string></value></member>" // type
+            + "<member><name>overwrite</name><value><boolean>1</boolean></value></member>"
+            + "<member><name>post_id</name><value><int>%d</int></value></member>" // remote post ID
+            + "<member><name>bits</name><value><base64>"; // bits
+    private static final String APPEND_XML =
+            "</base64></value></member></struct></value></param></params></methodCall>";
+
+    @NonNull private final String mPrependString;
+    private long mMediaSize;
+    private long mContentSize = -1;
+    private long mMediaBytesWritten = 0;
+
+    @SuppressWarnings("deprecation")
+    public XmlrpcUploadRequestBody(
+            @NonNull MediaModel media,
+            @NonNull ProgressListener listener,
+            @NonNull SiteModel site) {
+        super(media, listener);
+
+        // TODO: we should use the XMLRPCSerializer instead of doing this
+        mPrependString = String.format(Locale.ENGLISH, PREPEND_XML_FORMAT,
+                site.getSelfHostedSiteId(),
+                StringEscapeUtils.escapeXml(site.getUsername()),
+                StringEscapeUtils.escapeXml(site.getPassword()),
+                StringEscapeUtils.escapeXml(media.getFileName()),
+                StringEscapeUtils.escapeXml(media.getMimeType()),
+                media.getPostId());
+
+        try {
+            mMediaSize = contentLength();
+        } catch (IOException e) {
+            // Default to 1 (to avoid divide by zero errors)
+            mMediaSize = 1;
+        }
+    }
+
+    @Override
+    protected float getProgress(long bytesWritten) {
+        return (float) mMediaBytesWritten / mMediaSize;
+    }
+
+    @NonNull
+    @Override
+    public MediaType contentType() {
+        return MEDIA_TYPE;
+    }
+
+    @Override
+    public long contentLength() throws IOException {
+        if (mContentSize == -1) {
+            mContentSize = getMediaBase64EncodedSize()
+                           + mPrependString.getBytes(StandardCharsets.UTF_8).length
+                           + APPEND_XML.length();
+        }
+        return mContentSize;
+    }
+
+    private long getMediaBase64EncodedSize() throws IOException {
+        FileInputStream fis = new FileInputStream(getMedia().getFilePath());
+        int totalSize = 0;
+        try {
+            byte[] buffer = new byte[3600];
+            int length;
+            while ((length = fis.read(buffer)) > 0) {
+                totalSize += Base64.encodeToString(buffer, 0, length, Base64.DEFAULT).length();
+            }
+        } finally {
+            fis.close();
+        }
+        return totalSize;
+    }
+
+    @Override
+    public void writeTo(@NonNull BufferedSink sink) throws IOException {
+        CountingSink countingSink = new CountingSink(sink);
+        BufferedSink bufferedSink = Okio.buffer(countingSink);
+
+        // write XML up to point of file
+        bufferedSink.writeUtf8(mPrependString);
+
+        // write file to xml
+
+        try (FileInputStream fis = new FileInputStream(getMedia().getFilePath())) {
+            byte[] buffer = new byte[3600]; // you must use a 24bit multiple
+            int length;
+            String chunk;
+            while ((length = fis.read(buffer)) > 0) {
+                chunk = Base64.encodeToString(buffer, 0, length, Base64.DEFAULT);
+                mMediaBytesWritten += length;
+                bufferedSink.writeUtf8(chunk);
+            }
+        }
+
+        // write remainder or XML
+        bufferedSink.writeUtf8(APPEND_XML);
+
+        bufferedSink.flush();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/post/PostXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/post/PostXMLRPCClient.java
new file mode 100644
index 00000000000..fcdfe9a1f8d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/post/PostXMLRPCClient.java
@@ -0,0 +1,721 @@
+package org.wordpress.android.fluxc.network.xmlrpc.post;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.action.PostAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.generated.PostActionBuilder;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostsModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForXmlRpcSite;
+import org.wordpress.android.fluxc.model.post.PostLocation;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseErrorListener;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCFault;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCUtils;
+import org.wordpress.android.fluxc.store.PostStore;
+import org.wordpress.android.fluxc.store.PostStore.DeletedPostPayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostListResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostStatusResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsResponsePayload;
+import org.wordpress.android.fluxc.store.PostStore.PostDeleteActionType;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType;
+import org.wordpress.android.fluxc.store.PostStore.PostListItem;
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.DateTimeUtils;
+import org.wordpress.android.util.MapUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class PostXMLRPCClient extends BaseXMLRPCClient {
+    @Inject public PostXMLRPCClient(Dispatcher dispatcher,
+                            @Named("custom-ssl") RequestQueue requestQueue,
+                            UserAgent userAgent,
+                            HTTPAuthManager httpAuthManager) {
+        super(dispatcher, requestQueue, userAgent, httpAuthManager);
+    }
+
+    public void fetchPost(final PostModel post, final SiteModel site) {
+        fetchPost(post, site, PostAction.FETCH_POST);
+    }
+
+    public void fetchPost(final PostModel post, final SiteModel site, final PostAction origin) {
+        fetchPost(post, site, origin, false);
+    }
+
+    public void fetchPost(final PostModel post, final SiteModel site, final PostAction origin,
+                          final boolean isFirstTimePublish) {
+        List<Object> params = createFetchPostParams(post, site);
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_POST, params,
+                new Listener<Object>() {
+                    @Override
+                    public void onResponse(Object response) {
+                        if (response instanceof Map) {
+                            PostModel postModel = postResponseObjectToPostModel((Map) response, site);
+                            FetchPostResponsePayload payload;
+                            if (postModel != null) {
+                                if (origin == PostAction.PUSH_POST) {
+                                    postModel.setId(post.getId());
+                                }
+                                payload = new FetchPostResponsePayload(postModel, site);
+                            } else {
+                                payload = new FetchPostResponsePayload(post, site);
+                                payload.error = new PostError(PostErrorType.INVALID_RESPONSE);
+                            }
+                            payload.origin = origin;
+                            payload.isFirstTimePublish = isFirstTimePublish;
+                            mDispatcher.dispatch(PostActionBuilder.newFetchedPostAction(payload));
+                        }
+                    }
+                }, new BaseErrorListener() {
+            @Override
+            public void onErrorResponse(@NonNull BaseNetworkError error) {
+                FetchPostResponsePayload payload = new FetchPostResponsePayload(post, site);
+                payload.isFirstTimePublish = isFirstTimePublish;
+                payload.error = createPostErrorFromBaseNetworkError(error);
+                payload.origin = origin;
+                mDispatcher.dispatch(PostActionBuilder.newFetchedPostAction(payload));
+            }
+        });
+
+        add(request);
+    }
+
+    public void fetchPostStatus(final PostModel post, final SiteModel site) {
+        final String postStatusField = "post_status";
+        List<Object> params = createFetchPostParams(post, site);
+        // If we only request the status, we get an empty response
+        params.add(Arrays.asList("post_id", postStatusField));
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_POST, params,
+                new Listener<Object>() {
+                    @Override
+                    public void onResponse(Object response) {
+                        String remotePostStatus = null;
+                        if (response instanceof Map) {
+                            remotePostStatus = MapUtils.getMapStr((Map) response, postStatusField);
+                        }
+                        FetchPostStatusResponsePayload payload = new FetchPostStatusResponsePayload(post, site);
+                        if (remotePostStatus != null) {
+                            payload.remotePostStatus = remotePostStatus;
+                        } else {
+                            payload.error = new PostError(PostErrorType.INVALID_RESPONSE);
+                        }
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostStatusAction(payload));
+                    }
+                }, new BaseErrorListener() {
+            @Override
+            public void onErrorResponse(@NonNull BaseNetworkError error) {
+                FetchPostStatusResponsePayload payload = new FetchPostStatusResponsePayload(post, site);
+                payload.error = createPostErrorFromBaseNetworkError(error);
+                mDispatcher.dispatch(PostActionBuilder.newFetchedPostStatusAction(payload));
+            }
+        });
+
+        add(request);
+    }
+
+    public void fetchPostList(final PostListDescriptorForXmlRpcSite listDescriptor, final long offset) {
+        SiteModel site = listDescriptor.getSite();
+        List<String> fields = Arrays.asList("post_id", "post_modified_gmt", "post_status");
+        final int pageSize = listDescriptor.getConfig().getNetworkPageSize();
+        List<Object> params =
+                createFetchPostListParameters(site.getSelfHostedSiteId(), site.getUsername(), site.getPassword(), false,
+                        offset, pageSize, listDescriptor.getStatusList(), fields,
+                        listDescriptor.getOrderBy().getValue(), listDescriptor.getOrder().getValue(),
+                        listDescriptor.getSearchQuery());
+        final boolean loadedMore = offset > 0;
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_POSTS, params,
+                new Listener<Object[]>() {
+                    @Override
+                    public void onResponse(Object[] response) {
+                        boolean canLoadMore =
+                                response != null && response.length == pageSize;
+                        List<PostListItem> postListItems = postListItemsFromPostsResponse(response);
+                        PostError postError = response == null ? new PostError(PostErrorType.INVALID_RESPONSE) : null;
+                        FetchPostListResponsePayload responsePayload =
+                                new FetchPostListResponsePayload(listDescriptor, postListItems, loadedMore,
+                                        canLoadMore, postError);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostListAction(responsePayload));
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        PostError postError = createPostErrorFromBaseNetworkError(error);
+                        FetchPostListResponsePayload responsePayload =
+                                new FetchPostListResponsePayload(listDescriptor, Collections.<PostListItem>emptyList(),
+                                        loadedMore, false, postError);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostListAction(responsePayload));
+                    }
+                });
+
+        add(request);
+    }
+
+    public void fetchPosts(final SiteModel site, final boolean getPages, List<PostStatus> statusList,
+                           final int offset) {
+        List<Object> params =
+                createFetchPostListParameters(site.getSelfHostedSiteId(), site.getUsername(), site.getPassword(),
+                        getPages, offset, PostStore.NUM_POSTS_PER_FETCH, statusList, null, null, null, null);
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_POSTS, params,
+                new Listener<Object[]>() {
+                    @Override
+                    public void onResponse(Object[] response) {
+                        boolean canLoadMore = false;
+                        if (response != null && response.length == PostStore.NUM_POSTS_PER_FETCH) {
+                            canLoadMore = true;
+                        }
+
+                        PostsModel posts = postsResponseToPostsModel(response, site);
+
+                        FetchPostsResponsePayload payload = new FetchPostsResponsePayload(posts, site, getPages,
+                                offset > 0, canLoadMore);
+
+                        if (posts == null) {
+                            payload.error = new PostError(PostErrorType.INVALID_RESPONSE);
+                        }
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostsAction(payload));
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        PostError postError = createPostErrorFromBaseNetworkError(error);
+                        FetchPostsResponsePayload payload = new FetchPostsResponsePayload(postError, getPages);
+                        mDispatcher.dispatch(PostActionBuilder.newFetchedPostsAction(payload));
+                    }
+                });
+
+        add(request);
+    }
+
+    public void pushPost(
+            final PostModel post,
+            final SiteModel site,
+            boolean isFirstTimePublish,
+            boolean shouldSkipConflictResolutionCheck,
+            @Nullable String lastModifiedForConflictResolution
+    ) {
+        pushPostInternal(
+                post,
+                site,
+                false,
+                isFirstTimePublish,
+                shouldSkipConflictResolutionCheck,
+                lastModifiedForConflictResolution
+        );
+    }
+
+    public void restorePost(final PostModel post, final SiteModel site) {
+        pushPostInternal(post, site, true, false, true, "");
+    }
+
+    private void pushPostInternal(
+            final PostModel post,
+            final SiteModel site,
+            final boolean isRestoringPost,
+            final boolean isFirstTimePublish,
+            boolean shouldSkipConflictResolutionCheck,
+            String lastModifiedForConflictResolution) {
+        Map<String, Object> contentStruct = postModelToContentStruct(
+                post,
+                shouldSkipConflictResolutionCheck,
+                lastModifiedForConflictResolution
+        );
+
+        if (post.isLocalDraft()) {
+            // For first time publishing, set the comment status (open or closed) to the default value for the site
+            // (respect the existing comment status when editing posts)
+            contentStruct.put("comment_status", site.getDefaultCommentStatus());
+        }
+
+        List<Object> params = new ArrayList<>(5);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        if (!post.isLocalDraft()) {
+            params.add(post.getRemotePostId());
+        }
+        params.add(contentStruct);
+
+        final XMLRPC method = post.isLocalDraft() ? XMLRPC.NEW_POST : XMLRPC.EDIT_POST;
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), method, params,
+                new Listener<Object>() {
+                    @Override
+                    public void onResponse(Object response) {
+                        if (method.equals(XMLRPC.NEW_POST) && response instanceof String) {
+                            post.setRemotePostId(Long.valueOf((String) response));
+                        }
+                        post.setIsLocalDraft(false);
+                        post.setIsLocallyChanged(false);
+
+                        RemotePostPayload payload = new RemotePostPayload(post, site);
+                        payload.isFirstTimePublish = isFirstTimePublish;
+
+                        Action resultAction = isRestoringPost ? PostActionBuilder.newRestoredPostAction(payload)
+                                : UploadActionBuilder.newPushedPostAction(payload);
+                        mDispatcher.dispatch(resultAction);
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        RemotePostPayload payload = new RemotePostPayload(post, site);
+                        payload.error = createPostErrorFromBaseNetworkError(error);
+                        Action resultAction = isRestoringPost ? PostActionBuilder.newRestoredPostAction(payload)
+                                : UploadActionBuilder.newPushedPostAction(payload);
+                        mDispatcher.dispatch(resultAction);
+                    }
+                });
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void deletePost(final @NonNull PostModel post, final @NonNull SiteModel site,
+                           final @NonNull PostDeleteActionType postDeleteActionType) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(post.getRemotePostId());
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.DELETE_POST, params,
+                new Listener<Object>() {
+                    @Override
+                    public void onResponse(Object response) {
+                        // XML-RPC response doesn't contain the deleted post object
+                        DeletedPostPayload payload =
+                                new DeletedPostPayload(post, site, postDeleteActionType, (PostModel) null);
+                        mDispatcher.dispatch(PostActionBuilder.newDeletedPostAction(payload));
+                    }
+                },
+                new BaseErrorListener() {
+                    @Override
+                    public void onErrorResponse(@NonNull BaseNetworkError error) {
+                        PostError deletePostError = createPostErrorFromBaseNetworkError(error);
+                        DeletedPostPayload payload =
+                                new DeletedPostPayload(post, site, postDeleteActionType, deletePostError);
+                        mDispatcher.dispatch(PostActionBuilder.newDeletedPostAction(payload));
+                    }
+                });
+
+        request.disableRetries();
+        add(request);
+    }
+
+    private @NonNull List<PostListItem> postListItemsFromPostsResponse(@Nullable Object[] response) {
+        if (response == null) {
+            return Collections.emptyList();
+        }
+        List<PostListItem> postListItems = new ArrayList<>();
+        for (Object responseObject : response) {
+            Map<?, ?> postMap = (Map<?, ?>) responseObject;
+            String postID = MapUtils.getMapStr(postMap, "post_id");
+            String postStatus = MapUtils.getMapStr(postMap, "post_status");
+            Date lastModifiedGmt = MapUtils.getMapDate(postMap, "post_modified_gmt");
+            String lastModifiedAsIso8601 = DateTimeUtils.iso8601UTCFromDate(lastModifiedGmt);
+
+            postListItems.add(new PostListItem(Long.parseLong(postID), lastModifiedAsIso8601, postStatus, null));
+        }
+        return postListItems;
+    }
+
+    private PostsModel postsResponseToPostsModel(@Nullable Object[] response, SiteModel site) {
+        List<PostModel> postArray = new ArrayList<>();
+        if (response == null) {
+            return null;
+        }
+        if (response.length == 0) {
+            return new PostsModel(postArray);
+        }
+        for (Object responseObject : response) {
+            Map<?, ?> postMap = (Map<?, ?>) responseObject;
+            PostModel post = postResponseObjectToPostModel(postMap, site);
+            if (post != null) {
+                postArray.add(post);
+            }
+        }
+
+        if (postArray.isEmpty()) {
+            return null;
+        }
+
+        return new PostsModel(postArray);
+    }
+
+    private static PostModel postResponseObjectToPostModel(@NonNull Map postObject, SiteModel site) {
+        Map<?, ?> postMap = (Map<?, ?>) postObject;
+        PostModel post = new PostModel();
+
+        String postID = MapUtils.getMapStr(postMap, "post_id");
+        if (TextUtils.isEmpty(postID)) {
+            // If we don't have a post or page ID, move on
+            return null;
+        }
+
+        post.setLocalSiteId(site.getId());
+        post.setRemotePostId(Long.valueOf(postID));
+        post.setTitle(MapUtils.getMapStr(postMap, "post_title"));
+
+        Date dateCreatedGmt = MapUtils.getMapDate(postMap, "post_date_gmt");
+        String dateCreatedAsIso8601 = DateTimeUtils.iso8601UTCFromDate(dateCreatedGmt);
+        post.setDateCreated(dateCreatedAsIso8601);
+
+        Date lastModifiedGmt = MapUtils.getMapDate(postMap, "post_modified_gmt");
+        String lastModifiedAsIso8601 = DateTimeUtils.iso8601UTCFromDate(lastModifiedGmt);
+        post.setLastModified(lastModifiedAsIso8601);
+        post.setRemoteLastModified(lastModifiedAsIso8601);
+
+        post.setContent(MapUtils.getMapStr(postMap, "post_content"));
+        post.setLink(MapUtils.getMapStr(postMap, "link"));
+
+        Object[] terms = (Object[]) postMap.get("terms");
+        List<Long> categoryIds = new ArrayList<>();
+        List<String> tagNames = new ArrayList<>();
+        for (Object term : terms) {
+            if (!(term instanceof Map)) {
+                continue;
+            }
+            Map<?, ?> termMap = (Map<?, ?>) term;
+            String taxonomy = MapUtils.getMapStr(termMap, "taxonomy");
+            if (taxonomy.equals("category")) {
+                categoryIds.add(MapUtils.getMapLong(termMap, "term_id"));
+            } else if (taxonomy.equals("post_tag")) {
+                tagNames.add(MapUtils.getMapStr(termMap, "name"));
+            }
+        }
+        post.setCategoryIdList(categoryIds);
+        post.setTagNameList(tagNames);
+
+        Object[] customFields = (Object[]) postMap.get("custom_fields");
+        JSONArray jsonCustomFieldsArray = new JSONArray();
+        if (customFields != null) {
+            Double latitude = null;
+            Double longitude = null;
+            for (Object customField : customFields) {
+                jsonCustomFieldsArray.put(customField.toString());
+                // Update geo_long and geo_lat from custom fields
+                if (!(customField instanceof Map)) {
+                    continue;
+                }
+                Map<?, ?> customFieldMap = (Map<?, ?>) customField;
+                Object key = customFieldMap.get("key");
+                if (key != null && customFieldMap.get("value") != null) {
+                    if (key.equals("geo_longitude")) {
+                        longitude = XMLRPCUtils.safeGetMapValue(customFieldMap, 0.0);
+                    }
+                    if (key.equals("geo_latitude")) {
+                        latitude = XMLRPCUtils.safeGetMapValue(customFieldMap, 0.0);
+                    }
+                }
+            }
+            if (latitude != null && longitude != null) {
+                PostLocation postLocation = new PostLocation(latitude, longitude);
+                if (postLocation.isValid()) {
+                    post.setLocation(postLocation);
+                }
+            }
+        }
+        post.setCustomFields(jsonCustomFieldsArray.toString());
+
+        post.setExcerpt(MapUtils.getMapStr(postMap, "post_excerpt"));
+        post.setSlug(MapUtils.getMapStr(postMap, "post_name"));
+
+        post.setPassword(MapUtils.getMapStr(postMap, "post_password"));
+        post.setStatus(MapUtils.getMapStr(postMap, "post_status"));
+
+        if ("page".equals(MapUtils.getMapStr(postMap, "post_type"))) {
+            post.setIsPage(true);
+        }
+
+        if (post.isPage()) {
+            post.setParentId(MapUtils.getMapLong(postMap, "post_parent"));
+            post.setParentTitle(MapUtils.getMapStr(postMap, "wp_page_parent"));
+            post.setSlug(MapUtils.getMapStr(postMap, "wp_slug"));
+        } else {
+            // Extract featured image ID from post_thumbnail struct
+            Object featuredImageObject = postMap.get("post_thumbnail");
+            if (featuredImageObject instanceof Map) {
+                Map<?, ?> featuredImageMap = (Map<?, ?>) featuredImageObject;
+                post.setFeaturedImageId(MapUtils.getMapInt(featuredImageMap, "attachment_id"));
+            }
+
+            post.setPostFormat(MapUtils.getMapStr(postMap, "post_format"));
+        }
+
+        return post;
+    }
+
+    private static Map<String, Object> postModelToContentStruct(
+            PostModel post,
+            boolean shouldSkipConflictResolutionCheck,
+            @Nullable String lastModifiedForConflictResolution
+    ) {
+        Map<String, Object> contentStruct = new HashMap<>();
+
+        // Post format
+        if (!post.isPage()) {
+            if (!TextUtils.isEmpty(post.getPostFormat())) {
+                contentStruct.put("post_format", post.getPostFormat());
+            }
+        } else {
+            contentStruct.put("post_parent", post.getParentId());
+        }
+
+        contentStruct.put("post_type", post.isPage() ? "page" : "post");
+        contentStruct.put("post_title", post.getTitle());
+
+
+        String dateCreated = post.getDateCreated();
+        Date date = DateTimeUtils.dateUTCFromIso8601(dateCreated);
+        if (date != null) {
+            contentStruct.put("post_date", date);
+            // Redundant, but left in just in case
+            // Note: XML-RPC sends the same value for dateCreated and date_created_gmt in the first place
+            contentStruct.put("post_date_gmt", date);
+        }
+
+        // Should only send "if_not_modified_since" when we want to run the conflict resolution check on the BE
+        // For instance, we have showed the conflict resolution dialog and the user wants to push their local changes;
+        // setting this field to true, would not add the modified date and won't trigger a check for latest version
+        // on the remote host.
+        if (!shouldSkipConflictResolutionCheck) {
+            String dateLastModifiedStr = (lastModifiedForConflictResolution != null)
+                    ? lastModifiedForConflictResolution
+                    : post.getLastModified();
+            Date dateLastModified = DateTimeUtils.dateUTCFromIso8601(dateLastModifiedStr);
+            if (dateLastModified != null) {
+                contentStruct.put("if_not_modified_since", dateLastModified);
+            }
+        }
+
+        // We are not adding `lastModified` date to the params because that should be updated by the server when there
+        // is a change in the post. This is tested for on 08/21/2018 and verified that it's working as expected.
+        // I am only adding this note here to avoid a possible confusion about it in the future.
+
+        String content = post.getContent();
+
+        // gets rid of the weird character android inserts after images
+        content = content.replaceAll("\uFFFC", "");
+
+        contentStruct.put("post_content", content);
+
+        if (!post.isPage()) {
+            // Handle taxonomies
+
+            if (post.isLocalDraft()) {
+                // When first time publishing, we only want to send the category and tag arrays if they contain info
+                // For tags it doesn't matter if we send an empty array, but for categories we want WordPress to give
+                // the post the site's default category, and that won't happen if we send an empty category array
+                // (we should send nothing instead)
+                if (!post.getCategoryIdList().isEmpty()) {
+                    // Add categories by ID to the 'terms' param
+                    Map<Object, Object> terms = new HashMap<>();
+                    terms.put("category", post.getCategoryIdList().toArray());
+                    contentStruct.put("terms", terms);
+                }
+
+                if (!post.getTagNameList().isEmpty()) {
+                    // Add tags by name to the 'terms_names' param
+                    Map<Object, Object> termsNames = new HashMap<>();
+                    termsNames.put("post_tag", post.getTagNameList().toArray());
+                    contentStruct.put("terms_names", termsNames);
+                }
+            } else {
+                // When editing existing posts, we want to explicitly tell the server that tags or categories are now
+                // empty, as it might be because the user removed them from the post
+
+                // Add categories by ID to the 'terms' param
+                Map<Object, Object> terms = new HashMap<>();
+                if (post.getCategoryIdList().size() > 0 || !post.isLocalDraft()) {
+                    terms.put("category", post.getCategoryIdList().toArray());
+                }
+
+                if (!post.getTagNameList().isEmpty()) {
+                    // Add tags by name to the 'terms_names' param
+                    Map<Object, Object> termsNames = new HashMap<>();
+                    termsNames.put("post_tag", post.getTagNameList().toArray());
+                    contentStruct.put("terms_names", termsNames);
+                } else {
+                    // To clear any existing tags, we must pass an empty 'post_tag' array in the 'terms' param
+                    // (this won't work in the 'terms_names' param)
+                    terms.put("post_tag", post.getTagNameList().toArray());
+                }
+
+                contentStruct.put("terms", terms);
+            }
+        }
+
+        contentStruct.put("post_excerpt", post.getExcerpt());
+        contentStruct.put("post_name", post.getSlug());
+        contentStruct.put("post_status", post.getStatus());
+
+        // Geolocation
+        if (post.supportsLocation()) {
+            JSONObject remoteGeoLatitude = post.getCustomField("geo_latitude");
+            JSONObject remoteGeoLongitude = post.getCustomField("geo_longitude");
+            JSONObject remoteGeoPublic = post.getCustomField("geo_public");
+
+            Map<Object, Object> hLatitude = new HashMap<>();
+            Map<Object, Object> hLongitude = new HashMap<>();
+            Map<Object, Object> hPublic = new HashMap<>();
+
+            try {
+                if (remoteGeoLatitude != null) {
+                    hLatitude.put("id", remoteGeoLatitude.getInt("id"));
+                }
+
+                if (remoteGeoLongitude != null) {
+                    hLongitude.put("id", remoteGeoLongitude.getInt("id"));
+                }
+
+                if (remoteGeoPublic != null) {
+                    hPublic.put("id", remoteGeoPublic.getInt("id"));
+                }
+
+                if (post.hasLocation()) {
+                    PostLocation location = post.getLocation();
+                    hLatitude.put("key", "geo_latitude");
+                    hLongitude.put("key", "geo_longitude");
+                    hPublic.put("key", "geo_public");
+                    hLatitude.put("value", location.getLatitude());
+                    hLongitude.put("value", location.getLongitude());
+                    hPublic.put("value", 1);
+                }
+            } catch (JSONException e) {
+                AppLog.e(T.EDITOR, e);
+            }
+
+            if (!hLatitude.isEmpty() && !hLongitude.isEmpty() && !hPublic.isEmpty()) {
+                Object[] geo = {hLatitude, hLongitude, hPublic};
+                contentStruct.put("custom_fields", geo);
+            }
+        }
+
+        contentStruct.put("post_thumbnail", post.getFeaturedImageId());
+
+        contentStruct.put("post_password", post.getPassword());
+
+        return contentStruct;
+    }
+
+    private List<Object> createFetchPostListParameters(
+            final Long selfHostedSiteId,
+            final String username,
+            final String password,
+            final boolean getPages,
+            final long offset,
+            final int number,
+            @Nullable final List<PostStatus> statusList,
+            @Nullable final List<String> fields,
+            @Nullable final String orderBy,
+            @Nullable final String order,
+            @Nullable final String searchQuery) {
+        Map<String, Object> contentStruct = new HashMap<>();
+        contentStruct.put("number", number);
+        contentStruct.put("offset", offset);
+        if (!TextUtils.isEmpty(orderBy)) {
+            contentStruct.put("orderby", orderBy);
+        }
+        if (!TextUtils.isEmpty(order)) {
+            contentStruct.put("order", order);
+        }
+        if (statusList != null && statusList.size() > 0) {
+            contentStruct.put("post_status", PostStatus.postStatusListToString(statusList));
+        }
+        if (!TextUtils.isEmpty(searchQuery)) {
+            contentStruct.put("s", searchQuery);
+        }
+
+        if (getPages) {
+            contentStruct.put("post_type", "page");
+        }
+
+        List<Object> params = new ArrayList<>(4);
+        params.add(selfHostedSiteId);
+        params.add(username);
+        params.add(password);
+        params.add(contentStruct);
+        if (fields != null && fields.size() > 0) {
+            params.add(fields);
+        }
+        return params;
+    }
+
+    private List<Object> createFetchPostParams(final PostModel post, final SiteModel site) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(post.getRemotePostId());
+        return params;
+    }
+
+    private PostError createPostErrorFromBaseNetworkError(@NonNull BaseNetworkError error) {
+        // Possible non-generic errors:
+        // 403 - "Invalid post type"
+        // 403 - "Invalid term ID" (invalid category or tag id)
+        // 404 - "Invalid post ID." (editing only)
+        // 404 - "Invalid attachment ID." (invalid featured image)
+        // TODO: Check the error message and flag this as UNKNOWN_POST if applicable
+        // Convert GenericErrorType to PostErrorType where applicable
+
+        // Handles specific XMLRPC faults with precise error codes
+        if (error.volleyError != null && error.volleyError.getCause() instanceof XMLRPCFault) {
+            XMLRPCFault fault = (XMLRPCFault) error.volleyError.getCause();
+            if (fault != null) {
+                int code = fault.getFaultCode();
+                if (code == 409) {
+                    return new PostError(PostErrorType.OLD_REVISION, error.message);
+                }
+            }
+        }
+
+        // Handles general network errors based on type
+        switch (error.type) {
+            case AUTHORIZATION_REQUIRED:
+                return new PostError(PostErrorType.UNAUTHORIZED, error.message);
+            default:
+                return new PostError(PostErrorType.GENERIC_ERROR, error.message);
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCClient.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCClient.kt
new file mode 100644
index 00000000000..79a6b6ccc88
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCClient.kt
@@ -0,0 +1,291 @@
+package org.wordpress.android.fluxc.network.xmlrpc.site
+
+import com.android.volley.RequestQueue
+import org.apache.commons.text.StringEscapeUtils
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC.GET_OPTIONS
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC.GET_POST_FORMATS
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC.GET_PROFILE
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC.GET_USERS_SITES
+import org.wordpress.android.fluxc.model.PostFormatModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.SitesModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.HTTPAuthManager
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCUtils
+import org.wordpress.android.fluxc.store.SiteStore.FetchedPostFormatsPayload
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsError
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType
+import org.wordpress.android.fluxc.store.SiteStore.PostFormatsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.utils.SiteUtils
+import org.wordpress.android.util.MapUtils
+import java.util.ArrayList
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SiteXMLRPCClient @Inject constructor(
+    dispatcher: Dispatcher?,
+    @Named("custom-ssl") requestQueue: RequestQueue?,
+    userAgent: UserAgent?,
+    httpAuthManager: HTTPAuthManager?,
+    private val xmlrpcRequestBuilder: XMLRPCRequestBuilder
+) : BaseXMLRPCClient(dispatcher, requestQueue, userAgent, httpAuthManager) {
+    fun fetchProfile(site: SiteModel) {
+        val params: MutableList<Any> = ArrayList()
+        params.add(site.selfHostedSiteId)
+        params.add(site.username)
+        params.add(site.password)
+        val request = xmlrpcRequestBuilder.buildGetRequest(site.xmlRpcUrl, GET_PROFILE, params, Map::class.java,
+                { response ->
+                    val updatedSite = profileResponseToAccountModel(response, site)
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchedProfileXmlRpcAction(updatedSite))
+                }
+        ) { error ->
+            val site = SiteModel()
+            site.error = error
+            mDispatcher.dispatch(SiteActionBuilder.newFetchedProfileXmlRpcAction(site))
+        }
+        add(request)
+    }
+
+    suspend fun fetchSites(xmlrpcUrl: String, username: String, password: String): SitesModel {
+        val params = listOf(username, password)
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                this,
+                xmlrpcUrl,
+                GET_USERS_SITES,
+                params,
+                Array<Any>::class.java
+        )
+        return when (response) {
+            is Success -> {
+                val sites = sitesResponseToSitesModel(response.data, username, password)
+                if (sites != null) {
+                    sites
+                } else {
+                    val result = SitesModel()
+                    result.error = BaseNetworkError(INVALID_RESPONSE)
+                    result
+                }
+            }
+            is Error -> {
+                val sites = SitesModel()
+                sites.error = response.error
+                sites
+            }
+        }
+    }
+
+    suspend fun fetchSite(site: SiteModel): SiteModel {
+        val params = listOf(
+                site.selfHostedSiteId, site.username, site.password,
+                arrayOf(
+                        "software_version",
+                        "post_thumbnail",
+                        "default_comment_status",
+                        "jetpack_client_id",
+                        "blog_public",
+                        "home_url",
+                        "admin_url",
+                        "login_url",
+                        "blog_title",
+                        "time_zone",
+                        "jetpack_user_email"
+                )
+        )
+        val response = xmlrpcRequestBuilder.syncGetRequest(this, site.xmlRpcUrl, GET_OPTIONS, params, Map::class.java)
+        return when (response) {
+            is Success -> {
+                val updatedSite = updateSiteFromOptions(response.data, site)
+                updatedSite
+            }
+            is Error -> {
+                SiteModel().apply { error = response.error }
+            }
+        }
+    }
+
+    suspend fun fetchPostFormats(site: SiteModel): FetchedPostFormatsPayload {
+        val params = listOf(site.selfHostedSiteId, site.username, site.password)
+        val response = xmlrpcRequestBuilder.syncGetRequest(
+                this,
+                site.xmlRpcUrl,
+                GET_POST_FORMATS,
+                params,
+                Map::class.java
+        )
+        return when (response) {
+            is Success -> {
+                val postFormats = responseToPostFormats(response.data)
+                if (postFormats != null) {
+                    val payload = FetchedPostFormatsPayload(site, postFormats)
+                    payload
+                } else {
+                    val payload = FetchedPostFormatsPayload(site, emptyList())
+                    payload.error = PostFormatsError(PostFormatsErrorType.INVALID_RESPONSE)
+                    payload
+                }
+            }
+            is Error -> {
+                val postFormatsError: PostFormatsError = when (response.error.type) {
+                    INVALID_RESPONSE -> PostFormatsError(
+                            PostFormatsErrorType.INVALID_RESPONSE,
+                            response.error.message
+                    )
+                    else -> PostFormatsError(
+                            GENERIC_ERROR,
+                            response.error.message
+                    )
+                }
+                val payload = FetchedPostFormatsPayload(site, emptyList())
+                payload.error = postFormatsError
+                payload
+            }
+        }
+    }
+
+    private fun profileResponseToAccountModel(response: Map<*, *>?, site: SiteModel): SiteModel? {
+        if (response == null) return null
+        site.email = MapUtils.getMapStr(response, "email")
+        site.displayName = MapUtils.getMapStr(response, "display_name")
+        return site
+    }
+
+    private fun sitesResponseToSitesModel(response: Array<Any>?, username: String, password: String): SitesModel? {
+        if (response == null) return null
+        val siteArray: MutableList<SiteModel> = ArrayList()
+        for (siteObject in response) {
+            if (siteObject !is Map<*, *>) {
+                continue
+            }
+            val siteMap = siteObject
+            val site = SiteModel()
+            site.selfHostedSiteId = MapUtils.getMapInt(siteMap, "blogid", 1).toLong()
+            site.name = StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(siteMap, "blogName"))
+            site.url = MapUtils.getMapStr(siteMap, "url")
+            site.xmlRpcUrl = MapUtils.getMapStr(siteMap, "xmlrpc")
+            site.setIsSelfHostedAdmin(MapUtils.getMapBool(siteMap, "isAdmin"))
+            // From what we know about the host
+            site.setIsWPCom(false)
+            site.username = username
+            site.password = password
+            site.origin = SiteModel.ORIGIN_XMLRPC
+            siteArray.add(site)
+        }
+        return if (siteArray.isEmpty()) {
+            null
+        } else SitesModel(siteArray)
+    }
+
+    private fun string2Long(s: String, defvalue: Long): Long {
+        return try {
+            java.lang.Long.valueOf(s)
+        } catch (e: NumberFormatException) {
+            defvalue
+        }
+    }
+
+    private fun setJetpackStatus(siteOptions: Map<*, *>, oldModel: SiteModel) {
+        // * Jetpack not installed: field "jetpack_client_id" not included in the response
+        // * Jetpack installed but not activated: field "jetpack_client_id" not included in the response
+        // * Jetpack installed, activated but not connected: field "jetpack_client_id" included
+        //   and is "0" (boolean)
+        // * Jetpack installed, activated and connected: field "jetpack_client_id" included and is correctly
+        //   set to wpcom unique id eg. "1234"
+        val jetpackClientIdStr = XMLRPCUtils.safeGetNestedMapValue(siteOptions, "jetpack_client_id", "")
+        var jetpackClientId: Long = 0
+        // jetpackClientIdStr can be a boolean "0" (false), in that case we keep the default value "0".
+        if ("false" != jetpackClientIdStr) {
+            jetpackClientId = string2Long(jetpackClientIdStr, -1)
+        }
+
+        // Field "jetpack_client_id" not found:
+        if (jetpackClientId == -1L) {
+            oldModel.setIsJetpackInstalled(false)
+            oldModel.setIsJetpackConnected(false)
+        }
+
+        // Field "jetpack_client_id" is "0"
+        if (jetpackClientId == 0L) {
+            oldModel.setIsJetpackInstalled(true)
+            oldModel.setIsJetpackConnected(false)
+        }
+
+        // jetpack_client_id is set then it's a Jetpack connected site
+        if (jetpackClientId != 0L && jetpackClientId != -1L) {
+            oldModel.setIsJetpackInstalled(true)
+            oldModel.setIsJetpackConnected(true)
+            oldModel.siteId = jetpackClientId
+        } else {
+            oldModel.siteId = 0
+        }
+
+        // * Jetpack not installed: field "jetpack_user_email" not included in the response
+        // * Jetpack installed but not activated: field "jetpack_user_email" not included in the response
+        // * Jetpack installed, activated but not connected: field "jetpack_user_email" not included in the response
+        // * Jetpack installed, activated and connected: field "jetpack_user_email" included and is correctly
+        //   set to the email of the jetpack connected user
+        oldModel.jetpackUserEmail = XMLRPCUtils.safeGetNestedMapValue(
+                siteOptions,
+                "jetpack_user_email",
+                ""
+        )
+    }
+
+    @Suppress("ForbiddenComment")
+    private fun updateSiteFromOptions(response: Map<*, *>, oldModel: SiteModel): SiteModel {
+        val siteTitle = XMLRPCUtils.safeGetNestedMapValue(response, "blog_title", "")
+        if (!siteTitle.isEmpty()) {
+            oldModel.name = StringEscapeUtils.unescapeHtml4(siteTitle)
+        }
+
+        // TODO: set a canonical URL here
+        val homeUrl = XMLRPCUtils.safeGetNestedMapValue(response, "home_url", "")
+        if (!homeUrl.isEmpty()) {
+            oldModel.url = homeUrl
+        }
+        oldModel.softwareVersion = XMLRPCUtils.safeGetNestedMapValue(
+                response,
+                "software_version",
+                ""
+        )
+        oldModel.setIsFeaturedImageSupported(XMLRPCUtils.safeGetNestedMapValue(response, "post_thumbnail", false))
+        oldModel.defaultCommentStatus = XMLRPCUtils.safeGetNestedMapValue(
+                response, "default_comment_status",
+                "open"
+        )
+        oldModel.timezone = XMLRPCUtils.safeGetNestedMapValue(
+                response,
+                "time_zone",
+                "0"
+        )
+        oldModel.loginUrl = XMLRPCUtils.safeGetNestedMapValue(
+                response,
+                "login_url",
+                ""
+        )
+        oldModel.adminUrl = XMLRPCUtils.safeGetNestedMapValue(
+                response,
+                "admin_url",
+                ""
+        )
+        setJetpackStatus(response, oldModel)
+        // If the site is not public, it's private. Note: this field doesn't always exist.
+        val isPublic = XMLRPCUtils.safeGetNestedMapValue(response, "blog_public", true)
+        oldModel.setIsPrivate(!isPublic)
+        return oldModel
+    }
+
+    private fun responseToPostFormats(response: Map<*, *>): List<PostFormatModel>? {
+        return SiteUtils.getValidPostFormatsOrNull(response)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCResponse.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCResponse.java
new file mode 100644
index 00000000000..d36eb28ad13
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCResponse.java
@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.network.xmlrpc.site;
+
+import org.wordpress.android.fluxc.network.Response;
+
+public class SiteXMLRPCResponse implements Response {}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/taxonomy/TaxonomyXMLRPCClient.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/taxonomy/TaxonomyXMLRPCClient.java
new file mode 100644
index 00000000000..da212a978e4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/taxonomy/TaxonomyXMLRPCClient.java
@@ -0,0 +1,293 @@
+package org.wordpress.android.fluxc.network.xmlrpc.taxonomy;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.RequestQueue;
+import com.android.volley.Response.Listener;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.action.TaxonomyAction;
+import org.wordpress.android.fluxc.generated.TaxonomyActionBuilder;
+import org.wordpress.android.fluxc.generated.endpoint.XMLRPC;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.model.TermsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.xmlrpc.BaseXMLRPCClient;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.FetchTermsResponsePayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.RemoteTermPayload;
+import org.wordpress.android.fluxc.store.TaxonomyStore.TaxonomyError;
+import org.wordpress.android.fluxc.store.TaxonomyStore.TaxonomyErrorType;
+import org.wordpress.android.util.MapUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class TaxonomyXMLRPCClient extends BaseXMLRPCClient {
+    @Inject public TaxonomyXMLRPCClient(
+            Dispatcher dispatcher,
+            @Named("custom-ssl") RequestQueue requestQueue,
+            UserAgent userAgent,
+            HTTPAuthManager httpAuthManager) {
+        super(dispatcher, requestQueue, userAgent, httpAuthManager);
+    }
+
+    public void fetchTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        fetchTerm(term, site, TaxonomyAction.FETCH_TERM);
+    }
+
+    public void fetchTerm(
+            @NonNull final TermModel term,
+            @NonNull final SiteModel site,
+            @NonNull final TaxonomyAction origin) {
+        List<Object> params = new ArrayList<>(5);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(term.getTaxonomy());
+        params.add(term.getRemoteTermId());
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_TERM, params,
+                (Listener<Object>) response -> {
+                    if (response instanceof Map) {
+                        TermModel termModel = termResponseObjectToTermModel(response, site);
+                        FetchTermResponsePayload payload;
+                        if (termModel != null) {
+                            if (origin == TaxonomyAction.PUSH_TERM) {
+                                termModel.setId(term.getId());
+                            }
+                            payload = new FetchTermResponsePayload(termModel, site);
+                        } else {
+                            payload = new FetchTermResponsePayload(term, site);
+                            payload.error = new TaxonomyError(TaxonomyErrorType.INVALID_RESPONSE);
+                        }
+                        payload.origin = origin;
+
+                        mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermAction(payload));
+                    }
+                },
+                error -> {
+                    // Possible non-generic errors:
+                    // 403 - "Invalid taxonomy."
+                    // 404 - "Invalid term ID."
+                    FetchTermResponsePayload payload = new FetchTermResponsePayload(term, site);
+                    payload.error = getTaxonomyError(error);
+                    payload.origin = origin;
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermAction(payload));
+                });
+
+        add(request);
+    }
+
+    public void fetchTerms(@NonNull final SiteModel site, @NonNull final String taxonomyName) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(taxonomyName);
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.GET_TERMS, params,
+                response -> {
+                    FetchTermsResponsePayload payload;
+                    TermsModel terms = termsResponseToTermsModel(response, site);
+                    if (terms != null) {
+                        payload = new FetchTermsResponsePayload(terms, site, taxonomyName);
+                    } else {
+                        payload = new FetchTermsResponsePayload(
+                                new TaxonomyError(TaxonomyErrorType.INVALID_RESPONSE),
+                                taxonomyName
+                        );
+                    }
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermsAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors:
+                    // 403 - "Invalid taxonomy."
+                    FetchTermsResponsePayload payload = new FetchTermsResponsePayload(
+                            getTaxonomyError(error),
+                            taxonomyName
+                    );
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newFetchedTermsAction(payload));
+                });
+
+        add(request);
+    }
+
+    public void pushTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        Map<String, Object> contentStruct = termModelToContentStruct(term);
+        final boolean updatingExistingTerm = term.getRemoteTermId() > 0;
+
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        if (updatingExistingTerm) {
+            params.add(term.getRemoteTermId());
+        }
+        params.add(contentStruct);
+
+        XMLRPC method = updatingExistingTerm ? XMLRPC.EDIT_TERM : XMLRPC.NEW_TERM;
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), method, params,
+                (Listener<Object>) response -> {
+                    // `term_id` is only returned for XMLRPC.NEW_TERM
+                    if (!updatingExistingTerm) {
+                        term.setRemoteTermId(Long.parseLong((String) response));
+                    }
+
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newPushedTermAction(payload));
+                },
+                error -> {
+                    // Possible non-generic errors:
+                    // 403 - "Invalid taxonomy."
+                    // 403 - "Parent term does not exist."
+                    // 403 - "The term name cannot be empty."
+                    // 500 - "A term with the name provided already exists with this parent."
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    payload.error = getTaxonomyError(error);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newPushedTermAction(payload));
+                });
+
+        request.disableRetries();
+        add(request);
+    }
+
+    public void deleteTerm(@NonNull final TermModel term, @NonNull final SiteModel site) {
+        List<Object> params = new ArrayList<>(4);
+        params.add(site.getSelfHostedSiteId());
+        params.add(site.getUsername());
+        params.add(site.getPassword());
+        params.add(term.getTaxonomy());
+        params.add(term.getRemoteTermId());
+
+        final XMLRPCRequest request = new XMLRPCRequest(site.getXmlRpcUrl(), XMLRPC.DELETE_TERM, params,
+                (Listener<Object>) response -> {
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newDeletedTermAction(payload));
+                },
+                error -> {
+                    RemoteTermPayload payload = new RemoteTermPayload(term, site);
+                    payload.error = getTaxonomyError(error);
+                    mDispatcher.dispatch(TaxonomyActionBuilder.newDeletedTermAction(payload));
+                });
+
+        request.disableRetries();
+        add(request);
+    }
+
+    @Nullable
+    private TermsModel termsResponseToTermsModel(@NonNull Object[] response, @NonNull SiteModel site) {
+        List<Map<?, ?>> termsList = new ArrayList<>();
+        for (Object responseObject : response) {
+            Map<?, ?> termMap = (Map<?, ?>) responseObject;
+            termsList.add(termMap);
+        }
+
+        List<TermModel> termArray = new ArrayList<>();
+        TermModel term;
+
+        for (Object termObject : termsList) {
+            term = termResponseObjectToTermModel(termObject, site);
+            if (term != null) {
+                termArray.add(term);
+            }
+        }
+
+        if (termArray.isEmpty()) {
+            return null;
+        }
+
+        return new TermsModel(termArray);
+    }
+
+    @Nullable
+    private TermModel termResponseObjectToTermModel(@NonNull Object termObject, @NonNull SiteModel site) {
+        // Sanity checks
+        if (!(termObject instanceof Map)) {
+            return null;
+        }
+
+        Map<?, ?> termMap = (Map<?, ?>) termObject;
+        String termId = MapUtils.getMapStr(termMap, "term_id");
+        if (TextUtils.isEmpty(termId)) {
+            // If we don't have a term ID, move on
+            return null;
+        }
+
+        return new TermModel(
+                0,
+                site.getId(),
+                Long.parseLong(termId),
+                MapUtils.getMapStr(termMap, "taxonomy"),
+                StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(termMap, "name")),
+                MapUtils.getMapStr(termMap, "slug"),
+                StringEscapeUtils.unescapeHtml4(MapUtils.getMapStr(termMap, "description")),
+                MapUtils.getMapLong(termMap, "parent"),
+                MapUtils.getMapInt(termMap, "count", 0)
+        );
+    }
+
+    @NonNull
+    private static Map<String, Object> termModelToContentStruct(@NonNull TermModel term) {
+        Map<String, Object> contentStruct = new HashMap<>();
+
+        contentStruct.put("name", term.getName());
+        contentStruct.put("taxonomy", term.getTaxonomy());
+
+        if (term.getSlug() != null) {
+            contentStruct.put("slug", term.getSlug());
+        }
+
+        if (term.getDescription() != null) {
+            contentStruct.put("description", term.getDescription());
+        }
+
+        if (term.getParentRemoteId() > 0) {
+            contentStruct.put("parent", term.getParentRemoteId());
+        }
+
+        return contentStruct;
+    }
+
+    // TODO: Check the error message and flag this as a specific error if applicable.
+    // Convert GenericErrorType to TaxonomyErrorType where applicable
+    @NonNull
+    private TaxonomyError getTaxonomyError(@NonNull BaseNetworkError error) {
+        TaxonomyError taxonomyError;
+        switch (error.type) {
+            case AUTHORIZATION_REQUIRED:
+                taxonomyError = new TaxonomyError(TaxonomyErrorType.UNAUTHORIZED, error.message);
+                break;
+            case TIMEOUT:
+            case NO_CONNECTION:
+            case NETWORK_ERROR:
+            case NOT_FOUND:
+            case CENSORED:
+            case SERVER_ERROR:
+            case INVALID_SSL_CERTIFICATE:
+            case HTTP_AUTH_ERROR:
+            case INVALID_RESPONSE:
+            case NOT_AUTHENTICATED:
+            case PARSE_ERROR:
+            case UNKNOWN:
+            default:
+                taxonomyError = new TaxonomyError(TaxonomyErrorType.GENERIC_ERROR, error.message);
+        }
+        return taxonomyError;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/AccountSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/AccountSqlUtils.java
new file mode 100644
index 00000000000..73ff77d4fc3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/AccountSqlUtils.java
@@ -0,0 +1,149 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.content.ContentValues;
+import android.database.sqlite.SQLiteDatabase;
+
+import androidx.annotation.NonNull;
+
+import com.wellsql.generated.AccountModelTable;
+import com.wellsql.generated.SubscriptionModelTable;
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.mapper.InsertMapper;
+
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.model.SubscriptionModel;
+
+import java.util.List;
+
+public class AccountSqlUtils {
+    private static final int DEFAULT_ACCOUNT_LOCAL_ID = 1;
+
+    /**
+     * Adds or overwrites all columns for a matching row in the Account Table.
+     */
+    public static int insertOrUpdateDefaultAccount(AccountModel account) {
+        return insertOrUpdateAccount(account, DEFAULT_ACCOUNT_LOCAL_ID);
+    }
+
+    public static int insertOrUpdateAccount(AccountModel account, int localId) {
+        if (account == null) {
+            return 0;
+        }
+        account.setId(localId);
+        SQLiteDatabase db = WellSql.giveMeWritableDb();
+        db.beginTransaction();
+        try {
+            List<AccountModel> accountResults = WellSql.select(AccountModel.class)
+                                                       .where()
+                                                       .equals(AccountModelTable.ID, localId)
+                                                       .endWhere().getAsModel();
+            if (accountResults.isEmpty()) {
+                WellSql.insert(account).execute();
+                db.setTransactionSuccessful();
+                return 0;
+            } else {
+                ContentValues cv = new UpdateAllExceptId<>(AccountModel.class).toCv(account);
+                int result = updateAccount(accountResults.get(0).getId(), cv);
+                db.setTransactionSuccessful();
+                return result;
+            }
+        } finally {
+            db.endTransaction();
+        }
+    }
+
+    /**
+     * Updates an existing row in the Account Table that matches the given local ID. Only columns
+     * defined in the given {@link ContentValues} keys are modified.
+     */
+    public static int updateAccount(long localId, final ContentValues cv) {
+        AccountModel account = getAccountByLocalId(localId);
+        if (account == null || cv == null) return 0;
+        return WellSql.update(AccountModel.class).whereId(account.getId())
+                .put(account, new InsertMapper<AccountModel>() {
+                    @Override
+                    public ContentValues toCv(AccountModel item) {
+                        return cv;
+                    }
+                }).execute();
+    }
+
+    /**
+     * Update the username in the {@link AccountModelTable} that matches the given {@link AccountModel}.
+     *
+     * @param accountModel  {@link AccountModel} to update with username
+     * @param username      username to update in {@link AccountModelTable#USER_NAME}
+     *
+     * @return zero if update is not performed; non-zero otherwise
+     */
+    public static int updateUsername(AccountModel accountModel, final String username) {
+        if (accountModel == null || username == null) {
+            return 0;
+        } else {
+            return WellSql.update(AccountModel.class).whereId(accountModel.getId())
+                    .put(accountModel, new InsertMapper<AccountModel>() {
+                        @Override
+                        public ContentValues toCv(AccountModel item) {
+                            ContentValues cv = new ContentValues();
+                            cv.put(AccountModelTable.USER_NAME, username);
+                            return cv;
+                        }
+                    }).execute();
+        }
+    }
+
+    /**
+     * Deletes rows from the Account table that share an ID with the given {@link AccountModel}.
+     */
+    public static int deleteAccount(AccountModel account) {
+        return account == null ? 0 : WellSql.delete(AccountModel.class)
+                .where().equals(AccountModelTable.ID, account.getId()).endWhere().execute();
+    }
+
+    public static List<AccountModel> getAllAccounts() {
+        return WellSql.select(AccountModel.class).getAsModel();
+    }
+
+    /**
+     * Passthrough to {@link #getAccountByLocalId(long)} using the default Account local ID.
+     */
+    public static AccountModel getDefaultAccount() {
+        return getAccountByLocalId(DEFAULT_ACCOUNT_LOCAL_ID);
+    }
+
+    /**
+     * Attempts to load an Account with the given local ID from the Account Table.
+     *
+     * @return the Account row as {@link AccountModel}, null if no row matches the given ID
+     */
+    public static AccountModel getAccountByLocalId(long localId) {
+        List<AccountModel> accountResult = WellSql.select(AccountModel.class)
+                .where().equals(AccountModelTable.ID, localId)
+                .endWhere().getAsModel();
+        return accountResult.isEmpty() ? null : accountResult.get(0);
+    }
+
+    /**
+     * Get list of {@link SubscriptionModel} matching {@param searchString} by blog name or URL.
+     *
+     * @param searchString      Text to filter subscriptions by
+     *
+     * @return {@link List} of {@link SubscriptionModel}
+     */
+    public static List<SubscriptionModel> getSubscriptionsByNameOrUrlMatching(String searchString) {
+        return WellSql.select(SubscriptionModel.class)
+                      .where().contains(SubscriptionModelTable.BLOG_NAME, searchString)
+                      .or().contains(SubscriptionModelTable.URL, searchString)
+                      .endWhere().getAsModel();
+    }
+
+    /**
+     * Update list of {@link SubscriptionModel} by deleting existing subscriptions and inserting {@param subscriptions}.
+     *
+     * @param subscriptions     {@link List} of {@link SubscriptionModel} to insert into database
+     */
+    public static synchronized void updateSubscriptions(@NonNull List<SubscriptionModel> subscriptions) {
+        WellSql.delete(SubscriptionModel.class).execute();
+        WellSql.insert(subscriptions).execute();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ActivityLogSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ActivityLogSqlUtils.kt
new file mode 100644
index 00000000000..73bfcc7010f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ActivityLogSqlUtils.kt
@@ -0,0 +1,419 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.ActivityLogTable
+import com.wellsql.generated.BackupDownloadStatusTable
+import com.wellsql.generated.RewindStatusCredentialsTable
+import com.wellsql.generated.RewindStatusTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Credentials
+import org.wordpress.android.fluxc.tools.FormattableContentMapper
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ActivityLogSqlUtils @Inject constructor(private val formattableContentMapper: FormattableContentMapper) {
+    fun insertOrUpdateActivities(siteModel: SiteModel, activityModels: List<ActivityLogModel>): Int {
+        val activityIds = activityModels.map { it.activityID }
+        val activitiesToUpdate = WellSql.select(ActivityLogBuilder::class.java).where()
+                .isIn(ActivityLogTable.ACTIVITY_ID, activityIds)
+                .endWhere()
+                .asModel
+                .map { it.activityID }
+        val (existing, new) = activityModels
+                .map { it.toBuilder(siteModel) }
+                .partition { activitiesToUpdate.contains(it.activityID) }
+        val insertQuery = WellSql.insert(new)
+        val updateQueries = existing.map {
+            WellSql.update(ActivityLogBuilder::class.java)
+                    .where()
+                    .equals(ActivityLogTable.ACTIVITY_ID, it.activityID)
+                    .equals(ActivityLogTable.LOCAL_SITE_ID, it.localSiteId)
+                    .endWhere()
+                    .put(it, UpdateAllExceptId<ActivityLogBuilder>(ActivityLogBuilder::class.java))
+        }
+        insertQuery.execute()
+        return updateQueries.map { it.execute() }.sum() + new.count()
+    }
+
+    fun getActivitiesForSite(site: SiteModel, @SelectQuery.Order order: Int): List<ActivityLogModel> {
+        return WellSql.select(ActivityLogBuilder::class.java)
+                .where()
+                .equals(ActivityLogTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .orderBy(ActivityLogTable.PUBLISHED, order)
+                .asModel
+                .map { it.build(formattableContentMapper) }
+    }
+
+    fun getRewindableActivitiesForSite(site: SiteModel, @SelectQuery.Order order: Int): List<ActivityLogModel> {
+        return WellSql.select(ActivityLogBuilder::class.java)
+                .where()
+                .equals(ActivityLogTable.LOCAL_SITE_ID, site.id)
+                .equals(ActivityLogTable.REWINDABLE, true)
+                .endWhere()
+                .orderBy(ActivityLogTable.PUBLISHED, order)
+                .asModel
+                .map { it.build(formattableContentMapper) }
+    }
+
+    fun getActivityByRewindId(rewindId: String): ActivityLogModel? {
+        return WellSql.select(ActivityLogBuilder::class.java)
+                .where()
+                .equals(ActivityLogTable.REWIND_ID, rewindId)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+                ?.build(formattableContentMapper)
+    }
+
+    fun getActivityByActivityId(activityId: String): ActivityLogModel? {
+        return WellSql.select(ActivityLogBuilder::class.java)
+                .where()
+                .equals(ActivityLogTable.ACTIVITY_ID, activityId)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+                ?.build(formattableContentMapper)
+    }
+
+    fun deleteActivityLog(site: SiteModel): Int {
+        return WellSql
+                .delete(ActivityLogBuilder::class.java)
+                .where()
+                .equals(ActivityLogTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    fun deleteRewindStatus(site: SiteModel): Int {
+        return WellSql
+                .delete(RewindStatusBuilder::class.java)
+                .where()
+                .equals(RewindStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    fun deleteBackupDownloadStatus(site: SiteModel): Int {
+        return WellSql
+                .delete(BackupDownloadStatusBuilder::class.java)
+                .where()
+                .equals(BackupDownloadStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    fun replaceRewindStatus(site: SiteModel, rewindStatusModel: RewindStatusModel) {
+        val rewindStatusBuilder = rewindStatusModel.toBuilder(site)
+        WellSql.delete(RewindStatusBuilder::class.java)
+                .where()
+                .equals(RewindStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+        WellSql.delete(CredentialsBuilder::class.java)
+                .where()
+                .equals(RewindStatusCredentialsTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+        WellSql.insert(rewindStatusBuilder).execute()
+        WellSql.insert(rewindStatusModel.credentials?.map { it.toBuilder(rewindStatusBuilder.id, site) } ?: listOf())
+                .execute()
+    }
+
+    fun getRewindStatusForSite(site: SiteModel): RewindStatusModel? {
+        val rewindStatusBuilder = getRewindStatusBuilder(site)
+        val credentials = rewindStatusBuilder?.id?.let { getCredentialsBuilder(it) }
+        return rewindStatusBuilder?.build(credentials?.map { it.build() })
+    }
+
+    fun getBackupDownloadStatusForSite(site: SiteModel): BackupDownloadStatusModel? {
+        val downloadStatusBuilder = getBackupDownloadStatusBuilder(site)
+        return downloadStatusBuilder?.build()
+    }
+
+    fun replaceBackupDownloadStatus(site: SiteModel, backupDownloadStatusModel: BackupDownloadStatusModel) {
+        val backupDownloadStatusBuilder = backupDownloadStatusModel.toBuilder(site)
+        WellSql.delete(BackupDownloadStatusBuilder::class.java)
+                .where()
+                .equals(BackupDownloadStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+        WellSql.insert(backupDownloadStatusBuilder).execute()
+    }
+
+    private fun getRewindStatusBuilder(site: SiteModel): RewindStatusBuilder? {
+        return WellSql.select(RewindStatusBuilder::class.java)
+                .where()
+                .equals(RewindStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+    }
+
+    private fun getCredentialsBuilder(rewindId: Int): List<CredentialsBuilder> {
+        return WellSql.select(CredentialsBuilder::class.java)
+                .where()
+                .equals(RewindStatusCredentialsTable.REWIND_STATE_ID, rewindId)
+                .endWhere()
+                .asModel
+    }
+
+    private fun getBackupDownloadStatusBuilder(site: SiteModel): BackupDownloadStatusBuilder? {
+        return WellSql.select(BackupDownloadStatusBuilder::class.java)
+                .where()
+                .equals(RewindStatusTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+    }
+
+    private fun ActivityLogModel.toBuilder(site: SiteModel): ActivityLogBuilder {
+        return ActivityLogBuilder(
+                localSiteId = site.id,
+                remoteSiteId = site.siteId,
+                activityID = this.activityID,
+                summary = this.summary,
+                formattableContent = this.content?.let { formattableContentMapper.mapFormattableContentToJson(it) }
+                        ?: "",
+                name = this.name,
+                type = this.type,
+                gridicon = this.gridicon,
+                status = this.status,
+                rewindable = this.rewindable,
+                rewindID = this.rewindID,
+                published = this.published.time,
+                displayName = this.actor?.displayName,
+                actorType = this.actor?.type,
+                wpcomUserID = this.actor?.wpcomUserID,
+                avatarURL = this.actor?.avatarURL,
+                role = this.actor?.role
+        )
+    }
+
+    private fun RewindStatusModel.toBuilder(site: SiteModel): RewindStatusBuilder {
+        return RewindStatusBuilder(
+                localSiteId = site.id,
+                remoteSiteId = site.siteId,
+                state = this.state.value,
+                lastUpdated = this.lastUpdated.time,
+                reason = this.reason.value,
+                canAutoconfigure = this.canAutoconfigure,
+                rewindId = this.rewind?.rewindId,
+                restoreId = this.rewind?.restoreId,
+                rewindStatus = this.rewind?.status?.value,
+                rewindProgress = this.rewind?.progress,
+                rewindReason = this.rewind?.reason,
+                message = this.rewind?.message,
+                currentEntry = this.rewind?.currentEntry
+        )
+    }
+
+    private fun Credentials.toBuilder(rewindStatusId: Int, site: SiteModel): CredentialsBuilder {
+        return CredentialsBuilder(
+                localSiteId = site.id,
+                remoteSiteId = site.siteId,
+                rewindStateId = rewindStatusId,
+                type = this.type,
+                role = this.role,
+                host = this.host,
+                port = this.port,
+                stillValid = this.stillValid
+        )
+    }
+
+    private fun BackupDownloadStatusModel.toBuilder(site: SiteModel): BackupDownloadStatusBuilder {
+        return BackupDownloadStatusBuilder(
+                localSiteId = site.id,
+                remoteSiteId = site.siteId,
+                downloadId = this.downloadId,
+                rewindId = this.rewindId,
+                backupPoint = this.backupPoint.time,
+                startedAt = this.startedAt.time,
+                progress = this.progress,
+                downloadCount = this.downloadCount,
+                validUntil = this.validUntil?.time,
+                url = this.url
+        )
+    }
+
+    @Table(name = "ActivityLog")
+    data class ActivityLogBuilder(
+        @PrimaryKey
+        @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var activityID: String,
+        @Column var summary: String,
+        @Column var formattableContent: String,
+        @Column var name: String? = null,
+        @Column var type: String? = null,
+        @Column var gridicon: String? = null,
+        @Column var status: String? = null,
+        @Column var rewindable: Boolean? = null,
+        @Column var rewindID: String? = null,
+        @Column var published: Long,
+        @Column var discarded: Boolean? = null,
+        @Column var displayName: String? = null,
+        @Column var actorType: String? = null,
+        @Column var wpcomUserID: Long? = null,
+        @Column var avatarURL: String? = null,
+        @Column var role: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, "", "", "", published = 0)
+
+        override fun setId(id: Int) {
+            mId = id
+        }
+
+        override fun getId() = mId
+
+        @Suppress("ComplexCondition")
+        fun build(formattableContentMapper: FormattableContentMapper): ActivityLogModel {
+            val actor = if (
+                actorType != null ||
+                displayName != null ||
+                wpcomUserID != null ||
+                avatarURL != null ||
+                role != null
+            ) {
+                ActivityLogModel.ActivityActor(displayName, actorType, wpcomUserID, avatarURL, role)
+            } else {
+                null
+            }
+            return ActivityLogModel(
+                activityID,
+                summary,
+                formattableContentMapper.mapToFormattableContent(formattableContent),
+                name,
+                type,
+                gridicon,
+                status,
+                rewindable,
+                rewindID,
+                Date(published),
+                actor
+            )
+        }
+    }
+
+    @Table(name = "RewindStatus")
+    data class RewindStatusBuilder(
+        @PrimaryKey
+        @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var state: String,
+        @Column var lastUpdated: Long,
+        @Column var reason: String? = null,
+        @Column var canAutoconfigure: Boolean? = null,
+        @Column var rewindId: String? = null,
+        @Column var restoreId: Long? = null,
+        @Column var rewindStatus: String? = null,
+        @Column var rewindProgress: Int? = null,
+        @Column var rewindReason: String? = null,
+        @Column var message: String? = null,
+        @Column var currentEntry: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, "", 0)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        fun build(credentials: List<Credentials>?): RewindStatusModel {
+            val restoreStatus = RewindStatusModel.Rewind.build(
+                    rewindId,
+                    restoreId,
+                    rewindStatus,
+                    rewindProgress,
+                    rewindReason,
+                    message,
+                    currentEntry
+            )
+            return RewindStatusModel(
+                    RewindStatusModel.State.fromValue(state) ?: RewindStatusModel.State.UNKNOWN,
+                    RewindStatusModel.Reason.fromValue(reason),
+                    Date(lastUpdated),
+                    canAutoconfigure,
+                    credentials,
+                    restoreStatus
+            )
+        }
+    }
+
+    @Table(name = "RewindStatusCredentials")
+    data class CredentialsBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var rewindStateId: Int,
+        @Column var type: String,
+        @Column var role: String,
+        @Column var stillValid: Boolean,
+        @Column var host: String? = null,
+        @Column var port: Int? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, 0, "", "", false)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        fun build(): Credentials {
+            return Credentials(type, role, host, port, stillValid)
+        }
+    }
+
+    @Table(name = "BackupDownloadStatus")
+    data class BackupDownloadStatusBuilder(
+        @PrimaryKey
+        @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var downloadId: Long,
+        @Column var rewindId: String,
+        @Column var backupPoint: Long,
+        @Column var startedAt: Long,
+        @Column var progress: Int? = null,
+        @Column var downloadCount: Int? = null,
+        @Column var validUntil: Long? = null,
+        @Column var url: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, 0, "", 0, 0)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        fun build(): BackupDownloadStatusModel {
+            return BackupDownloadStatusModel(
+                    downloadId,
+                    rewindId,
+                    Date(backupPoint),
+                    Date(startedAt),
+                    progress,
+                    downloadCount,
+                    validUntil?.let {
+                        Date(it)
+                    },
+                    url
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/BloggingRemindersDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/BloggingRemindersDao.kt
new file mode 100644
index 00000000000..2f18aa93680
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/BloggingRemindersDao.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.ColumnInfo
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface BloggingRemindersDao {
+    @Query("SELECT * FROM BloggingReminders")
+    fun getAll(): Flow<List<BloggingReminders>>
+
+    @Query("SELECT * FROM BloggingReminders WHERE localSiteId = :siteId")
+    fun liveGetBySiteId(siteId: Int): Flow<BloggingReminders?>
+
+    @Query("SELECT * FROM BloggingReminders WHERE localSiteId = :siteId")
+    suspend fun getBySiteId(siteId: Int): List<BloggingReminders>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(type: BloggingReminders): Long
+
+    @Entity(tableName = "BloggingReminders")
+    data class BloggingReminders(
+        @PrimaryKey
+        val localSiteId: Int,
+        val monday: Boolean = false,
+        val tuesday: Boolean = false,
+        val wednesday: Boolean = false,
+        val thursday: Boolean = false,
+        val friday: Boolean = false,
+        val saturday: Boolean = false,
+        val sunday: Boolean = false,
+        val hour: Int = 10,
+        val minute: Int = 0,
+        val isPromptRemindersOptedIn: Boolean = false,
+        @ColumnInfo(defaultValue = "1") val isPromptsCardOptedIn: Boolean = true,
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/CommentSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/CommentSqlUtils.java
new file mode 100644
index 00000000000..5ce7f4aa085
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/CommentSqlUtils.java
@@ -0,0 +1,322 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.CommentModelTable;
+import com.wellsql.generated.LikeModelTable;
+import com.yarolegovich.wellsql.ConditionClauseBuilder;
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.SelectQuery.Order;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.CommentStatus;
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.LikeModel.LikeType;
+import org.wordpress.android.fluxc.model.SiteModel;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static org.wordpress.android.fluxc.model.LikeModel.TIMESTAMP_THRESHOLD;
+
+public class CommentSqlUtils {
+    public static int insertOrUpdateComment(@Nullable CommentModel comment) {
+        if (comment == null) {
+            return 0;
+        }
+
+        List<CommentModel> commentResult;
+
+        // If the comment already exist and has an id, we want to update it.
+        commentResult = WellSql.select(CommentModel.class).where()
+                               .beginGroup()
+                               .equals(CommentModelTable.ID, comment.getId())
+                               .endGroup().endWhere().getAsModel();
+
+        // If it's not a new comment, try to find the "remote" comment
+        if (commentResult.isEmpty()) {
+            commentResult = WellSql.select(CommentModel.class).where()
+                                   .beginGroup()
+                                   .equals(CommentModelTable.REMOTE_COMMENT_ID, comment.getRemoteCommentId())
+                                   .equals(CommentModelTable.LOCAL_SITE_ID, comment.getLocalSiteId())
+                                   .endGroup().endWhere().getAsModel();
+        }
+
+        if (commentResult.isEmpty()) {
+            // insert
+            WellSql.insert(comment).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            // update
+            int oldId = commentResult.get(0).getId();
+            return WellSql.update(CommentModel.class).whereId(oldId)
+                          .put(comment, new UpdateAllExceptId<>(CommentModel.class)).execute();
+        }
+    }
+
+    public static int removeComment(@Nullable CommentModel comment) {
+        if (comment == null) {
+            return 0;
+        }
+
+        return WellSql.delete(CommentModel.class)
+                      .where().equals(CommentModelTable.ID, comment.getId()).endWhere()
+                      .execute();
+    }
+
+    public static int removeComments(@NonNull SiteModel site) {
+        return WellSql.delete(CommentModel.class)
+                      .where().equals(CommentModelTable.LOCAL_SITE_ID, site.getId()).endWhere()
+                      .execute();
+    }
+
+    public static int removeCommentGaps(
+            @NonNull SiteModel site,
+            @NonNull List<CommentModel> comments,
+            int maxEntriesInResponse,
+            int requestOffset,
+            @Nullable CommentStatus... statuses) {
+        if (comments.isEmpty()) {
+            return 0;
+        }
+
+        comments.sort((o1, o2) -> {
+            long x = o2.getPublishedTimestamp();
+            long y = o1.getPublishedTimestamp();
+            return Long.compare(x, y);
+        });
+
+        ArrayList<Long> remoteIds = new ArrayList<>();
+        for (CommentModel comment : comments) {
+            remoteIds.add(comment.getRemoteCommentId());
+        }
+
+        long startOfRange = comments.get(0).getPublishedTimestamp();
+        long endOfRange = comments.get(comments.size() - 1).getPublishedTimestamp();
+
+        List<CommentStatus> sourceStatuses;
+        if (statuses != null) {
+            sourceStatuses = Arrays.asList(statuses);
+        } else {
+            sourceStatuses = Collections.emptyList();
+        }
+        ArrayList<CommentStatus> targetStatuses = new ArrayList<>();
+        if (sourceStatuses.contains(CommentStatus.ALL)) {
+            targetStatuses.add(CommentStatus.APPROVED);
+            targetStatuses.add(CommentStatus.UNAPPROVED);
+        } else {
+            targetStatuses.addAll(sourceStatuses);
+        }
+
+        int numOfDeletedComments = 0;
+
+        // try to trim comments from the top
+        if (requestOffset == 0) {
+            numOfDeletedComments += WellSql.delete(CommentModel.class)
+                                           .where()
+                                           .equals(CommentModelTable.LOCAL_SITE_ID, site.getId())
+                                           .isIn(CommentModelTable.STATUS, targetStatuses)
+                                           .isNotIn(CommentModelTable.REMOTE_COMMENT_ID, remoteIds)
+                                           .greaterThenOrEqual(CommentModelTable.PUBLISHED_TIMESTAMP, startOfRange)
+                                           .endWhere()
+                                           .execute();
+        }
+
+        // try to trim comments from the bottom
+        if (comments.size() < maxEntriesInResponse) {
+            numOfDeletedComments += WellSql.delete(CommentModel.class)
+                                           .where()
+                                           .equals(CommentModelTable.LOCAL_SITE_ID, site.getId())
+                                           .isIn(CommentModelTable.STATUS, targetStatuses)
+                                           .isNotIn(CommentModelTable.REMOTE_COMMENT_ID, remoteIds)
+                                           .lessThenOrEqual(CommentModelTable.PUBLISHED_TIMESTAMP, endOfRange)
+                                           .endWhere()
+                                           .execute();
+        }
+
+        // remove comments from the middle
+        return numOfDeletedComments + WellSql.delete(CommentModel.class)
+                                             .where()
+                                             .equals(CommentModelTable.LOCAL_SITE_ID, site.getId())
+                                             .isIn(CommentModelTable.STATUS, targetStatuses)
+                                             .isNotIn(CommentModelTable.REMOTE_COMMENT_ID, remoteIds)
+                                             .lessThenOrEqual(CommentModelTable.PUBLISHED_TIMESTAMP, startOfRange)
+                                             .greaterThenOrEqual(CommentModelTable.PUBLISHED_TIMESTAMP, endOfRange)
+                                             .endWhere()
+                                             .execute();
+    }
+
+    public static int deleteAllComments() {
+        return WellSql.delete(CommentModel.class).execute();
+    }
+
+    @Nullable
+    public static CommentModel getCommentByLocalCommentId(int localId) {
+        List<CommentModel> results = WellSql.select(CommentModel.class)
+                                            .where().equals(CommentModelTable.ID, localId).endWhere().getAsModel();
+        if (results.isEmpty()) {
+            return null;
+        }
+        return results.get(0);
+    }
+
+    @Nullable
+    public static CommentModel getCommentBySiteAndRemoteId(@NonNull SiteModel site, long remoteCommentId) {
+        List<CommentModel> results = WellSql.select(CommentModel.class)
+                                            .where()
+                                            .equals(CommentModelTable.REMOTE_COMMENT_ID, remoteCommentId)
+                                            .equals(CommentModelTable.LOCAL_SITE_ID, site.getId())
+                                            .endWhere().getAsModel();
+        if (results.isEmpty()) {
+            return null;
+        }
+        return results.get(0);
+    }
+
+    @NonNull
+    private static SelectQuery<CommentModel> getCommentsQueryForSite(
+            @NonNull SiteModel site,
+            @NonNull CommentStatus... statuses) {
+        return getCommentsQueryForSite(site, 0, statuses);
+    }
+
+    @NonNull
+    private static SelectQuery<CommentModel> getCommentsQueryForSite(
+            @NonNull SiteModel site,
+            int limit,
+            @NonNull CommentStatus... statuses) {
+        SelectQuery<CommentModel> query = WellSql.select(CommentModel.class);
+
+        if (limit > 0) {
+            query.limit(limit);
+        }
+
+        ConditionClauseBuilder<SelectQuery<CommentModel>> selectQueryBuilder =
+                query.where().beginGroup()
+                     .equals(CommentModelTable.LOCAL_SITE_ID, site.getId());
+
+        // Check if statuses contains ALL
+        if (!Arrays.asList(statuses).contains(CommentStatus.ALL)) {
+            selectQueryBuilder.isIn(CommentModelTable.STATUS, Arrays.asList(statuses));
+        }
+        return selectQueryBuilder.endGroup().endWhere();
+    }
+
+    @NonNull
+    public static List<CommentModel> getCommentsForSite(
+            @NonNull SiteModel site,
+            @Order int order,
+            @NonNull CommentStatus... statuses) {
+        return getCommentsForSite(site, order, 0, statuses);
+    }
+
+    @NonNull
+    public static List<CommentModel> getCommentsForSite(
+            @NonNull SiteModel site,
+            @Order int order,
+            int limit,
+            @NonNull CommentStatus... statuses) {
+        return getCommentsQueryForSite(site, limit, statuses)
+                .orderBy(CommentModelTable.DATE_PUBLISHED, order)
+                .getAsModel();
+    }
+
+    public static int getCommentsCountForSite(
+            @NonNull SiteModel site,
+            @NonNull CommentStatus... statuses) {
+        return (int) getCommentsQueryForSite(site, statuses).count();
+    }
+
+    @SuppressWarnings("resource")
+    public static int deleteCommentLikesAndPurgeExpired(long siteId, long remoteCommentId) {
+        int numDeleted = WellSql.delete(LikeModel.class)
+                                .where()
+                                .beginGroup()
+                                .equals(LikeModelTable.TYPE, LikeType.COMMENT_LIKE.getTypeName())
+                                .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                                .equals(LikeModelTable.REMOTE_ITEM_ID, remoteCommentId)
+                                .endGroup()
+                                .endWhere()
+                                .execute();
+
+        SQLiteDatabase db = WellSql.giveMeWritableDb();
+        db.beginTransaction();
+        try {
+            List<LikeModel> likeResult = WellSql.select(LikeModel.class)
+                                                .columns(LikeModelTable.REMOTE_SITE_ID, LikeModelTable.REMOTE_ITEM_ID)
+                                                .where().beginGroup()
+                                                .equals(LikeModelTable.TYPE, LikeType.COMMENT_LIKE.getTypeName())
+                                                .not().equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                                                .not().equals(LikeModelTable.REMOTE_ITEM_ID, remoteCommentId)
+                                                .lessThen(LikeModelTable.TIMESTAMP_FETCHED,
+                                                        (new Date().getTime()) - TIMESTAMP_THRESHOLD)
+                                                .endGroup().endWhere()
+                                                .getAsModel();
+
+            for (LikeModel likeModel : likeResult) {
+                numDeleted += WellSql.delete(LikeModel.class)
+                                     .where()
+                                     .beginGroup()
+                                     .equals(LikeModelTable.TYPE, LikeType.COMMENT_LIKE.getTypeName())
+                                     .equals(LikeModelTable.REMOTE_SITE_ID, likeModel.getRemoteSiteId())
+                                     .equals(LikeModelTable.REMOTE_ITEM_ID, likeModel.getRemoteItemId())
+                                     .endGroup()
+                                     .endWhere()
+                                     .execute();
+            }
+
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
+
+        return numDeleted;
+    }
+
+    public static int insertOrUpdateCommentLikes(
+            long siteId,
+            long remoteCommentId,
+            @NonNull LikeModel like) {
+        List<LikeModel> likeResult;
+
+        // If the like already exists and has an id, we want to update it.
+        likeResult = WellSql.select(LikeModel.class).where()
+                            .beginGroup()
+                            .equals(LikeModelTable.TYPE, LikeType.COMMENT_LIKE.getTypeName())
+                            .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                            .equals(LikeModelTable.REMOTE_ITEM_ID, remoteCommentId)
+                            .equals(LikeModelTable.LIKER_ID, like.getLikerId())
+                            .endGroup().endWhere().getAsModel();
+
+        if (likeResult.isEmpty()) {
+            // insert
+            WellSql.insert(like).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            // update
+            int oldId = likeResult.get(0).getId();
+            return WellSql.update(LikeModel.class).whereId(oldId)
+                          .put(like, new UpdateAllExceptId<>(LikeModel.class)).execute();
+        }
+    }
+
+    @NonNull
+    public static List<LikeModel> getCommentLikesByCommentId(long siteId, long remoteCommentId) {
+        return WellSql.select(LikeModel.class)
+                      .where()
+                      .beginGroup()
+                      .equals(LikeModelTable.TYPE, LikeType.COMMENT_LIKE.getTypeName())
+                      .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                      .equals(LikeModelTable.REMOTE_ITEM_ID, remoteCommentId)
+                      .endGroup()
+                      .endWhere()
+                      .getAsModel();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt
new file mode 100644
index 00000000000..5b9100cd0b7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt
@@ -0,0 +1,166 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.EditorThemeElementTable
+import com.wellsql.generated.EditorThemeTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.EditorTheme
+import org.wordpress.android.fluxc.model.EditorThemeElement
+import org.wordpress.android.fluxc.model.EditorThemeSupport
+import org.wordpress.android.fluxc.model.SiteModel
+
+enum class EditorThemeElementType(val value: String) {
+    COLOR("color"),
+    GRADIENT("gradient");
+}
+
+class EditorThemeSqlUtils {
+    fun replaceEditorThemeForSite(site: SiteModel, editorTheme: EditorTheme?) {
+        deleteEditorThemeForSite(site)
+        if (editorTheme == null) return
+        makeEditorTheme(site, editorTheme)
+    }
+
+    fun getEditorThemeForSite(site: SiteModel): EditorTheme? {
+        val editorTheme: EditorThemeBuilder? = WellSql.select(EditorThemeBuilder::class.java)
+                .limit(1)
+                .where()
+                .equals(EditorThemeTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+
+        if (editorTheme == null) return null
+
+        val colors = WellSql.select(EditorThemeElementBuilder::class.java)
+                .where()
+                .equals(EditorThemeElementTable.THEME_ID, editorTheme.id)
+                .equals(EditorThemeElementTable.TYPE, EditorThemeElementType.COLOR.value)
+                .endWhere()
+                .asModel
+
+        val gradients = WellSql.select(EditorThemeElementBuilder::class.java)
+                .where()
+                .equals(EditorThemeElementTable.THEME_ID, editorTheme.id)
+                .equals(EditorThemeElementTable.TYPE, EditorThemeElementType.GRADIENT.value)
+                .endWhere()
+                .asModel
+
+        return editorTheme.toEditorTheme(colors, gradients)
+    }
+
+    /**
+     * Deleting the row for the [EditorThemeTable] table row here will cascade to delete the
+     * associated rows in the [EditorThemeElementTable] as well.
+     */
+    fun deleteEditorThemeForSite(site: SiteModel) {
+        WellSql.delete(EditorThemeBuilder::class.java)
+                .where()
+                .equals(EditorThemeTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    private fun makeEditorTheme(site: SiteModel, editorTheme: EditorTheme) {
+        val editorThemeBuilder = editorTheme.toBuilder(site)
+        val items = (editorTheme.themeSupport.colors ?: emptyList()) +
+                (editorTheme.themeSupport.gradients ?: emptyList())
+
+        WellSql.insert(editorThemeBuilder).execute()
+
+        val elements = items.map {
+            it.toBuilder(editorThemeBuilder.id)
+        }
+
+        WellSql.insert(elements).asSingleTransaction(true).execute()
+    }
+
+    @Table(name = "EditorTheme")
+    data class EditorThemeBuilder(@PrimaryKey @Column private var mId: Int = -1) : Identifiable {
+        @Column var localSiteId: Int = -1
+            @JvmName("getLocalSiteId")
+            get
+            @JvmName("setLocalSiteId")
+            set
+        @Column var stylesheet: String? = null
+        @Column var version: String? = null
+        @Column var rawStyles: String? = null
+        @Column var rawFeatures: String? = null
+        @Column var hasBlockTemplates: Boolean = false
+            @JvmName("getHasBlockTemplates")
+            get
+            @JvmName("setHasBlockTemplates")
+            set
+        @Column var isBlockBasedTheme: Boolean = false
+            @JvmName("isBlockBasedTheme")
+            get
+            @JvmName("setIsBlockBasedTheme")
+            set
+        @Column var galleryWithImageBlocks: Boolean = false
+        @Column var quoteBlockV2: Boolean = false
+        @Column var listBlockV2: Boolean = false
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        fun toEditorTheme(
+            storedColors: List<EditorThemeElementBuilder>?,
+            storedGradients: List<EditorThemeElementBuilder>?
+        ): EditorTheme {
+            var colors: List<EditorThemeElement>? = null
+            if (storedColors != null && storedColors.count() > 0) {
+                colors = storedColors.mapNotNull { it.toEditorThemeElement() }
+            }
+
+            var gradients: List<EditorThemeElement>? = null
+            if (storedGradients != null && storedGradients.count() > 0) {
+                gradients = storedGradients.mapNotNull { it.toEditorThemeElement() }
+            }
+
+            val editorThemeSupport = EditorThemeSupport(
+                    colors,
+                    gradients,
+                    hasBlockTemplates,
+                    rawStyles,
+                    rawFeatures,
+                    isBlockBasedTheme,
+                    galleryWithImageBlocks,
+                    quoteBlockV2,
+                    listBlockV2
+            )
+
+            return EditorTheme(editorThemeSupport, stylesheet, version)
+        }
+    }
+
+    @Table(name = "EditorThemeElement")
+    data class EditorThemeElementBuilder(@PrimaryKey @Column private var mId: Int = -1) : Identifiable {
+        @Column var themeId: Int = -1
+        @Column var type: String = EditorThemeElementType.COLOR.value
+        @Column var name: String? = null
+        @Column var slug: String? = null
+        @Column var value: String? = null
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        /**
+         * Returning "null" shouldn't really happen as the "type" is defined in this library and isn't really driven
+         * off of the network call. However adding it for completeness.
+         */
+        fun toEditorThemeElement() = when (type) {
+            EditorThemeElementType.COLOR.value -> EditorThemeElement(name, slug, value, null)
+            EditorThemeElementType.GRADIENT.value -> EditorThemeElement(name, slug, null, value)
+            else -> null
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EncryptedLogSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EncryptedLogSqlUtils.kt
new file mode 100644
index 00000000000..d6953f2d92c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EncryptedLogSqlUtils.kt
@@ -0,0 +1,78 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.EncryptedLogModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLog
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogModel
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.FAILED
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.QUEUED
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.UPLOADING
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EncryptedLogSqlUtils @Inject constructor() {
+    fun insertOrUpdateEncryptedLog(encryptedLog: EncryptedLog) {
+        insertOrUpdateEncryptedLogs(listOf(encryptedLog))
+    }
+
+    fun insertOrUpdateEncryptedLogs(encryptedLogs: List<EncryptedLog>) {
+        val encryptedLogModels = encryptedLogs.map { EncryptedLogModel.fromEncryptedLog(it) }
+        // Since we have a unique constraint for uuid with 'on conflict replace', if there is an existing log,
+        // it'll be replaced with the new one. No need to check if the log already exists.
+        WellSql.insert(encryptedLogModels).execute()
+    }
+
+    fun getEncryptedLog(uuid: String): EncryptedLog? {
+        return getEncryptedLogModel(uuid)?.let { EncryptedLog.fromEncryptedLogModel(it) }
+    }
+
+    fun getUploadingEncryptedLogs(): List<EncryptedLog> =
+            getUploadingEncryptedLogsQuery().asModel.map { EncryptedLog.fromEncryptedLogModel(it) }
+
+    fun getNumberOfUploadingEncryptedLogs(): Long = getUploadingEncryptedLogsQuery().count()
+
+    fun deleteEncryptedLogs(encryptedLogList: List<EncryptedLog>) {
+        if (encryptedLogList.isEmpty()) {
+            return
+        }
+        WellSql.delete(EncryptedLogModel::class.java)
+                .where()
+                .isIn(EncryptedLogModelTable.UUID, encryptedLogList.map { it.uuid })
+                .endWhere()
+                .execute()
+    }
+
+    fun getEncryptedLogsForUpload(): List<EncryptedLog> {
+        val uploadStates = listOf(QUEUED, FAILED).map { it.value }
+        return WellSql.select(EncryptedLogModel::class.java)
+                .where()
+                .isIn(EncryptedLogModelTable.UPLOAD_STATE_DB_VALUE, uploadStates)
+                .endWhere()
+                // Queued status should have priority over failed status
+                .orderBy(EncryptedLogModelTable.UPLOAD_STATE_DB_VALUE, SelectQuery.ORDER_ASCENDING)
+                // First log that's queued should have priority
+                .orderBy(EncryptedLogModelTable.DATE_CREATED, SelectQuery.ORDER_ASCENDING)
+                .asModel
+                .map {
+                    EncryptedLog.fromEncryptedLogModel(it)
+                }
+    }
+
+    private fun getEncryptedLogModel(uuid: String): EncryptedLogModel? {
+        return WellSql.select(EncryptedLogModel::class.java)
+                .where()
+                .equals(EncryptedLogModelTable.UUID, uuid)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+    }
+
+    private fun getUploadingEncryptedLogsQuery(): SelectQuery<EncryptedLogModel> {
+        return WellSql.select(EncryptedLogModel::class.java)
+            .where()
+            .equals(EncryptedLogModelTable.UPLOAD_STATE_DB_VALUE, UPLOADING.value)
+            .endWhere()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/FeatureFlagConfigDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/FeatureFlagConfigDao.kt
new file mode 100644
index 00000000000..448afa8adfc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/FeatureFlagConfigDao.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.ColumnInfo
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao.FeatureFlagValueSource.REMOTE
+
+@Dao
+abstract class FeatureFlagConfigDao {
+    @Transaction
+    @Query("SELECT * from FeatureFlagConfigurations")
+    abstract fun getFeatureFlagList(): List<FeatureFlag>
+
+    @Transaction
+    @Query("SELECT * from FeatureFlagConfigurations WHERE `key` = :key")
+    abstract fun getFeatureFlag(key: String): List<FeatureFlag>
+
+    @Transaction
+    @Suppress("SpreadOperator")
+    open fun insert(featureFlags: Map<String, Boolean>) {
+        featureFlags.forEach {
+            insert(
+                    FeatureFlag(
+                            key = it.key,
+                            value = it.value,
+                            createdAt = System.currentTimeMillis(),
+                            modifiedAt = System.currentTimeMillis(),
+                            source = REMOTE
+                    )
+            )
+        }
+    }
+
+    @Transaction
+    @Query("DELETE FROM FeatureFlagConfigurations")
+    abstract fun clear()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insert(offer: FeatureFlag)
+
+    @Entity(
+            tableName = "FeatureFlagConfigurations",
+            primaryKeys = ["key"]
+    )
+    data class FeatureFlag(
+        val key: String,
+        val value: Boolean,
+        @ColumnInfo(name = "created_at") val createdAt: Long,
+        @ColumnInfo(name = "modified_at") val modifiedAt: Long,
+        @ColumnInfo(name = "source") val source: FeatureFlagValueSource
+    )
+
+    enum class FeatureFlagValueSource(value: Int) {
+        BUILD_CONFIG(0),
+        REMOTE(1),
+    }
+
+    class FeatureFlagValueSourceConverter {
+        @TypeConverter
+        fun toFeatureFlagValueSource(value: Int): FeatureFlagValueSource =
+                enumValues<FeatureFlagValueSource>()[value]
+
+        @TypeConverter
+        fun fromFeatureFlagValueSource(value: FeatureFlagValueSource): Int = value.ordinal
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/HTTPAuthSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/HTTPAuthSqlUtils.java
new file mode 100644
index 00000000000..587acffc03c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/HTTPAuthSqlUtils.java
@@ -0,0 +1,37 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.content.ContentValues;
+
+import com.wellsql.generated.HTTPAuthModelTable;
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.mapper.InsertMapper;
+
+import org.wordpress.android.fluxc.network.HTTPAuthModel;
+
+import java.util.List;
+
+public class HTTPAuthSqlUtils {
+    public static void insertOrUpdateModel(HTTPAuthModel model) {
+        List<HTTPAuthModel> modelResult = WellSql.select(HTTPAuthModel.class)
+                .where().equals(HTTPAuthModelTable.ROOT_URL, model.getRootUrl()).endWhere()
+                .getAsModel();
+        if (modelResult.isEmpty()) {
+            // insert
+            WellSql.insert(model).asSingleTransaction(true).execute();
+        } else {
+            // update
+            int oldId = modelResult.get(0).getId();
+            WellSql.update(HTTPAuthModel.class).whereId(oldId)
+                   .put(model, new InsertMapper<HTTPAuthModel>() {
+                       @Override
+                       public ContentValues toCv(HTTPAuthModel item) {
+                           ContentValues cv = new ContentValues();
+                           cv.put(HTTPAuthModelTable.USERNAME, item.getUsername());
+                           cv.put(HTTPAuthModelTable.PASSWORD, item.getPassword());
+                           cv.put(HTTPAuthModelTable.REALM, item.getRealm());
+                           return cv;
+                       }
+                   }).execute();
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightTypeSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightTypeSqlUtils.kt
new file mode 100644
index 00000000000..335b2f7b461
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightTypeSqlUtils.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.InsightTypesTable
+import com.yarolegovich.wellsql.SelectQuery.ORDER_ASCENDING
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightTypeDataModel
+import org.wordpress.android.fluxc.model.stats.InsightTypeDataModel.Status
+import org.wordpress.android.fluxc.model.stats.InsightTypeDataModel.Status.ADDED
+import org.wordpress.android.fluxc.model.stats.InsightTypeDataModel.Status.REMOVED
+import org.wordpress.android.fluxc.store.StatsStore.InsightType
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InsightTypeSqlUtils
+@Inject constructor() {
+    fun selectAddedItemsOrderedByStatus(site: SiteModel): List<InsightType> {
+        return selectItemsOrderedByStatus(site, ADDED)
+    }
+
+    fun selectRemovedItemsOrderedByStatus(site: SiteModel): List<InsightType> {
+        return selectItemsOrderedByStatus(site, REMOVED)
+    }
+
+    private fun selectItemsOrderedByStatus(site: SiteModel, status: Status): List<InsightType> {
+        return WellSql.select(InsightTypesBuilder::class.java)
+                .where()
+                .equals(InsightTypesTable.LOCAL_SITE_ID, site.id)
+                .equals(InsightTypesTable.STATUS, status.name)
+                .endWhere()
+                .orderBy(InsightTypesTable.POSITION, ORDER_ASCENDING)
+                .asModel
+                .map { InsightType.valueOf(it.insightType) }
+    }
+
+    fun insertOrReplaceAddedItems(site: SiteModel, insightTypes: List<InsightType>) {
+        insertOrReplaceList(site, insightTypes, ADDED)
+    }
+
+    fun insertOrReplaceRemovedItems(site: SiteModel, insightTypes: List<InsightType>) {
+        insertOrReplaceList(site, insightTypes, REMOVED)
+    }
+
+    private fun insertOrReplaceList(site: SiteModel, insightTypes: List<InsightType>, status: Status) {
+        WellSql.delete(InsightTypesBuilder::class.java)
+                .where()
+                .equals(InsightTypesTable.LOCAL_SITE_ID, site.id)
+                .equals(InsightTypesTable.STATUS, status.name)
+                .endWhere().execute()
+        WellSql.insert(insightTypes.mapIndexed { index, type ->
+            type.toBuilder(
+                    site,
+                    status,
+                    index
+            )
+        }).execute()
+    }
+
+    private fun InsightType.toBuilder(site: SiteModel, status: Status, position: Int): InsightTypesBuilder {
+        return InsightTypesBuilder(
+                localSiteId = site.id,
+                remoteSiteId = site.siteId,
+                insightType = this.name,
+                position = if (status == ADDED) position else -1,
+                status = status.name
+        )
+    }
+
+    @Table(name = "InsightTypes")
+    data class InsightTypesBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var insightType: String,
+        @Column var position: Int,
+        @Column var status: String
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, "", -1, "")
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+
+        fun build(): InsightTypeDataModel {
+            return InsightTypeDataModel(
+                    InsightType.valueOf(insightType),
+                    Status.valueOf(status),
+                    if (position >= 0) position else null
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightsSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightsSqlUtils.kt
new file mode 100644
index 00000000000..11f5870a30b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/InsightsSqlUtils.kt
@@ -0,0 +1,223 @@
+package org.wordpress.android.fluxc.persistence
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient.AllTimeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient.CommentsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostStatsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient.PostsResponse.PostResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient.MostPopularResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient.PostingActivityResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient.PublicizeResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient.SummaryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient.TagsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient.VisitResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.EmailsRestClient.EmailsSummaryResponse
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.ALL_TIME_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.COMMENTS_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.DETAILED_POST_STATS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.EMAILS_SUBSCRIBERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.EMAIL_FOLLOWERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.FOLLOWERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.LATEST_POST_DETAIL_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.MOST_POPULAR_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.POSTING_ACTIVITY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.PUBLICIZE_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.SUMMARY
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.TAGS_AND_CATEGORIES_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.TODAYS_INSIGHTS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.WP_COM_FOLLOWERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType.INSIGHTS
+import javax.inject.Inject
+
+open class InsightsSqlUtils<RESPONSE_TYPE>
+constructor(
+    private val statsSqlUtils: StatsSqlUtils,
+    private val statsRequestSqlUtils: StatsRequestSqlUtils,
+    private val blockType: BlockType,
+    private val classOfResponse: Class<RESPONSE_TYPE>
+) {
+    fun insert(
+        site: SiteModel,
+        data: RESPONSE_TYPE,
+        requestedItems: Int? = null,
+        replaceExistingData: Boolean = true,
+        postId: Long? = null
+    ) {
+        statsSqlUtils.insert(site, blockType, INSIGHTS, data, replaceExistingData, postId = postId)
+        if (replaceExistingData) {
+            statsRequestSqlUtils.insert(
+                    site,
+                    blockType,
+                    INSIGHTS,
+                    requestedItems,
+                    postId = postId
+            )
+        }
+    }
+
+    fun select(site: SiteModel, postId: Long? = null): RESPONSE_TYPE? {
+        return statsSqlUtils.select(site, blockType, INSIGHTS, classOfResponse, postId = postId)
+    }
+
+    fun selectAll(site: SiteModel): List<RESPONSE_TYPE> {
+        return statsSqlUtils.selectAll(site, blockType, INSIGHTS, classOfResponse)
+    }
+
+    fun hasFreshRequest(site: SiteModel, requestedItems: Int? = null, postId: Long? = null): Boolean {
+        return statsRequestSqlUtils.hasFreshRequest(site, blockType, INSIGHTS, requestedItems, postId = postId)
+    }
+
+    class AllTimeSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<AllTimeResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            ALL_TIME_INSIGHTS,
+            AllTimeResponse::class.java
+    )
+
+    class MostPopularSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<MostPopularResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            MOST_POPULAR_INSIGHTS,
+            MostPopularResponse::class.java
+    )
+
+    class LatestPostDetailSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<PostResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            LATEST_POST_DETAIL_INSIGHTS,
+            PostResponse::class.java
+    )
+
+    class DetailedPostStatsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<PostStatsResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            DETAILED_POST_STATS,
+            PostStatsResponse::class.java
+    )
+
+    class TodayInsightsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<VisitResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            TODAYS_INSIGHTS,
+            VisitResponse::class.java
+    )
+
+    class CommentsInsightsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<CommentsResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            COMMENTS_INSIGHTS,
+            CommentsResponse::class.java
+    )
+
+    class SummarySqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<SummaryResponse>(
+        statsSqlUtils,
+        statsRequestSqlUtils,
+        SUMMARY,
+        SummaryResponse::class.java
+    )
+
+    class FollowersSqlUtils @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<FollowersResponse>(
+        statsSqlUtils,
+        statsRequestSqlUtils,
+        FOLLOWERS,
+        FollowersResponse::class.java
+    )
+
+    class WpComFollowersSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<FollowersResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            WP_COM_FOLLOWERS,
+            FollowersResponse::class.java
+    )
+
+    class EmailFollowersSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<FollowersResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            EMAIL_FOLLOWERS,
+            FollowersResponse::class.java
+    )
+
+    class TagsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<TagsResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            TAGS_AND_CATEGORIES_INSIGHTS,
+            TagsResponse::class.java
+    )
+
+    class PublicizeSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<PublicizeResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            PUBLICIZE_INSIGHTS,
+            PublicizeResponse::class.java
+    )
+
+    class PostingActivitySqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<PostingActivityResponse>(
+            statsSqlUtils,
+            statsRequestSqlUtils,
+            POSTING_ACTIVITY,
+            PostingActivityResponse::class.java
+    )
+
+    class EmailsSqlUtils @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : InsightsSqlUtils<EmailsSummaryResponse>(
+        statsSqlUtils,
+        statsRequestSqlUtils,
+        EMAILS_SUBSCRIBERS,
+        EmailsSummaryResponse::class.java
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/JetpackCPConnectedSitesDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/JetpackCPConnectedSitesDao.kt
new file mode 100644
index 00000000000..3175d03e2b5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/JetpackCPConnectedSitesDao.kt
@@ -0,0 +1,85 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.wordpress.android.fluxc.model.SiteModel
+
+@Dao
+interface JetpackCPConnectedSitesDao {
+    @Query("SELECT COUNT(*) FROM JetpackCPConnectedSites")
+    suspend fun getCount(): Int
+
+    @Query("SELECT * FROM JetpackCPConnectedSites")
+    suspend fun getAll(): List<JetpackCPConnectedSiteEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(sites: List<JetpackCPConnectedSiteEntity>)
+
+    @Query("DELETE FROM JetpackCPConnectedSites")
+    suspend fun deleteAll()
+
+    @Entity(
+        tableName = "JetpackCPConnectedSites",
+        primaryKeys = ["remoteSiteId"]
+    )
+    data class JetpackCPConnectedSiteEntity(
+        val remoteSiteId: Long? = null,
+        val localSiteId: Int,
+        val url: String,
+        val name: String,
+        val description: String,
+        val activeJetpackConnectionPlugins: String,
+    ) {
+        fun toJetpackCPConnectedSite(): JetpackCPConnectedSiteModel = JetpackCPConnectedSiteModel(
+            remoteSiteId = remoteSiteId,
+            localSiteId = localSiteId,
+            url = url,
+            name = name,
+            description = description,
+            activeJetpackConnectionPlugins = activeJetpackConnectionPlugins.split(","),
+        )
+
+        companion object {
+            fun from(
+                jetpackConnectedSite: JetpackCPConnectedSiteModel
+            ): JetpackCPConnectedSiteEntity = jetpackConnectedSite.run {
+                JetpackCPConnectedSiteEntity(
+                    remoteSiteId = remoteSiteId,
+                    localSiteId = localSiteId,
+                    url = url,
+                    name = name,
+                    description = description,
+                    activeJetpackConnectionPlugins = activeJetpackConnectionPlugins
+                        .joinToString(","),
+                )
+            }
+
+            fun from(
+                siteModel: SiteModel
+            ): JetpackCPConnectedSiteEntity? = siteModel
+                .takeIf { it.isJetpackCPConnected }
+                ?.run {
+                    JetpackCPConnectedSiteEntity(
+                        remoteSiteId = remoteId().value,
+                        localSiteId = localId().value,
+                        url = url,
+                        name = name.orEmpty(),
+                        description = description.orEmpty(),
+                        activeJetpackConnectionPlugins = activeJetpackConnectionPlugins.orEmpty()
+                    )
+                }
+        }
+    }
+}
+
+data class JetpackCPConnectedSiteModel(
+    val remoteSiteId: Long? = null,
+    val localSiteId: Int,
+    val url: String,
+    val name: String,
+    val description: String,
+    val activeJetpackConnectionPlugins: List<String>,
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListItemSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListItemSqlUtils.kt
new file mode 100644
index 00000000000..73e2aa721d8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListItemSqlUtils.kt
@@ -0,0 +1,100 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.ListItemModelTable
+import com.wellsql.generated.ListModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.list.ListItemModel
+import org.wordpress.android.fluxc.persistence.WellSqlConfig.Companion.SQLITE_MAX_VARIABLE_NUMBER
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ListItemSqlUtils @Inject constructor() {
+    /**
+     * This function inserts the [itemList] in the [ListItemModelTable].
+     *
+     * Unique constraint in [ListItemModel] will ignore duplicate records which is what we want. That'll ensure that
+     * the order of the items will not be altered while the user is browsing the list. The order will fix itself
+     * once the list data is refreshed.
+     */
+    fun insertItemList(itemList: List<ListItemModel>) {
+        WellSql.insert(itemList).asSingleTransaction(true).execute()
+    }
+
+    /**
+     * This function returns a list of [ListItemModel] records for the given [listId].
+     * It catches exceptions that occur during the database query and handles them.
+     */
+    @Suppress("TooGenericExceptionCaught")
+    fun getListItems(listId: Int): List<ListItemModel> {
+        return try {
+            // Attempt to execute the query and map the result to models
+            getListItemsQuery(listId).asModel
+        } catch (e: Exception) {
+            // Handle exceptions that might occur
+            AppLog.e(T.DB, "Error fetching items for listId: $listId", e)
+            emptyList()
+        }
+    }
+
+    /**
+     * This function returns the number of records a list has for the given [listId].
+     */
+    fun getListItemsCount(listId: Int): Long = getListItemsQuery(listId).count()
+
+    /**
+     * A helper function that returns the select query for a list of [ListItemModel] records for the given [listId].
+     */
+    private fun getListItemsQuery(listId: Int): SelectQuery<ListItemModel> =
+            WellSql.select(ListItemModel::class.java)
+                    .where()
+                    .equals(ListItemModelTable.LIST_ID, listId)
+                    .endWhere()
+                    .orderBy(ListModelTable.ID, SelectQuery.ORDER_ASCENDING)
+
+    /**
+     * This function deletes [ListItemModel] records for the [listIds].
+     */
+    fun deleteItem(listIds: List<Int>, remoteItemId: Long) {
+        WellSql.delete(ListItemModel::class.java)
+                .where()
+                .isIn(ListItemModelTable.LIST_ID, listIds)
+                .equals(ListItemModelTable.REMOTE_ITEM_ID, remoteItemId)
+                .endWhere()
+                .execute()
+    }
+
+    /**
+     * This function deletes all [ListItemModel]s for a specific [listId].
+     */
+    fun deleteItems(listId: Int) {
+        WellSql.delete(ListItemModel::class.java)
+                .where()
+                .equals(ListItemModelTable.LIST_ID, listId)
+                .endWhere()
+                .execute()
+    }
+
+    /**
+     * This function deletes [ListItemModel]s for [remoteItemIds] in every lists with [listIds]
+     */
+    fun deleteItemsFromLists(listIds: List<Int>, remoteItemIds: List<Long>) {
+        // Prevent a crash caused by either of these lists being empty
+        if (listIds.isEmpty() || remoteItemIds.isEmpty()) {
+            return
+        }
+
+        val batches = listIds.chunked(SQLITE_MAX_VARIABLE_NUMBER - remoteItemIds.count())
+        batches.forEach {
+            WellSql.delete(ListItemModel::class.java)
+                .where()
+                .isIn(ListItemModelTable.LIST_ID, it)
+                .isIn(ListItemModelTable.REMOTE_ITEM_ID, remoteItemIds)
+                .endWhere()
+                .execute()
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListSqlUtils.kt
new file mode 100644
index 00000000000..6a46038a8a1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ListSqlUtils.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.ContentValues
+import com.wellsql.generated.ListModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListModel
+import org.wordpress.android.fluxc.model.list.ListState
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ListSqlUtils @Inject constructor() {
+    /**
+     * This function either creates a new [ListModel] for the [listDescriptor] or updates the existing record.
+     *
+     * If there is an existing record, only the [ListModel.lastModified] and [ListModel.stateDbValue] will be updated.
+     * If there is no existing record, a new [ListModel] will be created for [listDescriptor].
+     */
+    fun insertOrUpdateList(
+        listDescriptor: ListDescriptor,
+        listState: ListState = ListState.CAN_LOAD_MORE
+    ) {
+        val now = DateTimeUtils.iso8601FromDate(Date())
+        val listModel = ListModel()
+        listModel.lastModified = now
+        listModel.stateDbValue = listState.value
+
+        val existing = getList(listDescriptor)
+        if (existing != null) {
+            WellSql.update<ListModel>(ListModel::class.java)
+                    .whereId(existing.id)
+                    .put(listModel) { item ->
+                        val cv = ContentValues()
+                        cv.put(ListModelTable.LAST_MODIFIED, item.lastModified)
+                        cv.put(ListModelTable.STATE_DB_VALUE, item.stateDbValue)
+                        cv
+                    }.execute()
+        } else {
+            listModel.descriptorUniqueIdentifierDbValue = listDescriptor.uniqueIdentifier.value
+            listModel.descriptorTypeIdentifierDbValue = listDescriptor.typeIdentifier.value
+            WellSql.insert(listModel).execute()
+        }
+    }
+
+    /**
+     * This function returns the [ListModel] record for the given [listDescriptor] if there is one.
+     */
+    fun getList(listDescriptor: ListDescriptor): ListModel? {
+        return WellSql.select(ListModel::class.java)
+                .where()
+                .equals(ListModelTable.DESCRIPTOR_UNIQUE_IDENTIFIER_DB_VALUE, listDescriptor.uniqueIdentifier.value)
+                // Checking the type identifier shouldn't be necessary since we have a unique value, but if we don't
+                // implement perfect hash for the unique value, we can use this approach to even lower the chance
+                // of collisions for ListDescriptor values.
+                .equals(ListModelTable.DESCRIPTOR_TYPE_IDENTIFIER_DB_VALUE, listDescriptor.typeIdentifier.value)
+                .endWhere()
+                .asModel
+                .firstOrNull()
+    }
+
+    /**
+     * This function returns all [ListModel] records that matches the given [ListDescriptorTypeIdentifier].
+     */
+    fun getListsWithTypeIdentifier(descriptorTypeIdentifier: ListDescriptorTypeIdentifier): List<ListModel> {
+        return WellSql.select(ListModel::class.java)
+                .where()
+                .equals(ListModelTable.DESCRIPTOR_TYPE_IDENTIFIER_DB_VALUE, descriptorTypeIdentifier.value)
+                .endWhere()
+                .asModel
+    }
+
+    /**
+     * This function deletes the [ListModel] record for the given [listDescriptor] if there is one.
+     *
+     * To ensure that we have the same `where` queries for both `select` and `delete` queries, [getList] is utilized.
+     */
+    fun deleteList(listDescriptor: ListDescriptor) {
+        val existing = getList(listDescriptor)
+        existing?.let {
+            WellSql.delete(ListModel::class.java).whereId(it.id)
+        }
+    }
+
+    /**
+     * This function deletes [ListModel] records that hasn't been updated for the given [expirationDuration].
+     */
+    fun deleteExpiredLists(expirationDuration: Long) {
+        val allLists = WellSql.select(ListModel::class.java).asModel
+        val cutOffDate = Date(System.currentTimeMillis() - expirationDuration)
+        // Find the ids of lists that are expired
+        val listIdsToDelete = allLists.asSequence().filter {
+            DateTimeUtils.dateFromIso8601(it.lastModified).before(cutOffDate)
+        }.map { it.id }.toList()
+        if (listIdsToDelete.isNotEmpty()) {
+            WellSql.delete(ListModel::class.java)
+                    .where().isIn(ListModelTable.ID, listIdsToDelete).endWhere()
+                    .execute()
+        }
+    }
+
+    /**
+     * This function deletes all [ListModel] records from the DB.
+     */
+    fun deleteAllLists() {
+        WellSql.delete(ListModel::class.java).execute()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/MediaSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/MediaSqlUtils.java
new file mode 100644
index 00000000000..0f462fb458b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/MediaSqlUtils.java
@@ -0,0 +1,503 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.MediaModelTable;
+import com.yarolegovich.wellsql.ConditionClauseBuilder;
+import com.yarolegovich.wellsql.DeleteQuery;
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.WellCursor;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.utils.MimeType.Type;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MediaSqlUtils {
+    @NonNull
+    public static List<MediaModel> getAllSiteMedia(@NonNull SiteModel siteModel) {
+        return getAllSiteMediaQuery(siteModel).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> getMediaWithStates(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates) {
+        return getMediaWithStatesQuery(site, uploadStates).getAsModel();
+    }
+
+    @NonNull
+    public static WellCursor<MediaModel> getMediaWithStatesAsCursor(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates) {
+        return getMediaWithStatesQuery(site, uploadStates).getAsCursor();
+    }
+
+    @NonNull
+    public static List<MediaModel> getMediaWithStatesAndMimeType(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates,
+            @NonNull String mimeType) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .contains(MediaModelTable.MIME_TYPE, mimeType)
+                .isIn(MediaModelTable.UPLOAD_STATE, uploadStates)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    @NonNull
+    public static WellCursor<MediaModel> getImagesWithStatesAsCursor(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .contains(MediaModelTable.MIME_TYPE, Type.IMAGE.getValue())
+                .isIn(MediaModelTable.UPLOAD_STATE, uploadStates)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsCursor();
+    }
+
+    @NonNull
+    public static WellCursor<MediaModel> getUnattachedMediaWithStates(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(MediaModelTable.POST_ID, 0)
+                .isIn(MediaModelTable.UPLOAD_STATE, uploadStates)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsCursor();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getAllSiteMediaQuery(@NonNull SiteModel siteModel) {
+        return WellSql.select(MediaModel.class)
+                .where().equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId()).endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getMediaWithStatesQuery(
+            @NonNull SiteModel site,
+            @NonNull List<String> uploadStates) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .isIn(MediaModelTable.UPLOAD_STATE, uploadStates)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteMediaWithId(@NonNull SiteModel siteModel, long mediaId) {
+        return WellSql.select(MediaModel.class).where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .equals(MediaModelTable.MEDIA_ID, mediaId)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteMediaWithIds(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> mediaIds) {
+        return getSiteMediaWithIdsQuery(siteModel, mediaIds).getAsModel();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteMediaWithIdsQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> mediaIds) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .isIn(MediaModelTable.MEDIA_ID, mediaIds)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @Nullable
+    public static MediaModel getMediaWithLocalId(int localMediaId) {
+        List<MediaModel> result = WellSql.select(MediaModel.class).where()
+                .equals(MediaModelTable.ID, localMediaId)
+                .endWhere()
+                .getAsModel();
+        if (result.isEmpty()) {
+            return null;
+        } else {
+            return result.get(0);
+        }
+    }
+
+    @NonNull
+    public static List<MediaModel> searchSiteMedia(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return searchSiteMediaQuery(siteModel, searchTerm).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> searchSiteImages(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return searchSiteMediaByMimeTypeQuery(siteModel, searchTerm, Type.IMAGE.getValue()).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> searchSiteAudio(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return searchSiteMediaByMimeTypeQuery(siteModel, searchTerm, Type.AUDIO.getValue()).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> searchSiteVideos(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return searchSiteMediaByMimeTypeQuery(siteModel, searchTerm, Type.VIDEO.getValue()).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> searchSiteDocuments(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return searchSiteMediaByMimeTypeQuery(siteModel, searchTerm, Type.APPLICATION.getValue()).getAsModel();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> searchSiteMediaQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .beginGroup()
+                    .contains(MediaModelTable.TITLE, searchTerm)
+                    .or().contains(MediaModelTable.CAPTION, searchTerm)
+                    .or().contains(MediaModelTable.DESCRIPTION, searchTerm)
+                    .or().contains(MediaModelTable.MIME_TYPE, searchTerm)
+                .endGroup()
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> searchSiteMediaByMimeTypeQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm,
+            @NonNull String mimeTypePrefix) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .contains(MediaModelTable.MIME_TYPE, mimeTypePrefix)
+                .beginGroup()
+                    .contains(MediaModelTable.TITLE, searchTerm)
+                    .or().contains(MediaModelTable.CAPTION, searchTerm)
+                    .or().contains(MediaModelTable.DESCRIPTION, searchTerm)
+                .endGroup()
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteImages(@NonNull SiteModel siteModel) {
+        return getSiteImagesQuery(siteModel).getAsModel();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteImagesQuery(@NonNull SiteModel siteModel) {
+        return getSiteMediaByMimeTypeQuery(siteModel, Type.IMAGE.getValue());
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteImagesExcluding(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> filter) {
+        return getSiteImagesExcludingQuery(siteModel, filter).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteVideos(@NonNull SiteModel siteModel) {
+        return getSiteVideosQuery(siteModel).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteDocuments(@NonNull SiteModel siteModel) {
+        return getSiteDocumentsQuery(siteModel).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteAudio(@NonNull SiteModel siteModel) {
+        return getSiteAudioQuery(siteModel).getAsModel();
+    }
+
+    @NonNull
+    public static SelectQuery<MediaModel> getSiteImagesExcludingQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> filter) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .contains(MediaModelTable.MIME_TYPE, Type.IMAGE.getValue())
+                .isNotIn(MediaModelTable.MEDIA_ID, filter)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteVideosQuery(@NonNull SiteModel siteModel) {
+        return getSiteMediaByMimeTypeQuery(siteModel, Type.VIDEO.getValue());
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteAudioQuery(@NonNull SiteModel siteModel) {
+        return getSiteMediaByMimeTypeQuery(siteModel, Type.AUDIO.getValue());
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteDocumentsQuery(@NonNull SiteModel siteModel) {
+        return getSiteMediaByMimeTypeQuery(siteModel, Type.APPLICATION.getValue());
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteMediaByMimeTypeQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull String mimeTypePrefix) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .contains(MediaModelTable.MIME_TYPE, mimeTypePrefix)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    public static List<MediaModel> getSiteMediaExcluding(
+            @NonNull SiteModel site,
+            @NonNull String column,
+            @NonNull Object value) {
+        return getSiteMediaExcludingQuery(site, column, value).getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> matchSiteMedia(
+            @NonNull SiteModel siteModel,
+            @NonNull String column,
+            @NonNull Object value) {
+        return matchSiteMediaQuery(siteModel, column, value).getAsModel();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> matchSiteMediaQuery(
+            @NonNull SiteModel siteModel,
+            @NonNull String column,
+            @NonNull Object value) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .equals(column, value)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+
+    @NonNull
+    public static List<MediaModel> matchPostMedia(
+            int localPostId,
+            @NonNull String column,
+            @NonNull Object value) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_POST_ID, localPostId)
+                .equals(column, value)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    @NonNull
+    public static List<MediaModel> matchPostMedia(int localPostId) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_POST_ID, localPostId)
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    public static int insertOrUpdateMedia(@Nullable MediaModel media) {
+        if (media == null) return 0;
+
+        List<MediaModel> existingMedia;
+        if (media.getMediaId() == 0) {
+            // If the remote media ID is 0, this is a local media file and we should only match by local ID
+            // Otherwise, we'd match all local media files for that site
+            existingMedia = WellSql.select(MediaModel.class)
+                    .where()
+                    .equals(MediaModelTable.ID, media.getId())
+                    .endWhere().getAsModel();
+        } else {
+            // For remote media, we can uniquely identify the media by either its local ID
+            // or its remote media ID + its (local) site ID
+            existingMedia = WellSql.select(MediaModel.class)
+                    .where().beginGroup()
+                    .equals(MediaModelTable.ID, media.getId())
+                    .or()
+                    .beginGroup()
+                    .equals(MediaModelTable.LOCAL_SITE_ID, media.getLocalSiteId())
+                    .equals(MediaModelTable.MEDIA_ID, media.getMediaId())
+                    .endGroup()
+                    .endGroup().endWhere().getAsModel();
+        }
+
+        if (existingMedia.isEmpty()) {
+            // insert, media item does not exist
+            WellSql.insert(media).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            if (existingMedia.size() > 1) {
+                // We've ended up with a duplicate entry, probably due to a push/fetch race condition
+                // One matches based on local ID (this is the one we're trying to update with a remote media ID)
+                // The other matches based on local site ID + remote media ID, and we got it from a fetch
+                // Just remove the entry without a remote media ID (the one matching the current media's local ID)
+                return WellSql.delete(MediaModel.class).whereId(media.getId());
+            }
+            // update, media item already exists
+            int oldId = existingMedia.get(0).getId();
+            return WellSql.update(MediaModel.class).whereId(oldId)
+                    .put(media, new UpdateAllExceptId<>(MediaModel.class)).execute();
+        }
+    }
+
+    @NonNull
+    public static MediaModel insertMediaForResult(@NonNull MediaModel media) {
+        WellSql.insert(media).asSingleTransaction(true).execute();
+        return media;
+    }
+
+    public static int deleteMedia(@Nullable MediaModel media) {
+        if (media == null) return 0;
+        if (media.getMediaId() == 0) {
+            // If the remote media ID is 0, this is a local media file and we should only match by local ID
+            // Otherwise, we'd match all local media files for that site
+            return WellSql.delete(MediaModel.class)
+                    .where().beginGroup()
+                    .equals(MediaModelTable.ID, media.getId())
+                    .endGroup().endWhere()
+                    .execute();
+        } else {
+            // For remote media, we can uniquely identify the media by either its local ID
+            // or its remote media ID + its (local) site ID
+            return WellSql.delete(MediaModel.class)
+                    .where().beginGroup()
+                    .equals(MediaModelTable.ID, media.getId())
+                    .or()
+                    .beginGroup()
+                    .equals(MediaModelTable.LOCAL_SITE_ID, media.getLocalSiteId())
+                    .equals(MediaModelTable.MEDIA_ID, media.getMediaId())
+                    .endGroup()
+                    .endGroup().endWhere()
+                    .execute();
+        }
+    }
+
+    public static int deleteMatchingSiteMedia(
+            @NonNull SiteModel siteModel,
+            @NonNull String column,
+            @NonNull Object value) {
+        return WellSql.delete(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .equals(column, value)
+                .endGroup().endWhere().execute();
+    }
+
+    @SuppressWarnings("unused")
+    public static int deleteAllSiteMedia(@NonNull SiteModel site) {
+        return WellSql.delete(MediaModel.class)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .endGroup().endWhere().execute();
+    }
+
+    public static void deleteAllUploadedSiteMedia(@NonNull SiteModel siteModel) {
+        WellSql.delete(MediaModel.class)
+               .where().beginGroup()
+               .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+               .equals(MediaModelTable.UPLOAD_STATE, MediaUploadState.UPLOADED.toString())
+               .endGroup().endWhere().execute();
+    }
+
+    public static void deleteAllUploadedSiteMediaWithMimeType(
+            @NonNull SiteModel siteModel,
+            @NonNull String mimeType) {
+        WellSql.delete(MediaModel.class)
+               .where().beginGroup()
+               .equals(MediaModelTable.LOCAL_SITE_ID, siteModel.getId())
+               .equals(MediaModelTable.UPLOAD_STATE, MediaUploadState.UPLOADED.toString())
+               .contains(MediaModelTable.MIME_TYPE, mimeType)
+               .endGroup().endWhere().execute();
+    }
+
+    public static void deleteAllMedia() {
+        WellSql.delete(MediaModel.class).execute();
+    }
+
+    public static void deleteUploadedSiteMediaNotInList(
+            @NonNull SiteModel site,
+            @NonNull List<MediaModel> mediaList,
+            @NonNull String mimeType) {
+        if (mediaList.isEmpty()) {
+            if (!TextUtils.isEmpty(mimeType)) {
+                MediaSqlUtils.deleteAllUploadedSiteMediaWithMimeType(site, mimeType);
+            } else {
+                MediaSqlUtils.deleteAllUploadedSiteMedia(site);
+            }
+            return;
+        }
+
+        List<Integer> idList = new ArrayList<>();
+        for (MediaModel media : mediaList) {
+            idList.add(media.getId());
+        }
+
+        ConditionClauseBuilder<DeleteQuery<MediaModel>> builder = WellSql.delete(MediaModel.class)
+                .where().beginGroup()
+                .isNotIn(MediaModelTable.ID, idList)
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(MediaModelTable.UPLOAD_STATE, MediaUploadState.UPLOADED.toString());
+
+        if (!TextUtils.isEmpty(mimeType)) {
+            builder.contains(MediaModelTable.MIME_TYPE, mimeType);
+        }
+
+        builder.endGroup().endWhere().execute();
+    }
+
+    @NonNull
+    private static SelectQuery<MediaModel> getSiteMediaExcludingQuery(
+            @NonNull SiteModel site,
+            @NonNull String column,
+            @NonNull Object value) {
+        return WellSql.select(MediaModel.class)
+                .where().beginGroup()
+                .not().equals(column, value)
+                .equals(MediaModelTable.LOCAL_SITE_ID, site.getId())
+                .endGroup().endWhere()
+                .orderBy(MediaModelTable.UPLOAD_DATE, SelectQuery.ORDER_DESCENDING);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/NotificationSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/NotificationSqlUtils.kt
new file mode 100644
index 00000000000..b972db8b676
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/NotificationSqlUtils.kt
@@ -0,0 +1,294 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.annotation.SuppressLint
+import com.wellsql.generated.NotificationModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.SelectQuery.ORDER_DESCENDING
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onStart
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.notification.NoteIdSet
+import org.wordpress.android.fluxc.model.notification.NotificationModel
+import org.wordpress.android.fluxc.model.notification.NotificationModel.Kind
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.FormattableContentMapper
+import org.wordpress.android.fluxc.tools.FormattableMeta
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationSqlUtils @Inject constructor(private val formattableContentMapper: FormattableContentMapper) {
+    private val dataUpdatesTrigger = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+
+    fun insertOrUpdateNotification(notification: NotificationModel): Int {
+        val notificationResult = WellSql.select(NotificationModelBuilder::class.java)
+                .where().beginGroup()
+                .equals(NotificationModelTable.ID, notification.noteId)
+                .or()
+                .beginGroup()
+                .equals(NotificationModelTable.REMOTE_SITE_ID, notification.remoteSiteId)
+                .equals(NotificationModelTable.REMOTE_NOTE_ID, notification.remoteNoteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel
+
+        return if (notificationResult.isEmpty()) {
+            // insert
+            WellSql.insert(notification.toBuilder()).asSingleTransaction(true).execute()
+            dataUpdatesTrigger.tryEmit(Unit)
+            1
+        } else {
+            // update
+            val oldId = notificationResult[0].id
+            WellSql.update(NotificationModelBuilder::class.java).whereId(oldId).put(
+                    notification.toBuilder(),
+                    UpdateAllExceptId<NotificationModelBuilder>(NotificationModelBuilder::class.java)
+            ).execute().also(::triggerUpdateIfNeeded)
+        }
+    }
+
+    /**
+     * @return The total records in the notification table.
+     */
+    fun getNotificationsCount() = WellSql.select(NotificationModelBuilder::class.java).count()
+
+    @SuppressLint("WrongConstant")
+    fun getNotifications(
+        @SelectQuery.Order order: Int = ORDER_DESCENDING,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): List<NotificationModel> {
+        val conditionClauseBuilder = WellSql.select(NotificationModelBuilder::class.java)
+                .where()
+
+        if (filterByType != null || filterBySubtype != null) {
+            conditionClauseBuilder.beginGroup()
+
+            filterByType?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.TYPE, it)
+            }
+
+            if (filterByType != null && filterBySubtype != null) {
+                conditionClauseBuilder.or()
+            }
+
+            filterBySubtype?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.SUBTYPE, it)
+            }
+
+            conditionClauseBuilder.endGroup()
+        }
+
+        return conditionClauseBuilder.endWhere()
+                .orderBy(NotificationModelTable.TIMESTAMP, order)
+                .asModel
+                .map { it.build(formattableContentMapper) }
+    }
+
+    @SuppressLint("WrongConstant")
+    fun getNotificationsForSite(
+        site: SiteModel,
+        @SelectQuery.Order order: Int = ORDER_DESCENDING,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): List<NotificationModel> {
+        val conditionClauseBuilder = WellSql.select(NotificationModelBuilder::class.java)
+                .where()
+                .equals(NotificationModelTable.REMOTE_SITE_ID, site.siteId)
+
+        if (filterByType != null || filterBySubtype != null) {
+            conditionClauseBuilder.beginGroup()
+
+            filterByType?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.TYPE, it)
+            }
+
+            if (filterByType != null && filterBySubtype != null) {
+                conditionClauseBuilder.or()
+            }
+
+            filterBySubtype?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.SUBTYPE, it)
+            }
+
+            conditionClauseBuilder.endGroup()
+        }
+
+        return conditionClauseBuilder.endWhere()
+                .orderBy(NotificationModelTable.TIMESTAMP, order)
+                .asModel
+                .map { it.build(formattableContentMapper) }
+    }
+
+    fun observeNotificationsForSite(
+        site: SiteModel,
+        @SelectQuery.Order order: Int = ORDER_DESCENDING,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): Flow<List<NotificationModel>> {
+        return dataUpdatesTrigger
+                .onStart { emit(Unit) }
+                .mapLatest {
+                    getNotificationsForSite(site, order, filterByType, filterBySubtype)
+                }
+                .flowOn(Dispatchers.IO)
+    }
+
+    fun hasUnreadNotificationsForSite(
+        site: SiteModel,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): Boolean {
+        val conditionClauseBuilder = WellSql.select(NotificationModelBuilder::class.java)
+                .where()
+                .equals(NotificationModelTable.REMOTE_SITE_ID, site.siteId)
+                .equals(NotificationModelTable.READ, 0)
+
+        if (filterByType != null || filterBySubtype != null) {
+            conditionClauseBuilder.beginGroup()
+
+            filterByType?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.TYPE, it)
+            }
+
+            if (filterByType != null && filterBySubtype != null) {
+                conditionClauseBuilder.or()
+            }
+
+            filterBySubtype?.let {
+                conditionClauseBuilder.isIn(NotificationModelTable.SUBTYPE, it)
+            }
+
+            conditionClauseBuilder.endGroup()
+        }
+
+        return conditionClauseBuilder.endWhere().exists()
+    }
+
+    fun getNotificationByIdSet(idSet: NoteIdSet): NotificationModel? {
+        val (id, remoteNoteId, remoteSiteId) = idSet
+        return WellSql.select(NotificationModelBuilder::class.java)
+                .where().beginGroup()
+                .equals(NotificationModelTable.ID, id)
+                .or()
+                .beginGroup()
+                .equals(NotificationModelTable.REMOTE_SITE_ID, remoteSiteId)
+                .equals(NotificationModelTable.REMOTE_NOTE_ID, remoteNoteId)
+                .endGroup()
+                .endGroup().endWhere()
+                .asModel
+                .firstOrNull()?.build(formattableContentMapper)
+    }
+
+    fun getNotificationByRemoteId(remoteNoteId: Long): NotificationModel? {
+        return WellSql.select(NotificationModelBuilder::class.java)
+                .where()
+                .equals(NotificationModelTable.REMOTE_NOTE_ID, remoteNoteId)
+                .endWhere()
+                .asModel
+                .firstOrNull()?.build(formattableContentMapper)
+    }
+
+    fun deleteAllNotifications() = WellSql.delete(NotificationModelBuilder::class.java)
+            .execute()
+            .also(::triggerUpdateIfNeeded)
+
+    fun deleteNotificationByRemoteId(remoteNoteId: Long): Int {
+        return WellSql.delete(NotificationModelBuilder::class.java)
+                .where().beginGroup()
+                .equals(NotificationModelTable.REMOTE_NOTE_ID, remoteNoteId)
+                .endGroup().endWhere()
+                .execute()
+                .also(::triggerUpdateIfNeeded)
+    }
+
+    private fun triggerUpdateIfNeeded(affectedRows: Int) {
+        if (affectedRows != 0) dataUpdatesTrigger.tryEmit(Unit)
+    }
+
+    private fun NotificationModel.toBuilder(): NotificationModelBuilder {
+        return NotificationModelBuilder(
+                mId = this.noteId,
+                remoteNoteId = this.remoteNoteId,
+                remoteSiteId = this.remoteSiteId,
+                noteHash = this.noteHash,
+                type = this.type.toString(),
+                subtype = this.subtype.toString(),
+                read = this.read,
+                icon = this.icon,
+                noticon = this.noticon,
+                timestamp = this.timestamp,
+                url = this.url,
+                title = this.title,
+                formattableBody = this.body?.let { formattableContentMapper.mapFormattableContentListToJson(it) },
+                formattableSubject = this.subject?.let { formattableContentMapper.mapFormattableContentListToJson(it) },
+                formattableMeta = this.meta?.let { formattableContentMapper.mapFormattableMetaToJson(it) }
+        )
+    }
+
+    @Table(name = "NotificationModel")
+    data class NotificationModelBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var remoteNoteId: Long,
+        @Column var remoteSiteId: Long,
+        @Column var noteHash: Long,
+        @Column var type: String,
+        @Column var subtype: String? = null,
+        @Column var read: Boolean = false,
+        @Column var icon: String? = null,
+        @Column var noticon: String? = null,
+        @Column var timestamp: String? = null,
+        @Column var url: String? = null,
+        @Column var title: String? = null,
+        @Column var formattableBody: String? = null,
+        @Column var formattableSubject: String? = null,
+        @Column var formattableMeta: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0L, -1, 0, NotificationModel.Kind.STORE_ORDER.toString())
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = this.mId
+
+        fun build(formattableContentMapper: FormattableContentMapper): NotificationModel {
+            val subkind: NotificationModel.Subkind? = subtype?.let { NotificationModel.Subkind.fromString(it) }
+
+            val body: List<FormattableContent>? = formattableBody?.let {
+                formattableContentMapper.mapToFormattableContentList(it)
+            }
+            val subject: List<FormattableContent>? = formattableSubject?.let {
+                formattableContentMapper.mapToFormattableContentList(it)
+            }
+            val meta: FormattableMeta? = formattableMeta?.let {
+                formattableContentMapper.mapToFormattableMeta(it)
+            }
+            return NotificationModel(
+                    mId,
+                    remoteNoteId,
+                    remoteSiteId,
+                    noteHash,
+                    Kind.fromString(type),
+                    subkind,
+                    read,
+                    icon,
+                    noticon,
+                    timestamp,
+                    url,
+                    title,
+                    body,
+                    subject,
+                    meta
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersDao.kt
new file mode 100644
index 00000000000..37c14512b03
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersDao.kt
@@ -0,0 +1,107 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.Dao
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.Companion.CASCADE
+import androidx.room.Index
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.Relation
+import androidx.room.Transaction
+
+@Dao
+abstract class PlanOffersDao {
+    @Transaction
+    @Suppress("SpreadOperator")
+    open fun insertPlanOfferWithDetails(vararg planOfferWithDetails: PlanOfferWithDetails) {
+        planOfferWithDetails.forEach {
+            this.insertPlanOffer(it.planOffer)
+            this.insertPlanOfferIds(*it.planIds.toTypedArray())
+            this.insertPlanOfferFeatures(*it.planFeatures.toTypedArray())
+        }
+    }
+
+    @Transaction
+    @Query("SELECT * from PlanOffers")
+    abstract fun getPlanOfferWithDetails(): List<PlanOfferWithDetails>
+
+    @Transaction
+    @Query("DELETE FROM PlanOffers")
+    abstract fun clearPlanOffers()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun insertPlanOffer(offer: PlanOffer)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun insertPlanOfferIds(vararg planOfferIds: PlanOfferId)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun insertPlanOfferFeatures(vararg features: PlanOfferFeature)
+
+    @Entity(
+            tableName = "PlanOffers",
+            indices = [Index(
+                    value = ["internalPlanId"],
+                    unique = true
+            )]
+    )
+    data class PlanOffer(
+        @PrimaryKey(autoGenerate = true)
+        val id: Int = 0,
+        val internalPlanId: Int = 0,
+        val name: String? = null,
+        val shortName: String? = null,
+        val tagline: String? = null,
+        val description: String? = null,
+        val icon: String? = null
+    )
+
+    @Entity(
+            tableName = "PlanOfferIds",
+            foreignKeys = [ForeignKey(
+                    entity = PlanOffer::class,
+                    parentColumns = ["internalPlanId"],
+                    childColumns = ["internalPlanId"],
+                    onDelete = CASCADE
+            )]
+    )
+    data class PlanOfferId(
+        @PrimaryKey(autoGenerate = true)
+        val id: Int = 0,
+        val productId: Int = 0,
+        val internalPlanId: Int = 0
+    )
+
+    @Entity(
+            tableName = "PlanOfferFeatures",
+            foreignKeys = [ForeignKey(
+                    entity = PlanOffer::class,
+                    parentColumns = ["internalPlanId"],
+                    childColumns = ["internalPlanId"],
+                    onDelete = CASCADE
+            )]
+    )
+    data class PlanOfferFeature(
+        @PrimaryKey(autoGenerate = true)
+        val id: Int = 0,
+        val internalPlanId: Int = 0,
+        val stringId: String? = null,
+        val name: String? = null,
+        val description: String? = null
+    )
+
+    data class PlanOfferWithDetails(
+        @Embedded
+        val planOffer: PlanOffer,
+
+        @Relation(parentColumn = "internalPlanId", entityColumn = "internalPlanId")
+        val planIds: List<PlanOfferId> = emptyList(),
+
+        @Relation(parentColumn = "internalPlanId", entityColumn = "internalPlanId")
+        val planFeatures: List<PlanOfferFeature> = emptyList()
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersSqlUtils.kt
new file mode 100644
index 00000000000..ddc41f011de
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PlanOffersSqlUtils.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.fluxc.persistence
+
+import org.wordpress.android.fluxc.model.plans.PlanOffersMapper
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PlanOffersSqlUtils @Inject constructor(
+    private val planOffersDao: PlanOffersDao,
+    private val planOffersMapper: PlanOffersMapper
+) {
+    @Suppress("SpreadOperator")
+    fun storePlanOffers(planOffers: List<PlanOffersModel>) {
+        planOffersDao.clearPlanOffers()
+
+        planOffersDao.insertPlanOfferWithDetails(
+                *(planOffers.mapIndexed { index, planOffersModel ->
+                    planOffersMapper.toDatabaseModel(index, planOffersModel)
+                }).toTypedArray()
+        )
+    }
+
+    fun getPlanOffers(): List<PlanOffersModel> {
+        return planOffersDao.getPlanOfferWithDetails().map { planOffersMapper.toDomainModel(it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtils.kt
new file mode 100644
index 00000000000..592fda505d1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtils.kt
@@ -0,0 +1,225 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.text.TextUtils
+import com.wellsql.generated.PluginDirectoryModelTable
+import com.wellsql.generated.SitePluginModelTable
+import com.wellsql.generated.WPOrgPluginModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel
+import kotlin.math.max
+
+object PluginSqlUtils {
+    @JvmStatic
+    fun getSitePlugins(site: SiteModel): List<SitePluginModel> =
+        WellSql.select(SitePluginModel::class.java)
+            .where()
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .orderBy(SitePluginModelTable.DISPLAY_NAME, SelectQuery.ORDER_ASCENDING)
+            .asModel
+
+    @JvmStatic
+    fun insertOrReplaceSitePlugins(site: SiteModel, plugins: List<SitePluginModel>) {
+        // Remove previous plugins for this site
+        removeSitePlugins(site)
+        // Insert new plugins for this site
+        for (sitePluginModel in plugins) {
+            sitePluginModel.localSiteId = site.id
+        }
+        WellSql.insert(plugins).asSingleTransaction(true).execute()
+    }
+
+    private fun removeSitePlugins(site: SiteModel) =
+        WellSql.delete(SitePluginModel::class.java)
+            .where()
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere().execute()
+
+    @JvmStatic
+    fun insertOrUpdateSitePlugin(site: SiteModel, plugin: SitePluginModel?): Int {
+        if (plugin == null) {
+            return 0
+        }
+        val oldPlugin = getSitePluginBySlug(site, plugin.slug)
+        // Make sure the site id is set (if the plugin is retrieved from network)
+        plugin.localSiteId = site.id
+        return if (oldPlugin == null) {
+            WellSql.insert(plugin).execute()
+            1
+        } else {
+            val oldId = oldPlugin.id
+            WellSql.update(SitePluginModel::class.java)
+                .whereId(oldId)
+                .put(plugin, UpdateAllExceptId(SitePluginModel::class.java))
+                .execute()
+        }
+    }
+
+    @JvmStatic
+    fun deleteSitePlugins(site: SiteModel): Int =
+        WellSql.delete(SitePluginModel::class.java)
+            .where()
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere().execute()
+
+    @JvmStatic
+    fun deleteSitePlugin(site: SiteModel, slug: String?): Int {
+        return if (TextUtils.isEmpty(slug)) {
+            0
+        } else {
+            // The local id of the plugin might not be set if it's coming from a network request,
+            // using site id and slug is a safer approach here
+            WellSql.delete(SitePluginModel::class.java)
+                .where()
+                .equals(SitePluginModelTable.SLUG, slug)
+                .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+                .endWhere().execute()
+        }
+    }
+
+    @JvmStatic
+    fun getSitePluginBySlug(site: SiteModel, slug: String?): SitePluginModel? {
+        val result = WellSql.select(SitePluginModel::class.java).where()
+            .equals(SitePluginModelTable.SLUG, slug)
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .asModel
+        return if (result.isEmpty()) null else result.first()
+    }
+
+    fun getSitePluginByName(site: SiteModel, pluginName: String?): SitePluginModel? {
+        val result = WellSql.select(SitePluginModel::class.java)
+            .where()
+            .equals(SitePluginModelTable.NAME, pluginName)
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .asModel
+        return if (result.isEmpty()) null else result.first()
+    }
+
+    fun getSitePluginByNames(site: SiteModel, pluginNames: List<String?>?): List<SitePluginModel> =
+        WellSql.select(SitePluginModel::class.java)
+            .where()
+            .isIn(SitePluginModelTable.NAME, pluginNames)
+            .equals(SitePluginModelTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .asModel
+
+    @JvmStatic
+    fun getWPOrgPluginBySlug(slug: String?): WPOrgPluginModel? {
+        val result = WellSql.select(WPOrgPluginModel::class.java)
+            .where()
+            .equals(WPOrgPluginModelTable.SLUG, slug)
+            .endWhere()
+            .asModel
+        return if (result.isEmpty()) null else result.first()
+    }
+
+    @JvmStatic
+    fun getWPOrgPluginsForDirectory(directoryType: PluginDirectoryType?): List<WPOrgPluginModel> {
+        val directoryModels = getPluginDirectoriesForType(directoryType)
+        if (directoryModels.isEmpty()) {
+            // No directories found, return an empty list
+            return ArrayList()
+        }
+        val slugList = ArrayList<String?>(directoryModels.size)
+        val orderMap = HashMap<String, Int>()
+        directoryModels.forEachIndexed { index, pluginDirectoryModel ->
+            val slug = pluginDirectoryModel.slug
+            slugList.add(slug)
+            orderMap[slug] = index
+        }
+
+        val batches = slugList.chunked(WellSqlConfig.SQLITE_MAX_VARIABLE_NUMBER)
+        val wpOrgPlugins = mutableListOf<WPOrgPluginModel>()
+        batches.forEach {
+            val batchQueryResult = WellSql.select(WPOrgPluginModel::class.java)
+                .where()
+                .isIn(WPOrgPluginModelTable.SLUG, it)
+                .endWhere()
+                .asModel
+            wpOrgPlugins.addAll(batchQueryResult)
+        }
+        // We need to manually order the list according to the directory models since SQLite will
+        // return mixed results
+        wpOrgPlugins.sortWith { plugin1, plugin2 ->
+            val order1 = orderMap[plugin1.slug] ?: 0
+            val order2 = orderMap[plugin2.slug] ?: 0
+            order1.compareTo(order2)
+        }
+        return wpOrgPlugins
+    }
+
+    @JvmStatic
+    fun insertOrUpdateWPOrgPlugin(wpOrgPluginModel: WPOrgPluginModel?): Int {
+        if (wpOrgPluginModel == null) {
+            return 0
+        }
+
+        // Slug is the primary key in remote, so we should use that to identify WPOrgPluginModels
+        val oldPlugin = getWPOrgPluginBySlug(wpOrgPluginModel.slug)
+
+        return if (oldPlugin == null) {
+            WellSql.insert(wpOrgPluginModel).execute()
+            1
+        } else {
+            val oldId = oldPlugin.id
+            WellSql.update(WPOrgPluginModel::class.java)
+                .whereId(oldId)
+                .put(wpOrgPluginModel, UpdateAllExceptId(WPOrgPluginModel::class.java))
+                .execute()
+        }
+    }
+
+    @JvmStatic
+    fun insertOrUpdateWPOrgPluginList(wpOrgPluginModels: List<WPOrgPluginModel?>?): Int {
+        if (wpOrgPluginModels == null) {
+            return 0
+        }
+
+        var result = 0
+        wpOrgPluginModels.forEach { result += insertOrUpdateWPOrgPlugin(it) }
+        return result
+    }
+
+    // Plugin Directory
+
+    @JvmStatic
+    fun deletePluginDirectoryForType(directoryType: PluginDirectoryType) =
+        WellSql.delete(PluginDirectoryModel::class.java)
+            .where()
+            .equals(PluginDirectoryModelTable.DIRECTORY_TYPE, directoryType.toString())
+            .endWhere()
+            .execute()
+
+    @JvmStatic
+    fun insertPluginDirectoryList(pluginDirectories: List<PluginDirectoryModel>?) {
+        if (pluginDirectories == null) {
+            return
+        }
+        WellSql.insert(pluginDirectories).asSingleTransaction(true).execute()
+    }
+
+    @JvmStatic
+    fun getLastRequestedPageForDirectoryType(directoryType: PluginDirectoryType?): Int {
+        val list = getPluginDirectoriesForType(directoryType)
+        var page = 0
+        list.forEach { page = max(it.page, page) }
+        return page
+    }
+
+    @JvmStatic
+    private fun getPluginDirectoriesForType(
+        directoryType: PluginDirectoryType?
+    ): List<PluginDirectoryModel> =
+        WellSql.select(PluginDirectoryModel::class.java)
+            .where()
+            .equals(PluginDirectoryModelTable.DIRECTORY_TYPE, directoryType)
+            .endWhere()
+            .asModel
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtilsWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtilsWrapper.kt
new file mode 100644
index 00000000000..72329023776
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PluginSqlUtilsWrapper.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.fluxc.persistence
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel
+import javax.inject.Inject
+
+class PluginSqlUtilsWrapper
+@Inject constructor() {
+    fun getSitePlugins(site: SiteModel): List<SitePluginModel> {
+        return PluginSqlUtils.getSitePlugins(site)
+    }
+
+    fun insertOrReplaceSitePlugins(site: SiteModel, plugins: List<SitePluginModel>) {
+        PluginSqlUtils.insertOrReplaceSitePlugins(site, plugins)
+    }
+
+    fun insertOrUpdateSitePlugin(site: SiteModel, plugin: SitePluginModel?): Int {
+        return PluginSqlUtils.insertOrUpdateSitePlugin(site, plugin)
+    }
+
+    fun deleteSitePlugins(site: SiteModel): Int {
+        return PluginSqlUtils.deleteSitePlugins(site)
+    }
+
+    fun deleteSitePlugin(site: SiteModel, slug: String?): Int {
+        return PluginSqlUtils.deleteSitePlugin(site, slug)
+    }
+
+    fun getSitePluginBySlug(site: SiteModel, slug: String?): SitePluginModel? {
+        return PluginSqlUtils.getSitePluginBySlug(site, slug)
+    }
+
+    fun getWPOrgPluginBySlug(slug: String?): WPOrgPluginModel? {
+        return PluginSqlUtils.getWPOrgPluginBySlug(slug)
+    }
+
+    fun getWPOrgPluginsForDirectory(directoryType: PluginDirectoryType?): List<WPOrgPluginModel?> {
+        return PluginSqlUtils.getWPOrgPluginsForDirectory(directoryType)
+    }
+
+    fun insertOrUpdateWPOrgPlugin(wpOrgPluginModel: WPOrgPluginModel?): Int {
+        return PluginSqlUtils.insertOrUpdateWPOrgPlugin(wpOrgPluginModel)
+    }
+
+    fun insertOrUpdateWPOrgPluginList(wpOrgPluginModels: List<WPOrgPluginModel?>?): Int {
+        return PluginSqlUtils.insertOrUpdateWPOrgPluginList(wpOrgPluginModels)
+    }
+
+    fun deletePluginDirectoryForType(directoryType: PluginDirectoryType) {
+        PluginSqlUtils.deletePluginDirectoryForType(directoryType)
+    }
+
+    fun insertPluginDirectoryList(pluginDirectories: List<PluginDirectoryModel>?) {
+        PluginSqlUtils.insertPluginDirectoryList(pluginDirectories)
+    }
+
+    fun getLastRequestedPageForDirectoryType(directoryType: PluginDirectoryType?): Int {
+        return PluginSqlUtils.getLastRequestedPageForDirectoryType(directoryType)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSchedulingNotificationSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSchedulingNotificationSqlUtils.kt
new file mode 100644
index 00000000000..6acebfb0f74
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSchedulingNotificationSqlUtils.kt
@@ -0,0 +1,85 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.PostSchedulingReminderTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PostSchedulingNotificationSqlUtils
+@Inject constructor() {
+    fun insert(
+        postId: Int,
+        scheduledTime: SchedulingReminderDbModel.Period
+    ): Int? {
+        WellSql.insert(
+                PostSchedulingReminderBuilder(
+                        postId = postId,
+                        scheduledTime = scheduledTime.name
+                )
+        ).execute()
+        return WellSql.select(PostSchedulingReminderBuilder::class.java)
+                .where()
+                .equals(PostSchedulingReminderTable.POST_ID, postId)
+                .equals(PostSchedulingReminderTable.SCHEDULED_TIME, scheduledTime.name)
+                .endWhere().asModel.firstOrNull()?.id
+    }
+
+    fun deleteSchedulingReminders(postId: Int) {
+        WellSql.delete(PostSchedulingReminderBuilder::class.java)
+                .where()
+                .equals(PostSchedulingReminderTable.POST_ID, postId)
+                .endWhere()
+                .execute()
+    }
+
+    fun getSchedulingReminderPeriodDbModel(
+        postId: Int
+    ): SchedulingReminderDbModel.Period? {
+        return WellSql.select(PostSchedulingReminderBuilder::class.java)
+                .where()
+                .equals(PostSchedulingReminderTable.POST_ID, postId)
+                .endWhere().asModel.firstOrNull()?.scheduledTime?.let { SchedulingReminderDbModel.Period.valueOf(it) }
+    }
+
+    fun getSchedulingReminder(
+        notificationId: Int
+    ): SchedulingReminderDbModel? {
+        return WellSql.select(PostSchedulingReminderBuilder::class.java)
+                .where()
+                .equals(PostSchedulingReminderTable.ID, notificationId)
+                .endWhere().asModel.firstOrNull()
+                ?.let {
+                    SchedulingReminderDbModel(
+                            it.id,
+                            it.postId,
+                            SchedulingReminderDbModel.Period.valueOf(it.scheduledTime)
+                    )
+                }
+    }
+
+    data class SchedulingReminderDbModel(val notificationId: Int, val postId: Int, val period: Period) {
+        enum class Period {
+            ONE_HOUR, TEN_MINUTES, WHEN_PUBLISHED
+        }
+    }
+
+    @Table(name = "PostSchedulingReminder")
+    data class PostSchedulingReminderBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var postId: Int,
+        @Column var scheduledTime: String
+    ) : Identifiable {
+        constructor() : this(-1, -1, "")
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSqlUtils.java
new file mode 100644
index 00000000000..175f8b7c6b4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/PostSqlUtils.java
@@ -0,0 +1,515 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.content.ContentValues;
+import android.database.sqlite.SQLiteDatabase;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.LikeModelTable;
+import com.wellsql.generated.LocalDiffModelTable;
+import com.wellsql.generated.LocalRevisionModelTable;
+import com.wellsql.generated.PostModelTable;
+import com.yarolegovich.wellsql.ConditionClauseBuilder;
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.SelectQuery.Order;
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.mapper.InsertMapper;
+
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.LikeModel.LikeType;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.revisions.LocalDiffModel;
+import org.wordpress.android.fluxc.model.revisions.LocalRevisionModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRemoteAutoSaveModel;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.ListIterator;
+
+import javax.inject.Inject;
+
+import static org.wordpress.android.fluxc.model.LikeModel.TIMESTAMP_THRESHOLD;
+
+import dagger.Reusable;
+
+@Reusable
+public class PostSqlUtils {
+    @Inject public PostSqlUtils() {
+    }
+
+    public synchronized int insertOrUpdatePost(PostModel post, boolean overwriteLocalChanges) {
+        if (post == null) {
+            return 0;
+        }
+        List<PostModel> postResult;
+        if (post.isLocalDraft()) {
+            postResult = WellSql.select(PostModel.class)
+                    .where()
+                    .equals(PostModelTable.ID, post.getId())
+                    .endWhere().getAsModel();
+        } else {
+            postResult = WellSql.select(PostModel.class)
+                    .where().beginGroup()
+                    .equals(PostModelTable.ID, post.getId())
+                    .or()
+                    .beginGroup()
+                    .equals(PostModelTable.REMOTE_POST_ID, post.getRemotePostId())
+                    .equals(PostModelTable.LOCAL_SITE_ID, post.getLocalSiteId())
+                    .endGroup()
+                    .endGroup().endWhere().getAsModel();
+        }
+        int numberOfDeletedRows = 0;
+        if (postResult.isEmpty()) {
+            // insert post
+            post.setDbTimestamp(System.currentTimeMillis());
+            WellSql.insert(post).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            if (postResult.size() > 1) {
+                // We've ended up with a duplicate entry, probably due to a push/fetch race
+                // condition. One matches based on local ID (this is the one we're trying to
+                // update with a remote post ID). The other matches based on local site ID +
+                // remote post ID, and we got it from a fetch. Just remove the duplicated
+                // entry we got from the fetch as the chance the client app is already using it is
+                // lower (it was most probably fetched a few ms ago).
+                ListIterator<PostModel> postModelListIterator = postResult.listIterator();
+                while (postModelListIterator.hasNext()) {
+                    PostModel item = postModelListIterator.next();
+                    if (item.getId() != post.getId()) {
+                        WellSql.delete(PostModel.class).whereId(item.getId());
+                        postModelListIterator.remove();
+                        numberOfDeletedRows++;
+                    }
+                }
+            }
+            // Update only if local changes for this post don't exist
+            if (overwriteLocalChanges || !postResult.get(0).isLocallyChanged()) {
+                int oldId = postResult.get(0).getId();
+                post.setDbTimestamp(System.currentTimeMillis());
+                return WellSql.update(PostModel.class).whereId(oldId)
+                              .put(post, new UpdateAllExceptId<>(PostModel.class)).execute()
+                       + numberOfDeletedRows;
+            }
+        }
+        return numberOfDeletedRows;
+    }
+
+    public int insertOrUpdatePostKeepingLocalChanges(PostModel post) {
+        return insertOrUpdatePost(post, false);
+    }
+
+    public int insertOrUpdatePostOverwritingLocalChanges(PostModel post) {
+        return insertOrUpdatePost(post, true);
+    }
+
+    public List<PostModel> getPostsForSite(SiteModel site, boolean getPages) {
+        if (site == null) {
+            return Collections.emptyList();
+        }
+
+        return WellSql.select(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(PostModelTable.IS_PAGE, getPages)
+                .endGroup().endWhere()
+                .orderBy(PostModelTable.IS_LOCAL_DRAFT, SelectQuery.ORDER_DESCENDING)
+                .orderBy(PostModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    public List<PostModel> getPostsForSiteWithFormat(SiteModel site, List<String> postFormat, boolean getPages) {
+        if (site == null) {
+            return Collections.emptyList();
+        }
+
+        return WellSql.select(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                .isIn(PostModelTable.POST_FORMAT, postFormat)
+                .equals(PostModelTable.IS_PAGE, getPages)
+                .endGroup().endWhere()
+                .orderBy(PostModelTable.IS_LOCAL_DRAFT, SelectQuery.ORDER_DESCENDING)
+                .orderBy(PostModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    public List<PostModel> getUploadedPostsForSite(SiteModel site, boolean getPages) {
+        if (site == null) {
+            return Collections.emptyList();
+        }
+
+        return WellSql.select(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(PostModelTable.IS_PAGE, getPages)
+                .equals(PostModelTable.IS_LOCAL_DRAFT, false)
+                .endGroup().endWhere()
+                .orderBy(PostModelTable.IS_LOCAL_DRAFT, SelectQuery.ORDER_DESCENDING)
+                .orderBy(PostModelTable.DATE_CREATED, SelectQuery.ORDER_DESCENDING)
+                .getAsModel();
+    }
+
+    public List<PostModel> getLocalDrafts(@NonNull Integer localSiteId, boolean isPage) {
+        return WellSql.select(PostModel.class)
+                      .where()
+                      .beginGroup()
+                      .equals(PostModelTable.LOCAL_SITE_ID, localSiteId)
+                      .equals(PostModelTable.IS_LOCAL_DRAFT, true)
+                      .equals(PostModelTable.IS_PAGE, isPage)
+                      .endGroup()
+                      .endWhere()
+                      .getAsModel();
+    }
+
+    public List<PostModel> getPostsWithLocalChanges(@NonNull Integer localSiteId, boolean isPage) {
+        return WellSql.select(PostModel.class)
+                      .where()
+                      .equals(PostModelTable.IS_PAGE, isPage)
+                      .equals(PostModelTable.LOCAL_SITE_ID, localSiteId)
+                      .beginGroup()
+                      .equals(PostModelTable.IS_LOCAL_DRAFT, true).or().equals(PostModelTable.IS_LOCALLY_CHANGED, true)
+                      .endGroup()
+                      .endWhere()
+                      .getAsModel();
+    }
+
+    public List<PostModel> getPostsByRemoteIds(@Nullable List<Long> remoteIds, int localSiteId) {
+        if (remoteIds != null && remoteIds.size() > 0) {
+            return WellSql.select(PostModel.class)
+                          .where().isIn(PostModelTable.REMOTE_POST_ID, remoteIds)
+                          .equals(PostModelTable.LOCAL_SITE_ID, localSiteId).endWhere()
+                          .getAsModel();
+        }
+        return Collections.emptyList();
+    }
+
+    public List<PostModel> getPostsByLocalOrRemotePostIds(
+            @NonNull List<? extends LocalOrRemoteId> localOrRemoteIds, int localSiteId) {
+        if (localOrRemoteIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<Integer> localIds = new ArrayList<>();
+        List<Long> remoteIds = new ArrayList<>();
+        for (LocalOrRemoteId localOrRemoteId : localOrRemoteIds) {
+            if (localOrRemoteId instanceof LocalId) {
+                localIds.add(((LocalId) localOrRemoteId).getValue());
+            } else if (localOrRemoteId instanceof RemoteId) {
+                remoteIds.add(((RemoteId) localOrRemoteId).getValue());
+            }
+        }
+        ConditionClauseBuilder<SelectQuery<PostModel>> whereQuery =
+                WellSql.select(PostModel.class).where().equals(PostModelTable.LOCAL_SITE_ID, localSiteId).beginGroup();
+        boolean addIsInLocalIdsCondition = !localIds.isEmpty();
+        if (addIsInLocalIdsCondition) {
+            whereQuery = whereQuery.isIn(PostModelTable.ID, localIds);
+        }
+        if (!remoteIds.isEmpty()) {
+            if (addIsInLocalIdsCondition) {
+                // Add `or` only if we are checking for both local and remote ids
+                whereQuery = whereQuery.or();
+            }
+            whereQuery = whereQuery.isIn(PostModelTable.REMOTE_POST_ID, remoteIds);
+        }
+        return whereQuery.endGroup().endWhere().getAsModel();
+    }
+
+    public PostModel insertPostForResult(PostModel post) {
+        WellSql.insert(post).asSingleTransaction(true).execute();
+
+        return post;
+    }
+
+    public int deletePost(PostModel post) {
+        if (post == null) {
+            return 0;
+        }
+
+        return WellSql.delete(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.ID, post.getId())
+                .equals(PostModelTable.LOCAL_SITE_ID, post.getLocalSiteId())
+                .endGroup()
+                .endWhere()
+                .execute();
+    }
+
+    public int deleteUploadedPostsForSite(SiteModel site, boolean pages) {
+        if (site == null) {
+            return 0;
+        }
+
+        return WellSql.delete(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(PostModelTable.IS_PAGE, pages)
+                .equals(PostModelTable.IS_LOCAL_DRAFT, false)
+                .equals(PostModelTable.IS_LOCALLY_CHANGED, false)
+                .endGroup()
+                .endWhere()
+                .execute();
+    }
+
+    public int deleteAllPosts() {
+        return WellSql.delete(PostModel.class).execute();
+    }
+
+    public boolean getSiteHasLocalChanges(SiteModel site) {
+        return site != null && WellSql.select(PostModel.class)
+                .where().beginGroup()
+                .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                .beginGroup()
+                .equals(PostModelTable.IS_LOCAL_DRAFT, true)
+                .or()
+                .equals(PostModelTable.IS_LOCALLY_CHANGED, true)
+                .endGroup().endGroup().endWhere().exists();
+    }
+
+    public int getNumLocalChanges() {
+        return (int) WellSql.select(PostModel.class)
+                            .where().beginGroup()
+                            .equals(PostModelTable.IS_LOCAL_DRAFT, true)
+                            .or()
+                            .equals(PostModelTable.IS_LOCALLY_CHANGED, true)
+                            .endGroup().endWhere()
+                            .count();
+    }
+
+    public int updatePostsAutoSave(SiteModel site, final PostRemoteAutoSaveModel autoSaveModel) {
+        return WellSql.update(PostModel.class)
+               .where().beginGroup()
+               .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+               .equals(PostModelTable.REMOTE_POST_ID, autoSaveModel.getRemotePostId())
+               .endGroup().endWhere()
+               .put(autoSaveModel, new InsertMapper<PostRemoteAutoSaveModel>() {
+                   @Override
+                   public ContentValues toCv(PostRemoteAutoSaveModel item) {
+                       ContentValues cv = new ContentValues();
+                       cv.put(PostModelTable.AUTO_SAVE_REVISION_ID, autoSaveModel.getRevisionId());
+                       cv.put(PostModelTable.AUTO_SAVE_MODIFIED, autoSaveModel.getModified());
+                       cv.put(PostModelTable.AUTO_SAVE_PREVIEW_URL, autoSaveModel.getPreviewUrl());
+                       cv.put(PostModelTable.REMOTE_AUTO_SAVE_MODIFIED, autoSaveModel.getModified());
+                       return cv;
+                   }
+               }).execute();
+    }
+
+    public void insertOrUpdateLocalRevision(LocalRevisionModel revision, List<LocalDiffModel> diffs) {
+        boolean hasLocalRevisionModels =
+                WellSql.select(LocalRevisionModel.class)
+                        .where().beginGroup()
+                        .equals(LocalRevisionModelTable.REVISION_ID, revision.getRevisionId())
+                        .equals(LocalRevisionModelTable.POST_ID, revision.getPostId())
+                        .equals(LocalRevisionModelTable.SITE_ID, revision.getSiteId())
+                        .endGroup().endWhere().exists();
+        if (hasLocalRevisionModels) {
+            WellSql.update(LocalRevisionModel.class)
+                    .where().beginGroup()
+                    .equals(LocalRevisionModelTable.REVISION_ID, revision.getRevisionId())
+                    .equals(LocalRevisionModelTable.POST_ID, revision.getPostId())
+                    .equals(LocalRevisionModelTable.SITE_ID, revision.getSiteId())
+                    .endGroup().endWhere()
+                    .put(revision, new UpdateAllExceptId<>(LocalRevisionModel.class)).execute();
+        } else {
+            WellSql.insert(revision).execute();
+        }
+
+        // we need to maintain order of diffs, so it's better to remove all of existing ones beforehand
+        WellSql.delete(LocalDiffModel.class)
+                .where().beginGroup()
+                .equals(LocalDiffModelTable.REVISION_ID, revision.getRevisionId())
+                .equals(LocalDiffModelTable.POST_ID, revision.getPostId())
+                .equals(LocalDiffModelTable.SITE_ID, revision.getSiteId())
+                .endGroup().endWhere().execute();
+
+        for (LocalDiffModel diff : diffs) {
+            WellSql.insert(diff).execute();
+        }
+    }
+
+    public List<LocalRevisionModel> getLocalRevisions(SiteModel site, PostModel post) {
+        return WellSql.select(LocalRevisionModel.class)
+                .where().beginGroup()
+                .equals(LocalRevisionModelTable.POST_ID, post.getRemotePostId())
+                .equals(LocalRevisionModelTable.SITE_ID, site.getSiteId())
+                .endGroup().endWhere().getAsModel();
+    }
+
+    @Nullable
+    public LocalRevisionModel getRevisionById(@NonNull final String revisionId, final long postId, final long siteId) {
+        final List<LocalRevisionModel> localRevisionModels = WellSql.select(LocalRevisionModel.class)
+                      .where().beginGroup()
+                      .equals(LocalRevisionModelTable.REVISION_ID, revisionId)
+                      .equals(LocalRevisionModelTable.POST_ID, postId)
+                      .equals(LocalRevisionModelTable.SITE_ID, siteId)
+                      .endGroup().endWhere().getAsModel();
+        if (localRevisionModels != null && !localRevisionModels.isEmpty()) {
+            return localRevisionModels.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    public List<LocalDiffModel> getLocalRevisionDiffs(LocalRevisionModel revision) {
+        return WellSql.select(LocalDiffModel.class)
+                .where().beginGroup()
+                .equals(LocalDiffModelTable.POST_ID, revision.getPostId())
+                .equals(LocalDiffModelTable.REVISION_ID, revision.getRevisionId())
+                .equals(LocalDiffModelTable.SITE_ID, revision.getSiteId())
+                .endGroup().endWhere().getAsModel();
+    }
+
+    public void deleteLocalRevisionAndDiffs(LocalRevisionModel revision) {
+        WellSql.delete(LocalRevisionModel.class)
+                .where().beginGroup()
+                .equals(LocalRevisionModelTable.REVISION_ID, revision.getRevisionId())
+                .equals(LocalRevisionModelTable.POST_ID, revision.getPostId())
+                .equals(LocalRevisionModelTable.SITE_ID, revision.getSiteId())
+                .endGroup().endWhere().execute();
+
+        WellSql.delete(LocalDiffModel.class)
+                .where().beginGroup()
+                .equals(LocalDiffModelTable.REVISION_ID, revision.getRevisionId())
+                .equals(LocalDiffModelTable.POST_ID, revision.getPostId())
+                .equals(LocalDiffModelTable.SITE_ID, revision.getSiteId())
+                .endGroup().endWhere().execute();
+    }
+
+    public void deleteLocalRevisionAndDiffsOfAPostOrPage(PostModel post) {
+        WellSql.delete(LocalRevisionModel.class)
+                .where().beginGroup()
+                .equals(LocalRevisionModelTable.POST_ID, post.getRemotePostId())
+                .equals(LocalRevisionModelTable.SITE_ID, post.getRemoteSiteId())
+                .endGroup().endWhere().execute();
+
+        WellSql.delete(LocalDiffModel.class)
+                .where().beginGroup()
+                .equals(LocalRevisionModelTable.POST_ID, post.getRemotePostId())
+                .equals(LocalRevisionModelTable.SITE_ID, post.getRemoteSiteId())
+                .endGroup().endWhere().execute();
+    }
+
+    public void deleteAllLocalRevisionsAndDiffs() {
+        WellSql.delete(LocalRevisionModel.class).execute();
+        WellSql.delete(LocalDiffModel.class).execute();
+    }
+
+    public List<LocalId> getLocalPostIdsForFilter(SiteModel site, boolean isPage, String searchQuery,
+                                                         String orderBy, @Order int order) {
+        ConditionClauseBuilder<SelectQuery<PostModel>> clauseBuilder =
+                WellSql.select(PostModel.class)
+                       // We only need the local ids
+                       .columns(PostModelTable.ID)
+                       .where().beginGroup()
+                       .equals(PostModelTable.IS_LOCAL_DRAFT, true)
+                       .equals(PostModelTable.LOCAL_SITE_ID, site.getId())
+                       .equals(PostModelTable.IS_PAGE, isPage)
+                       .endGroup();
+        if (!TextUtils.isEmpty(searchQuery)) {
+            clauseBuilder = clauseBuilder.beginGroup().contains(PostModelTable.TITLE, searchQuery).or()
+                                         .contains(PostModelTable.CONTENT, searchQuery).endGroup();
+        }
+        /*
+         * Remember that, since we are only querying the `PostModelTable.ID` column, the rest of the fields for the
+         * post won't be there which is exactly what we want.
+         */
+        List<PostModel> localPosts = clauseBuilder.endWhere().orderBy(orderBy, order).getAsModel();
+        List<LocalId> localPostIds = new ArrayList<>();
+        for (PostModel post : localPosts) {
+            localPostIds.add(new LocalId(post.getId()));
+        }
+        return localPostIds;
+    }
+
+    public int deletePostLikesAndPurgeExpired(long siteId, long remotePostId) {
+        int numDeleted = WellSql.delete(LikeModel.class)
+                                .where()
+                                .beginGroup()
+                                .equals(LikeModelTable.TYPE, LikeType.POST_LIKE.getTypeName())
+                                .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                                .equals(LikeModelTable.REMOTE_ITEM_ID, remotePostId)
+                                .endGroup()
+                                .endWhere()
+                                .execute();
+
+        SQLiteDatabase db = WellSql.giveMeWritableDb();
+        db.beginTransaction();
+        try {
+            List<LikeModel> likeResult = WellSql.select(LikeModel.class)
+                                                .columns(LikeModelTable.REMOTE_SITE_ID, LikeModelTable.REMOTE_ITEM_ID)
+                                                .where().beginGroup()
+                                                .equals(LikeModelTable.TYPE, LikeType.POST_LIKE.getTypeName())
+                                                .not().equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                                                .not().equals(LikeModelTable.REMOTE_ITEM_ID, remotePostId)
+                                                .lessThen(LikeModelTable.TIMESTAMP_FETCHED,
+                                                        (new Date().getTime()) - TIMESTAMP_THRESHOLD)
+                                                .endGroup().endWhere()
+                                                .getAsModel();
+
+            for (LikeModel likeModel : likeResult) {
+                numDeleted += WellSql.delete(LikeModel.class)
+                                     .where()
+                                     .beginGroup()
+                                     .equals(LikeModelTable.TYPE, LikeType.POST_LIKE.getTypeName())
+                                     .equals(LikeModelTable.REMOTE_SITE_ID, likeModel.getRemoteSiteId())
+                                     .equals(LikeModelTable.REMOTE_ITEM_ID, likeModel.getRemoteItemId())
+                                     .endGroup()
+                                     .endWhere()
+                                     .execute();
+            }
+
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
+
+        return numDeleted;
+    }
+
+    public int insertOrUpdatePostLikes(long siteId, long remotePostId, LikeModel like) {
+        if (null == like) {
+            return 0;
+        }
+
+        List<LikeModel> likeResult;
+
+        // If the like already exist and has an id, we want to update it.
+        likeResult = WellSql.select(LikeModel.class).where()
+                            .beginGroup()
+                            .equals(LikeModelTable.TYPE, LikeType.POST_LIKE.getTypeName())
+                            .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                            .equals(LikeModelTable.REMOTE_ITEM_ID, remotePostId)
+                            .equals(LikeModelTable.LIKER_ID, like.getLikerId())
+                            .endGroup().endWhere().getAsModel();
+
+        if (likeResult.isEmpty()) {
+            // insert
+            WellSql.insert(like).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            // update
+            int oldId = likeResult.get(0).getId();
+            return WellSql.update(LikeModel.class).whereId(oldId)
+                          .put(like, new UpdateAllExceptId<>(LikeModel.class)).execute();
+        }
+    }
+
+    public List<LikeModel> getPostLikesByPostId(long siteId, long remotePostId) {
+        return WellSql.select(LikeModel.class)
+                      .where()
+                      .beginGroup()
+                      .equals(LikeModelTable.TYPE, LikeType.POST_LIKE.getTypeName())
+                      .equals(LikeModelTable.REMOTE_SITE_ID, siteId)
+                      .equals(LikeModelTable.REMOTE_ITEM_ID, remotePostId)
+                      .endGroup()
+                      .endWhere()
+                      .getAsModel();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/QuickStartSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/QuickStartSqlUtils.kt
new file mode 100644
index 00000000000..8f1497e5484
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/QuickStartSqlUtils.kt
@@ -0,0 +1,121 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.QuickStartStatusModelTable
+import com.wellsql.generated.QuickStartTaskModelTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.QuickStartStatusModel
+import org.wordpress.android.fluxc.model.QuickStartTaskModel
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class QuickStartSqlUtils
+@Inject constructor() {
+    fun getDoneCount(siteId: Long): Int {
+        return WellSql.select(QuickStartTaskModel::class.java)
+                .where().beginGroup()
+                .equals(QuickStartTaskModelTable.SITE_ID, siteId)
+                .equals(QuickStartTaskModelTable.IS_DONE, true)
+                .endGroup().endWhere()
+                .asModel.size
+    }
+
+    fun getDoneCountByType(siteId: Long, taskType: QuickStartTaskType): Int {
+        return WellSql.select(QuickStartTaskModel::class.java)
+                .where().beginGroup()
+                .equals(QuickStartTaskModelTable.SITE_ID, siteId)
+                .equals(QuickStartTaskModelTable.IS_DONE, true)
+                .equals(QuickStartTaskModelTable.TASK_TYPE, taskType.toString())
+                .endGroup().endWhere()
+                .asModel.size
+    }
+
+    fun getShownCountByType(siteId: Long, taskType: QuickStartTaskType): Int {
+        return WellSql.select(QuickStartTaskModel::class.java)
+                .where().beginGroup()
+                .equals(QuickStartTaskModelTable.SITE_ID, siteId)
+                .equals(QuickStartTaskModelTable.IS_SHOWN, true)
+                .equals(QuickStartTaskModelTable.TASK_TYPE, taskType.toString())
+                .endGroup().endWhere()
+                .asModel.size
+    }
+
+    private fun getTask(siteId: Long, task: QuickStartTask): QuickStartTaskModel? {
+        return WellSql.select(QuickStartTaskModel::class.java)
+                .where().beginGroup()
+                .equals(QuickStartTaskModelTable.SITE_ID, siteId)
+                .equals(QuickStartTaskModelTable.TASK_NAME, task.toString())
+                .equals(QuickStartTaskModelTable.TASK_TYPE, task.taskType.toString())
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun getQuickStartStatus(siteId: Long): QuickStartStatusModel? {
+        return WellSql.select(QuickStartStatusModel::class.java)
+                .where().beginGroup()
+                .equals(QuickStartStatusModelTable.SITE_ID, siteId)
+                .endGroup().endWhere()
+                .asModel.firstOrNull()
+    }
+
+    fun hasDoneTask(siteId: Long, task: QuickStartTask): Boolean {
+        return getTask(siteId, task)?.isDone ?: false
+    }
+
+    private fun insertOrUpdateQuickStartTaskModel(newTaskModel: QuickStartTaskModel) {
+        val oldModel = getTask(newTaskModel.siteId, QuickStartTask.getTaskFromModel(newTaskModel))
+        oldModel?.let {
+            WellSql.update(QuickStartTaskModel::class.java)
+                    .whereId(it.id)
+                    .put(newTaskModel, UpdateAllExceptId(QuickStartTaskModel::class.java))
+                    .execute()
+            return
+        }
+        WellSql.insert(newTaskModel).execute()
+    }
+
+    private fun insertOrUpdateQuickStartStatusModel(newQuickStartStatus: QuickStartStatusModel) {
+        val oldModel = getQuickStartStatus(newQuickStartStatus.siteId)
+        oldModel?.let {
+            WellSql.update(QuickStartStatusModel::class.java)
+                    .whereId(it.id)
+                    .put(newQuickStartStatus, UpdateAllExceptId(QuickStartStatusModel::class.java))
+                    .execute()
+            return
+        }
+        WellSql.insert(newQuickStartStatus).execute()
+    }
+
+    fun setDoneTask(siteId: Long, task: QuickStartTask, isDone: Boolean) {
+        val model = getTask(siteId, task) ?: QuickStartTaskModel()
+        model.siteId = siteId
+        model.taskName = task.toString()
+        model.taskType = task.taskType.toString()
+        model.isDone = isDone
+        insertOrUpdateQuickStartTaskModel(model)
+    }
+
+    fun setQuickStartCompleted(siteId: Long, isCompleted: Boolean) {
+        val model = getQuickStartStatus(siteId) ?: QuickStartStatusModel()
+        model.siteId = siteId
+        model.isCompleted = isCompleted
+        insertOrUpdateQuickStartStatusModel(model)
+    }
+
+    fun getQuickStartCompleted(siteId: Long): Boolean {
+        return getQuickStartStatus(siteId)?.isCompleted ?: false
+    }
+
+    fun setQuickStartNotificationReceived(siteId: Long, isReceived: Boolean) {
+        val model = getQuickStartStatus(siteId) ?: QuickStartStatusModel()
+        model.siteId = siteId
+        model.isNotificationReceived = isReceived
+        insertOrUpdateQuickStartStatusModel(model)
+    }
+
+    fun getQuickStartNotificationReceived(siteId: Long): Boolean {
+        return getQuickStartStatus(siteId)?.isNotificationReceived ?: false
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/RemoteConfigDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/RemoteConfigDao.kt
new file mode 100644
index 00000000000..2e1b7485de1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/RemoteConfigDao.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.fluxc.persistence
+
+import androidx.room.ColumnInfo
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao.RemoteConfigValueSource.REMOTE
+
+@Dao
+abstract class RemoteConfigDao {
+    @Transaction
+    @Query("SELECT * from RemoteConfigurations")
+    abstract fun getRemoteConfigList(): List<RemoteConfig>
+
+    @Transaction
+    @Query("SELECT * from RemoteConfigurations WHERE `key` = :key")
+    abstract fun getRemoteConfig(key: String): List<RemoteConfig>
+
+    @Transaction
+    @Suppress("SpreadOperator")
+    open fun insert(remoteFlags: Map<String, String>) {
+        remoteFlags.forEach {
+            insert(
+                    RemoteConfig(
+                            key = it.key,
+                            value = it.value,
+                            createdAt = System.currentTimeMillis(),
+                            modifiedAt = System.currentTimeMillis(),
+                            source = REMOTE
+                    )
+            )
+        }
+    }
+
+    @Transaction
+    @Query("DELETE FROM RemoteConfigurations")
+    abstract fun clear()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun insert(offer: RemoteConfig)
+
+    @Entity(
+            tableName = "RemoteConfigurations",
+            primaryKeys = ["key"]
+    )
+    data class RemoteConfig(
+        val key: String,
+        val value: String,
+        @ColumnInfo(name = "created_at") val createdAt: Long,
+        @ColumnInfo(name = "modified_at") val modifiedAt: Long,
+        @ColumnInfo(name = "source") val source: RemoteConfigValueSource
+    )
+
+    enum class RemoteConfigValueSource(val value: Int) {
+        BUILD_CONFIG(0),
+        REMOTE(1),
+    }
+
+    class RemoteConfigValueConverter {
+        @TypeConverter
+        fun toRemoteConfigValueSource(value: Int): RemoteConfigValueSource =
+                enumValues<RemoteConfigValueSource>()[value]
+
+        @TypeConverter
+        fun fromRemoteConfigValueSource(value: RemoteConfigValueSource): Int = value.ordinal
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ScanSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ScanSqlUtils.kt
new file mode 100644
index 00000000000..ca26ce54e66
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ScanSqlUtils.kt
@@ -0,0 +1,143 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.ScanStateTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.Reason
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.ScanProgressStatus
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.IDLE
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.PROVISIONING
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.SCANNING
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.UNAVAILABLE
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.UNKNOWN
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ScanSqlUtils @Inject constructor() {
+    fun replaceScanState(site: SiteModel, scanStateModel: ScanStateModel) {
+        val scanStatusBuilder = scanStateModel.toBuilder(site)
+        WellSql.delete(ScanStateBuilder::class.java)
+            .where()
+            .equals(ScanStateTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .execute()
+        WellSql.insert(scanStatusBuilder).execute()
+    }
+
+    fun getScanStateForSite(site: SiteModel): ScanStateModel? {
+        val scanStateBuilder = getScanStateBuilder(site)
+        return scanStateBuilder?.build()
+    }
+
+    private fun getScanStateBuilder(site: SiteModel): ScanStateBuilder? {
+        return WellSql.select(ScanStateBuilder::class.java)
+            .where()
+            .equals(ScanStateTable.LOCAL_SITE_ID, site.id)
+            .endWhere()
+            .asModel
+            .firstOrNull()
+    }
+
+    private fun ScanStateModel.toBuilder(site: SiteModel): ScanStateBuilder {
+        return ScanStateBuilder(
+            localSiteId = site.id,
+            remoteSiteId = site.siteId,
+            state = state.value,
+            startDate = startDate(),
+            duration = mostRecentStatus?.duration ?: 0,
+            progress = progress(),
+            reason = reason.value,
+            error = mostRecentStatus?.error ?: false,
+            initial = isInitial(),
+            hasCloud = hasCloud,
+            hasValidCredentials = hasValidCredentials
+        )
+    }
+
+    private fun ScanStateModel.startDate() = when (state) {
+        IDLE -> mostRecentStatus?.startDate?.time
+        SCANNING -> currentStatus?.startDate?.time
+        PROVISIONING, UNAVAILABLE, UNKNOWN -> null
+    }
+
+    private fun ScanStateModel.progress() = when (state) {
+        IDLE -> mostRecentStatus?.progress ?: 0
+        SCANNING -> currentStatus?.progress ?: 0
+        PROVISIONING, UNAVAILABLE, UNKNOWN -> 0
+    }
+
+    private fun ScanStateModel.isInitial() = when (state) {
+        IDLE -> mostRecentStatus?.isInitial ?: false
+        SCANNING -> currentStatus?.isInitial ?: false
+        PROVISIONING, UNAVAILABLE, UNKNOWN -> false
+    }
+
+    @Table(name = "ScanState")
+    data class ScanStateBuilder(
+        @PrimaryKey
+        @Column private var id: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var state: String,
+        @Column var startDate: Long? = null,
+        @Column var duration: Int = 0,
+        @Column var progress: Int = 0,
+        @Column var reason: String? = null,
+        @Column var error: Boolean = false,
+        @Column var initial: Boolean = false,
+        @Column var hasCloud: Boolean = false,
+        @Column var hasValidCredentials: Boolean = false
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, "")
+
+        override fun setId(id: Int) {
+            this.id = id
+        }
+
+        override fun getId() = id
+
+        fun build(): ScanStateModel {
+            val stateForModel = State.fromValue(state) ?: UNKNOWN
+
+            var currentStatus: ScanProgressStatus? = null
+            var mostRecentStatus: ScanProgressStatus? = null
+
+            when (stateForModel) {
+                SCANNING -> {
+                    currentStatus = ScanProgressStatus(
+                        startDate = startDate?.let { Date(it) },
+                        progress = progress,
+                        isInitial = initial
+                    )
+                }
+                IDLE -> {
+                    mostRecentStatus = ScanProgressStatus(
+                        startDate = startDate?.let { Date(it) },
+                        duration = duration,
+                        progress = progress,
+                        error = error,
+                        isInitial = initial
+                    )
+                }
+                else -> Unit // Do nothing (ignore)
+            }
+
+            return ScanStateModel(
+                state = stateForModel,
+                hasCloud = hasCloud,
+                mostRecentStatus = mostRecentStatus,
+                currentStatus = currentStatus,
+                reason = Reason.fromValue(reason),
+                hasValidCredentials = hasValidCredentials
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/SiteSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/SiteSqlUtils.kt
new file mode 100644
index 00000000000..015a86374fc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/SiteSqlUtils.kt
@@ -0,0 +1,539 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.ContentValues
+import android.database.Cursor
+import android.database.sqlite.SQLiteConstraintException
+import com.wellsql.generated.AccountModelTable
+import com.wellsql.generated.GutenbergLayoutCategoriesModelTable
+import com.wellsql.generated.GutenbergLayoutCategoryModelTable
+import com.wellsql.generated.GutenbergLayoutModelTable
+import com.wellsql.generated.PostFormatModelTable
+import com.wellsql.generated.RoleModelTable
+import com.wellsql.generated.SiteModelTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.PostFormatModel
+import org.wordpress.android.fluxc.model.RoleModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.layouts.GutenbergLayoutCategoriesModel
+import org.wordpress.android.fluxc.model.layouts.GutenbergLayoutCategoryModel
+import org.wordpress.android.fluxc.model.layouts.GutenbergLayoutModel
+import org.wordpress.android.fluxc.model.layouts.connections
+import org.wordpress.android.fluxc.model.layouts.transform
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.DB
+import org.wordpress.android.util.UrlUtils
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SiteSqlUtils
+@Inject constructor() {
+    object DuplicateSiteException : Exception() {
+        private const val serialVersionUID = -224883903136726226L
+    }
+
+    fun getSiteWithLocalId(id: LocalId): SiteModel? = WellSql.select(SiteModel::class.java)
+            .where()
+            .equals(SiteModelTable.ID, id.value)
+            .endWhere()
+            .asModel
+            .firstOrNull()
+
+    fun getSitesWithLocalId(id: Int): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where().equals(SiteModelTable.ID, id).endWhere().asModel
+    }
+
+    fun getSitesWithRemoteId(id: Long): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where().equals(SiteModelTable.SITE_ID, id).endWhere().asModel
+    }
+
+    fun getWpComSites(): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where().equals(SiteModelTable.IS_WPCOM, true).endWhere().asModel
+    }
+
+    fun getWpComAtomicSites(): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where().equals(SiteModelTable.IS_WPCOM_ATOMIC, true).endWhere().asModel
+    }
+
+    fun getSitesWith(field: String?, value: Boolean): SelectQuery<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where().equals(field, value).endWhere()
+    }
+
+    fun getSitesAccessedViaWPComRestByNameOrUrlMatching(searchString: String?): List<SiteModel> {
+        // Note: by default SQLite "LIKE" operator is case insensitive, and that's what we're looking for.
+        return WellSql.select(SiteModel::class.java).where() // ORIGIN = ORIGIN_WPCOM_REST AND (x in url OR x in name)
+                .equals(SiteModelTable.ORIGIN, SiteModel.ORIGIN_WPCOM_REST)
+                .beginGroup()
+                .contains(SiteModelTable.URL, searchString)
+                .or().contains(SiteModelTable.NAME, searchString)
+                .endGroup().endWhere().asModel
+    }
+
+    fun getSitesByNameOrUrlMatching(searchString: String?): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java).where()
+                .contains(SiteModelTable.URL, searchString)
+                .or().contains(SiteModelTable.NAME, searchString)
+                .endWhere().asModel
+    }
+
+    fun getSites(): List<SiteModel> = WellSql.select(SiteModel::class.java).asModel
+
+    fun getVisibleSites(): List<SiteModel> {
+        return WellSql.select(SiteModel::class.java)
+                .where()
+                .equals(SiteModelTable.IS_VISIBLE, true)
+                .endWhere()
+                .asModel
+    }
+
+    /**
+     * Inserts the given SiteModel into the DB, or updates an existing entry where sites match.
+     *
+     * Possible cases:
+     * 1. Exists in the DB already and matches by local id (simple update) -> UPDATE
+     * 2. Exists in the DB, is a Jetpack or WordPress site and matches by remote id (SITE_ID) -> UPDATE
+     * 3. Exists in the DB, is a pure self hosted and matches by remote id (SITE_ID) + URL -> UPDATE
+     * 4. Exists in the DB, originally a WP.com REST site, and matches by XMLRPC_URL -> THROW a DuplicateSiteException
+     * 5. Exists in the DB, originally an XML-RPC site, and matches by XMLRPC_URL -> UPDATE
+     * 6. Not matching any previous cases -> INSERT
+     */
+    @Suppress("LongMethod", "ReturnCount", "ComplexMethod")
+    @Throws(DuplicateSiteException::class)
+    fun insertOrUpdateSite(site: SiteModel?): Int {
+        if (site == null) {
+            return 0
+        }
+
+        // If we're inserting or updating a WP.com REST API site, validate that we actually have a WordPress.com
+        // AccountModel present
+        // This prevents a late UPDATE_SITES action from re-populating the database after sign out from WordPress.com
+        if (site.isUsingWpComRestApi) {
+            val accountModel = WellSql.select(AccountModel::class.java)
+                    .where()
+                    .not().equals(AccountModelTable.USER_ID, 0)
+                    .endWhere()
+                    .asModel
+            if (accountModel.isEmpty()) {
+                AppLog.w(DB, "Can't insert WP.com site " + site.url + ", missing user account")
+                return 0
+            }
+        }
+
+        // If the site already exist and has an id, we want to update it.
+        var siteResult = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ID, site.id)
+                .endGroup().endWhere().asModel
+        if (!siteResult.isEmpty()) {
+            AppLog.d(DB, "Site found by (local) ID: " + site.id)
+        }
+
+        // Looks like a new site, make sure we don't already have it.
+        if (siteResult.isEmpty()) {
+            if (site.siteId > 0) {
+                // For WordPress.com and Jetpack sites, the WP.com ID is a unique enough identifier
+                siteResult = WellSql.select(SiteModel::class.java)
+                        .where().beginGroup()
+                        .equals(SiteModelTable.SITE_ID, site.siteId)
+                        .endGroup().endWhere().asModel
+                if (!siteResult.isEmpty()) {
+                    AppLog.d(DB, "Site found by SITE_ID: " + site.siteId)
+                }
+            } else {
+                siteResult = WellSql.select(SiteModel::class.java)
+                        .where().beginGroup()
+                        .equals(SiteModelTable.SITE_ID, site.siteId)
+                        .equals(SiteModelTable.URL, site.url)
+                        .endGroup().endWhere().asModel
+                if (!siteResult.isEmpty()) {
+                    AppLog.d(DB, "Site found by SITE_ID: " + site.siteId + " and URL: " + site.url)
+                }
+            }
+        }
+
+        // If the site is a self hosted, maybe it's already in the DB as a Jetpack site, and we don't want to create
+        // a duplicate.
+        if (siteResult.isEmpty()) {
+            val forcedHttpXmlRpcUrl = "http://" + UrlUtils.removeScheme(site.xmlRpcUrl)
+            val forcedHttpsXmlRpcUrl = "https://" + UrlUtils.removeScheme(site.xmlRpcUrl)
+            siteResult = WellSql.select(SiteModel::class.java)
+                    .where()
+                    .beginGroup()
+                    .equals(SiteModelTable.XMLRPC_URL, forcedHttpXmlRpcUrl)
+                    .or().equals(SiteModelTable.XMLRPC_URL, forcedHttpsXmlRpcUrl)
+                    .endGroup()
+                    .endWhere()
+                    .asModel
+            if (siteResult.isNotEmpty()) {
+                AppLog.d(DB, "Site found using XML-RPC url: " + site.xmlRpcUrl)
+                // Four possibilities here:
+                // 1. DB site is WP.com, new site is WP.com with different siteIds:
+                // The site could be having an "Identity Crisis", while this should be fixed on the site itself,
+                // it shouldn't block sign-in -> proceed
+                // 2. DB site is WP.com, new site is XML-RPC:
+                // It looks like an existing Jetpack-connected site over the REST API was added again as an XML-RPC
+                // Wed don't allow this --> DuplicateSiteException
+                // 3. DB site is XML-RPC, new site is WP.com:
+                // Upgrading a self-hosted site to Jetpack --> proceed
+                // 4. DB site is XML-RPC, new site is XML-RPC:
+                // An existing self-hosted site was logged-into again, and we couldn't identify it by URL or
+                // by WP.com site ID + URL --> proceed
+                if (siteResult[0].origin == SiteModel.ORIGIN_WPCOM_REST && site.origin == SiteModel.ORIGIN_WPCOM_REST) {
+                    AppLog.d(
+                        DB,
+                        "Duplicate WPCom sites with same URLs, it could be an Identity Crisis, insert both sites"
+                    )
+                    siteResult = emptyList()
+                } else if (siteResult[0].origin == SiteModel.ORIGIN_WPCOM_REST) {
+                    AppLog.d(DB, "Site is a duplicate")
+                    throw DuplicateSiteException
+                }
+            }
+        }
+        return if (siteResult.isEmpty()) {
+            // No site with this local ID, REMOTE_ID + URL, or XMLRPC URL, then insert it
+            AppLog.d(DB, "Inserting site: " + site.url)
+            WellSql.insert(site).asSingleTransaction(true).execute()
+            1
+        } else {
+            // Update old site
+            AppLog.d(DB, "Updating site: " + site.url)
+            val oldId = siteResult[0].id
+            try {
+                WellSql.update(SiteModel::class.java).whereId(oldId)
+                        .put(site, UpdateAllExceptId(SiteModel::class.java)).execute()
+            } catch (e: SQLiteConstraintException) {
+                AppLog.e(
+                        DB,
+                        "Error while updating site: siteId=${site.siteId} url=${site.url} " +
+                                "xmlrpc=${site.xmlRpcUrl}",
+                        e
+                )
+                throw DuplicateSiteException
+            }
+        }
+    }
+
+    fun deleteSite(site: SiteModel?): Int {
+        return if (site == null) {
+            0
+        } else WellSql.delete(SiteModel::class.java)
+                .where().equals(SiteModelTable.ID, site.id).endWhere()
+                .execute()
+    }
+
+    fun deleteAllSites(): Int {
+        return WellSql.delete(SiteModel::class.java).execute()
+    }
+
+    fun setSiteVisibility(site: SiteModel?, visible: Boolean): Int {
+        return if (site == null) {
+            0
+        } else WellSql.update(SiteModel::class.java)
+                .whereId(site.id)
+                .where().equals(SiteModelTable.IS_WPCOM, true).endWhere()
+                .put(visible, { item ->
+                    val cv = ContentValues()
+                    cv.put(SiteModelTable.IS_VISIBLE, item)
+                    cv
+                }).execute()
+    }
+
+    val wPComSites: SelectQuery<SiteModel>
+        get() = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.IS_WPCOM, true)
+                .endGroup().endWhere()
+
+    /**
+     * @return A selectQuery to get all the sites accessed via the XMLRPC, this includes: pure self hosted sites,
+     * but also Jetpack sites connected via XMLRPC.
+     */
+    val sitesAccessedViaXMLRPC: SelectQuery<SiteModel>
+        get() = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ORIGIN, SiteModel.ORIGIN_XMLRPC)
+                .endGroup().endWhere()
+    val sitesAccessedViaWPComRest: SelectQuery<SiteModel>
+        get() = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ORIGIN, SiteModel.ORIGIN_WPCOM_REST)
+                .endGroup().endWhere()
+    val visibleSitesAccessedViaWPCom: SelectQuery<SiteModel>
+        get() = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ORIGIN, SiteModel.ORIGIN_WPCOM_REST)
+                .equals(SiteModelTable.IS_VISIBLE, true)
+                .endGroup().endWhere()
+
+    fun getPostFormats(site: SiteModel): List<PostFormatModel> {
+        return WellSql.select(PostFormatModel::class.java)
+                .where()
+                .equals(PostFormatModelTable.SITE_ID, site.id)
+                .endWhere().asModel
+    }
+
+    fun insertOrReplacePostFormats(site: SiteModel, postFormats: List<PostFormatModel>) {
+        // Remove previous post formats for this site
+        WellSql.delete(PostFormatModel::class.java)
+                .where()
+                .equals(PostFormatModelTable.SITE_ID, site.id)
+                .endWhere().execute()
+        // Insert new post formats for this site
+        for (postFormat in postFormats) {
+            postFormat.siteId = site.id
+        }
+        WellSql.insert(postFormats).execute()
+    }
+
+    fun getUserRoles(site: SiteModel): List<RoleModel> {
+        return WellSql.select(RoleModel::class.java)
+                .where()
+                .equals(RoleModelTable.SITE_ID, site.id)
+                .endWhere().asModel
+    }
+
+    fun insertOrReplaceUserRoles(site: SiteModel, roles: List<RoleModel>) {
+        // Remove previous roles for this site
+        WellSql.delete(RoleModel::class.java)
+                .where()
+                .equals(RoleModelTable.SITE_ID, site.id)
+                .endWhere().execute()
+        // Insert new user roles for this site
+        for (role in roles) {
+            role.siteId = site.id
+        }
+        WellSql.insert(roles).execute()
+    }
+
+    fun getBlockLayoutCategories(site: SiteModel): List<GutenbergLayoutCategory> {
+        val categories = WellSql.select(
+                GutenbergLayoutCategoryModel::class.java
+        )
+                .where()
+                .equals(GutenbergLayoutCategoryModelTable.SITE_ID, site.id)
+                .endWhere().asModel
+        return categories.transform()
+    }
+
+    fun getBlockLayouts(site: SiteModel): List<GutenbergLayout> {
+        val blockLayouts = ArrayList<GutenbergLayout>()
+        val layouts = WellSql.select(
+                GutenbergLayoutModel::class.java
+        )
+                .where()
+                .equals(GutenbergLayoutModelTable.SITE_ID, site.id)
+                .endWhere().asModel
+        for (layout in layouts) {
+            blockLayouts.add(getGutenbergLayout(site, layout))
+        }
+        return blockLayouts
+    }
+
+    fun getBlockLayout(site: SiteModel, slug: String): GutenbergLayout? {
+        val layoutModel = getGutenbergLayoutModel(site, slug)
+        return layoutModel?.let { getGutenbergLayout(site, it) }
+    }
+
+    private fun getGutenbergLayout(site: SiteModel, layout: GutenbergLayoutModel): GutenbergLayout {
+        val connections = WellSql.select(
+                GutenbergLayoutCategoriesModel::class.java
+        )
+                .where()
+                .equals(
+                        GutenbergLayoutCategoriesModelTable.SITE_ID,
+                        site.id
+                )
+                .equals(
+                        GutenbergLayoutCategoriesModelTable.LAYOUT_ID,
+                        layout.id
+                )
+                .endWhere().asModel
+        val categories = ArrayList<GutenbergLayoutCategoryModel>()
+        for (connection in connections) {
+            categories.addAll(
+                    WellSql.select(GutenbergLayoutCategoryModel::class.java)
+                            .where()
+                            .equals(GutenbergLayoutCategoriesModelTable.ID, connection.categoryId)
+                            .endWhere().asModel
+            )
+        }
+        return layout.transform(categories)
+    }
+
+    private fun getGutenbergLayoutModel(
+        site: SiteModel,
+        slug: String
+    ): GutenbergLayoutModel? {
+        val layouts = WellSql.select(
+                GutenbergLayoutModel::class.java
+        )
+                .where()
+                .equals(GutenbergLayoutModelTable.SITE_ID, site.id)
+                .equals(GutenbergLayoutModelTable.SLUG, slug)
+                .endWhere().asModel
+        return if (layouts.size == 1) {
+            layouts[0]
+        } else null
+    }
+
+    fun getBlockLayoutContent(site: SiteModel, slug: String): String? {
+        val layout = getGutenbergLayoutModel(site, slug)
+        return layout?.content
+    }
+
+    fun insertOrReplaceBlockLayouts(
+        site: SiteModel,
+        categories: List<GutenbergLayoutCategory>,
+        layouts: List<GutenbergLayout>
+    ) {
+        // Update categories
+        WellSql.delete(GutenbergLayoutCategoryModel::class.java)
+                .where()
+                .equals(GutenbergLayoutCategoryModelTable.SITE_ID, site.id)
+                .endWhere().execute()
+        WellSql.insert(categories.transform(site)).execute()
+        // Update layouts
+        WellSql.delete(GutenbergLayoutModel::class.java)
+                .where()
+                .equals(GutenbergLayoutModelTable.SITE_ID, site.id)
+                .endWhere().execute()
+        WellSql.insert(layouts.transform(site)).execute()
+        // Update connections
+        WellSql.delete(GutenbergLayoutCategoriesModel::class.java)
+                .where()
+                .equals(GutenbergLayoutCategoriesModelTable.SITE_ID, site.id)
+                .endWhere().execute()
+        WellSql.insert<GutenbergLayoutCategoriesModel>(layouts.connections(site)).execute()
+    }
+
+    /**
+     * Removes all sites from local database with the following criteria:
+     * 1. Site is a WP.com -or- Jetpack connected site
+     * 2. Site has no local-only data (posts/pages/drafts)
+     * 3. Remote site ID does not match a site ID found in given sites list
+     *
+     * @param sites
+     * list of sites to keep in local database
+     */
+    @Suppress("NestedBlockDepth")
+    fun removeWPComRestSitesAbsentFromList(postSqlUtils: PostSqlUtils, sites: List<SiteModel>): Int {
+        // get all local WP.com+Jetpack sites
+        val localSites = WellSql.select(SiteModel::class.java)
+                .where()
+                .equals(SiteModelTable.ORIGIN, SiteModel.ORIGIN_WPCOM_REST)
+                .endWhere().asModel
+        if (localSites.size > 0) {
+            // iterate through all local WP.com+Jetpack sites
+            val localIterator = localSites.iterator()
+            while (localIterator.hasNext()) {
+                val localSite = localIterator.next()
+
+                // don't remove sites with local changes
+                if (postSqlUtils.getSiteHasLocalChanges(localSite)) {
+                    localIterator.remove()
+                } else {
+                    // don't remove local site if the remote ID matches a given site's ID
+                    for (site in sites) {
+                        if (site.siteId == localSite.siteId) {
+                            localIterator.remove()
+                            break
+                        }
+                    }
+                }
+            }
+
+            // delete applicable sites
+            for (site in localSites) {
+                deleteSite(site)
+            }
+        }
+        return localSites.size
+    }
+
+    fun isWPComSiteVisibleByLocalId(id: Int): Boolean {
+        return WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ID, id)
+                .equals(SiteModelTable.IS_WPCOM, true)
+                .equals(SiteModelTable.IS_VISIBLE, true)
+                .endGroup().endWhere()
+                .exists()
+    }
+
+    /**
+     * Given a (remote) site id, returns the corresponding (local) id.
+     */
+    fun getLocalIdForRemoteSiteId(siteId: Long): Int {
+        val sites = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.SITE_ID, siteId)
+                .or()
+                .equals(SiteModelTable.SELF_HOSTED_SITE_ID, siteId)
+                .endGroup().endWhere()
+                .getAsModel(this::toSiteModel)
+        return if (sites.size > 0) {
+            sites[0].id
+        } else 0
+    }
+
+    private fun toSiteModel(cursor: Cursor): SiteModel {
+        val siteModel = SiteModel()
+        siteModel.id = cursor.getInt(cursor.getColumnIndexOrThrow(SiteModelTable.ID))
+        return siteModel
+    }
+
+    /**
+     * Given a (remote) self-hosted site id and XML-RPC url, returns the corresponding (local) id.
+     */
+    fun getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(selfHostedSiteId: Long, xmlRpcUrl: String?): Int {
+        val sites = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.SELF_HOSTED_SITE_ID, selfHostedSiteId)
+                .equals(SiteModelTable.XMLRPC_URL, xmlRpcUrl)
+                .endGroup().endWhere()
+                .getAsModel(this::toSiteModel)
+        return if (sites.size > 0) {
+            sites[0].id
+        } else 0
+    }
+
+    /**
+     * Given a (local) id, returns the (remote) site id. Searches first for .COM and Jetpack, then looks for self-hosted
+     * sites.
+     */
+    fun getSiteIdForLocalId(id: Int): Long {
+        val result = WellSql.select(SiteModel::class.java)
+                .where().beginGroup()
+                .equals(SiteModelTable.ID, id)
+                .endGroup().endWhere()
+                .getAsModel { cursor ->
+                    val siteModel = SiteModel()
+                    siteModel.siteId = cursor.getInt(
+                            cursor.getColumnIndexOrThrow(SiteModelTable.SITE_ID)
+                    ).toLong()
+                    siteModel.selfHostedSiteId = cursor.getLong(
+                            cursor.getColumnIndexOrThrow(SiteModelTable.SELF_HOSTED_SITE_ID)
+                    )
+                    siteModel
+                }
+        if (result.isEmpty()) {
+            return 0
+        }
+        return if (result[0].siteId > 0) {
+            result[0].siteId
+        } else {
+            result[0].selfHostedSiteId
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsRequestSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsRequestSqlUtils.kt
new file mode 100644
index 00000000000..55905d70d2e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsRequestSqlUtils.kt
@@ -0,0 +1,121 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.StatsBlockTable
+import com.wellsql.generated.StatsRequestTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StatsRequestSqlUtils @Inject constructor() {
+    fun insert(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        requestedItems: Int? = null,
+        date: String? = null,
+        postId: Long? = null
+    ) {
+        var deleteStatement = WellSql.delete(StatsRequestBuilder::class.java)
+                .where()
+                .equals(StatsBlockTable.LOCAL_SITE_ID, site.id)
+                .equals(StatsBlockTable.BLOCK_TYPE, blockType.name)
+                .equals(StatsBlockTable.STATS_TYPE, statsType.name)
+        if (date != null) {
+            deleteStatement = deleteStatement.equals(StatsBlockTable.DATE, date)
+        }
+        deleteStatement.endWhere().execute()
+        val timeStamp = System.currentTimeMillis()
+        WellSql.insert(
+                StatsRequestBuilder(
+                        localSiteId = site.id,
+                        blockType = blockType.name,
+                        statsType = statsType.name,
+                        date = date,
+                        postId = postId,
+                        timeStamp = timeStamp,
+                        requestedItems = requestedItems
+                )
+        ).execute()
+    }
+
+    fun hasFreshRequest(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        requestedItems: Int? = null,
+        after: Long = System.currentTimeMillis() - STALE_PERIOD,
+        date: String? = null,
+        postId: Long? = null
+    ): Boolean {
+        return createSelectStatement(
+                site,
+                blockType,
+                statsType,
+                date,
+                postId,
+                after,
+                requestedItems
+        ).asModel.firstOrNull<StatsRequestBuilder?>() != null
+    }
+
+    @Suppress("LongParameterList")
+    private fun createSelectStatement(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        date: String?,
+        postId: Long?,
+        after: Long,
+        requestedItems: Int? = null
+    ): SelectQuery<StatsRequestBuilder> {
+        var select = WellSql.select(StatsRequestBuilder::class.java)
+                .where()
+                .equals(StatsRequestTable.LOCAL_SITE_ID, site.id)
+                .equals(StatsRequestTable.BLOCK_TYPE, blockType.name)
+                .equals(StatsRequestTable.STATS_TYPE, statsType.name)
+                .greaterThen(StatsRequestTable.TIME_STAMP, after)
+        if (requestedItems != null) {
+            select = select.greaterThenOrEqual(StatsRequestTable.REQUESTED_ITEMS, requestedItems)
+        }
+        if (date != null) {
+            select = select.equals(StatsRequestTable.DATE, date)
+        }
+        if (postId != null) {
+            select = select.equals(StatsRequestTable.POST_ID, postId)
+        }
+        return select.endWhere()
+    }
+
+    @Table(name = "StatsRequest")
+    data class StatsRequestBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var blockType: String,
+        @Column var statsType: String,
+        @Column var date: String?,
+        @Column var postId: Long?,
+        @Column var timeStamp: Long,
+        @Column var requestedItems: Int?
+    ) : Identifiable {
+        constructor() : this(-1, -1, "", "", null, null, 0, null)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+
+    companion object {
+        private const val STALE_PERIOD = 5 * 60 * 1000
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsSqlUtils.kt
new file mode 100644
index 00000000000..c8c22dc8dda
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StatsSqlUtils.kt
@@ -0,0 +1,175 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.wellsql.generated.StatsBlockTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import javax.inject.Inject
+import javax.inject.Singleton
+
+const val DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ"
+
+@Singleton
+class StatsSqlUtils @Inject constructor() {
+    private val gson: Gson by lazy {
+        val builder = GsonBuilder()
+        builder.setDateFormat(DATE_FORMAT)
+        builder.create()
+    }
+
+    fun <T> insert(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        item: T,
+        replaceExistingData: Boolean,
+        date: String? = null,
+        postId: Long? = null
+    ) {
+        val json = gson.toJson(item)
+        if (replaceExistingData) {
+            var deleteStatement = WellSql.delete(StatsBlockBuilder::class.java)
+                    .where()
+                    .equals(StatsBlockTable.LOCAL_SITE_ID, site.id)
+                    .equals(StatsBlockTable.BLOCK_TYPE, blockType.name)
+                    .equals(StatsBlockTable.STATS_TYPE, statsType.name)
+            if (date != null) {
+                deleteStatement = deleteStatement.equals(StatsBlockTable.DATE, date)
+            }
+            if (postId != null) {
+                deleteStatement = deleteStatement.equals(StatsBlockTable.POST_ID, postId)
+            }
+            deleteStatement.endWhere().execute()
+        }
+        WellSql.insert(
+                StatsBlockBuilder(
+                        localSiteId = site.id,
+                        blockType = blockType.name,
+                        statsType = statsType.name,
+                        date = date,
+                        postId = postId,
+                        json = json
+                )
+        ).execute()
+    }
+
+    fun <T> selectAll(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        classOfT: Class<T>,
+        date: String? = null,
+        postId: Long? = null
+    ): List<T> {
+        val models = createSelectStatement(site, blockType, statsType, date, postId).asModel
+        return models.map { gson.fromJson(it.json, classOfT) }
+    }
+
+    fun <T> select(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        classOfT: Class<T>,
+        date: String? = null,
+        postId: Long? = null
+    ): T? {
+        val model = createSelectStatement(site, blockType, statsType, date, postId).asModel.firstOrNull()
+        if (model != null) {
+            return gson.fromJson(model.json, classOfT)
+        }
+        return null
+    }
+
+    fun deleteAllStats(): Int {
+        return WellSql.delete(StatsBlockBuilder::class.java).execute()
+    }
+
+    fun deleteSiteStats(site: SiteModel): Int {
+        return WellSql.delete(StatsBlockBuilder::class.java)
+                .where()
+                .equals(StatsBlockTable.LOCAL_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+
+    private fun createSelectStatement(
+        site: SiteModel,
+        blockType: BlockType,
+        statsType: StatsType,
+        date: String?,
+        postId: Long?
+    ): SelectQuery<StatsBlockBuilder> {
+        var select = WellSql.select(StatsBlockBuilder::class.java)
+                .where()
+                .equals(StatsBlockTable.LOCAL_SITE_ID, site.id)
+                .equals(StatsBlockTable.BLOCK_TYPE, blockType.name)
+                .equals(StatsBlockTable.STATS_TYPE, statsType.name)
+        if (date != null) {
+            select = select.equals(StatsBlockTable.DATE, date)
+        }
+        if (postId != null) {
+            select = select.equals(StatsBlockTable.POST_ID, postId)
+        }
+        return select.endWhere()
+    }
+
+    @Table(name = "StatsBlock")
+    data class StatsBlockBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var localSiteId: Int,
+        @Column var blockType: String,
+        @Column var statsType: String,
+        @Column var date: String?,
+        @Column var postId: Long?,
+        @Column var json: String
+    ) : Identifiable {
+        constructor() : this(-1, -1, "", "", null, null, "")
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+
+    enum class StatsType {
+        INSIGHTS,
+        DAY,
+        WEEK,
+        MONTH,
+        YEAR
+    }
+
+    enum class BlockType {
+        ALL_TIME_INSIGHTS,
+        MOST_POPULAR_INSIGHTS,
+        LATEST_POST_DETAIL_INSIGHTS,
+        DETAILED_POST_STATS,
+        TODAYS_INSIGHTS,
+        WP_COM_FOLLOWERS,
+        EMAIL_FOLLOWERS,
+        COMMENTS_INSIGHTS,
+        SUMMARY,
+        TAGS_AND_CATEGORIES_INSIGHTS,
+        POSTS_AND_PAGES_VIEWS,
+        REFERRERS,
+        CLICKS,
+        VISITS_AND_VIEWS,
+        COUNTRY_VIEWS,
+        AUTHORS,
+        SEARCH_TERMS,
+        VIDEO_PLAYS,
+        PUBLICIZE_INSIGHTS,
+        POSTING_ACTIVITY,
+        FILE_DOWNLOADS,
+        SUBSCRIBERS,
+        FOLLOWERS,
+        EMAILS_SUBSCRIBERS
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StockMediaSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StockMediaSqlUtils.kt
new file mode 100644
index 00000000000..0faca12482c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/StockMediaSqlUtils.kt
@@ -0,0 +1,107 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.StockMediaPageTable
+import com.yarolegovich.wellsql.SelectQuery
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.store.StockMediaItem
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StockMediaSqlUtils
+@Inject constructor() {
+    fun insert(
+        page: Int,
+        nextPage: Int?,
+        items: List<StockMediaItem>
+    ) {
+        val writableDb = WellSql.giveMeWritableDb()
+        writableDb.beginTransaction()
+        try {
+            WellSql.insert(StockMediaPageBuilder(page = page, nextPage = nextPage)).execute()
+            WellSql.insert(
+                    items.map {
+                        StockMediaBuilder(
+                                itemId = it.id,
+                                name = it.name,
+                                title = it.title,
+                                url = it.url,
+                                date = it.date,
+                                thumbnail = it.thumbnail
+                        )
+                    }
+            ).execute()
+            writableDb.setTransactionSuccessful()
+        } finally {
+            writableDb.endTransaction()
+        }
+    }
+
+    fun selectAll(): List<StockMediaItem> {
+        return WellSql.select(StockMediaBuilder::class.java).asModel.map {
+            StockMediaItem(
+                    it.itemId,
+                    it.name,
+                    it.title,
+                    it.url,
+                    it.date,
+                    it.thumbnail
+            )
+        }
+    }
+
+    fun getNextPage(): Int? {
+        return WellSql.select(StockMediaPageBuilder::class.java)
+                .orderBy(StockMediaPageTable.PAGE, SelectQuery.ORDER_DESCENDING).asModel.firstOrNull()?.nextPage
+    }
+
+    fun clear() {
+        val writableDb = WellSql.giveMeWritableDb()
+        writableDb.beginTransaction()
+        try {
+            WellSql.delete(StockMediaBuilder::class.java).execute()
+            WellSql.delete(StockMediaPageBuilder::class.java).execute()
+            writableDb.setTransactionSuccessful()
+        } finally {
+            writableDb.endTransaction()
+        }
+    }
+
+    @Table(name = "StockMediaPage")
+    data class StockMediaPageBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var page: Int,
+        @Column var nextPage: Int?
+    ) : Identifiable {
+        constructor() : this(-1, -1, null)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+
+    @Table(name = "StockMedia")
+    data class StockMediaBuilder(
+        @PrimaryKey @Column private var mId: Int = -1,
+        @Column var itemId: String?,
+        @Column var name: String?,
+        @Column var title: String?,
+        @Column var url: String?,
+        @Column var date: String?,
+        @Column var thumbnail: String?
+    ) : Identifiable {
+        constructor() : this(-1, null, null, null, null, null, null)
+
+        override fun setId(id: Int) {
+            this.mId = id
+        }
+
+        override fun getId() = mId
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TaxonomySqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TaxonomySqlUtils.java
new file mode 100644
index 00000000000..0bf45f5f072
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TaxonomySqlUtils.java
@@ -0,0 +1,148 @@
+package org.wordpress.android.fluxc.persistence;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.TermModelTable;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TermModel;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TaxonomySqlUtils {
+    public static int insertOrUpdateTerm(@NonNull TermModel term) {
+        List<TermModel> termResult = WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.ID, term.getId())
+                .or()
+                .beginGroup()
+                .equals(TermModelTable.REMOTE_TERM_ID, term.getRemoteTermId())
+                .equals(TermModelTable.LOCAL_SITE_ID, term.getLocalSiteId())
+                .equals(TermModelTable.TAXONOMY, term.getTaxonomy())
+                .endGroup()
+                .endGroup().endWhere().getAsModel();
+
+        if (termResult.isEmpty()) {
+            // insert
+            WellSql.insert(term).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            return WellSql.update(TermModel.class).whereId(termResult.get(0).getId())
+                    .put(term, new UpdateAllExceptId<>(TermModel.class)).execute();
+        }
+    }
+
+    @NonNull
+    public static List<TermModel> getTermsForSite(
+            @NonNull SiteModel site,
+            @NonNull String taxonomyName) {
+        return WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .endGroup().endWhere()
+                .getAsModel();
+    }
+
+    @Nullable
+    public static TermModel getTermByRemoteId(
+            @NonNull SiteModel site,
+            long remoteTermId,
+            @NonNull String taxonomyName) {
+        List<TermModel> termResult = WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(TermModelTable.REMOTE_TERM_ID, remoteTermId)
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .endGroup().endWhere()
+                .getAsModel();
+
+        if (!termResult.isEmpty()) {
+            return termResult.get(0);
+        }
+        return null;
+    }
+
+    @Nullable
+    public static TermModel getTermByName(
+            @NonNull SiteModel site,
+            @NonNull String termName,
+            @NonNull String taxonomyName) {
+        List<TermModel> termResult = WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(TermModelTable.NAME, termName)
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .endGroup().endWhere()
+                .getAsModel();
+
+        if (!termResult.isEmpty()) {
+            return termResult.get(0);
+        }
+        return null;
+    }
+
+    @NonNull
+    public static List<TermModel> getTermsFromRemoteIdList(
+            @NonNull List<Long> remoteTermIds,
+            @NonNull SiteModel site,
+            @NonNull String taxonomyName) {
+        if (remoteTermIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        return WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .isIn(TermModelTable.REMOTE_TERM_ID, remoteTermIds)
+                .endGroup().endWhere()
+                .getAsModel();
+    }
+
+    @NonNull
+    public static List<TermModel> getTermsFromRemoteNameList(
+            @NonNull List<String> remoteTermNames,
+            @NonNull SiteModel site,
+            @NonNull String taxonomyName) {
+        if (remoteTermNames.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        return WellSql.select(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .isIn(TermModelTable.NAME, remoteTermNames)
+                .endGroup().endWhere()
+                .getAsModel();
+    }
+
+    public static int clearTaxonomyForSite(
+            @NonNull SiteModel site,
+            @NonNull String taxonomyName) {
+        return WellSql.delete(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(TermModelTable.TAXONOMY, taxonomyName)
+                .endGroup().endWhere()
+                .execute();
+    }
+
+    public static int removeTerm(@NonNull TermModel term) {
+        return WellSql.delete(TermModel.class)
+                .where().beginGroup()
+                .equals(TermModelTable.TAXONOMY, term.getTaxonomy())
+                .equals(TermModelTable.REMOTE_TERM_ID, term.getRemoteTermId())
+                .equals(TermModelTable.LOCAL_SITE_ID, term.getLocalSiteId())
+                .endGroup().endWhere()
+                .execute();
+    }
+
+    public static int deleteAllTerms() {
+        return WellSql.delete(TermModel.class).execute();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThemeSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThemeSqlUtils.java
new file mode 100644
index 00000000000..bc248e56727
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThemeSqlUtils.java
@@ -0,0 +1,186 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.ThemeModelTable;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.ThemeModel;
+
+import java.util.List;
+
+public class ThemeSqlUtils {
+    public static void insertOrUpdateSiteTheme(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+        List<ThemeModel> existing = WellSql.select(ThemeModel.class)
+                .where().beginGroup()
+                .equals(ThemeModelTable.THEME_ID, theme.getThemeId())
+                .equals(ThemeModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(ThemeModelTable.IS_WP_COM_THEME, false)
+                .endGroup().endWhere().getAsModel();
+
+        // Make sure the local id of the theme is set correctly
+        theme.setLocalSiteId(site.getId());
+        // Always remove WP.com flag while storing as a site associate theme as we might be saving
+        // a copy of a wp.com theme after an activation
+        theme.setIsWpComTheme(false);
+
+        if (existing.isEmpty()) {
+            // theme is not in the local DB so we insert it
+            WellSql.insert(theme).asSingleTransaction(true).execute();
+        } else {
+            // theme already exists in the local DB so we update the existing row with the passed theme
+            WellSql.update(ThemeModel.class).whereId(existing.get(0).getId())
+                    .put(theme, new UpdateAllExceptId<>(ThemeModel.class)).execute();
+        }
+    }
+
+    public static void insertOrReplaceWpComThemes(@NonNull List<ThemeModel> themes) {
+        // remove existing WP.com themes
+        removeWpComThemes();
+
+        // ensure WP.com flag is set before inserting
+        for (ThemeModel theme : themes) {
+            theme.setIsWpComTheme(true);
+        }
+
+        WellSql.insert(themes).asSingleTransaction(true).execute();
+    }
+
+    public static void insertOrReplaceInstalledThemes(@NonNull SiteModel site, @NonNull List<ThemeModel> themes) {
+        // remove existing installed themes
+        removeSiteThemes(site);
+
+        // ensure site ID is set before inserting
+        for (ThemeModel theme : themes) {
+            theme.setLocalSiteId(site.getId());
+        }
+
+        WellSql.insert(themes).asSingleTransaction(true).execute();
+    }
+
+    public static void insertOrReplaceActiveThemeForSite(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+        // find any existing active theme for the site and unset active flag
+        List<ThemeModel> existing = getActiveThemeForSite(site);
+        if (!existing.isEmpty()) {
+            for (ThemeModel activeTheme : existing) {
+                activeTheme.setActive(false);
+                WellSql.update(ThemeModel.class)
+                        .whereId(activeTheme.getId())
+                        .put(activeTheme).execute();
+            }
+        }
+
+        // make sure active flag is set
+        theme.setActive(true);
+        insertOrUpdateSiteTheme(site, theme);
+    }
+
+    @NonNull
+    public static List<ThemeModel> getActiveThemeForSite(@NonNull SiteModel site) {
+        return WellSql.select(ThemeModel.class)
+                .where().beginGroup()
+                .equals(ThemeModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(ThemeModelTable.ACTIVE, true)
+                .endGroup().endWhere().getAsModel();
+    }
+
+    @NonNull
+    public static List<ThemeModel> getWpComThemes() {
+        return WellSql.select(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.IS_WP_COM_THEME, true)
+                .endWhere().getAsModel();
+    }
+
+    @NonNull
+    public static List<ThemeModel> getWpComThemes(@NonNull List<String> themeIds) {
+        return WellSql.select(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.IS_WP_COM_THEME, true)
+                .isIn(ThemeModelTable.THEME_ID, themeIds)
+                .endWhere().getAsModel();
+    }
+
+    @NonNull
+    public static List<ThemeModel> getWpComMobileFriendlyThemes(@NonNull String categorySlug) {
+        return WellSql.select(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.MOBILE_FRIENDLY_CATEGORY_SLUG, categorySlug)
+                .equals(ThemeModelTable.IS_WP_COM_THEME, true)
+                .endWhere().getAsModel();
+    }
+
+    @NonNull
+    public static List<ThemeModel> getThemesForSite(@NonNull SiteModel site) {
+        return WellSql.select(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.LOCAL_SITE_ID, site.getId())
+                .endWhere().getAsModel();
+    }
+
+    @Nullable
+    public static ThemeModel getWpComThemeByThemeId(@NonNull String themeId) {
+        if (TextUtils.isEmpty(themeId)) {
+            return null;
+        }
+
+        List<ThemeModel> matches = WellSql.select(ThemeModel.class)
+                .where().beginGroup()
+                .equals(ThemeModelTable.THEME_ID, themeId)
+                .equals(ThemeModelTable.IS_WP_COM_THEME, true)
+                .endGroup().endWhere().getAsModel();
+
+        if (matches == null || matches.isEmpty()) {
+            return null;
+        }
+
+        return matches.get(0);
+    }
+
+    @Nullable
+    public static ThemeModel getSiteThemeByThemeId(@NonNull SiteModel siteModel, @NonNull String themeId) {
+        if (TextUtils.isEmpty(themeId)) {
+            return null;
+        }
+        List<ThemeModel> matches = WellSql.select(ThemeModel.class)
+                .where().beginGroup()
+                .equals(ThemeModelTable.LOCAL_SITE_ID, siteModel.getId())
+                .equals(ThemeModelTable.THEME_ID, themeId)
+                .equals(ThemeModelTable.IS_WP_COM_THEME, false)
+                .endGroup().endWhere().getAsModel();
+
+        if (matches == null || matches.isEmpty()) {
+            return null;
+        }
+
+        return matches.get(0);
+    }
+
+    public static void removeWpComThemes() {
+        WellSql.delete(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.IS_WP_COM_THEME, true)
+                .endWhere().execute();
+    }
+
+    public static void removeSiteTheme(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+        WellSql.delete(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(ThemeModelTable.THEME_ID, theme.getThemeId())
+                .equals(ThemeModelTable.IS_WP_COM_THEME, false)
+                .endWhere().execute();
+    }
+
+    public static void removeSiteThemes(@NonNull SiteModel site) {
+        WellSql.delete(ThemeModel.class)
+                .where()
+                .equals(ThemeModelTable.LOCAL_SITE_ID, site.getId())
+                .equals(ThemeModelTable.IS_WP_COM_THEME, false)
+                .endWhere().execute();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtils.kt
new file mode 100644
index 00000000000..7d3f7ca1fcc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/ThreatSqlUtils.kt
@@ -0,0 +1,170 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.wellsql.generated.ThreatModelTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatMapper
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.threat.Threat
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ThreatSqlUtils @Inject constructor(private val gson: Gson, private val threatMapper: ThreatMapper) {
+    fun removeThreatsWithStatus(site: SiteModel, statuses: List<ThreatStatus>) {
+        WellSql.delete(ThreatBuilder::class.java)
+                .where()
+                .equals(ThreatModelTable.LOCAL_SITE_ID, site.id)
+                .isIn(ThreatModelTable.STATUS, statuses.map { it.value })
+                .endWhere()
+                .execute()
+    }
+
+    fun insertThreats(site: SiteModel, threatModels: List<ThreatModel>) {
+        WellSql.insert(threatModels.map { it.toBuilder(site) }).execute()
+    }
+
+    fun getThreats(site: SiteModel, statuses: List<ThreatStatus>): List<ThreatModel> {
+        return WellSql.select(ThreatBuilder::class.java)
+            .where()
+            .equals(ThreatModelTable.LOCAL_SITE_ID, site.id)
+            .isIn(ThreatModelTable.STATUS, statuses.map { it.value })
+            .endWhere()
+            .asModel
+            .map { it.build(gson, threatMapper) }
+    }
+
+    fun getThreatByThreatId(threatId: Long): ThreatModel? {
+        return WellSql.select(ThreatBuilder::class.java)
+            .where()
+            .equals(ThreatModelTable.THREAT_ID, threatId)
+            .endWhere()
+            .asModel
+            .firstOrNull()
+            ?.build(gson, threatMapper)
+    }
+
+    private fun ThreatModel.toBuilder(site: SiteModel): ThreatBuilder {
+        var fileName: String? = null
+        var diff: String? = null
+        var extension: String? = null
+        var rows: String? = null
+        var context: String? = null
+
+        when (this) {
+            is CoreFileModificationThreatModel -> {
+                fileName = this.fileName
+                diff = this.diff
+            }
+            is VulnerableExtensionThreatModel -> {
+                with(this.extension) {
+                    extension = gson.toJson(
+                        Threat.Extension(
+                            type = type.value,
+                            slug = slug,
+                            name = name,
+                            version = version,
+                            isPremium = isPremium
+                        )
+                    )
+                }
+            }
+            is DatabaseThreatModel -> rows = gson.toJson(this.rows)
+            is FileThreatModel -> {
+                fileName = this.fileName
+                context = gson.toJson(this.context)
+            }
+            else -> Unit // Do Nothing (ignore)
+        }
+        return ThreatBuilder(
+            threatId = baseThreatModel.id,
+            localSiteId = site.id,
+            remoteSiteId = site.siteId,
+            signature = baseThreatModel.signature,
+            description = baseThreatModel.description,
+            status = baseThreatModel.status.value,
+            firstDetected = baseThreatModel.firstDetected.time,
+            fixedOn = baseThreatModel.fixedOn?.time,
+            fixableFile = baseThreatModel.fixable?.file,
+            fixableFixer = baseThreatModel.fixable?.fixer?.value,
+            fixableTarget = baseThreatModel.fixable?.target,
+            fileName = fileName,
+            diff = diff,
+            extension = extension,
+            rows = rows,
+            context = context
+        )
+    }
+
+    @Table(name = "ThreatModel")
+    data class ThreatBuilder(
+        @PrimaryKey
+        @Column private var id: Int = -1,
+        @Column var threatId: Long,
+        @Column var localSiteId: Int,
+        @Column var remoteSiteId: Long,
+        @Column var signature: String,
+        @Column var description: String,
+        @Column var status: String,
+        @Column var firstDetected: Long,
+        @Column var fixedOn: Long? = null,
+        @Column var fixableFile: String? = null,
+        @Column var fixableFixer: String? = null,
+        @Column var fixableTarget: String? = null,
+        @Column var fileName: String? = null,
+        @Column var diff: String? = null,
+        @Column var extension: String? = null,
+        @Column var rows: String? = null,
+        @Column var context: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, 0, 0, 0, "", "", "", 0, 0)
+
+        override fun setId(id: Int) {
+            this.id = id
+        }
+
+        override fun getId() = id
+
+        fun build(gson: Gson, threatMapper: ThreatMapper): ThreatModel {
+            val threat = Threat(
+                id = threatId,
+                signature = signature,
+                description = description,
+                status = status,
+                firstDetected = Date(firstDetected),
+                fixable = fixableFixer?.let {
+                    Threat.Fixable(
+                        file = fixableFile,
+                        fixer = it,
+                        target = fixableTarget
+                    )
+                },
+                fixedOn = fixedOn?.let { Date(it) },
+                fileName = fileName,
+                diff = diff,
+                extension = extension?.let { gson.fromJson(extension, Threat.Extension::class.java) },
+                rows = rows?.let {
+                    gson.fromJson<List<DatabaseThreatModel.Row>>(
+                        rows,
+                        object : TypeToken<List<DatabaseThreatModel.Row?>?>() {}.type
+                    )
+                },
+                context = context?.let { gson.fromJson(context, FileThreatModel.ThreatContext::class.java) }
+            )
+
+            return threatMapper.map(threat)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TimeStatsSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TimeStatsSqlUtils.kt
new file mode 100644
index 00000000000..ab6d1ef49a7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/TimeStatsSqlUtils.kt
@@ -0,0 +1,248 @@
+package org.wordpress.android.fluxc.persistence
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient.SubscribersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient.AuthorsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient.ClicksResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient.CountryViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient.FileDownloadsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient.PostAndPageViewsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient.SearchTermsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient.VideoPlaysResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient.VisitsAndViewsResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.MONTHS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.WEEKS
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.AUTHORS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.CLICKS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.COUNTRY_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.FILE_DOWNLOADS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.POSTS_AND_PAGES_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.REFERRERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.SEARCH_TERMS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.SUBSCRIBERS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.VIDEO_PLAYS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.BlockType.VISITS_AND_VIEWS
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils.StatsType
+import java.util.Date
+import javax.inject.Inject
+
+open class TimeStatsSqlUtils<RESPONSE_TYPE>(
+    private val statsSqlUtils: StatsSqlUtils,
+    private val statsUtils: StatsUtils,
+    private val statsRequestSqlUtils: StatsRequestSqlUtils,
+    private val blockType: BlockType,
+    private val classOfResponse: Class<RESPONSE_TYPE>
+) {
+    fun insert(
+        site: SiteModel,
+        data: RESPONSE_TYPE,
+        granularity: StatsGranularity,
+        date: Date,
+        requestedItems: Int? = null
+    ) {
+        insert(site, data, granularity, statsUtils.getFormattedDate(date), requestedItems)
+    }
+
+    fun insert(
+        site: SiteModel,
+        data: RESPONSE_TYPE,
+        granularity: StatsGranularity,
+        formattedDate: String,
+        requestedItems: Int?
+    ) {
+        statsSqlUtils.insert(site, blockType, granularity.toStatsType(), data, true, formattedDate)
+        statsRequestSqlUtils.insert(
+                site,
+                blockType,
+                granularity.toStatsType(),
+                requestedItems,
+                formattedDate
+        )
+    }
+
+    fun select(site: SiteModel, granularity: StatsGranularity, date: Date): RESPONSE_TYPE? {
+        return select(site, granularity, statsUtils.getFormattedDate(date))
+    }
+
+    fun select(site: SiteModel, granularity: StatsGranularity, date: String): RESPONSE_TYPE? {
+        return statsSqlUtils.select(
+                site,
+                blockType,
+                granularity.toStatsType(),
+                classOfResponse,
+                date
+        )
+    }
+
+    fun hasFreshRequest(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        requestedItems: Int? = null
+    ): Boolean {
+        return hasFreshRequest(site,
+                granularity,
+                statsUtils.getFormattedDate(date),
+                requestedItems
+        )
+    }
+
+    fun hasFreshRequest(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: String,
+        requestedItems: Int? = null
+    ): Boolean {
+        return statsRequestSqlUtils.hasFreshRequest(
+                site,
+                blockType,
+                granularity.toStatsType(),
+                requestedItems,
+                date = date
+        )
+    }
+
+    class PostsAndPagesSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<PostAndPageViewsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            POSTS_AND_PAGES_VIEWS,
+            PostAndPageViewsResponse::class.java
+    )
+
+    class ReferrersSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<ReferrersResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            REFERRERS,
+            ReferrersResponse::class.java
+    )
+
+    class ClicksSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<ClicksResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            CLICKS,
+            ClicksResponse::class.java
+    )
+
+    class VisitsAndViewsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<VisitsAndViewsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            VISITS_AND_VIEWS,
+            VisitsAndViewsResponse::class.java
+    )
+
+    class SubscribersSqlUtils @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<SubscribersResponse>(
+        statsSqlUtils,
+        statsUtils,
+        statsRequestSqlUtils,
+        SUBSCRIBERS,
+        SubscribersResponse::class.java
+    )
+
+    class CountryViewsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<CountryViewsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            COUNTRY_VIEWS,
+            CountryViewsResponse::class.java
+    )
+
+    class AuthorsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<AuthorsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            AUTHORS,
+            AuthorsResponse::class.java
+    )
+
+    class SearchTermsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<SearchTermsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            SEARCH_TERMS,
+            SearchTermsResponse::class.java
+    )
+
+    class VideoPlaysSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<VideoPlaysResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            VIDEO_PLAYS,
+            VideoPlaysResponse::class.java
+    )
+
+    class FileDownloadsSqlUtils
+    @Inject constructor(
+        statsSqlUtils: StatsSqlUtils,
+        statsUtils: StatsUtils,
+        statsRequestSqlUtils: StatsRequestSqlUtils
+    ) : TimeStatsSqlUtils<FileDownloadsResponse>(
+            statsSqlUtils,
+            statsUtils,
+            statsRequestSqlUtils,
+            FILE_DOWNLOADS,
+            FileDownloadsResponse::class.java
+    )
+
+    private fun StatsGranularity.toStatsType(): StatsType {
+        return when (this) {
+            DAYS -> StatsType.DAY
+            WEEKS -> StatsType.WEEK
+            MONTHS -> StatsType.MONTH
+            YEARS -> StatsType.YEAR
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UpdateAllExceptId.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UpdateAllExceptId.java
new file mode 100644
index 00000000000..3d3c79e5ead
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UpdateAllExceptId.java
@@ -0,0 +1,22 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.content.ContentValues;
+
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.mapper.InsertMapper;
+import com.yarolegovich.wellsql.mapper.SQLiteMapper;
+
+class UpdateAllExceptId<T> implements InsertMapper<T> {
+    private final SQLiteMapper<T> mMapper;
+
+    UpdateAllExceptId(Class<T> clazz) {
+        mMapper = WellSql.mapperFor(clazz);
+    }
+
+    @Override
+    public ContentValues toCv(T item) {
+        ContentValues cv = mMapper.toCv(item);
+        cv.remove("_id");
+        return cv;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UploadSqlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UploadSqlUtils.java
new file mode 100644
index 00000000000..fb819ea8095
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/UploadSqlUtils.java
@@ -0,0 +1,223 @@
+package org.wordpress.android.fluxc.persistence;
+
+import android.content.ContentValues;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.MediaModelTable;
+import com.wellsql.generated.MediaUploadModelTable;
+import com.wellsql.generated.PostModelTable;
+import com.wellsql.generated.PostUploadModelTable;
+import com.yarolegovich.wellsql.WellCursor;
+import com.yarolegovich.wellsql.WellSql;
+import com.yarolegovich.wellsql.mapper.InsertMapper;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.wordpress.android.fluxc.persistence.WellSqlConfig.SQLITE_MAX_VARIABLE_NUMBER;
+
+public class UploadSqlUtils {
+    public static int insertOrUpdateMedia(MediaUploadModel media) {
+        if (media == null) return 0;
+
+        List<MediaUploadModel> existingMedia;
+        existingMedia = WellSql.select(MediaUploadModel.class)
+                .where()
+                .equals(MediaUploadModelTable.ID, media.getId())
+                .endWhere().getAsModel();
+
+        if (existingMedia.isEmpty()) {
+            // Insert, media item does not exist
+            WellSql.insert(media).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            // Update, media item already exists
+            int oldId = existingMedia.get(0).getId();
+            return WellSql.update(MediaUploadModel.class).whereId(oldId)
+                    .put(media, new UpdateAllExceptId<>(MediaUploadModel.class)).execute();
+        }
+    }
+
+    public static int updateMediaProgressOnly(MediaUploadModel media) {
+        if (media == null) return 0;
+
+        List<MediaUploadModel> existingMedia;
+        existingMedia = WellSql.select(MediaUploadModel.class)
+                .where()
+                .equals(MediaUploadModelTable.ID, media.getId())
+                .endWhere().getAsModel();
+
+        if (existingMedia.isEmpty()) {
+            // We're only interested in updating the progress for existing MediaUploadModels
+            return 0;
+        } else {
+            // Update, media item already exists
+            int oldId = existingMedia.get(0).getId();
+            return WellSql.update(MediaUploadModel.class).whereId(oldId)
+                    .put(media, new InsertMapper<MediaUploadModel>() {
+                        @Override
+                        public ContentValues toCv(MediaUploadModel item) {
+                            ContentValues cv = new ContentValues();
+                            cv.put(MediaUploadModelTable.PROGRESS, item.getProgress());
+                            return cv;
+                        }
+                    }).execute();
+        }
+    }
+
+    public static @Nullable MediaUploadModel getMediaUploadModelForLocalId(int localMediaId) {
+        List<MediaUploadModel> result = WellSql.select(MediaUploadModel.class).where()
+                .equals(MediaUploadModelTable.ID, localMediaId)
+                .endWhere()
+                .getAsModel();
+        if (result.isEmpty()) {
+            return null;
+        } else {
+            return result.get(0);
+        }
+    }
+
+    public static Set<MediaUploadModel> getMediaUploadModelsForPostId(int localPostId) {
+        WellCursor<MediaModel> mediaModelCursor = WellSql.select(MediaModel.class)
+                .columns(MediaModelTable.ID)
+                .where().beginGroup()
+                .equals(MediaModelTable.LOCAL_POST_ID, localPostId)
+                .endGroup().endWhere()
+                .getAsCursor();
+
+        Set<MediaUploadModel> mediaUploadModels = new HashSet<>();
+        while (mediaModelCursor.moveToNext()) {
+            MediaUploadModel mediaUploadModel = getMediaUploadModelForLocalId(mediaModelCursor.getInt(0));
+            if (mediaUploadModel != null) {
+                mediaUploadModels.add(mediaUploadModel);
+            }
+        }
+        mediaModelCursor.close();
+
+        return mediaUploadModels;
+    }
+
+    public static int deleteMediaUploadModelWithLocalId(int localMediaId) {
+        return WellSql.delete(MediaUploadModel.class)
+                .where()
+                .equals(MediaUploadModelTable.ID, localMediaId)
+                .endWhere()
+                .execute();
+    }
+
+    public static int deleteMediaUploadModelsWithLocalIds(Set<Integer> localMediaIds) {
+        if (localMediaIds.size() > 0) {
+            return WellSql.delete(MediaUploadModel.class)
+                    .where()
+                    .isIn(MediaUploadModelTable.ID, localMediaIds)
+                    .endWhere()
+                    .execute();
+        }
+        return 0;
+    }
+
+    public static int insertOrUpdatePost(PostUploadModel post) {
+        if (post == null) return 0;
+
+        List<PostUploadModel> existingPosts;
+        existingPosts = WellSql.select(PostUploadModel.class)
+                .where()
+                .equals(PostUploadModelTable.ID, post.getId())
+                .endWhere().getAsModel();
+
+        if (existingPosts.isEmpty()) {
+            // Insert, post does not exist
+            WellSql.insert(post).asSingleTransaction(true).execute();
+            return 1;
+        } else {
+            // Update, post already exists
+            int oldId = existingPosts.get(0).getId();
+            return WellSql.update(PostUploadModel.class).whereId(oldId)
+                    .put(post, new UpdateAllExceptId<>(PostUploadModel.class)).execute();
+        }
+    }
+
+    public static @Nullable PostUploadModel getPostUploadModelForLocalId(int localPostId) {
+        List<PostUploadModel> result = WellSql.select(PostUploadModel.class).where()
+                .equals(PostUploadModelTable.ID, localPostId)
+                .endWhere()
+                .getAsModel();
+        if (result.isEmpty()) {
+            return null;
+        } else {
+            return result.get(0);
+        }
+    }
+
+    public static @NonNull List<PostUploadModel> getPostUploadModelsWithState(@PostUploadModel.UploadState int state) {
+        return WellSql.select(PostUploadModel.class).where()
+                .equals(PostUploadModelTable.UPLOAD_STATE, state)
+                .endWhere()
+                .getAsModel();
+    }
+
+    public static @NonNull List<PostUploadModel> getAllPostUploadModels() {
+        return WellSql.select(PostUploadModel.class).getAsModel();
+    }
+
+    public static @NonNull List<PostModel> getPostModelsForPostUploadModels(List<PostUploadModel> postUploadModels) {
+        if (postUploadModels.size() > 0) {
+            List<List<PostUploadModel>> batches = getBatches(postUploadModels, SQLITE_MAX_VARIABLE_NUMBER);
+            List<PostModel> postModelList = new ArrayList<>();
+
+            for (List<PostUploadModel> batch : batches) {
+                Set<Integer> postIdSet = new HashSet<>();
+
+                for (PostUploadModel postUploadModel : batch) {
+                    postIdSet.add(postUploadModel.getId());
+                }
+                postModelList.addAll(
+                        WellSql.select(PostModel.class)
+                               .where()
+                               .isIn(PostModelTable.ID, postIdSet)
+                               .endWhere()
+                               .getAsModel()
+                );
+            }
+            return postModelList;
+        }
+        return Collections.emptyList();
+    }
+
+    public static <T> List<List<T>> getBatches(List<T> collection, int batchSize) {
+        List<List<T>> batches = new ArrayList<>();
+        for (int i = 0; i < collection.size(); i += batchSize) {
+            batches.add(collection.subList(i, Math.min(i + batchSize, collection.size())));
+        }
+        return batches;
+    }
+
+    public static int deletePostUploadModelWithLocalId(int localPostId) {
+        return WellSql.delete(PostUploadModel.class)
+                .where()
+                .equals(PostUploadModelTable.ID, localPostId)
+                .endWhere()
+                .execute();
+    }
+
+    public static int deletePostUploadModelsWithLocalIds(Set<Integer> localPostIds) {
+        if (localPostIds.size() > 0) {
+            return WellSql.delete(PostUploadModel.class)
+                    .where()
+                    .isIn(PostUploadModelTable.ID, localPostIds)
+                    .endWhere()
+                    .execute();
+        }
+        return 0;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WPAndroidDatabase.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WPAndroidDatabase.kt
new file mode 100644
index 00000000000..c3f8e698a21
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WPAndroidDatabase.kt
@@ -0,0 +1,368 @@
+package org.wordpress.android.fluxc.persistence
+
+import android.content.Context
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.DeleteTable
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.room.migration.AutoMigrationSpec
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao.BloggingReminders
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao.FeatureFlag
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao.JetpackCPConnectedSiteEntity
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOffer
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferFeature
+import org.wordpress.android.fluxc.persistence.PlanOffersDao.PlanOfferId
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao.RemoteConfig
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao.BlazeCampaignEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao.BlazeCampaignObjectiveEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDeviceEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingLanguageEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingTopicEntity
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao.BloggingPromptEntity
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.persistence.coverters.StringListConverter
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao.CardEntity
+import org.wordpress.android.fluxc.persistence.domains.DomainDao
+import org.wordpress.android.fluxc.persistence.domains.DomainDao.DomainEntity
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao.JetpackSocialEntity
+
+@Database(
+        version = 29,
+        entities = [
+            BloggingReminders::class,
+            PlanOffer::class,
+            PlanOfferId::class,
+            PlanOfferFeature::class,
+            CommentEntity::class,
+            CardEntity::class,
+            BloggingPromptEntity::class,
+            FeatureFlag::class,
+            RemoteConfig::class,
+            JetpackCPConnectedSiteEntity::class,
+            DomainEntity::class,
+            BlazeCampaignEntity::class,
+            JetpackSocialEntity::class,
+            BlazeCampaignObjectiveEntity::class,
+            BlazeTargetingLanguageEntity::class,
+            BlazeTargetingDeviceEntity::class,
+            BlazeTargetingTopicEntity::class,
+        ],
+        autoMigrations = [
+            AutoMigration(from = 11, to = 12),
+            AutoMigration(from = 12, to = 13),
+            AutoMigration(from = 13, to = 14),
+            AutoMigration(from = 16, to = 17),
+            AutoMigration(from = 17, to = 18),
+            AutoMigration(from = 22, to = 23),
+            AutoMigration(from = 23, to = 24),
+            AutoMigration(from = 24, to = 25),
+            AutoMigration(from = 25, to = 26, spec = AutoMigration25to26::class),
+            AutoMigration(from = 27, to = 28),
+            AutoMigration(from = 28, to = 29),
+        ]
+)
+@TypeConverters(
+    value = [
+        StringListConverter::class
+    ]
+)
+abstract class WPAndroidDatabase : RoomDatabase() {
+    abstract fun bloggingRemindersDao(): BloggingRemindersDao
+
+    abstract fun planOffersDao(): PlanOffersDao
+
+    abstract fun commentsDao(): CommentsDao
+
+    abstract fun dashboardCardsDao(): CardsDao
+
+    abstract fun bloggingPromptsDao(): BloggingPromptsDao
+
+    abstract fun featureFlagConfigDao(): FeatureFlagConfigDao
+
+    abstract fun remoteConfigDao(): RemoteConfigDao
+
+    abstract fun domainDao(): DomainDao
+
+    abstract fun jetpackCPConnectedSitesDao(): JetpackCPConnectedSitesDao
+
+    abstract fun blazeCampaignsDao(): BlazeCampaignsDao
+
+    abstract fun blazeTargetingDao(): BlazeTargetingDao
+
+    abstract fun jetpackSocialDao(): JetpackSocialDao
+
+    abstract fun blazeObjectivesDao(): BlazeObjectivesDao
+
+    @Suppress("MemberVisibilityCanBePrivate")
+    companion object {
+        const val WP_DB_NAME = "wp-android-database"
+
+        fun buildDb(applicationContext: Context) = Room.databaseBuilder(
+            applicationContext,
+            WPAndroidDatabase::class.java,
+            WP_DB_NAME
+        )
+                .fallbackToDestructiveMigration()
+                .addMigrations(MIGRATION_1_2)
+                .addMigrations(MIGRATION_2_3)
+                .addMigrations(MIGRATION_3_4)
+                .addMigrations(MIGRATION_5_6)
+                .addMigrations(MIGRATION_7_8)
+                .addMigrations(MIGRATION_14_15)
+                .addMigrations(MIGRATION_15_16)
+                .addMigrations(MIGRATION_18_19)
+                .addMigrations(MIGRATION_19_20)
+                .addMigrations(MIGRATION_20_21)
+                .addMigrations(MIGRATION_26_27)
+                .build()
+
+        val MIGRATION_1_2 = object : Migration(1, 2) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "CREATE TABLE IF NOT EXISTS `PlanOffers` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`internalPlanId` INTEGER NOT NULL, " +
+                            "`name` TEXT, " +
+                            "`shortName` TEXT, " +
+                            "`tagline` TEXT, " +
+                            "`description` TEXT, " +
+                            "`icon` TEXT" +
+                            ")"
+                    )
+                    execSQL(
+                        "CREATE UNIQUE INDEX IF NOT EXISTS `index_PlanOffers_internalPlanId` " +
+                            "ON `PlanOffers` (`internalPlanId`)"
+                    )
+                    execSQL(
+                        "CREATE TABLE IF NOT EXISTS `PlanOfferIds` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`productId` INTEGER NOT NULL, " +
+                            "`internalPlanId` INTEGER NOT NULL, " +
+                            "FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) " +
+                            "ON UPDATE NO ACTION ON DELETE CASCADE" +
+                            ")"
+                    )
+                    execSQL(
+                        "CREATE TABLE IF NOT EXISTS `PlanOfferFeatures` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`internalPlanId` INTEGER NOT NULL, " +
+                            "`stringId` TEXT, " +
+                            "`name` TEXT, " +
+                            "`description` TEXT, " +
+                            "FOREIGN KEY(`internalPlanId`) REFERENCES `PlanOffers`(`internalPlanId`) " +
+                            "ON UPDATE NO ACTION ON DELETE CASCADE" +
+                            ")"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_2_3 = object : Migration(2, 3) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "CREATE TABLE IF NOT EXISTS `Comments` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`remoteCommentId` INTEGER NOT NULL, " +
+                            "`remotePostId` INTEGER NOT NULL, " +
+                            "`remoteParentCommentId` INTEGER NOT NULL, " +
+                            "`localSiteId` INTEGER NOT NULL, " +
+                            "`remoteSiteId` INTEGER NOT NULL, " +
+                            "`authorUrl` TEXT, " +
+                            "`authorName` TEXT, " +
+                            "`authorEmail` TEXT, " +
+                            "`authorProfileImageUrl` TEXT, " +
+                            "`postTitle` TEXT, " +
+                            "`status` TEXT, " +
+                            "`datePublished` TEXT, " +
+                            "`publishedTimestamp` INTEGER NOT NULL, " +
+                            "`content` TEXT, " +
+                            "`url` TEXT, " +
+                            "`hasParent` INTEGER NOT NULL, " +
+                            "`parentId` INTEGER NOT NULL, " +
+                            "`iLike` INTEGER NOT NULL)"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_3_4 = object : Migration(3, 4) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("ALTER TABLE BloggingReminders ADD COLUMN hour INTEGER DEFAULT 10 NOT NULL")
+                    execSQL("ALTER TABLE BloggingReminders ADD COLUMN minute INTEGER DEFAULT 0 NOT NULL")
+                }
+            }
+        }
+
+        val MIGRATION_5_6 = object : Migration(5, 6) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("DROP TABLE Comments")
+                    execSQL(
+                        "CREATE TABLE `Comments` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`remoteCommentId` INTEGER NOT NULL, " +
+                            "`remotePostId` INTEGER NOT NULL, " +
+                            "`localSiteId` INTEGER NOT NULL, " +
+                            "`remoteSiteId` INTEGER NOT NULL, " +
+                            "`authorUrl` TEXT, " +
+                            "`authorName` TEXT, " +
+                            "`authorEmail` TEXT, " +
+                            "`authorProfileImageUrl` TEXT, " +
+                            "`authorId` INTEGER NOT NULL , " +
+                            "`postTitle` TEXT, " +
+                            "`status` TEXT, " +
+                            "`datePublished` TEXT, " +
+                            "`publishedTimestamp` INTEGER NOT NULL, " +
+                            "`content` TEXT, " +
+                            "`url` TEXT, " +
+                            "`hasParent` INTEGER NOT NULL, " +
+                            "`parentId` INTEGER NOT NULL, " +
+                            "`iLike` INTEGER NOT NULL)"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_7_8 = object : Migration(7, 8) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "ALTER TABLE BloggingReminders ADD COLUMN isPromptRemindersOptedIn" +
+                            " INTEGER DEFAULT 0 NOT NULL"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_14_15 = object : Migration(14,15){
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "DROP TABLE IF EXISTS `BlazeStatus`"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_15_16 = object : Migration(15,16){
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "DROP TABLE IF EXISTS `BlazeStatus`"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_18_19 = object : Migration(18, 19) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("DROP TABLE IF EXISTS `BlazeCampaigns`")
+                    execSQL("DELETE FROM `BlazeCampaignsPagination`")
+                    execSQL("CREATE TABLE `BlazeCampaigns` (" +
+                        "`siteId` INTEGER NOT NULL, " +
+                        "`campaignId` INTEGER NOT NULL, " +
+                        "`title` TEXT NOT NULL, " +
+                        "`imageUrl` TEXT, " +
+                        "`startDate` TEXT NOT NULL, " +
+                        "`endDate` TEXT, " +
+                        "`uiStatus` TEXT NOT NULL, " +
+                        "`budgetCents` INTEGER NOT NULL, " +
+                        "`impressions` INTEGER NOT NULL, " +
+                        "`clicks` INTEGER NOT NULL, " +
+                        "PRIMARY KEY (`siteId`, `campaignId`)" +
+                        ")"
+                    )
+                    execSQL(
+                        "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` " +
+                            "ON `BlazeCampaigns` (`siteId`)"
+                    )
+                }
+            }
+        }
+
+        val MIGRATION_19_20 = object : Migration(19, 20) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("DROP TABLE IF EXISTS `BlazeCampaigns`")
+                    execSQL("DELETE FROM `BlazeCampaignsPagination`")
+                    execSQL("CREATE TABLE `BlazeCampaigns` (" +
+                            "`siteId` INTEGER NOT NULL, " +
+                            "`campaignId` INTEGER NOT NULL, " +
+                            "`title` TEXT NOT NULL, " +
+                            "`imageUrl` TEXT, " +
+                            "`createdAt` TEXT NOT NULL, " +
+                            "`endDate` TEXT, " +
+                            "`uiStatus` TEXT NOT NULL, " +
+                            "`budgetCents` INTEGER NOT NULL, " +
+                            "`impressions` INTEGER NOT NULL, " +
+                            "`clicks` INTEGER NOT NULL, " +
+                            "PRIMARY KEY (`siteId`, `campaignId`)" +
+                            ")"
+                    )
+                    execSQL(
+                        "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` " +
+                                "ON `BlazeCampaigns` (`siteId`)"
+                    )
+                }
+            }
+        }
+        val MIGRATION_20_21 = object : Migration(20, 21) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL(
+                        "ALTER TABLE `BlazeCampaigns` ADD COLUMN `targetUrn` TEXT"
+                    )
+                }
+            }
+        }
+        val MIGRATION_26_27 = object : Migration(26, 27) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.apply {
+                    execSQL("DROP TABLE IF EXISTS `BlazeCampaigns`")
+                    execSQL("DROP TABLE IF EXISTS `BlazeCampaignsPagination`")
+                    execSQL(
+                        "CREATE TABLE IF NOT EXISTS `BlazeCampaigns` (" +
+                            "`siteId` INTEGER NOT NULL, " +
+                            "`campaignId` TEXT NOT NULL, " +
+                            "`title` TEXT NOT NULL, " +
+                            "`imageUrl` TEXT, " +
+                            "`startTime` TEXT NOT NULL, " +
+                            "`durationInDays` INTEGER NOT NULL, " +
+                            "`uiStatus` TEXT NOT NULL, " +
+                            "`impressions` INTEGER NOT NULL, " +
+                            "`clicks` INTEGER NOT NULL, " +
+                            "`targetUrn` TEXT, " +
+                            "`totalBudget` REAL NOT NULL, " +
+                            "`spentBudget` REAL NOT NULL, " +
+                            "PRIMARY KEY (`siteId`, `campaignId`)" +
+                            ")"
+                    )
+                    execSQL(
+                        "CREATE INDEX IF NOT EXISTS `index_BlazeCampaigns_siteId` " +
+                                "ON `BlazeCampaigns` (`siteId`)"
+                    )
+                }
+            }
+        }
+    }
+}
+
+@DeleteTable.Entries(
+    DeleteTable(tableName = "BlazeAdSuggestions")
+)
+internal class AutoMigration25to26 : AutoMigrationSpec
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt
new file mode 100644
index 00000000000..4487925edec
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt
@@ -0,0 +1,2201 @@
+@file:Suppress("UnusedImports")
+
+package org.wordpress.android.fluxc.persistence
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import android.preference.PreferenceManager
+import android.view.Gravity
+import android.widget.Toast
+import androidx.annotation.StringDef
+import com.yarolegovich.wellsql.DefaultWellConfig
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.WellTableManager
+import org.wordpress.android.fluxc.BuildConfig
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import kotlin.annotation.AnnotationRetention.SOURCE
+import kotlin.annotation.AnnotationTarget.VALUE_PARAMETER
+
+@Suppress("LargeClass")
+open class WellSqlConfig : DefaultWellConfig {
+    companion object {
+        const val ADDON_WOOCOMMERCE = "WC"
+
+        // The maximum value of a host parameter number is SQLITE_MAX_VARIABLE_NUMBER, which defaults to 999 for
+        // SQLite versions prior to 3.32.0 (2020-05-22) or 32766 for SQLite versions after 3.32.0.
+        // @see https://www.sqlite.org/limits.html
+        const val SQLITE_MAX_VARIABLE_NUMBER = 999
+    }
+
+    constructor(context: Context) : super(context)
+
+    @Suppress("SpreadOperator")
+    constructor(context: Context, @AddOn vararg addOns: String) : super(context, mutableSetOf(*addOns))
+
+    @Retention(SOURCE)
+    @StringDef(ADDON_WOOCOMMERCE)
+    @Target(VALUE_PARAMETER)
+    annotation class AddOn
+
+    override fun getDbVersion(): Int {
+        return 206
+    }
+
+    override fun getDbName(): String {
+        return "wp-fluxc"
+    }
+
+    override fun onCreate(db: SQLiteDatabase, helper: WellTableManager) {
+        mTables.forEach { table -> helper.createTable(table) }
+    }
+
+    @Suppress("CheckStyle", "LongMethod", "ComplexMethod", "MagicNumber")
+    override fun onUpgrade(db: SQLiteDatabase, helper: WellTableManager, oldVersion: Int, newVersion: Int) {
+        AppLog.d(T.DB, "Upgrading database from version $oldVersion to $newVersion")
+
+        db.beginTransaction()
+        for (version in oldVersion..newVersion) {
+            when (version) {
+                1 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS SiteModel")
+                    db.execSQL(
+                            "CREATE TABLE SiteModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "SITE_ID INTEGER," +
+                                "URL TEXT," +
+                                "ADMIN_URL TEXT," +
+                                "LOGIN_URL TEXT," +
+                                "NAME TEXT," +
+                                "DESCRIPTION TEXT," +
+                                "IS_WPCOM INTEGER," +
+                                "IS_FEATURED_IMAGE_SUPPORTED INTEGER," +
+                                "DEFAULT_COMMENT_STATUS TEXT," +
+                                "TIMEZONE TEXT," +
+                                "SELF_HOSTED_SITE_ID INTEGER," +
+                                "USERNAME TEXT," +
+                                "PASSWORD TEXT," +
+                                "XMLRPC_URL TEXT," +
+                                "SOFTWARE_VERSION TEXT," +
+                                "IS_SELF_HOSTED_ADMIN INTEGER," +
+                                "IS_JETPACK_INSTALLED INTEGER," +
+                                "IS_JETPACK_CONNECTED INTEGER," +
+                                "IS_AUTOMATED_TRANSFER INTEGER," +
+                                "IS_VISIBLE INTEGER," +
+                                "IS_PRIVATE INTEGER," +
+                                "IS_VIDEO_PRESS_SUPPORTED INTEGER," +
+                                "PLAN_ID INTEGER," +
+                                "PLAN_SHORT_NAME TEXT," +
+                                "ICON_URL TEXT," +
+                                "HAS_CAPABILITY_EDIT_PAGES INTEGER," +
+                                "HAS_CAPABILITY_EDIT_POSTS INTEGER," +
+                                "HAS_CAPABILITY_EDIT_OTHERS_POSTS INTEGER," +
+                                "HAS_CAPABILITY_EDIT_OTHERS_PAGES INTEGER," +
+                                "HAS_CAPABILITY_DELETE_POSTS INTEGER," +
+                                "HAS_CAPABILITY_DELETE_OTHERS_POSTS INTEGER," +
+                                "HAS_CAPABILITY_EDIT_THEME_OPTIONS INTEGER," +
+                                "HAS_CAPABILITY_EDIT_USERS INTEGER," +
+                                "HAS_CAPABILITY_LIST_USERS INTEGER," +
+                                "HAS_CAPABILITY_MANAGE_CATEGORIES INTEGER," +
+                                "HAS_CAPABILITY_MANAGE_OPTIONS INTEGER," +
+                                "HAS_CAPABILITY_ACTIVATE_WORDADS INTEGER," +
+                                "HAS_CAPABILITY_PROMOTE_USERS INTEGER," +
+                                "HAS_CAPABILITY_PUBLISH_POSTS INTEGER," +
+                                "HAS_CAPABILITY_UPLOAD_FILES INTEGER," +
+                                "HAS_CAPABILITY_DELETE_USER INTEGER," +
+                                "HAS_CAPABILITY_REMOVE_USERS INTEGER," +
+                                "HAS_CAPABILITY_VIEW_STATS INTEGER," +
+                                "UNIQUE (SITE_ID, URL))"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS AccountModel")
+                    db.execSQL(
+                            "CREATE TABLE AccountModel (" +
+                                "_id INTEGER PRIMARY KEY," +
+                                "USER_NAME TEXT," +
+                                "USER_ID INTEGER," +
+                                "DISPLAY_NAME TEXT," +
+                                "PROFILE_URL TEXT," +
+                                "AVATAR_URL TEXT," +
+                                "EMAIL TEXT," +
+                                "PRIMARY_SITE_ID INTEGER," +
+                                "SITE_COUNT INTEGER," +
+                                "VISIBLE_SITE_COUNT INTEGER," +
+                                "HAS_UNSEEN_NOTES INTEGER," +
+                                "FIRST_NAME TEXT," +
+                                "LAST_NAME TEXT," +
+                                "ABOUT_ME TEXT," +
+                                "DATE TEXT," +
+                                "NEW_EMAIL TEXT," +
+                                "PENDING_EMAIL_CHANGE INTEGER," +
+                                "WEB_ADDRESS TEXT)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS HTTPAuthModel")
+                    db.execSQL(
+                            "CREATE TABLE HTTPAuthModel (_id INTEGER PRIMARY KEY AUTOINCREMENT,ROOT_URL TEXT," +
+                                    "REALM TEXT,USERNAME TEXT,PASSWORD TEXT,UNIQUE (ROOT_URL))"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS PostFormatModel")
+                    db.execSQL(
+                            "CREATE TABLE PostFormatModel (SITE_ID INTEGER,SLUG TEXT,DISPLAY_NAME TEXT," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS PostModel")
+                    db.execSQL(
+                            "CREATE TABLE PostModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_SITE_ID INTEGER," +
+                                "REMOTE_POST_ID INTEGER," +
+                                "TITLE TEXT,CONTENT TEXT," +
+                                "DATE_CREATED TEXT," +
+                                "CATEGORY_IDS TEXT," +
+                                "CUSTOM_FIELDS TEXT," +
+                                "LINK TEXT,EXCERPT TEXT," +
+                                "TAG_NAMES TEXT," +
+                                "STATUS TEXT," +
+                                "PASSWORD TEXT," +
+                                "FEATURED_IMAGE_ID INTEGER," +
+                                "POST_FORMAT TEXT,SLUG TEXT," +
+                                "LATITUDE REAL," +
+                                "LONGITUDE REAL," +
+                                "IS_PAGE INTEGER,PARENT_ID INTEGER," +
+                                "PARENT_TITLE TEXT," +
+                                "IS_LOCAL_DRAFT INTEGER," +
+                                "IS_LOCALLY_CHANGED INTEGER," +
+                                "DATE_LOCALLY_CHANGED TEXT," +
+                                "LAST_KNOWN_REMOTE_FEATURED_IMAGE_ID INTEGER," +
+                                "HAS_CAPABILITY_PUBLISH_POST INTEGER," +
+                                "HAS_CAPABILITY_EDIT_POST INTEGER," +
+                                "HAS_CAPABILITY_DELETE_POST INTEGER)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS MediaModel")
+                    db.execSQL(
+                            "CREATE TABLE MediaModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "MEDIA_ID INTEGER," +
+                                "POST_ID INTEGER," +
+                                "AUTHOR_ID INTEGER," +
+                                "GUID TEXT," +
+                                "UPLOAD_DATE TEXT," +
+                                "URL TEXT," +
+                                "THUMBNAIL_URL TEXT," +
+                                "FILE_NAME TEXT," +
+                                "FILE_PATH TEXT," +
+                                "FILE_EXTENSION TEXT," +
+                                "MIME_TYPE TEXT," +
+                                "TITLE TEXT," +
+                                "CAPTION TEXT," +
+                                "DESCRIPTION TEXT," +
+                                "ALT TEXT," +
+                                "WIDTH INTEGER," +
+                                "HEIGHT INTEGER," +
+                                "LENGTH INTEGER," +
+                                "VIDEO_PRESS_GUID TEXT," +
+                                "VIDEO_PRESS_PROCESSING_DONE INTEGER," +
+                                "UPLOAD_STATE TEXT," +
+                                "HORIZONTAL_ALIGNMENT INTEGER," +
+                                "VERTICAL_ALIGNMENT INTEGER," +
+                                "FEATURED INTEGER," +
+                                "FEATURED_IN_POST INTEGER)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS TermModel")
+                    db.execSQL(
+                            "CREATE TABLE TermModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_TERM_ID INTEGER," +
+                                "TAXONOMY TEXT," +
+                                "NAME TEXT," +
+                                "SLUG TEXT," +
+                                "DESCRIPTION TEXT," +
+                                "PARENT_REMOTE_ID INTEGER)"
+                    )
+                }
+                2 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD FRAME_NONCE TEXT")
+                }
+                3 -> migrate(version) {
+                    db.execSQL("ALTER TABLE AccountModel ADD EMAIL_VERIFIED BOOLEAN")
+                }
+                4 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD ORIGIN INTEGER")
+                }
+                5 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD HAS_FREE_PLAN BOOLEAN")
+                }
+                6 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD UNMAPPED_URL TEXT")
+                }
+                7 -> migrate(version) {
+                    db.execSQL("ALTER TABLE MediaModel ADD LOCAL_POST_ID INTEGER")
+                }
+                8 -> migrate(version) {
+                    db.execSQL("ALTER TABLE MediaModel ADD FILE_URL_MEDIUM_SIZE TEXT")
+                    db.execSQL("ALTER TABLE MediaModel ADD FILE_URL_MEDIUM_LARGE_SIZE TEXT")
+                    db.execSQL("ALTER TABLE MediaModel ADD FILE_URL_LARGE_SIZE TEXT")
+                }
+                9 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD MAX_UPLOAD_SIZE INTEGER")
+                }
+                10 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD MEMORY_LIMIT INTEGER")
+                }
+                11 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE RoleModel (_id INTEGER PRIMARY KEY AUTOINCREMENT,SITE_ID INTEGER," +
+                                "NAME TEXT,DISPLAY_NAME TEXT)"
+                    )
+                }
+                12 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PluginModel (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "NAME TEXT,DISPLAY_NAME TEXT,PLUGIN_URL TEXT,VERSION TEXT,SLUG TEXT,DESCRIPTION TEXT," +
+                                "AUTHOR_NAME TEXT,AUTHOR_URL TEXT,IS_ACTIVE INTEGER,IS_AUTO_UPDATE_ENABLED INTEGER)"
+                    )
+                }
+                13 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PluginInfoModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "NAME TEXT,SLUG TEXT,VERSION TEXT,RATING TEXT,ICON TEXT)"
+                    )
+                }
+                14 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE MediaUploadModel (_id INTEGER PRIMARY KEY,UPLOAD_STATE INTEGER," +
+                                "PROGRESS REAL,ERROR_TYPE TEXT,ERROR_MESSAGE TEXT,FOREIGN KEY(_id) REFERENCES " +
+                                "MediaModel(_id) ON DELETE CASCADE)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE PostUploadModel (_id INTEGER PRIMARY KEY,UPLOAD_STATE INTEGER," +
+                                "ASSOCIATED_MEDIA_IDS TEXT,ERROR_TYPE TEXT,ERROR_MESSAGE TEXT," +
+                                "FOREIGN KEY(_id) REFERENCES PostModel(_id) ON DELETE CASCADE)"
+                    )
+                }
+                15 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE ThemeModel (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "THEME_ID TEXT,NAME TEXT,DESCRIPTION TEXT,SLUG TEXT,VERSION TEXT,AUTHOR_NAME TEXT," +
+                                "AUTHOR_URL TEXT,THEME_URL TEXT,SCREENSHOT_URL TEXT,DEMO_URL TEXT,DOWNLOAD_URL TEXT," +
+                                "STYLESHEET TEXT,CURRENCY TEXT,PRICE REAL,ACTIVE INTEGER,AUTO_UPDATE INTEGER," +
+                                "AUTO_UPDATE_TRANSLATION INTEGER,IS_WP_COM_THEME INTEGER)"
+                    )
+                }
+                16 -> migrate(version) {
+                    db.execSQL("ALTER TABLE ThemeModel ADD FREE INTEGER")
+                    db.execSQL("ALTER TABLE ThemeModel ADD PRICE_TEXT INTEGER")
+                }
+                17 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD EMAIL TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD DISPLAY_NAME TEXT")
+                }
+                18 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD JETPACK_VERSION TEXT")
+                }
+                19 -> migrate(version) {
+                    db.execSQL("ALTER TABLE TermModel ADD POST_COUNT INTEGER")
+                }
+                20 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PluginModel rename to SitePluginModel")
+                    db.execSQL("ALTER TABLE PluginInfoModel rename to WPOrgPluginModel")
+                }
+                21 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SitePluginModel ADD SETTINGS_URL TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD AUTHOR_AS_HTML TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD BANNER TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD DESCRIPTION_AS_HTML TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD FAQ_AS_HTML TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD HOMEPAGE_URL TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD INSTALLATION_INSTRUCTIONS_AS_HTML TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD LAST_UPDATED TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD REQUIRED_WORD_PRESS_VERSION TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD WHATS_NEW_AS_HTML TEXT")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD DOWNLOAD_COUNT INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS_OF_ONE INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS_OF_TWO INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS_OF_THREE INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS_OF_FOUR INTEGER")
+                    db.execSQL("ALTER TABLE WPOrgPluginModel ADD NUMBER_OF_RATINGS_OF_FIVE INTEGER")
+                }
+                22 -> migrate(version) {
+                    db.execSQL("ALTER TABLE ThemeModel ADD MOBILE_FRIENDLY_CATEGORY_SLUG TEXT")
+                }
+                23 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PluginDirectoryModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "SLUG TEXT,DIRECTORY_TYPE TEXT,PAGE INTEGER)"
+                    )
+                }
+                24 -> migrate(version) {
+                    /**
+                     * Start with a clean slate for Plugins. This migration adds unique constraints for
+                     * [SitePluginModel] and [WPOrgPluginModel] tables. Adds `authorName` column and renames `name`
+                     * column to `displayName` in [WPOrgPluginModel] table. Since these records are only used as cache
+                     * and would & should be refreshed often, there is no real harm to do this other than a slightly
+                     * longer loading time for the first usage after the migration. This migration would be much more
+                     * complicated otherwise.
+                     */
+                    db.execSQL("DELETE FROM PluginDirectoryModel")
+                    db.execSQL("DROP TABLE IF EXISTS SitePluginModel")
+                    db.execSQL("DROP TABLE IF EXISTS WPOrgPluginModel")
+                    db.execSQL(
+                            "CREATE TABLE SitePluginModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "NAME TEXT,DISPLAY_NAME TEXT,PLUGIN_URL TEXT,VERSION TEXT,SLUG TEXT,DESCRIPTION TEXT," +
+                                "AUTHOR_NAME TEXT,AUTHOR_URL TEXT,SETTINGS_URL TEXT,IS_ACTIVE INTEGER," +
+                                "IS_AUTO_UPDATE_ENABLED INTEGER,UNIQUE (SLUG, LOCAL_SITE_ID))"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE WPOrgPluginModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "AUTHOR_AS_HTML TEXT,AUTHOR_NAME TEXT,BANNER TEXT,DESCRIPTION_AS_HTML TEXT," +
+                                "DISPLAY_NAME TEXT,FAQ_AS_HTML TEXT,HOMEPAGE_URL TEXT,ICON TEXT," +
+                                "INSTALLATION_INSTRUCTIONS_AS_HTML TEXT,LAST_UPDATED TEXT,RATING TEXT," +
+                                "REQUIRED_WORD_PRESS_VERSION TEXT,SLUG TEXT,VERSION TEXT,WHATS_NEW_AS_HTML TEXT," +
+                                "DOWNLOAD_COUNT INTEGER,NUMBER_OF_RATINGS INTEGER,NUMBER_OF_RATINGS_OF_ONE INTEGER," +
+                                "NUMBER_OF_RATINGS_OF_TWO INTEGER,NUMBER_OF_RATINGS_OF_THREE INTEGER," +
+                                "NUMBER_OF_RATINGS_OF_FOUR INTEGER,NUMBER_OF_RATINGS_OF_FIVE INTEGER,UNIQUE (SLUG))"
+                    )
+                }
+                25 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD SPACE_AVAILABLE INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD SPACE_ALLOWED INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD SPACE_USED INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD SPACE_PERCENT_USED REAL")
+                }
+                26 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_WP_COM_STORE INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD HAS_WOO_COMMERCE INTEGER")
+                }
+                27 -> migrate(version) {
+                    db.execSQL("ALTER TABLE AccountModel ADD TRACKS_OPT_OUT BOOLEAN")
+                }
+                28 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE ActivityLogModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,ACTIVITY_ID TEXT NOT NULL," +
+                                "SUMMARY TEXT NOT NULL,TEXT TEXT NOT NULL,NAME TEXT,TYPE TEXT,GRIDICON TEXT," +
+                                "STATUS TEXT,REWINDABLE INTEGER,REWIND_ID TEXT,PUBLISHED TEXT NOT NULL," +
+                                "DISCARDED INTEGER,DISPLAY_NAME TEXT,ACTOR_TYPE TEXT,WPCOM_USER_ID INTEGER," +
+                                "AVATAR_URL TEXT,ROLE TEXT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE RewindStatus (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_SITE_ID INTEGER,REWIND_STATE TEXT,REASON TEXT,RESTORE_ID TEXT," +
+                                "RESTORE_STATE TEXT,RESTORE_PROGRESS INTEGER,RESTORE_MESSAGE TEXT," +
+                                "RESTORE_ERROR_CODE TEXT,RESTORE_FAILURE_REASON TEXT)"
+                    )
+                }
+                29 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE SubscriptionModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "SUBSCRIPTION_ID TEXT,BLOG_ID TEXT,BLOG_NAME TEXT,FEED_ID TEXT,URL TEXT," +
+                                "SHOULD_NOTIFY_POSTS INTEGER,SHOULD_EMAIL_POSTS INTEGER," +
+                                "EMAIL_POSTS_FREQUENCY TEXT,SHOULD_EMAIL_COMMENTS INTEGER)"
+                    )
+                }
+                30 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS ActivityLogModel")
+                    db.execSQL(
+                            "CREATE TABLE IF NOT EXISTS ActivityLog (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,ACTIVITY_ID TEXT NOT NULL," +
+                                "SUMMARY TEXT NOT NULL,TEXT TEXT NOT NULL,NAME TEXT,TYPE TEXT,GRIDICON TEXT," +
+                                "STATUS TEXT,REWINDABLE INTEGER,REWIND_ID TEXT,PUBLISHED INTEGER,DISCARDED INTEGER," +
+                                "DISPLAY_NAME TEXT,ACTOR_TYPE TEXT,WPCOM_USER_ID INTEGER,AVATAR_URL TEXT,ROLE TEXT)"
+                    )
+                }
+                31 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderModel")
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderNoteModel")
+                    db.execSQL(
+                            "CREATE TABLE WCOrderModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_ORDER_ID INTEGER,NUMBER TEXT NOT NULL," +
+                                "STATUS TEXT NOT NULL,CURRENCY TEXT NOT NULL,DATE_CREATED TEXT NOT NULL," +
+                                "TOTAL TEXT NOT NULL,TOTAL_TAX TEXT NOT NULL,SHIPPING_TOTAL TEXT NOT NULL," +
+                                "PAYMENT_METHOD TEXT NOT NULL,PAYMENT_METHOD_TITLE TEXT NOT NULL," +
+                                "PRICES_INCLUDE_TAX INTEGER,CUSTOMER_NOTE TEXT NOT NULL,DISCOUNT_TOTAL TEXT NOT NULL," +
+                                "DISCOUNT_CODES TEXT NOT NULL,REFUND_TOTAL REAL,BILLING_FIRST_NAME TEXT NOT NULL," +
+                                "BILLING_LAST_NAME TEXT NOT NULL,BILLING_COMPANY TEXT NOT NULL," +
+                                "BILLING_ADDRESS1 TEXT NOT NULL,BILLING_ADDRESS2 TEXT NOT NULL," +
+                                "BILLING_CITY TEXT NOT NULL,BILLING_STATE TEXT NOT NULL," +
+                                "BILLING_POSTCODE TEXT NOT NULL,BILLING_COUNTRY TEXT NOT NULL," +
+                                "BILLING_EMAIL TEXT NOT NULL,BILLING_PHONE TEXT NOT NULL," +
+                                "SHIPPING_FIRST_NAME TEXT NOT NULL,SHIPPING_LAST_NAME TEXT NOT NULL," +
+                                "SHIPPING_COMPANY TEXT NOT NULL,SHIPPING_ADDRESS1 TEXT NOT NULL," +
+                                "SHIPPING_ADDRESS2 TEXT NOT NULL,SHIPPING_CITY TEXT NOT NULL," +
+                                "SHIPPING_STATE TEXT NOT NULL,SHIPPING_POSTCODE TEXT NOT NULL," +
+                                "SHIPPING_COUNTRY TEXT NOT NULL,LINE_ITEMS TEXT NOT NULL)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE WCOrderNoteModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,LOCAL_ORDER_ID INTEGER,REMOTE_NOTE_ID INTEGER," +
+                                "DATE_CREATED TEXT NOT NULL,NOTE TEXT NOT NULL,IS_CUSTOMER_NOTE INTEGER)")
+                }
+                32 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS RewindStatus")
+                    db.execSQL(
+                            "CREATE TABLE RewindStatus (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,STATE TEXT NOT NULL," +
+                                "LAST_UPDATED INTEGER,REASON TEXT,CAN_AUTOCONFIGURE INTEGER,REWIND_ID TEXT," +
+                                "REWIND_STATUS TEXT,REWIND_STARTED_AT INTEGER,REWIND_PROGRESS INTEGER," +
+                                "REWIND_REASON TEXT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE RewindStatusCredentials (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REWIND_STATE_ID INTEGER,TYPE TEXT NOT NULL,ROLE TEXT NOT NULL,STILL_VALID INTEGER," +
+                                "HOST TEXT,PORT INTEGER)"
+                    )
+                }
+                33 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS RewindStatusCredentials")
+                    db.execSQL(
+                            "CREATE TABLE RewindStatusCredentials (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,REWIND_STATE_ID INTEGER," +
+                                "TYPE TEXT NOT NULL,ROLE TEXT NOT NULL,STILL_VALID INTEGER,HOST TEXT,PORT INTEGER)"
+                    )
+                }
+                34 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS RewindStatus")
+                    db.execSQL(
+                            "CREATE TABLE RewindStatus (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,STATE TEXT NOT NULL," +
+                                "LAST_UPDATED INTEGER,REASON TEXT,CAN_AUTOCONFIGURE INTEGER,REWIND_ID TEXT," +
+                                "REWIND_STATUS TEXT,REWIND_PROGRESS INTEGER,REWIND_REASON TEXT)"
+                    )
+                }
+                35 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCOrderStatsModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,UNIT TEXT NOT NULL,FIELDS TEXT NOT NULL,DATA TEXT NOT NULL)")
+                }
+                36 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS RewindStatus")
+                    db.execSQL(
+                            "CREATE TABLE RewindStatus (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,STATE TEXT NOT NULL," +
+                                "LAST_UPDATED INTEGER,REASON TEXT,CAN_AUTOCONFIGURE INTEGER,REWIND_ID TEXT," +
+                                "RESTORE_ID INTEGER,REWIND_STATUS TEXT,REWIND_PROGRESS INTEGER,REWIND_REASON TEXT)"
+                    )
+                }
+                37 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS QuickStartModel")
+                    db.execSQL(
+                            "CREATE TABLE QuickStartTaskModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "SITE_ID INTEGER,TASK_NAME TEXT,IS_DONE INTEGER,IS_SHOWN INTEGER)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE QuickStartStatusModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "SITE_ID INTEGER,IS_COMPLETED INTEGER,IS_NOTIFICATION_RECEIVED INTEGER)"
+                    )
+                }
+                38 -> migrate(version) {
+                    val defaultSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
+                    defaultSharedPrefs.getString("ACCOUNT_TOKEN_PREF_KEY", "")?.let { token ->
+                        if (token.isNotEmpty()) {
+                            AppLog.d(T.DB, "Migrating token to fluxc-preferences")
+                            val fluxCPreferences = context.getSharedPreferences(
+                                    context.packageName + "_fluxc-preferences",
+                                    Context.MODE_PRIVATE
+                            )
+                            fluxCPreferences.edit().putString("ACCOUNT_TOKEN_PREF_KEY", token).apply()
+                            defaultSharedPrefs.edit().remove("ACCOUNT_TOKEN_PREF_KEY").apply()
+                        }
+                    }
+                }
+                39 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS QuickStartModel")
+                    db.execSQL(
+                            "CREATE TABLE IF NOT EXISTS QuickStartTaskModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT,SITE_ID INTEGER,TASK_NAME TEXT," +
+                                "IS_DONE INTEGER,IS_SHOWN INTEGER)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE IF NOT EXISTS QuickStartStatusModel (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT,SITE_ID INTEGER,IS_COMPLETED INTEGER," +
+                                "IS_NOTIFICATION_RECEIVED INTEGER)"
+                    )
+                }
+                40 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS ActivityLog")
+                    db.execSQL(
+                            "CREATE TABLE ActivityLog (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_SITE_ID INTEGER,ACTIVITY_ID TEXT NOT NULL,SUMMARY TEXT NOT NULL," +
+                                "FORMATTABLE_CONTENT TEXT NOT NULL,NAME TEXT,TYPE TEXT,GRIDICON TEXT,STATUS TEXT," +
+                                "REWINDABLE INTEGER,REWIND_ID TEXT,PUBLISHED INTEGER,DISCARDED INTEGER," +
+                                "DISPLAY_NAME TEXT,ACTOR_TYPE TEXT,WPCOM_USER_ID INTEGER,AVATAR_URL TEXT,ROLE TEXT)"
+                    )
+                }
+                41 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE LocalDiffModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REVISION_ID INTEGER,POST_ID INTEGER,SITE_ID INTEGER,OPERATION TEXT,VALUE TEXT," +
+                                "DIFF_TYPE TEXT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE LocalRevisionModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REVISION_ID INTEGER,POST_ID INTEGER,SITE_ID INTEGER,DIFF_FROM_VERSION INTEGER," +
+                                "TOTAL_ADDITIONS INTEGER,TOTAL_DELETIONS INTEGER,POST_CONTENT TEXT," +
+                                "POST_EXCERPT TEXT,POST_TITLE TEXT,POST_DATE_GMT TEXT,POST_MODIFIED_GMT TEXT," +
+                                "POST_AUTHOR_ID TEXT)"
+                    )
+                }
+                42 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,TYPE TEXT NOT NULL,JSON TEXT NOT NULL)"
+                    )
+                }
+                43 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE ListModel (LAST_MODIFIED TEXT," +
+                                "DESCRIPTOR_UNIQUE_IDENTIFIER_DB_VALUE INTEGER," +
+                                "DESCRIPTOR_TYPE_IDENTIFIER_DB_VALUE INTEGER,STATE_DB_VALUE INTEGER," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE ListItemModel (LIST_ID INTEGER,REMOTE_ITEM_ID INTEGER," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "FOREIGN KEY(LIST_ID) REFERENCES ListModel(_id) ON DELETE CASCADE," +
+                                "UNIQUE(LIST_ID, REMOTE_ITEM_ID) ON CONFLICT IGNORE)"
+                    )
+                    db.execSQL("ALTER TABLE PostModel ADD LAST_MODIFIED TEXT")
+                }
+                44 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StatsBlock")
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,JSON TEXT NOT NULL)"
+                    )
+                }
+                45 -> {
+                    migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                        db.execSQL("ALTER TABLE WCOrderNoteModel ADD IS_SYSTEM_NOTE INTEGER")
+                    }
+                    migrate(version) {
+                        db.execSQL(
+                            "CREATE TABLE NotificationModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REMOTE_NOTE_ID INTEGER,LOCAL_SITE_ID INTEGER,NOTE_HASH INTEGER,TYPE TEXT," +
+                                "SUBTYPE TEXT,READ INTEGER,ICON TEXT,NOTICON TEXT,TIMESTAMP TEXT,URL TEXT," +
+                                "TITLE TEXT,FORMATTABLE_BODY TEXT,FORMATTABLE_SUBJECT TEXT,FORMATTABLE_META TEXT)"
+                        )
+                    }
+                }
+                46 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StatsBlock")
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,DATE TEXT NOT NULL," +
+                                "JSON TEXT NOT NULL)"
+                    )
+                }
+                47 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StatsBlock")
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,DATE TEXT NOT NULL," +
+                                "JSON TEXT NOT NULL)"
+                    )
+                }
+                48 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD REMOTE_LAST_MODIFIED TEXT")
+                }
+                49 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCSettingsModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,CURRENCY_CODE TEXT NOT NULL,CURRENCY_POSITION TEXT NOT NULL," +
+                                "CURRENCY_THOUSAND_SEPARATOR TEXT NOT NULL,CURRENCY_DECIMAL_SEPARATOR TEXT NOT NULL," +
+                                "CURRENCY_DECIMAL_NUMBER INTEGER)"
+                    )
+                }
+                50 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PlanOffers (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "INTERNAL_PLAN_ID INTEGER,NAME TEXT,SHORT_NAME TEXT,TAGLINE TEXT," +
+                                "DESCRIPTION TEXT,ICON TEXT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE PlanOffersId (_id INTEGER PRIMARY KEY AUTOINCREMENT,PRODUCT_ID INTEGER," +
+                                    "INTERNAL_PLAN_ID INTEGER)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE PlanOffersFeature (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "INTERNAL_PLAN_ID INTEGER,STRING_ID TEXT UNIQUE,NAME TEXT,DESCRIPTION TEXT)"
+                    )
+                }
+                51 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("CREATE TABLE WCOrderStatusModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER,STATUS_KEY TEXT NOT NULL,LABEL TEXT NOT NULL)"
+                    )
+                }
+                52 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PlanOffersFeatureTemp (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "INTERNAL_PLAN_ID INTEGER,STRING_ID TEXT,NAME TEXT,DESCRIPTION TEXT)"
+                    )
+                    db.execSQL("INSERT INTO PlanOffersFeatureTemp SELECT * FROM PlanOffersFeature")
+                    db.execSQL("DROP TABLE PlanOffersFeature")
+                    db.execSQL("ALTER TABLE PlanOffersFeatureTemp RENAME TO PlanOffersFeature")
+                }
+                53 -> migrate(version) {
+                    db.execSQL("ALTER TABLE QuickStartTaskModel ADD TASK_TYPE TEXT")
+                }
+                54 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderStatsModel ADD IS_CUSTOM_FIELD INTEGER")
+                    db.execSQL("ALTER TABLE WCOrderStatsModel ADD DATE TEXT")
+                    db.execSQL("ALTER TABLE WCOrderStatsModel ADD ENDDATE TEXT")
+                    db.execSQL("ALTER TABLE WCOrderStatsModel ADD STARTDATE TEXT")
+                    db.execSQL("ALTER TABLE WCOrderStatsModel ADD QUANTITY TEXT")
+                }
+                55 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderStatsModel")
+                    db.execSQL(
+                            "CREATE TABLE WCOrderStatsModel(" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "UNIT TEXT NOT NULL," +
+                                "DATE TEXT NOT NULL," +
+                                "START_DATE TEXT NOT NULL," +
+                                "END_DATE TEXT NOT NULL," +
+                                "QUANTITY TEXT NOT NULL," +
+                                "IS_CUSTOM_FIELD INTEGER," +
+                                "FIELDS TEXT NOT NULL," +
+                                "DATA TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                56 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductModel")
+                    db.execSQL(
+                            "CREATE TABLE WCProductModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_PRODUCT_ID INTEGER," +
+                                "NAME TEXT NOT NULL,SLUG TEXT NOT NULL,PERMALINK TEXT NOT NULL," +
+                                "DATE_CREATED TEXT NOT NULL,DATE_MODIFIED TEXT NOT NULL," +
+                                "TYPE TEXT NOT NULL,STATUS TEXT NOT NULL,FEATURED INTEGER," +
+                                "CATALOG_VISIBILITY TEXT NOT NULL,DESCRIPTION TEXT NOT NULL," +
+                                "SHORT_DESCRIPTION TEXT NOT NULL,SKU TEXT NOT NULL," +
+                                "PRICE TEXT NOT NULL,REGULAR_PRICE TEXT NOT NULL, SALE_PRICE TEXT NOT NULL," +
+                                "ON_SALE INTEGER,TOTAL_SALES INTEGER,VIRTUAL INTEGER,DOWNLOADABLE INTEGER," +
+                                "TAX_STATUS TEXT NOT NULL,TAX_CLASS TEXT NOT NULL," +
+                                "MANAGE_STOCK INTEGER,STOCK_QUANTITY INTEGER,STOCK_STATUS TEXT NOT NULL," +
+                                "BACKORDERS TEXT NOT NULL,BACKORDERS_ALLOWED INTEGER,BACKORDERED INTEGER," +
+                                "SOLD_INDIVIDUALLY INTEGER,WEIGHT TEXT NOT NULL,LENGTH TEXT NOT NULL," +
+                                "WIDTH TEXT NOT NULL,HEIGHT TEXT NOT NULL,SHIPPING_REQUIRED INTEGER," +
+                                "SHIPPING_TAXABLE INTEGER,SHIPPING_CLASS TEXT NOT NULL," +
+                                "SHIPPING_CLASS_ID INTEGER,REVIEWS_ALLOWED INTEGER,AVERAGE_RATING TEXT NOT NULL," +
+                                "RATING_COUNT INTEGER,PARENT_ID INTEGER,PURCHASE_NOTE TEXT NOT NULL," +
+                                "CATEGORIES TEXT NOT NULL,TAGS TEXT NOT NULL," +
+                                "IMAGES TEXT NOT NULL,ATTRIBUTES TEXT NOT NULL," +
+                                "VARIATIONS TEXT NOT NULL)"
+                    )
+                }
+                57 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DELETE FROM WCOrderStatsModel")
+                }
+                58 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductVariationModel")
+                    db.execSQL(
+                            "CREATE TABLE WCProductVariationModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_PRODUCT_ID INTEGER," +
+                                "REMOTE_VARIATION_ID INTEGER," +
+                                "DATE_CREATED TEXT NOT NULL," +
+                                "DATE_MODIFIED TEXT NOT NULL," +
+                                "DESCRIPTION TEXT NOT NULL," +
+                                "PERMALINK TEXT NOT NULL," +
+                                "SKU TEXT NOT NULL," +
+                                "STATUS TEXT NOT NULL," +
+                                "PRICE TEXT NOT NULL," +
+                                "REGULAR_PRICE TEXT NOT NULL," +
+                                "SALE_PRICE TEXT NOT NULL," +
+                                "ON_SALE INTEGER," +
+                                "PURCHASABLE INTEGER," +
+                                "VIRTUAL INTEGER," +
+                                "DOWNLOADABLE INTEGER," +
+                                "MANAGE_STOCK INTEGER," +
+                                "STOCK_QUANTITY INTEGER," +
+                                "STOCK_STATUS TEXT NOT NULL," +
+                                "IMAGE_URL TEXT NOT NULL," +
+                                "WEIGHT TEXT NOT NULL," +
+                                "LENGTH TEXT NOT NULL," +
+                                "WIDTH TEXT NOT NULL," +
+                                "HEIGHT TEXT NOT NULL," +
+                                "ATTRIBUTES TEXT NOT NULL)"
+                    )
+                }
+                59 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StatsBlock")
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,DATE TEXT,POST_ID INTEGER," +
+                                "JSON TEXT NOT NULL)"
+                    )
+                }
+                60 -> migrate(version) {
+                    db.execSQL("DROP TABLE StatsBlock")
+                    db.execSQL(
+                            "CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER," +
+                                "BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,DATE TEXT,POST_ID INTEGER," +
+                                "JSON TEXT NOT NULL)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE StatsRequest (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL," +
+                                "DATE TEXT,TIME_STAMP INTEGER,REQUESTED_ITEMS INTEGER)"
+                    )
+                }
+                61 -> {
+                    migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                        db.execSQL("DROP TABLE IF EXISTS WCProductModel")
+                        db.execSQL(
+                                "CREATE TABLE WCProductModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_PRODUCT_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "PERMALINK TEXT NOT NULL," +
+                                    "DATE_CREATED TEXT NOT NULL," +
+                                    "DATE_MODIFIED TEXT NOT NULL," +
+                                    "TYPE TEXT NOT NULL," +
+                                    "STATUS TEXT NOT NULL," +
+                                    "FEATURED INTEGER," +
+                                    "CATALOG_VISIBILITY TEXT NOT NULL," +
+                                    "DESCRIPTION TEXT NOT NULL," +
+                                    "SHORT_DESCRIPTION TEXT NOT NULL," +
+                                    "SKU TEXT NOT NULL," +
+                                    "PRICE TEXT NOT NULL," +
+                                    "REGULAR_PRICE TEXT NOT NULL," +
+                                    "SALE_PRICE TEXT NOT NULL," +
+                                    "ON_SALE INTEGER," +
+                                    "TOTAL_SALES INTEGER," +
+                                    "VIRTUAL INTEGER," +
+                                    "DOWNLOADABLE INTEGER," +
+                                    "DOWNLOAD_LIMIT INTEGER," +
+                                    "DOWNLOAD_EXPIRY INTEGER," +
+                                    "DOWNLOADS TEXT NOT NULL," +
+                                    "EXTERNAL_URL TEXT NOT NULL," +
+                                    "TAX_STATUS TEXT NOT NULL," +
+                                    "TAX_CLASS TEXT NOT NULL," +
+                                    "MANAGE_STOCK INTEGER," +
+                                    "STOCK_QUANTITY INTEGER," +
+                                    "STOCK_STATUS TEXT NOT NULL," +
+                                    "BACKORDERS TEXT NOT NULL," +
+                                    "BACKORDERS_ALLOWED INTEGER," +
+                                    "BACKORDERED INTEGER," +
+                                    "SOLD_INDIVIDUALLY INTEGER," +
+                                    "WEIGHT TEXT NOT NULL," +
+                                    "LENGTH TEXT NOT NULL," +
+                                    "WIDTH TEXT NOT NULL," +
+                                    "HEIGHT TEXT NOT NULL," +
+                                    "SHIPPING_REQUIRED INTEGER," +
+                                    "SHIPPING_TAXABLE INTEGER," +
+                                    "SHIPPING_CLASS TEXT NOT NULL," +
+                                    "SHIPPING_CLASS_ID INTEGER," +
+                                    "REVIEWS_ALLOWED INTEGER," +
+                                    "AVERAGE_RATING TEXT NOT NULL," +
+                                    "RATING_COUNT INTEGER," +
+                                    "PARENT_ID INTEGER," +
+                                    "PURCHASE_NOTE TEXT NOT NULL," +
+                                    "CATEGORIES TEXT NOT NULL," +
+                                    "TAGS TEXT NOT NULL," +
+                                    "IMAGES TEXT NOT NULL," +
+                                    "ATTRIBUTES TEXT NOT NULL," +
+                                    "RELATED_IDS TEXT NOT NULL," +
+                                    "CROSS_SELL_IDS TEXT NOT NULL," +
+                                    "UPSELL_IDS TEXT NOT NULL," +
+                                    "VARIATIONS TEXT NOT NULL)"
+                        )
+                    }
+                    migrate(version) {
+                        db.execSQL("DROP TABLE StatsRequest")
+                        db.execSQL(
+                                "CREATE TABLE StatsRequest (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER,BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL," +
+                                    "DATE TEXT,POST_ID INTEGER,TIME_STAMP INTEGER,REQUESTED_ITEMS INTEGER)"
+                        )
+                    }
+                }
+                62 -> migrate(version) {
+                    db.execSQL("DROP TABLE StatsRequest")
+                    db.execSQL(
+                            "CREATE TABLE StatsRequest (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL," +
+                                "DATE TEXT,POST_ID INTEGER,TIME_STAMP INTEGER,REQUESTED_ITEMS INTEGER)"
+                    )
+                }
+                63 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCProductSettingsModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "WEIGHT_UNIT TEXT NOT NULL," +
+                                "DIMENSION_UNIT TEXT NOT NULL)"
+                    )
+                }
+                64 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCOrderShipmentTrackingModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "LOCAL_ORDER_ID INTEGER," +
+                                "REMOTE_TRACKING_ID TEXT NOT NULL," +
+                                "TRACKING_NUMBER TEXT NOT NULL," +
+                                "TRACKING_PROVIDER TEXT NOT NULL," +
+                                "TRACKING_LINK TEXT NOT NULL," +
+                                "DATE_SHIPPED TEXT NOT NULL)"
+                    )
+                }
+                65 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCOrderShipmentProviderModel (" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "COUNTRY TEXT NOT NULL," +
+                                "CARRIER_NAME TEXT NOT NULL," +
+                                "CARRIER_LINK TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                66 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE InsightTypes (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,INSIGHT_TYPE TEXT NOT NULL," +
+                                "POSITION INTEGER,STATUS TEXT NOT NULL)"
+                    )
+                }
+                67 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD COUNTRY_CODE TEXT")
+                }
+                68 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS NotificationModel")
+                    db.execSQL(
+                            "CREATE TABLE NotificationModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REMOTE_NOTE_ID INTEGER,LOCAL_SITE_ID INTEGER,NOTE_HASH INTEGER,TYPE TEXT," +
+                                "SUBTYPE TEXT,READ INTEGER,ICON TEXT,NOTICON TEXT,TIMESTAMP TEXT,URL TEXT," +
+                                "TITLE TEXT,FORMATTABLE_BODY TEXT,FORMATTABLE_SUBJECT TEXT,FORMATTABLE_META TEXT," +
+                                "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE)"
+                    )
+                }
+                69 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD DATE_MODIFIED TEXT")
+                    db.execSQL(
+                            "CREATE TABLE WCOrderSummaryModel (LOCAL_SITE_ID INTEGER,REMOTE_ORDER_ID INTEGER," +
+                                "DATE_CREATED TEXT NOT NULL,_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                "UNIQUE (REMOTE_ORDER_ID, LOCAL_SITE_ID) ON CONFLICT REPLACE)"
+                    )
+                }
+                70 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS NotificationModel")
+                    db.execSQL(
+                            "CREATE TABLE NotificationModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REMOTE_NOTE_ID INTEGER,LOCAL_SITE_ID INTEGER,NOTE_HASH INTEGER,TYPE TEXT," +
+                                "SUBTYPE TEXT,READ INTEGER,ICON TEXT,NOTICON TEXT,TIMESTAMP TEXT,URL TEXT," +
+                                "TITLE TEXT,FORMATTABLE_BODY TEXT,FORMATTABLE_SUBJECT TEXT,FORMATTABLE_META TEXT)"
+                    )
+                }
+                71 -> migrate(version) {
+                    db.execSQL("ALTER TABLE MediaModel ADD MARKED_LOCALLY_AS_FEATURED INTEGER")
+                }
+                72 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostUploadModel ADD NUMBER_OF_UPLOAD_ERRORS_OR_CANCELLATIONS INTEGER")
+                }
+                73 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS NotificationModel")
+                    db.execSQL(
+                            "CREATE TABLE NotificationModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "REMOTE_NOTE_ID INTEGER,REMOTE_SITE_ID INTEGER,NOTE_HASH INTEGER,TYPE TEXT," +
+                                "SUBTYPE TEXT,READ INTEGER,ICON TEXT,NOTICON TEXT,TIMESTAMP TEXT,URL TEXT," +
+                                "TITLE TEXT,FORMATTABLE_BODY TEXT,FORMATTABLE_SUBJECT TEXT,FORMATTABLE_META TEXT)"
+                    )
+                }
+                74 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD WEB_EDITOR TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD MOBILE_EDITOR TEXT")
+                }
+                75 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCRevenueStatsModel(" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "INTERVAL TEXT NOT NULL," +
+                                "START_DATE TEXT NOT NULL," +
+                                "END_DATE TEXT NOT NULL," +
+                                "DATA TEXT NOT NULL," +
+                                "TOTAL TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                76 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE PostSchedulingReminder (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "POST_ID INTEGER,SCHEDULED_TIME TEXT NOT NULL)"
+                    )
+                }
+                77 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD AUTHOR_ID INTEGER")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTHOR_DISPLAY_NAME TEXT")
+                }
+                78 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCVisitorStatsModel(" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "UNIT TEXT NOT NULL," +
+                                "DATE TEXT NOT NULL," +
+                                "START_DATE TEXT NOT NULL," +
+                                "END_DATE TEXT NOT NULL," +
+                                "QUANTITY TEXT NOT NULL," +
+                                "IS_CUSTOM_FIELD INTEGER," +
+                                "FIELDS TEXT NOT NULL," +
+                                "DATA TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                79 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD CHANGES_CONFIRMED_CONTENT_HASHCODE INTEGER")
+                }
+                80 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCNewVisitorStatsModel(" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "GRANULARITY TEXT NOT NULL," +
+                                "DATE TEXT NOT NULL," +
+                                "START_DATE TEXT NOT NULL," +
+                                "END_DATE TEXT NOT NULL," +
+                                "QUANTITY TEXT NOT NULL," +
+                                "IS_CUSTOM_FIELD INTEGER," +
+                                "FIELDS TEXT NOT NULL," +
+                                "DATA TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                81 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCProductReviewModel (" +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "REMOTE_PRODUCT_REVIEW_ID INTEGER," +
+                                "REMOTE_PRODUCT_ID INTEGER," +
+                                "DATE_CREATED TEXT NOT NULL," +
+                                "STATUS TEXT NOT NULL," +
+                                "REVIEWER_NAME TEXT NOT NULL," +
+                                "REVIEWER_EMAIL TEXT NOT NULL," +
+                                "REVIEW TEXT NOT NULL," +
+                                "RATING INTEGER," +
+                                "VERIFIED INTEGER," +
+                                "REVIEWER_AVATARS_JSON TEXT NOT NULL," +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                "UNIQUE (REMOTE_PRODUCT_REVIEW_ID, REMOTE_PRODUCT_ID, LOCAL_SITE_ID) " +
+                                "ON CONFLICT REPLACE)"
+                    )
+                }
+                82 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD COLUMN DATE_PAID TEXT NOT NULL DEFAULT ''")
+                }
+                83 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderStatusModel ADD STATUS_COUNT INTEGER")
+                }
+                84 -> migrate(version) {
+                    db.execSQL("ALTER TABLE AccountModel ADD USERNAME_CAN_BE_CHANGED BOOLEAN")
+                }
+                85 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_REVISION_ID INTEGER")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_MODIFIED TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD REMOTE_AUTO_SAVE_MODIFIED TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_PREVIEW_URL TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_TITLE TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_CONTENT TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SAVE_EXCERPT TEXT")
+                }
+                86 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostUploadModel ADD NUMBER_OF_AUTO_UPLOAD_ATTEMPTS INTEGER")
+                }
+                87 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCRefunds (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER," +
+                                "ORDER_ID INTEGER," +
+                                "REFUND_ID INTEGER," +
+                                "DATA TEXT NOT NULL)"
+                    )
+                }
+                88 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderNoteModel ADD AUTHOR TEXT")
+                }
+                89 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD JETPACK_USER_EMAIL TEXT")
+                }
+                90 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCGateways (" +
+                                "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "GATEWAY_ID TEXT NOT NULL," +
+                                    "DATA TEXT NOT NULL)"
+                    )
+                }
+                91 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD SHIPPING_LINES TEXT")
+                }
+                92 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD DATE_ON_SALE_FROM TEXT")
+                    db.execSQL("ALTER TABLE WCProductModel ADD DATE_ON_SALE_TO TEXT")
+                }
+                93 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD MENU_ORDER INTEGER")
+                }
+                94 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCProductShippingClassModel(" +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_SHIPPING_CLASS_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "DESCRIPTION TEXT NOT NULL," +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                    "UNIQUE (REMOTE_SHIPPING_CLASS_ID, LOCAL_SITE_ID) " +
+                                    "ON CONFLICT REPLACE)"
+                    )
+                }
+                95 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCTaxClassModel(" +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                    "UNIQUE (SLUG, LOCAL_SITE_ID) " +
+                                    "ON CONFLICT REPLACE)"
+                    )
+                }
+                96 -> migrate(version) {
+                    db.execSQL("CREATE TABLE PostSummaryModel (REMOTE_ID INTEGER,LOCAL_SITE_ID INTEGER,STATUS TEXT," +
+                            "DATE_CREATED TEXT,_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                            "UNIQUE(REMOTE_ID) ON CONFLICT REPLACE)")
+                }
+                97 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD DATE_ON_SALE_FROM_GMT TEXT")
+                    db.execSQL("ALTER TABLE WCProductModel ADD DATE_ON_SALE_TO_GMT TEXT")
+                }
+                98 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS PostSummaryModel")
+                }
+                99 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD WP_API_REST_URL TEXT")
+                }
+                100 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_WPCOM_ATOMIC BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_COMING_SOON BOOLEAN")
+                }
+                101 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD MENU_ORDER INTEGER")
+                }
+                102 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD BUTTON_TEXT TEXT")
+                }
+                103 -> migrate(version) {
+                    db.execSQL("ALTER TABLE CommentModel ADD URL TEXT")
+                }
+                104 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCShippingLabelModel (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "LOCAL_ORDER_ID INTEGER," +
+                                    "REMOTE_SHIPPING_LABEL_ID INTEGER," +
+                                    "CARRIER_ID TEXT NOT NULL," +
+                                    "PRODUCT_NAMES TEXT NULL," +
+                                    "TRACKING_NUMBER TEXT NOT NULL," +
+                                    "SERVICE_NAME TEXT NOT NULL," +
+                                    "STATUS TEXT NOT NULL," +
+                                    "PACKAGE_NAME TEXT NOT NULL," +
+                                    "RATE REAL NOT NULL," +
+                                    "REFUNDABLE_AMOUNT REAL NOT NULL," +
+                                    "CURRENCY TEXT NOT NULL," +
+                                    "PAPER_SIZE TEXT NOT NULL," +
+                                    "FORM_DATA TEXT NOT NULL," +
+                                    "STORE_OPTIONS TEXT NOT NULL," +
+                                    "REFUND TEXT NULL)"
+                    )
+                }
+                105 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCProductCategoryModel (" +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_CATEGORY_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "PARENT INTEGER," +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                    "UNIQUE (REMOTE_CATEGORY_ID, LOCAL_SITE_ID) " +
+                                    "ON CONFLICT REPLACE)"
+                    )
+                }
+                106 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD SHOW_ON_FRONT TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD PAGE_ON_FRONT INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD PAGE_FOR_POSTS INTEGER")
+                }
+                107 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductVariationModel")
+                    db.execSQL("CREATE TABLE WCProductVariationModel (" +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "REMOTE_PRODUCT_ID INTEGER," +
+                            "REMOTE_VARIATION_ID INTEGER," +
+                            "DATE_CREATED TEXT NOT NULL," +
+                            "DATE_MODIFIED TEXT NOT NULL," +
+                            "DESCRIPTION TEXT NOT NULL," +
+                            "PERMALINK TEXT NOT NULL," +
+                            "SKU TEXT NOT NULL," +
+                            "STATUS TEXT NOT NULL," +
+                            "PRICE TEXT NOT NULL," +
+                            "REGULAR_PRICE TEXT NOT NULL," +
+                            "SALE_PRICE TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM_GMT TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO_GMT TEXT NOT NULL," +
+                            "ON_SALE INTEGER," +
+                            "PURCHASABLE INTEGER," +
+                            "VIRTUAL INTEGER," +
+                            "DOWNLOADABLE INTEGER," +
+                            "MANAGE_STOCK INTEGER," +
+                            "STOCK_QUANTITY INTEGER," +
+                            "STOCK_STATUS TEXT NOT NULL," +
+                            "IMAGE TEXT NOT NULL," +
+                            "WEIGHT TEXT NOT NULL," +
+                            "LENGTH TEXT NOT NULL," +
+                            "WIDTH TEXT NOT NULL," +
+                            "HEIGHT TEXT NOT NULL," +
+                            "MENU_ORDER INTEGER," +
+                            "ATTRIBUTES TEXT NOT NULL," +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT)")
+                }
+                108 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductVariationModel")
+                    db.execSQL("CREATE TABLE WCProductVariationModel (" +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "REMOTE_PRODUCT_ID INTEGER," +
+                            "REMOTE_VARIATION_ID INTEGER," +
+                            "DATE_CREATED TEXT NOT NULL," +
+                            "DATE_MODIFIED TEXT NOT NULL," +
+                            "DESCRIPTION TEXT NOT NULL," +
+                            "PERMALINK TEXT NOT NULL," +
+                            "SKU TEXT NOT NULL," +
+                            "STATUS TEXT NOT NULL," +
+                            "PRICE TEXT NOT NULL," +
+                            "REGULAR_PRICE TEXT NOT NULL," +
+                            "SALE_PRICE TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM_GMT TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO_GMT TEXT NOT NULL," +
+                            "ON_SALE INTEGER," +
+                            "PURCHASABLE INTEGER," +
+                            "VIRTUAL INTEGER," +
+                            "DOWNLOADABLE INTEGER," +
+                            "TAX_STATUS TEXT NOT NULL," +
+                            "TAX_CLASS TEXT NOT NULL," +
+                            "DOWNLOAD_LIMIT INTEGER," +
+                            "DOWNLOAD_EXPIRY INTEGER," +
+                            "DOWNLOADS TEXT NOT NULL," +
+                            "BACKORDERS TEXT NOT NULL," +
+                            "BACKORDERS_ALLOWED INTEGER," +
+                            "BACKORDERED INTEGER," +
+                            "SHIPPING_CLASS TEXT NOT NULL," +
+                            "SHIPPING_CLASS_ID INTEGER," +
+                            "MANAGE_STOCK INTEGER," +
+                            "STOCK_QUANTITY INTEGER," +
+                            "STOCK_STATUS TEXT NOT NULL," +
+                            "IMAGE TEXT NOT NULL," +
+                            "WEIGHT TEXT NOT NULL," +
+                            "LENGTH TEXT NOT NULL," +
+                            "WIDTH TEXT NOT NULL," +
+                            "HEIGHT TEXT NOT NULL," +
+                            "MENU_ORDER INTEGER," +
+                            "ATTRIBUTES TEXT NOT NULL," +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT)")
+                }
+                109 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE EditorTheme(" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "STYLESHEET TEXT," +
+                                    "VERSION TEXT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE EditorThemeElement(" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "THEME_ID INTEGER," +
+                                    "TYPE TEXT NOT NULL," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "VALUE TEXT NOT NULL," +
+                                    "CHECK(TYPE IN (\"color\", \"gradient\") )," +
+                                    "FOREIGN KEY(THEME_ID) REFERENCES EditorTheme(_id) ON DELETE CASCADE)"
+                    )
+                }
+                110 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS WhatsNewAnnouncement")
+                    db.execSQL("DROP TABLE IF EXISTS WhatsNewAnnouncementFeature")
+                    db.execSQL(
+                            "CREATE TABLE WhatsNewAnnouncement (_announcement_id INTEGER PRIMARY KEY," +
+                                    "APP_VERSION_NAME TEXT NOT NULL,MINIMUM_APP_VERSION TEXT NOT NULL," +
+                                    "MAXIMUM_APP_VERSION TEXT NOT NULL,LOCALIZED INTEGER," +
+                                    "RESPONSE_LOCALE TEXT NOT NULL,DETAILS_URL TEXT)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE WhatsNewAnnouncementFeature (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "ANNOUNCEMENT_ID INTEGER,TITLE TEXT,SUBTITLE TEXT,ICON_URL TEXT,ICON_BASE64 TEXT)"
+                    )
+                }
+                111 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE WCProductTagModel (" +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_TAG_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "DESCRIPTION TEXT," +
+                                    "COUNT INTEGER," +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                    "UNIQUE (REMOTE_TAG_ID, LOCAL_SITE_ID) " +
+                                    "ON CONFLICT REPLACE)"
+                    )
+                }
+                112 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS WhatsNewAnnouncement")
+                    db.execSQL(
+                            "CREATE TABLE WhatsNewAnnouncement (_announcement_id INTEGER PRIMARY KEY," +
+                                    "APP_VERSION_NAME TEXT NOT NULL,MINIMUM_APP_VERSION TEXT NOT NULL," +
+                                    "MAXIMUM_APP_VERSION TEXT NOT NULL,APP_VERSION_TARGETS TEXT NOT NULL," +
+                                    "LOCALIZED INTEGER,RESPONSE_LOCALE TEXT NOT NULL,DETAILS_URL TEXT)"
+                    )
+                }
+                113 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCShippingLabelModel ADD DATE_CREATED TEXT")
+                }
+                114 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD GROUPED_PRODUCT_IDS TEXT")
+                }
+                115 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE EncryptedLogModel (UUID TEXT,FILE_PATH TEXT,DATE_CREATED TEXT," +
+                                    "UPLOAD_STATE_DB_VALUE INTEGER,FAILED_COUNT INTEGER," +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT,UNIQUE(UUID) ON CONFLICT REPLACE)"
+                    )
+                }
+                116 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCTopPerformerProductModel")
+                    db.execSQL("CREATE TABLE WCTopPerformerProductModel (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "PRODUCT_INFO TEXT, " +
+                            "CURRENCY TEXT, " +
+                            "QUANTITY INTEGER, " +
+                            "UNIT TEXT," +
+                            "TOTAL REAL)")
+                }
+                117 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StockMedia")
+                    db.execSQL("CREATE TABLE StockMedia (_id INTEGER PRIMARY KEY AUTOINCREMENT,ITEM_ID TEXT," +
+                            "NAME TEXT,TITLE TEXT,URL TEXT,DATE TEXT,THUMBNAIL TEXT)")
+                    db.execSQL("DROP TABLE IF EXISTS StockMediaPage")
+                    db.execSQL("CREATE TABLE StockMediaPage (_id INTEGER PRIMARY KEY AUTOINCREMENT,PAGE INTEGER," +
+                            "NEXT_PAGE INTEGER)")
+                }
+                118 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS GutenbergLayoutCategoryModel")
+                    db.execSQL("CREATE TABLE GutenbergLayoutCategoryModel (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "SLUG TEXT NOT NULL," +
+                            "SITE_ID INTEGER," +
+                            "TITLE TEXT NOT NULL," +
+                            "DESCRIPTION TEXT NOT NULL," +
+                            "EMOJI TEXT NOT NULL)")
+                    db.execSQL("DROP TABLE IF EXISTS GutenbergLayoutModel")
+                    db.execSQL("CREATE TABLE GutenbergLayoutModel (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "SLUG TEXT NOT NULL," +
+                            "SITE_ID INTEGER," +
+                            "TITLE TEXT NOT NULL," +
+                            "PREVIEW TEXT NOT NULL," +
+                            "CONTENT TEXT NOT NULL)")
+                    db.execSQL("DROP TABLE IF EXISTS GutenbergLayoutCategoriesModel")
+                    db.execSQL("CREATE TABLE GutenbergLayoutCategoriesModel (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LAYOUT_ID INTEGER," +
+                            "CATEGORY_ID INTEGER," +
+                            "SITE_ID INTEGER)")
+                }
+                119 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DELETE FROM WCOrderModel")
+                }
+                120 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS StatsBlock")
+                    db.execSQL("CREATE TABLE StatsBlock (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER,BLOCK_TYPE TEXT NOT NULL,STATS_TYPE TEXT NOT NULL,DATE TEXT," +
+                            "POST_ID INTEGER,JSON TEXT NOT NULL)")
+                }
+                121 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCPlugins")
+                    db.execSQL("CREATE TABLE WCPlugins (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "ACTIVE BOOLEAN NOT NULL," +
+                            "DISPLAY_NAME TEXT NOT NULL," +
+                            "SLUG TEXT NOT NULL," +
+                            "VERSION TEXT NOT NULL)"
+                    )
+                }
+                122 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_WP_FOR_TEAMS_SITE BOOLEAN")
+                }
+                123 -> migrate(version) {
+                    db.execSQL(
+                        "CREATE TABLE ScanState (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER," +
+                            "START_DATE INTEGER," +
+                            "DURATION INTEGER," +
+                            "PROGRESS INTEGER," +
+                            "SCAN_STATE TEXT," +
+                            "ERROR TEXT," +
+                            "INITIAL BOOLEAN," +
+                            "REASON TEXT)"
+                    )
+                }
+                124 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD FEE_LINES TEXT")
+                }
+                125 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCShippingLabelModel ADD PRODUCT_IDS TEXT")
+                }
+                126 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCLocations")
+                    db.execSQL("CREATE TABLE WCLocations (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "PARENT_CODE TEXT NOT NULL," +
+                            "CODE TEXT NOT NULL," +
+                            "NAME TEXT NOT NULL)"
+                    )
+                }
+                127 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS ScanState")
+                    db.execSQL(
+                            "CREATE TABLE ScanState (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER, REMOTE_SITE_ID INTEGER," +
+                                    "START_DATE INTEGER," +
+                                    "DURATION INTEGER NOT NULL," +
+                                    "PROGRESS INTEGER NOT NULL," +
+                                    "STATE TEXT NOT NULL," +
+                                    "ERROR BOOLEAN NOT NULL," +
+                                    "INITIAL BOOLEAN NOT NULL," +
+                                    "REASON TEXT, " +
+                                    "HAS_CLOUD BOOLEAN NOT NULL)"
+                    )
+                }
+                128 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS ThreatModel")
+                    db.execSQL(
+                        "CREATE TABLE ThreatModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                "LOCAL_SITE_ID INTEGER, REMOTE_SITE_ID INTEGER," +
+                                "THREAT_ID INTEGER," +
+                                "SIGNATURE TEXT NOT NULL," +
+                                "DESCRIPTION TEXT NOT NULL," +
+                                "STATUS TEXT NOT NULL," +
+                                "FIRST_DETECTED INTEGER," +
+                                "FIXED_ON INTEGER," +
+                                "FIXABLE_FILE TEXT," +
+                                "FIXABLE_FIXER TEXT," +
+                                "FIXABLE_TARGET TEXT," +
+                                "FILE_NAME TEXT," +
+                                "DIFF TEXT," +
+                                "EXTENSION TEXT," +
+                                "ROWS TEXT," +
+                                "CONTEXT TEXT)"
+                    )
+                }
+                129 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE XPostSites (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "BLOG_ID INTEGER," +
+                                    "TITLE TEXT," +
+                                    "SITE_URL TEXT," +
+                                    "SUBDOMAIN TEXT," +
+                                    "BLAVATAR TEXT," +
+                                    "UNIQUE (BLOG_ID) ON CONFLICT REPLACE)"
+                    )
+                    db.execSQL(
+                            "CREATE TABLE XPosts (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "SOURCE_SITE_ID INTEGER," +
+                                    "TARGET_SITE_ID INTEGER," +
+                                    "FOREIGN KEY(SOURCE_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE," +
+                                    "FOREIGN KEY(TARGET_SITE_ID) REFERENCES XPostSites(BLOG_ID)," +
+                                    "UNIQUE (SOURCE_SITE_ID, TARGET_SITE_ID) ON CONFLICT IGNORE)"
+                    )
+                }
+                130 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS BackupDownloadStatus")
+                    db.execSQL(
+                            "CREATE TABLE BackupDownloadStatus (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_SITE_ID INTEGER," +
+                                    "DOWNLOAD_ID INTEGER," +
+                                    "REWIND_ID TEXT NOT NULL," +
+                                    "BACKUP_POINT INTEGER," +
+                                    "STARTED_AT INTEGER," +
+                                    "PROGRESS INTEGER," +
+                                    "DOWNLOAD_COUNT INTEGER," +
+                                    "VALID_UNTIL INTEGER," +
+                                    "URL TEXT)"
+                    )
+                }
+                131 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS RewindStatus")
+                    db.execSQL(
+                            "CREATE TABLE RewindStatus (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER,REMOTE_SITE_ID INTEGER,STATE TEXT NOT NULL," +
+                                    "LAST_UPDATED INTEGER,REASON TEXT,CAN_AUTOCONFIGURE INTEGER,REWIND_ID TEXT," +
+                                    "RESTORE_ID INTEGER,REWIND_STATUS TEXT,REWIND_PROGRESS INTEGER," +
+                                    "REWIND_REASON TEXT,MESSAGE TEXT,CURRENT_ENTRY TEXT)"
+                    )
+                }
+                132 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductAttributeModel")
+                    db.execSQL(
+                            "CREATE TABLE WCProductAttributeModel (" +
+                                    "_id INTEGER PRIMARY KEY, " +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT, " +
+                                    "TYPE TEXT, " +
+                                    "ORDER_BY TEXT, " +
+                                    "HAS_ARCHIVES BOOLEAN NOT NULL)"
+                    )
+                }
+                133 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD ADDRESS TEXT")
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD ADDRESS2 TEXT")
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD CITY TEXT")
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD POSTAL_CODE TEXT")
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD STATE_CODE TEXT")
+                }
+                134 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCAttributeTermModel")
+                    db.execSQL("ALTER TABLE WCProductAttributeModel ADD TERMS TEXT")
+                    db.execSQL("ALTER TABLE WCProductAttributeModel ADD REMOTE_ID INTEGER")
+                    db.execSQL(
+                            "CREATE TABLE WCAttributeTermModel (" +
+                                    "_id INTEGER PRIMARY KEY, " +
+                                    "REMOTE_ID INTEGER," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "ATTRIBUTE_ID INTEGER," +
+                                    "NAME TEXT NOT NULL," +
+                                    "SLUG TEXT, " +
+                                    "DESCRIPTION TEXT, " +
+                                    "COUNT INTEGER, " +
+                                    "MENU_ORDER INTEGER)"
+                    )
+                }
+                135 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductAttributeModel RENAME TO WCGlobalAttributeModel")
+                }
+                136 -> migrate(version) {
+                    db.execSQL("CREATE TABLE DynamicCard (_id INTEGER PRIMARY KEY AUTOINCREMENT,SITE_ID INTEGER," +
+                            "DYNAMIC_CARD_TYPE TEXT,STATE TEXT)")
+                }
+                137 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS GutenbergLayoutModel")
+                    db.execSQL(
+                            "CREATE TABLE GutenbergLayoutModel (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "SLUG TEXT NOT NULL," +
+                                    "SITE_ID INTEGER," +
+                                    "TITLE TEXT NOT NULL," +
+                                    "PREVIEW TEXT NOT NULL," +
+                                    "PREVIEW_TABLET TEXT NOT NULL," +
+                                    "PREVIEW_MOBILE TEXT NOT NULL," +
+                                    "CONTENT TEXT NOT NULL," +
+                                    "DEMO_URL TEXT NOT NULL)"
+                    )
+                }
+                138 -> migrate(version) {
+                    db.execSQL("ALTER TABLE CommentModel ADD PUBLISHED_TIMESTAMP INTEGER")
+                }
+                139 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCCustomerModel")
+                    db.execSQL("CREATE TABLE WCCustomerModel (AVATAR_URL TEXT NOT NULL," +
+                            "DATE_CREATED TEXT NOT NULL,DATE_CREATED_GMT TEXT NOT NULL,DATE_MODIFIED TEXT NOT NULL," +
+                            "DATE_MODIFIED_GMT TEXT NOT NULL,EMAIL TEXT NOT NULL,FIRST_NAME TEXT NOT NULL," +
+                            "REMOTE_CUSTOMER_ID INTEGER,IS_PAYING_CUSTOMER INTEGER,LAST_NAME TEXT NOT NULL," +
+                            "ROLE TEXT NOT NULL,USERNAME TEXT NOT NULL,LOCAL_SITE_ID INTEGER,BILLING_ADDRESS1" +
+                            " TEXT NOT NULL,BILLING_ADDRESS2 TEXT NOT NULL,BILLING_CITY TEXT NOT NULL," +
+                            "BILLING_COMPANY TEXT NOT NULL,BILLING_COUNTRY TEXT NOT NULL,BILLING_EMAIL" +
+                            " TEXT NOT NULL,BILLING_FIRST_NAME TEXT NOT NULL,BILLING_LAST_NAME TEXT " +
+                            "NOT NULL,BILLING_PHONE TEXT NOT NULL,BILLING_POSTCODE TEXT NOT NULL,BILLING_STATE" +
+                            " TEXT NOT NULL,SHIPPING_ADDRESS1 TEXT NOT NULL,SHIPPING_ADDRESS2 TEXT NOT NULL," +
+                            "SHIPPING_CITY TEXT NOT NULL,SHIPPING_COMPANY TEXT NOT NULL,SHIPPING_COUNTRY TEXT" +
+                            " NOT NULL,SHIPPING_FIRST_NAME TEXT NOT NULL,SHIPPING_LAST_NAME TEXT NOT NULL," +
+                            "SHIPPING_POSTCODE TEXT NOT NULL,SHIPPING_STATE TEXT NOT NULL,_id INTEGER" +
+                            " PRIMARY KEY AUTOINCREMENT)")
+                }
+                140 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductModel")
+                    db.execSQL("CREATE TABLE WCProductModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "REMOTE_PRODUCT_ID INTEGER," +
+                            "NAME TEXT NOT NULL," +
+                            "SLUG TEXT NOT NULL," +
+                            "PERMALINK TEXT NOT NULL," +
+                            "DATE_CREATED TEXT NOT NULL," +
+                            "DATE_MODIFIED TEXT NOT NULL," +
+                            "TYPE TEXT NOT NULL," +
+                            "STATUS TEXT NOT NULL," +
+                            "FEATURED INTEGER," +
+                            "CATALOG_VISIBILITY TEXT NOT NULL," +
+                            "DESCRIPTION TEXT NOT NULL," +
+                            "SHORT_DESCRIPTION TEXT NOT NULL," +
+                            "SKU TEXT NOT NULL," +
+                            "PRICE TEXT NOT NULL," +
+                            "REGULAR_PRICE TEXT NOT NULL," +
+                            "SALE_PRICE TEXT NOT NULL," +
+                            "ON_SALE INTEGER," +
+                            "TOTAL_SALES INTEGER," +
+                            "DATE_ON_SALE_FROM TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM_GMT TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO_GMT TEXT NOT NULL," +
+                            "VIRTUAL INTEGER," +
+                            "DOWNLOADABLE INTEGER," +
+                            "DOWNLOAD_LIMIT INTEGER," +
+                            "DOWNLOAD_EXPIRY INTEGER," +
+                            "SOLD_INDIVIDUALLY INTEGER," +
+                            "EXTERNAL_URL TEXT NOT NULL," +
+                            "BUTTON_TEXT TEXT NOT NULL," +
+                            "TAX_STATUS TEXT NOT NULL," +
+                            "TAX_CLASS TEXT NOT NULL," +
+                            "MANAGE_STOCK INTEGER," +
+                            "STOCK_QUANTITY REAL," +
+                            "STOCK_STATUS TEXT NOT NULL," +
+                            "BACKORDERS TEXT NOT NULL," +
+                            "BACKORDERS_ALLOWED INTEGER," +
+                            "BACKORDERED INTEGER," +
+                            "SHIPPING_REQUIRED INTEGER," +
+                            "SHIPPING_TAXABLE INTEGER," +
+                            "SHIPPING_CLASS TEXT NOT NULL," +
+                            "SHIPPING_CLASS_ID INTEGER," +
+                            "REVIEWS_ALLOWED INTEGER," +
+                            "AVERAGE_RATING TEXT NOT NULL," +
+                            "RATING_COUNT INTEGER," +
+                            "PARENT_ID INTEGER," +
+                            "PURCHASE_NOTE TEXT NOT NULL," +
+                            "MENU_ORDER INTEGER," +
+                            "CATEGORIES TEXT NOT NULL," +
+                            "TAGS TEXT NOT NULL," +
+                            "IMAGES TEXT NOT NULL," +
+                            "ATTRIBUTES TEXT NOT NULL," +
+                            "VARIATIONS TEXT NOT NULL," +
+                            "DOWNLOADS TEXT NOT NULL," +
+                            "RELATED_IDS TEXT NOT NULL," +
+                            "CROSS_SELL_IDS TEXT NOT NULL," +
+                            "UPSELL_IDS TEXT NOT NULL," +
+                            "GROUPED_PRODUCT_IDS TEXT NOT NULL," +
+                            "WEIGHT TEXT NOT NULL," +
+                            "LENGTH TEXT NOT NULL," +
+                            "WIDTH TEXT NOT NULL," +
+                            "HEIGHT TEXT NOT NULL)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS WCProductVariationModel")
+                    db.execSQL("CREATE TABLE WCProductVariationModel (" +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "REMOTE_PRODUCT_ID INTEGER," +
+                            "REMOTE_VARIATION_ID INTEGER," +
+                            "DATE_CREATED TEXT NOT NULL," +
+                            "DATE_MODIFIED TEXT NOT NULL," +
+                            "DESCRIPTION TEXT NOT NULL," +
+                            "PERMALINK TEXT NOT NULL," +
+                            "SKU TEXT NOT NULL," +
+                            "STATUS TEXT NOT NULL," +
+                            "PRICE TEXT NOT NULL," +
+                            "REGULAR_PRICE TEXT NOT NULL," +
+                            "SALE_PRICE TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO TEXT NOT NULL," +
+                            "DATE_ON_SALE_FROM_GMT TEXT NOT NULL," +
+                            "DATE_ON_SALE_TO_GMT TEXT NOT NULL," +
+                            "ON_SALE INTEGER," +
+                            "PURCHASABLE INTEGER," +
+                            "VIRTUAL INTEGER," +
+                            "DOWNLOADABLE INTEGER," +
+                            "TAX_STATUS TEXT NOT NULL," +
+                            "TAX_CLASS TEXT NOT NULL," +
+                            "DOWNLOAD_LIMIT INTEGER," +
+                            "DOWNLOAD_EXPIRY INTEGER," +
+                            "DOWNLOADS TEXT NOT NULL," +
+                            "BACKORDERS TEXT NOT NULL," +
+                            "BACKORDERS_ALLOWED INTEGER," +
+                            "BACKORDERED INTEGER," +
+                            "SHIPPING_CLASS TEXT NOT NULL," +
+                            "SHIPPING_CLASS_ID INTEGER," +
+                            "MANAGE_STOCK INTEGER," +
+                            "STOCK_QUANTITY REAL," +
+                            "STOCK_STATUS TEXT NOT NULL," +
+                            "IMAGE TEXT NOT NULL," +
+                            "WEIGHT TEXT NOT NULL," +
+                            "LENGTH TEXT NOT NULL," +
+                            "WIDTH TEXT NOT NULL," +
+                            "HEIGHT TEXT NOT NULL," +
+                            "MENU_ORDER INTEGER," +
+                            "ATTRIBUTES TEXT NOT NULL," +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT)")
+                }
+                141 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE LikeModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "TYPE TEXT NOT NULL,REMOTE_SITE_ID INTEGER,REMOTE_ITEM_ID INTEGER,REMOTE_LIKE_ID INTEGER," +
+                            "LIKER_NAME TEXT,LIKER_LOGIN TEXT,LIKER_AVATAR_URL TEXT,LIKER_SITE_ID INTEGER," +
+                            "LIKER_SITE_URL TEXT)"
+                    )
+                }
+                142 -> migrate(version) {
+                    db.execSQL("ALTER TABLE CommentModel ADD HAS_PARENT BOOLEAN")
+                    db.execSQL("ALTER TABLE CommentModel ADD PARENT_ID INTEGER")
+                }
+                143 -> migrate(version) {
+                    db.execSQL(
+                            "CREATE TABLE WCShippingLabelCreationEligibility (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_ORDER_ID INTEGER," +
+                                    "CAN_CREATE_PACKAGE BOOLEAN," +
+                                    "CAN_CREATE_PAYMENT_METHOD BOOLEAN," +
+                                    "CAN_CREATE_CUSTOMS_FORM BOOLEAN," +
+                                    "IS_ELIGIBLE BOOLEAN," +
+                                    "REASON TEXT)"
+                    )
+                    db.execSQL("DROP TABLE IF EXISTS WCShippingLabelModel")
+                    db.execSQL(
+                            "CREATE TABLE WCShippingLabelModel (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_ORDER_ID INTEGER," +
+                                    "REMOTE_SHIPPING_LABEL_ID INTEGER," +
+                                    "CARRIER_ID TEXT NOT NULL," +
+                                    "PRODUCT_NAMES TEXT NULL," +
+                                    "TRACKING_NUMBER TEXT NOT NULL," +
+                                    "SERVICE_NAME TEXT NOT NULL," +
+                                    "STATUS TEXT NOT NULL," +
+                                    "PACKAGE_NAME TEXT NOT NULL," +
+                                    "RATE REAL NOT NULL," +
+                                    "REFUNDABLE_AMOUNT REAL NOT NULL," +
+                                    "CURRENCY TEXT NOT NULL," +
+                                    "FORM_DATA TEXT NOT NULL," +
+                                    "REFUND TEXT NULL," +
+                                    "PRODUCT_IDS TEXT," +
+                                    "DATE_CREATED TEXT)"
+                    )
+                }
+                144 -> migrate(version) {
+                    db.execSQL("ALTER TABLE ScanState ADD HAS_VALID_CREDENTIALS BOOLEAN")
+                }
+                145 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCShippingLabelModel")
+                    db.execSQL(
+                            "CREATE TABLE WCShippingLabelModel (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_ORDER_ID INTEGER," +
+                                    "REMOTE_SHIPPING_LABEL_ID INTEGER," +
+                                    "CARRIER_ID TEXT NOT NULL," +
+                                    "PRODUCT_NAMES TEXT NULL," +
+                                    "TRACKING_NUMBER TEXT NOT NULL," +
+                                    "SERVICE_NAME TEXT NOT NULL," +
+                                    "STATUS TEXT NOT NULL," +
+                                    "PACKAGE_NAME TEXT NOT NULL," +
+                                    "RATE REAL NOT NULL," +
+                                    "REFUNDABLE_AMOUNT REAL NOT NULL," +
+                                    "CURRENCY TEXT NOT NULL," +
+                                    "FORM_DATA TEXT NOT NULL," +
+                                    "REFUND TEXT NULL," +
+                                    "PRODUCT_IDS TEXT," +
+                                    "DATE_CREATED INTEGER," +
+                                    "EXPIRY_DATE INTEGER)"
+                    )
+                }
+                146 -> migrate(version) {
+                    db.execSQL("ALTER TABLE LikeModel ADD PREFERRED_BLOG_ID INTEGER")
+                    db.execSQL("ALTER TABLE LikeModel ADD PREFERRED_BLOG_NAME TEXT")
+                    db.execSQL("ALTER TABLE LikeModel ADD PREFERRED_BLOG_URL TEXT")
+                    db.execSQL("ALTER TABLE LikeModel ADD PREFERRED_BLOG_BLAVATAR_URL TEXT")
+                }
+                147 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS LikeModel")
+                    db.execSQL(
+                            "CREATE TABLE LikeModel (_id INTEGER PRIMARY KEY AUTOINCREMENT,TYPE TEXT NOT NULL," +
+                            "REMOTE_SITE_ID INTEGER,REMOTE_ITEM_ID INTEGER,LIKER_ID INTEGER,LIKER_NAME TEXT," +
+                            "LIKER_LOGIN TEXT,LIKER_AVATAR_URL TEXT,LIKER_BIO TEXT,LIKER_SITE_ID INTEGER," +
+                            "LIKER_SITE_URL TEXT,PREFERRED_BLOG_ID INTEGER,PREFERRED_BLOG_NAME TEXT," +
+                            "PREFERRED_BLOG_URL TEXT,PREFERRED_BLOG_BLAVATAR_URL TEXT,DATE_LIKED TEXT)"
+                    )
+                }
+                148 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS LikeModel")
+                    db.execSQL("CREATE TABLE LikeModel (_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "TYPE TEXT NOT NULL,REMOTE_SITE_ID INTEGER,REMOTE_ITEM_ID INTEGER,LIKER_ID INTEGER," +
+                            "LIKER_NAME TEXT,LIKER_LOGIN TEXT,LIKER_AVATAR_URL TEXT,LIKER_BIO TEXT," +
+                            "LIKER_SITE_ID INTEGER,LIKER_SITE_URL TEXT,PREFERRED_BLOG_ID INTEGER," +
+                            "PREFERRED_BLOG_NAME TEXT,PREFERRED_BLOG_URL TEXT,PREFERRED_BLOG_BLAVATAR_URL TEXT," +
+                            "DATE_LIKED TEXT,TIMESTAMP_FETCHED INTEGER)")
+                }
+                149 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCRefunds")
+                    db.execSQL(
+                            "CREATE TABLE WCRefunds (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "ORDER_ID INTEGER," +
+                                    "REFUND_ID INTEGER," +
+                                    "DATA TEXT NOT NULL)"
+                    )
+                }
+                150 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL(
+                            "CREATE TABLE WCUserModel (" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "REMOTE_USER_ID INTEGER," +
+                                    "FIRST_NAME TEXT," +
+                                    "LAST_NAME TEXT," +
+                                    "USERNAME TEXT," +
+                                    "EMAIL TEXT," +
+                                    "ROLES TEXT)"
+                    )
+                }
+                151 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS MediaUploadModel")
+                    db.execSQL("CREATE TABLE MediaUploadModel (_id INTEGER PRIMARY KEY,UPLOAD_STATE INTEGER," +
+                            "PROGRESS REAL,ERROR_TYPE TEXT,ERROR_MESSAGE TEXT,ERROR_SUB_TYPE TEXT," +
+                            "FOREIGN KEY(_id) REFERENCES MediaModel(_id) ON DELETE CASCADE)")
+                }
+                152 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCShippingLabelModel ADD COMMERCIAL_INVOICE_URL TEXT")
+                }
+                153 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD META_DATA TEXT")
+                }
+                154 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS EditorTheme")
+                    db.execSQL(
+                            "CREATE TABLE EditorTheme(" +
+                                    "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                                    "LOCAL_SITE_ID INTEGER," +
+                                    "STYLESHEET TEXT," +
+                                    "VERSION TEXT," +
+                                    "RAW_STYLES TEXT," +
+                                    "RAW_FEATURES TEXT," +
+                                    "FOREIGN KEY(LOCAL_SITE_ID) REFERENCES SiteModel(_id) ON DELETE CASCADE)"
+                    )
+                }
+                155 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS PlanOffers")
+                    db.execSQL("DROP TABLE IF EXISTS PlanOffersFeature")
+                    db.execSQL("DROP TABLE IF EXISTS PlanOffersId")
+                }
+                156 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD ACTIVE_MODULES TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_PUBLICIZE_PERMANENTLY_DISABLED BOOLEAN")
+                }
+                157 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD ZENDESK_PLAN TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD ZENDESK_ADD_ONS TEXT")
+                }
+                158 -> migrate(version) {
+                    db.execSQL("ALTER TABLE EditorTheme ADD IS_FSETHEME BOOLEAN")
+                }
+                159 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD METADATA TEXT")
+                }
+                160 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD ORDER_KEY TEXT")
+                }
+                161 -> migrate(version) {
+                    db.execSQL("ALTER TABLE EditorTheme ADD GALLERY_WITH_IMAGE_BLOCKS BOOLEAN")
+                }
+                162 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD STICKY BOOLEAN")
+                }
+                163 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD ORGANIZATION_ID INTEGER")
+                }
+                164 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_JETPACK_CP_CONNECTED BOOLEAN")
+                }
+                165 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderModel ADD SHIPPING_PHONE TEXT")
+                }
+                166 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD ACTIVE_JETPACK_CONNECTION_PLUGINS TEXT")
+                }
+                167 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderModel")
+                }
+                168 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD PURCHASABLE INTEGER")
+                }
+                169 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCPlugins")
+                }
+                170 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderNoteModel")
+                }
+                171 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DELETE FROM WCOrderSummaryModel")
+                    db.execSQL("DELETE FROM WCOrderShipmentTrackingModel")
+                }
+                172 -> migrate(version) {
+                    db.execSQL("ALTER TABLE EditorTheme ADD QUOTE_BLOCK_V2 BOOLEAN")
+                }
+                173 -> migrate(version) {
+                    db.execSQL("DELETE FROM QuickStartTaskModel WHERE TASK_NAME='explore_plans' " +
+                        "AND TASK_TYPE='grow';")
+                }
+                174 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_PROMPTS_OPTED_IN BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_PROMPTS_CARD_OPTED_IN BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_POTENTIAL_BLOGGING_SITE BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_MONDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_TUESDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_WEDNESDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_THURSDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_FRIDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_SATURDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_BLOGGING_REMINDER_ON_SUNDAY BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD BLOGGING_REMINDER_HOUR INTEGER")
+                    db.execSQL("ALTER TABLE SiteModel ADD BLOGGING_REMINDER_MINUTE INTEGER")
+                }
+                175 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD ANSWERED_PROMPT_ID INTEGER")
+                }
+                176 -> migrate(version) {
+                    db.execSQL("DELETE FROM QuickStartTaskModel WHERE TASK_NAME='edit_homepage' " +
+                        "AND TASK_TYPE='customize';")
+                }
+                177 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCSettingsModel ADD COUPONS_ENABLED BOOLEAN NOT NULL DEFAULT 0")
+                }
+                178 -> migrate(version) {
+                    db.execSQL("ALTER TABLE EditorTheme ADD LIST_BLOCK_V2 BOOLEAN")
+                }
+                179 -> migrate(version) {
+                    db.execSQL("ALTER TABLE AccountModel ADD TWO_STEP_ENABLED BOOLEAN")
+                }
+                180 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD APPLICATION_PASSWORDS_AUTHORIZE_URL TEXT")
+                }
+                181 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD METADATA TEXT")
+                }
+                182 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD BUNDLED_ITEMS TEXT")
+                }
+                183 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD COMPOSITE_COMPONENTS TEXT")
+                }
+                184 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD SPECIAL_STOCK_STATUS TEXT")
+                }
+                185 -> migrate(version) {
+                    // renaming tables is not supported by SQLite in some versions, so we need to:
+                    // 1. create a new table
+                    // 2. copy data from old table to new table, mapping to the new column names
+                    // 3. drop the old table
+                    // 4. rename the new table to the old table name
+                    db.execSQL(
+                        "CREATE TABLE IF NOT EXISTS EditorTheme_new (" +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "STYLESHEET TEXT," +
+                            "VERSION TEXT," +
+                            "RAW_STYLES TEXT," +
+                            "RAW_FEATURES TEXT," +
+                            "HAS_BLOCK_TEMPLATES INTEGER," +
+                            "IS_BLOCK_BASED_THEME INTEGER," +
+                            "GALLERY_WITH_IMAGE_BLOCKS INTEGER," +
+                            "QUOTE_BLOCK_V2 INTEGER," +
+                            "LIST_BLOCK_V2 INTEGER)"
+                    )
+
+                    db.execSQL(
+                        "INSERT INTO EditorTheme_new (" +
+                            "_id, LOCAL_SITE_ID, STYLESHEET, VERSION, RAW_STYLES, RAW_FEATURES, " +
+                            "HAS_BLOCK_TEMPLATES, IS_BLOCK_BASED_THEME, GALLERY_WITH_IMAGE_BLOCKS, " +
+                            "QUOTE_BLOCK_V2, LIST_BLOCK_V2) " +
+                            "SELECT " +
+                            "_id, LOCAL_SITE_ID, STYLESHEET, VERSION, RAW_STYLES, RAW_FEATURES, " +
+                            "0, IS_FSETHEME, GALLERY_WITH_IMAGE_BLOCKS, " +
+                            "QUOTE_BLOCK_V2, LIST_BLOCK_V2 " +
+                            "FROM EditorTheme"
+                    )
+
+                    db.execSQL("DROP TABLE EditorTheme")
+                    db.execSQL("ALTER TABLE EditorTheme_new RENAME TO EditorTheme")
+                }
+                186 -> migrate(version) {
+                    db.execSQL("ALTER TABLE AccountModel ADD USER_IP_COUNTRY_CODE TEXT")
+                }
+                187 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD PUBLISHED_STATUS INTEGER")
+                }
+                188 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD CAN_BLAZE BOOLEAN")
+                }
+                189 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD PLAN_ACTIVE_FEATURES TEXT")
+                }
+                190 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SHARE_MESSAGE TEXT")
+                    db.execSQL("ALTER TABLE PostModel ADD AUTO_SHARE_ID INTEGER")
+                }
+                191 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCRevenueStatsModel ADD RANGE_ID INTEGER")
+                }
+                192 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD WAS_ECOMMERCE_TRIAL BOOLEAN")
+                    db.execSQL("ALTER TABLE SiteModel ADD PLAN_PRODUCT_SLUG TEXT")
+                }
+                193 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD PUBLICIZE_SKIP_CONNECTIONS_JSON TEXT")
+                }
+                194 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS DynamicCard")
+                }
+                195 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCRevenueStatsModel")
+                    db.execSQL(
+                        "CREATE TABLE WCRevenueStatsModel(" +
+                            "LOCAL_SITE_ID INTEGER," +
+                            "INTERVAL TEXT NOT NULL," +
+                            "START_DATE TEXT NOT NULL," +
+                            "END_DATE TEXT NOT NULL," +
+                            "DATA TEXT NOT NULL," +
+                            "TOTAL TEXT NOT NULL," +
+                            "RANGE_ID TEXT NOT NULL," +
+                            "_id INTEGER PRIMARY KEY AUTOINCREMENT)"
+                    )
+                }
+                196 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD IS_SINGLE_USER_SITE BOOLEAN")
+                }
+                197 -> migrate(version) {
+                    db.execSQL("ALTER TABLE ThemeModel ADD THEME_TYPE TEXT")
+                    db.execSQL("ALTER TABLE ThemeModel ADD IS_EXTERNAL_THEME BOOLEAN")
+                }
+                198 -> migrate(version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCOrderStatsModel")
+                    db.execSQL("DROP TABLE IF EXISTS WCVisitorStatsModel")
+                }
+                199 -> migrate(version) {
+                    db.execSQL("ALTER TABLE PostModel ADD DB_TIMESTAMP INTEGER")
+                }
+                200 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD IS_SAMPLE_PRODUCT BOOLEAN")
+                }
+
+                201 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD MIN_ALLOWED_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductModel ADD MAX_ALLOWED_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductModel ADD GROUP_OF_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductModel ADD COMBINE_VARIATION_QUANTITIES BOOLEAN")
+
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD MIN_ALLOWED_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD MAX_ALLOWED_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD GROUP_OF_QUANTITY INTEGER")
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD OVERRIDE_PRODUCT_QUANTITIES BOOLEAN")
+                }
+
+                202 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD BUNDLE_MIN_SIZE REAL")
+                    db.execSQL("ALTER TABLE WCProductModel ADD BUNDLE_MAX_SIZE REAL")
+                }
+
+                203 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("DROP TABLE IF EXISTS WCProductModel")
+                    db.execSQL("""
+                        CREATE TABLE WCProductModel (
+                        _id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER,
+                        REMOTE_PRODUCT_ID INTEGER,NAME TEXT NOT NULL,SLUG TEXT NOT NULL,PERMALINK TEXT NOT NULL,
+                        DATE_CREATED TEXT NOT NULL,DATE_MODIFIED TEXT NOT NULL,TYPE TEXT NOT NULL,STATUS TEXT NOT NULL,
+                        FEATURED INTEGER,CATALOG_VISIBILITY TEXT NOT NULL,DESCRIPTION TEXT NOT NULL,
+                        SHORT_DESCRIPTION TEXT NOT NULL,SKU TEXT NOT NULL,PRICE TEXT NOT NULL,REGULAR_PRICE TEXT NOT NULL,
+                        SALE_PRICE TEXT NOT NULL,ON_SALE INTEGER,TOTAL_SALES INTEGER,PURCHASABLE INTEGER,
+                        DATE_ON_SALE_FROM TEXT NOT NULL,DATE_ON_SALE_TO TEXT NOT NULL,DATE_ON_SALE_FROM_GMT TEXT NOT NULL,
+                        DATE_ON_SALE_TO_GMT TEXT NOT NULL,VIRTUAL INTEGER,DOWNLOADABLE INTEGER,DOWNLOAD_LIMIT INTEGER,
+                        DOWNLOAD_EXPIRY INTEGER,SOLD_INDIVIDUALLY INTEGER,EXTERNAL_URL TEXT NOT NULL,BUTTON_TEXT TEXT NOT NULL,
+                        TAX_STATUS TEXT NOT NULL,TAX_CLASS TEXT NOT NULL,MANAGE_STOCK INTEGER,STOCK_QUANTITY REAL,
+                        STOCK_STATUS TEXT NOT NULL,BACKORDERS TEXT NOT NULL,BACKORDERS_ALLOWED INTEGER,BACKORDERED INTEGER,
+                        SHIPPING_REQUIRED INTEGER,SHIPPING_TAXABLE INTEGER,SHIPPING_CLASS TEXT NOT NULL,SHIPPING_CLASS_ID INTEGER,
+                        REVIEWS_ALLOWED INTEGER,AVERAGE_RATING TEXT NOT NULL,RATING_COUNT INTEGER,PARENT_ID INTEGER,
+                        PURCHASE_NOTE TEXT NOT NULL,MENU_ORDER INTEGER,CATEGORIES TEXT NOT NULL,TAGS TEXT NOT NULL,
+                        IMAGES TEXT NOT NULL,ATTRIBUTES TEXT NOT NULL,VARIATIONS TEXT NOT NULL,DOWNLOADS TEXT NOT NULL,
+                        RELATED_IDS TEXT NOT NULL,CROSS_SELL_IDS TEXT NOT NULL,UPSELL_IDS TEXT NOT NULL,
+                        GROUPED_PRODUCT_IDS TEXT NOT NULL,WEIGHT TEXT NOT NULL,LENGTH TEXT NOT NULL,WIDTH TEXT NOT NULL,
+                        HEIGHT TEXT NOT NULL,METADATA TEXT NOT NULL,BUNDLED_ITEMS TEXT NOT NULL,
+                        COMPOSITE_COMPONENTS TEXT NOT NULL,SPECIAL_STOCK_STATUS TEXT NOT NULL,BUNDLE_MIN_SIZE REAL,
+                        BUNDLE_MAX_SIZE REAL,MIN_ALLOWED_QUANTITY INTEGER,MAX_ALLOWED_QUANTITY INTEGER,
+                        GROUP_OF_QUANTITY INTEGER,COMBINE_VARIATION_QUANTITIES INTEGER,PASSWORD TEXT,IS_SAMPLE_PRODUCT INTEGER
+                        )
+                    """.trimIndent())
+                }
+
+                204 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    // Drop the column METADATA from WCProductModel
+                    // Since SQLite version varies across devices, we can't rely on the support of DROP COLUMN,
+                    // So we'll use an intermediate table
+                    db.execSQL("""
+                        CREATE TABLE WCProductModel_temp (
+                            _id INTEGER PRIMARY KEY AUTOINCREMENT,LOCAL_SITE_ID INTEGER,
+                            REMOTE_PRODUCT_ID INTEGER,NAME TEXT NOT NULL,SLUG TEXT NOT NULL,PERMALINK TEXT NOT NULL,
+                            DATE_CREATED TEXT NOT NULL,DATE_MODIFIED TEXT NOT NULL,TYPE TEXT NOT NULL,STATUS TEXT NOT NULL,
+                            FEATURED INTEGER,CATALOG_VISIBILITY TEXT NOT NULL,DESCRIPTION TEXT NOT NULL,
+                            SHORT_DESCRIPTION TEXT NOT NULL,SKU TEXT NOT NULL,PRICE TEXT NOT NULL,REGULAR_PRICE TEXT NOT NULL,
+                            SALE_PRICE TEXT NOT NULL,ON_SALE INTEGER,TOTAL_SALES INTEGER,PURCHASABLE INTEGER,
+                            DATE_ON_SALE_FROM TEXT NOT NULL,DATE_ON_SALE_TO TEXT NOT NULL,DATE_ON_SALE_FROM_GMT TEXT NOT NULL,
+                            DATE_ON_SALE_TO_GMT TEXT NOT NULL,VIRTUAL INTEGER,DOWNLOADABLE INTEGER,DOWNLOAD_LIMIT INTEGER,
+                            DOWNLOAD_EXPIRY INTEGER,SOLD_INDIVIDUALLY INTEGER,EXTERNAL_URL TEXT NOT NULL,BUTTON_TEXT TEXT NOT NULL,
+                            TAX_STATUS TEXT NOT NULL,TAX_CLASS TEXT NOT NULL,MANAGE_STOCK INTEGER,STOCK_QUANTITY REAL,
+                            STOCK_STATUS TEXT NOT NULL,BACKORDERS TEXT NOT NULL,BACKORDERS_ALLOWED INTEGER,BACKORDERED INTEGER,
+                            SHIPPING_REQUIRED INTEGER,SHIPPING_TAXABLE INTEGER,SHIPPING_CLASS TEXT NOT NULL,SHIPPING_CLASS_ID INTEGER,
+                            REVIEWS_ALLOWED INTEGER,AVERAGE_RATING TEXT NOT NULL,RATING_COUNT INTEGER,PARENT_ID INTEGER,
+                            PURCHASE_NOTE TEXT NOT NULL,MENU_ORDER INTEGER,CATEGORIES TEXT NOT NULL,TAGS TEXT NOT NULL,
+                            IMAGES TEXT NOT NULL,ATTRIBUTES TEXT NOT NULL,VARIATIONS TEXT NOT NULL,DOWNLOADS TEXT NOT NULL,
+                            RELATED_IDS TEXT NOT NULL,CROSS_SELL_IDS TEXT NOT NULL,UPSELL_IDS TEXT NOT NULL,
+                            GROUPED_PRODUCT_IDS TEXT NOT NULL,WEIGHT TEXT NOT NULL,LENGTH TEXT NOT NULL,WIDTH TEXT NOT NULL,
+                            HEIGHT TEXT NOT NULL,BUNDLED_ITEMS TEXT NOT NULL,COMPOSITE_COMPONENTS TEXT NOT NULL,
+                            SPECIAL_STOCK_STATUS TEXT NOT NULL,BUNDLE_MIN_SIZE REAL,BUNDLE_MAX_SIZE REAL,
+                            MIN_ALLOWED_QUANTITY INTEGER,MAX_ALLOWED_QUANTITY INTEGER,GROUP_OF_QUANTITY INTEGER,
+                            COMBINE_VARIATION_QUANTITIES INTEGER,PASSWORD TEXT,IS_SAMPLE_PRODUCT INTEGER
+                        )
+                    """.trimIndent())
+
+                    db.execSQL("""
+                        INSERT INTO WCProductModel_temp (
+                            _id, LOCAL_SITE_ID, REMOTE_PRODUCT_ID, NAME, SLUG, PERMALINK, DATE_CREATED, DATE_MODIFIED, TYPE, STATUS, FEATURED,
+                            CATALOG_VISIBILITY, DESCRIPTION, SHORT_DESCRIPTION, SKU, PRICE, REGULAR_PRICE, SALE_PRICE, ON_SALE, TOTAL_SALES,
+                            PURCHASABLE, DATE_ON_SALE_FROM, DATE_ON_SALE_TO, DATE_ON_SALE_FROM_GMT, DATE_ON_SALE_TO_GMT, VIRTUAL, DOWNLOADABLE,
+                            DOWNLOAD_LIMIT, DOWNLOAD_EXPIRY, SOLD_INDIVIDUALLY, EXTERNAL_URL, BUTTON_TEXT, TAX_STATUS, TAX_CLASS, MANAGE_STOCK,
+                            STOCK_QUANTITY, STOCK_STATUS, BACKORDERS, BACKORDERS_ALLOWED, BACKORDERED, SHIPPING_REQUIRED, SHIPPING_TAXABLE,
+                            SHIPPING_CLASS, SHIPPING_CLASS_ID, REVIEWS_ALLOWED, AVERAGE_RATING, RATING_COUNT, PARENT_ID, PURCHASE_NOTE, MENU_ORDER,
+                            CATEGORIES, TAGS, IMAGES, ATTRIBUTES, VARIATIONS, DOWNLOADS, RELATED_IDS, CROSS_SELL_IDS, UPSELL_IDS, GROUPED_PRODUCT_IDS,
+                            WEIGHT, LENGTH, WIDTH, HEIGHT, BUNDLED_ITEMS, COMPOSITE_COMPONENTS, SPECIAL_STOCK_STATUS, BUNDLE_MIN_SIZE, BUNDLE_MAX_SIZE,
+                            MIN_ALLOWED_QUANTITY, MAX_ALLOWED_QUANTITY, GROUP_OF_QUANTITY, COMBINE_VARIATION_QUANTITIES, PASSWORD, IS_SAMPLE_PRODUCT
+                        )
+                        SELECT 
+                            _id, LOCAL_SITE_ID, REMOTE_PRODUCT_ID, NAME, SLUG, PERMALINK, DATE_CREATED, DATE_MODIFIED, TYPE, STATUS, FEATURED,
+                            CATALOG_VISIBILITY, DESCRIPTION, SHORT_DESCRIPTION, SKU, PRICE, REGULAR_PRICE, SALE_PRICE, ON_SALE, TOTAL_SALES,
+                            PURCHASABLE, DATE_ON_SALE_FROM, DATE_ON_SALE_TO, DATE_ON_SALE_FROM_GMT, DATE_ON_SALE_TO_GMT, VIRTUAL, DOWNLOADABLE,
+                            DOWNLOAD_LIMIT, DOWNLOAD_EXPIRY, SOLD_INDIVIDUALLY, EXTERNAL_URL, BUTTON_TEXT, TAX_STATUS, TAX_CLASS, MANAGE_STOCK,
+                            STOCK_QUANTITY, STOCK_STATUS, BACKORDERS, BACKORDERS_ALLOWED, BACKORDERED, SHIPPING_REQUIRED, SHIPPING_TAXABLE,
+                            SHIPPING_CLASS, SHIPPING_CLASS_ID, REVIEWS_ALLOWED, AVERAGE_RATING, RATING_COUNT, PARENT_ID, PURCHASE_NOTE, MENU_ORDER,
+                            CATEGORIES, TAGS, IMAGES, ATTRIBUTES, VARIATIONS, DOWNLOADS, RELATED_IDS, CROSS_SELL_IDS, UPSELL_IDS, GROUPED_PRODUCT_IDS,
+                            WEIGHT, LENGTH, WIDTH, HEIGHT, BUNDLED_ITEMS, COMPOSITE_COMPONENTS, SPECIAL_STOCK_STATUS, BUNDLE_MIN_SIZE, BUNDLE_MAX_SIZE,
+                            MIN_ALLOWED_QUANTITY, MAX_ALLOWED_QUANTITY, GROUP_OF_QUANTITY, COMBINE_VARIATION_QUANTITIES, PASSWORD, IS_SAMPLE_PRODUCT
+                        FROM WCProductModel
+                    """.trimIndent())
+
+                    db.execSQL("DROP TABLE WCProductModel")
+
+                    db.execSQL("ALTER TABLE WCProductModel_temp RENAME TO WCProductModel")
+                }
+
+                205 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCProductModel ADD GLOBAL_UNIQUE_ID TEXT")
+                    db.execSQL("ALTER TABLE WCProductVariationModel ADD GLOBAL_UNIQUE_ID TEXT")
+                }
+            }
+        }
+        db.setTransactionSuccessful()
+        db.endTransaction()
+    }
+
+    /**
+     * Detect when the database is downgraded in debug builds so we can recreate all the tables. Note that we
+     * hide this behind a BuildConfig flag as a protection against accidentally deleting the data (ie: we
+     * don't want this to ever be enabled for release builds by mistake).
+     */
+    override fun onDowngrade(db: SQLiteDatabase?, helper: WellTableManager?, oldVersion: Int, newVersion: Int) {
+        if (BuildConfig.DEBUG && BuildConfig.WP_ENABLE_DATABASE_DOWNGRADE) {
+            // note: don't call super() here because it throws an exception
+            val toast = Toast.makeText(
+                    context,
+                    "Database downgraded from version $oldVersion to $newVersion",
+                    Toast.LENGTH_LONG
+            )
+            toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 0)
+            toast.show()
+
+            AppLog.d(T.DB, "Database downgraded from version $oldVersion to $newVersion")
+            helper?.let { reset(it) }
+        } else {
+            super.onDowngrade(db, helper, oldVersion, newVersion)
+        }
+    }
+
+    override fun onConfigure(db: SQLiteDatabase, helper: WellTableManager?) {
+        db.setForeignKeyConstraintsEnabled(true)
+    }
+
+    /**
+     * Increase the cursor window size to 5MB for devices running API 28 and above. This should
+     * reduce the number of SQLiteBlobTooBigExceptions.
+     * NOTE: this is only called on API 28 and above since earlier versions don't allow adjusting
+     * the cursor window size.
+     */
+    @Suppress("MagicNumber")
+    override fun getCursorWindowSize() = (1024L * 1024L * 5L)
+
+    /**
+     * Drop and create all tables
+     */
+    @Suppress("CheckStyle")
+    open fun reset() {
+        val db = WellSql.giveMeWritableDb()
+        mTables.forEach { clazz ->
+            val table = getTable(clazz)
+            db.execSQL("DROP TABLE IF EXISTS ${table.tableName}")
+            db.execSQL(table.createStatement())
+        }
+    }
+
+    /**
+     * Recreates all the tables in this database - similar to the above but can be used from onDowngrade where we can't
+     * call giveMeWritableDb (attempting to do so results in "IllegalStateException: getDatabase called recursively")
+     */
+    fun reset(helper: WellTableManager) {
+        AppLog.d(T.DB, "resetting tables")
+        for (table in mTables) {
+            AppLog.d(T.DB, "dropping table " + table.simpleName)
+            helper.dropTable(table)
+            AppLog.d(T.DB, "creating table " + table.simpleName)
+            helper.createTable(table)
+        }
+    }
+
+    private fun migrate(version: Int, script: () -> Unit) {
+        AppLog.d(T.DB, "Migrating to version ${version + 1}")
+        script()
+    }
+
+    private fun migrateAddOn(@AddOn name: String, version: Int, script: () -> Unit) {
+        AppLog.d(T.DB, "Migrating addon $name to version ${version + 1}")
+        if (mActiveAddOns.contains(name)) {
+            script()
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WhatsNewSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WhatsNewSqlUtils.kt
new file mode 100644
index 00000000000..a14c19e66f0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WhatsNewSqlUtils.kt
@@ -0,0 +1,159 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.WhatsNewAnnouncementFeatureTable
+import com.yarolegovich.wellsql.WellSql
+import com.yarolegovich.wellsql.core.Identifiable
+import com.yarolegovich.wellsql.core.annotation.Column
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey
+import com.yarolegovich.wellsql.core.annotation.Table
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel.WhatsNewAnnouncementFeature
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WhatsNewSqlUtils
+@Inject constructor() {
+    companion object {
+        const val APP_VERSION_TARGETS_SEPARATOR = ";@;"
+    }
+
+    fun hasCachedAnnouncements(): Boolean {
+        return WellSql.select(WhatsNewAnnouncementBuilder::class.java).count() > 0
+    }
+
+    fun getAnnouncements(): List<WhatsNewAnnouncementModel> {
+        val announcements = mutableListOf<WhatsNewAnnouncementModel>()
+
+        val announcementModels = WellSql.select(WhatsNewAnnouncementBuilder::class.java).asModel
+
+        for (announcementModel in announcementModels) {
+            val features = getAnnouncementFeatures(announcementModel.announcementId)
+            announcements.add(announcementModel.build(features))
+        }
+
+        return announcements
+    }
+
+    private fun getAnnouncementFeatures(announcementId: Int): List<WhatsNewAnnouncementFeatureBuilder> {
+        return WellSql.select(WhatsNewAnnouncementFeatureBuilder::class.java)
+                .where().beginGroup()
+                .equals(WhatsNewAnnouncementFeatureTable.ANNOUNCEMENT_ID, announcementId)
+                .endGroup().endWhere()
+                .asModel
+    }
+
+    fun updateAnnouncementCache(announcements: List<WhatsNewAnnouncementModel>?) {
+        val db = WellSql.giveMeWritableDb()
+        db.beginTransaction()
+        try {
+            // we want the local store to be 1 to 1 representation of endpoint announcements
+            WellSql.delete(WhatsNewAnnouncementBuilder::class.java).execute()
+            WellSql.delete(WhatsNewAnnouncementFeatureBuilder::class.java).execute()
+
+            if (announcements == null || announcements.isEmpty()) {
+                db.setTransactionSuccessful()
+                return
+            }
+
+            val announcementBuilders = announcements.map { it.toBuilder() }
+
+            val featureBuilders = mutableListOf<WhatsNewAnnouncementFeatureBuilder>()
+            for (announcement in announcements) {
+                featureBuilders.addAll(announcement.features.map { it.toBuilder(announcement.announcementVersion) })
+            }
+
+            WellSql.insert(announcementBuilders).execute()
+            WellSql.insert(featureBuilders).execute()
+
+            db.setTransactionSuccessful()
+        } finally {
+            db.endTransaction()
+        }
+    }
+
+    @Table(name = "WhatsNewAnnouncement")
+    class WhatsNewAnnouncementBuilder(
+        @PrimaryKey(autoincrement = false) @Column var announcementId: Int = 0,
+        @Column var appVersionName: String = "",
+        @Column var minimumAppVersion: String,
+        @Column var maximumAppVersion: String,
+        @Column var appVersionTargets: String,
+        @Column var localized: Boolean,
+        @Column var responseLocale: String,
+        @Column var detailsUrl: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, "", "", "", "", false, "", "")
+
+        fun build(featuresBuilders: List<WhatsNewAnnouncementFeatureBuilder>): WhatsNewAnnouncementModel {
+            val features = featuresBuilders.map { it.build() }
+            val targetAppVersions = appVersionTargets.split(APP_VERSION_TARGETS_SEPARATOR).filter { it != "" }
+            return WhatsNewAnnouncementModel(
+                    appVersionName,
+                    announcementId,
+                    minimumAppVersion,
+                    maximumAppVersion,
+                    targetAppVersions,
+                    detailsUrl,
+                    localized,
+                    responseLocale,
+                    features
+            )
+        }
+
+        override fun getId(): Int {
+            return this.announcementId
+        }
+
+        override fun setId(id: Int) {
+            this.announcementId = id
+        }
+    }
+
+    @Table(name = "WhatsNewAnnouncementFeature")
+    class WhatsNewAnnouncementFeatureBuilder(
+        @PrimaryKey @Column private var id: Int = 0,
+        @Column var announcementId: Int = 0,
+        @Column var title: String? = null,
+        @Column var subtitle: String? = null,
+        @Column var iconUrl: String? = null,
+        @Column var iconBase64: String? = null
+    ) : Identifiable {
+        constructor() : this(-1, -1, "", "", "", "")
+
+        fun build(): WhatsNewAnnouncementFeature {
+            return WhatsNewAnnouncementFeature(title, subtitle, iconBase64, iconUrl)
+        }
+
+        override fun getId(): Int {
+            return this.id
+        }
+
+        override fun setId(id: Int) {
+            this.id = id
+        }
+    }
+
+    private fun WhatsNewAnnouncementFeature.toBuilder(announcementId: Int): WhatsNewAnnouncementFeatureBuilder {
+        return WhatsNewAnnouncementFeatureBuilder(
+                announcementId = announcementId,
+                title = this.title,
+                subtitle = this.subtitle,
+                iconBase64 = this.iconBase64,
+                iconUrl = this.iconUrl
+        )
+    }
+
+    private fun WhatsNewAnnouncementModel.toBuilder(): WhatsNewAnnouncementBuilder {
+        return WhatsNewAnnouncementBuilder(
+                announcementId = this.announcementVersion,
+                appVersionName = this.appVersionName,
+                minimumAppVersion = this.minimumAppVersion,
+                maximumAppVersion = this.maximumAppVersion,
+                appVersionTargets = this.appVersionTargets.joinToString(APP_VERSION_TARGETS_SEPARATOR),
+                localized = this.isLocalized,
+                responseLocale = this.responseLocale,
+                detailsUrl = this.detailsUrl
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/XPostsSqlUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/XPostsSqlUtils.kt
new file mode 100644
index 00000000000..046aad1239f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/XPostsSqlUtils.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.fluxc.persistence
+
+import com.wellsql.generated.XPostSitesTable
+import com.wellsql.generated.XPostsTable
+import com.yarolegovich.wellsql.WellSql
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import javax.inject.Inject
+
+class XPostsSqlUtils @Inject constructor() {
+    fun persistNoXpostsForSite(site: SiteModel) {
+        setXPostsForSite(emptyList(), site)
+    }
+
+    /**
+     * If an empty list is being set, then insert a single [XPostModel.noXPostModel] entry in
+     * the XPosts table (that should be the only entry for that site, see [hasNoXPosts]). This
+     * allows us to distinguish between a site that has no XPosts (which will have the single
+     * [hasNoXPosts] row), and a site for which we have not persisted the XPosts yet (which will
+     * have no matching rows).
+     */
+    fun setXPostsForSite(xPostSites: List<XPostSiteModel>, site: SiteModel) {
+        deleteXpostsForSite(site)
+
+        if (xPostSites.isEmpty()) {
+            WellSql.insert(XPostModel.noXPostModel(site))
+                    .execute()
+        } else {
+            WellSql.insert(xPostSites)
+                    .asSingleTransaction(true)
+                    .execute()
+
+            val xPostModels = xPostSites.map {
+                XPostModel().apply {
+                    sourceSiteId = site.id
+                    targetSiteId = it.blogId
+                }
+            }
+            WellSql.insert(xPostModels)
+                    .asSingleTransaction(true)
+                    .execute()
+        }
+    }
+
+    /**
+     * This function has three possible return paths:
+     *
+     * 1. Because we persist a specific entry in the XPost table to represent no XPosts (see
+     * [setXPostsForSite]), an empty xpost list actually indicates that we do
+     * not know whether the site has any XPosts, so we return null.
+     *
+     * 2. Only if the specific "no xposts" entry exists for the given [site] do we know the site does not
+     * have any xposts and we should return an empty list.
+     *
+     * 3. Otherwise, we return the persisted list of XPosts.
+     */
+    fun selectXPostsForSite(site: SiteModel): List<XPostSiteModel>? {
+        val xPosts = WellSql.select(XPostModel::class.java)
+                .where()
+                .equals(XPostsTable.SOURCE_SITE_ID, site.id)
+                .endWhere()
+                .asModel
+
+        return when {
+            xPosts.isEmpty() -> null
+            hasNoXPosts(xPosts) -> emptyList()
+            else -> {
+                val xPostSiteIds = xPosts.map { it.targetSiteId }
+                WellSql.select(XPostSiteModel::class.java)
+                        .where()
+                        .isIn(XPostSitesTable.BLOG_ID, xPostSiteIds)
+                        .endWhere()
+                        .asModel
+            }
+        }
+    }
+
+    /**
+     * If the only XPost for a site is a "no xposts" entry, we know there are no available xposts.
+     */
+    private fun hasNoXPosts(xPostsForSite: List<XPostModel>) =
+            xPostsForSite.size == 1 && XPostModel.isNoXPostsEntry(xPostsForSite.first())
+
+    /**
+     * Only deleting the XPostModel entries.
+     */
+    private fun deleteXpostsForSite(site: SiteModel) {
+        WellSql.delete(XPostModel::class.java)
+                .where()
+                .equals(XPostsTable.SOURCE_SITE_ID, site.id)
+                .endWhere()
+                .execute()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeCampaignsDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeCampaignsDao.kt
new file mode 100644
index 00000000000..e36e8d078e3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeCampaignsDao.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.fluxc.persistence.blaze
+
+import androidx.room.ColumnInfo
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.TypeConverters
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignsModel
+import org.wordpress.android.fluxc.persistence.coverters.BlazeCampaignsDateConverter
+import java.util.Date
+
+@Dao
+abstract class BlazeCampaignsDao {
+    @Transaction
+    open suspend fun getCachedCampaigns(siteId: Long): List<BlazeCampaignModel> {
+        val campaigns = getCampaigns(siteId)
+        return campaigns.map { it.toDomainModel() }
+    }
+
+    @Query("SELECT * from BlazeCampaigns WHERE `siteId` = :siteId ORDER BY CAST(campaignId AS int) DESC")
+    abstract fun getCampaigns(siteId: Long): List<BlazeCampaignEntity>
+
+    @Query("SELECT * from BlazeCampaigns WHERE `siteId` = :siteId ORDER BY CAST(campaignId AS int) DESC")
+    abstract fun observeCampaigns(siteId: Long): Flow<List<BlazeCampaignEntity>>
+
+    @Query("SELECT * from BlazeCampaigns WHERE `siteId` = :siteId ORDER BY CAST(campaignId AS int) DESC LIMIT 1")
+    abstract fun getMostRecentCampaignForSite(siteId: Long): BlazeCampaignEntity?
+
+    @Query("SELECT * from BlazeCampaigns WHERE `siteId` = :siteId ORDER BY CAST(campaignId AS int) DESC LIMIT 1")
+    abstract fun observeMostRecentCampaignForSite(siteId: Long): Flow<BlazeCampaignEntity?>
+
+    @Transaction
+    open suspend fun insertCampaigns(siteId: Long, domainModel: BlazeCampaignsModel) {
+        if (domainModel.skipped == 0) {
+            clearBlazeCampaigns(siteId)
+        }
+        insert(domainModel.campaigns.map { BlazeCampaignEntity.fromDomainModel(siteId, it) })
+    }
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insert(campaigns: List<BlazeCampaignEntity>)
+
+    @Query("DELETE FROM BlazeCampaigns where siteId = :siteId")
+    abstract fun clearBlazeCampaigns(siteId: Long)
+
+    @Entity(
+        tableName = "BlazeCampaigns",
+        indices = [Index(value = ["siteId"], unique = false)],
+        primaryKeys = ["siteId", "campaignId"]
+    )
+    @TypeConverters(BlazeCampaignsDateConverter::class)
+    data class BlazeCampaignEntity(
+        val siteId: Long,
+        val campaignId: String,
+        val title: String,
+        val imageUrl: String?,
+        val startTime: Date,
+        val durationInDays: Int,
+        val uiStatus: String,
+        val impressions: Long,
+        val clicks: Long,
+        val targetUrn: String?,
+        val totalBudget: Double,
+        val spentBudget: Double,
+        @ColumnInfo(defaultValue = "0")
+        val isEndlessCampaign: Boolean
+    ) {
+        fun toDomainModel() = BlazeCampaignModel(
+            campaignId = campaignId,
+            title = title,
+            imageUrl = imageUrl,
+            startTime = startTime,
+            durationInDays = durationInDays,
+            uiStatus = uiStatus,
+            impressions = impressions,
+            clicks = clicks,
+            targetUrn = targetUrn,
+            totalBudget = totalBudget,
+            spentBudget = spentBudget,
+            isEndlessCampaign = isEndlessCampaign
+        )
+
+        companion object {
+            fun fromDomainModel(
+                siteId: Long,
+                campaign: BlazeCampaignModel
+            ) = BlazeCampaignEntity(
+                siteId = siteId,
+                campaignId = campaign.campaignId,
+                title = campaign.title,
+                imageUrl = campaign.imageUrl,
+                startTime = campaign.startTime,
+                durationInDays = campaign.durationInDays,
+                uiStatus = campaign.uiStatus,
+                impressions = campaign.impressions,
+                clicks = campaign.clicks,
+                targetUrn = campaign.targetUrn,
+                totalBudget = campaign.totalBudget,
+                spentBudget = campaign.spentBudget,
+                isEndlessCampaign = campaign.isEndlessCampaign
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeObjectivesDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeObjectivesDao.kt
new file mode 100644
index 00000000000..7033e3e668d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeObjectivesDao.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.persistence.blaze
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignObjective
+
+@Dao
+interface BlazeObjectivesDao {
+    @Query("SELECT * FROM BlazeCampaignObjectives WHERE locale = :locale")
+    fun observeObjectives(locale: String): Flow<List<BlazeCampaignObjectiveEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertObjectives(topics: List<BlazeCampaignObjectiveEntity>)
+
+    @Query("DELETE FROM BlazeCampaignObjectives")
+    suspend fun deleteObjectives()
+
+    @Transaction
+    suspend fun replaceObjectives(objectives: List<BlazeCampaignObjectiveEntity>) {
+        deleteObjectives()
+        insertObjectives(objectives)
+    }
+
+    @Entity(tableName = "BlazeCampaignObjectives")
+    data class BlazeCampaignObjectiveEntity(
+        @PrimaryKey val id: String,
+        val title: String,
+        val description: String,
+        val suitableForDescription: String,
+        val locale: String
+    ) {
+        fun toDomainModel() = BlazeCampaignObjective(id, title, description, suitableForDescription)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeTargetingDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeTargetingDao.kt
new file mode 100644
index 00000000000..b618a11084e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/blaze/BlazeTargetingDao.kt
@@ -0,0 +1,91 @@
+package org.wordpress.android.fluxc.persistence.blaze
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingDevice
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingLanguage
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingTopic
+
+@Dao
+interface BlazeTargetingDao {
+    @Query("SELECT * FROM BlazeTargetingDevices WHERE locale = :locale")
+    fun observeDevices(locale: String): Flow<List<BlazeTargetingDeviceEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertDevices(devices: List<BlazeTargetingDeviceEntity>)
+
+    @Query("DELETE FROM BlazeTargetingDevices")
+    suspend fun deleteDevices()
+
+    @Transaction
+    suspend fun replaceDevices(devices: List<BlazeTargetingDeviceEntity>) {
+        deleteDevices()
+        insertDevices(devices)
+    }
+
+    @Query("SELECT * FROM BlazeTargetingTopics WHERE locale = :locale")
+    fun observeTopics(locale: String): Flow<List<BlazeTargetingTopicEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertTopics(topics: List<BlazeTargetingTopicEntity>)
+
+    @Query("DELETE FROM BlazeTargetingTopics")
+    suspend fun deleteTopics()
+
+    @Transaction
+    suspend fun replaceTopics(topics: List<BlazeTargetingTopicEntity>) {
+        deleteTopics()
+        insertTopics(topics)
+    }
+
+    @Query("SELECT * FROM BlazeTargetingLanguages WHERE locale = :locale")
+    fun observeLanguages(locale: String): Flow<List<BlazeTargetingLanguageEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLanguages(languages: List<BlazeTargetingLanguageEntity>)
+
+    @Query("DELETE FROM BlazeTargetingLanguages")
+    suspend fun deleteLanguages()
+
+    @Transaction
+    suspend fun replaceLanguages(languages: List<BlazeTargetingLanguageEntity>) {
+        deleteLanguages()
+        insertLanguages(languages)
+    }
+}
+
+@Entity(tableName = "BlazeTargetingDevices")
+data class BlazeTargetingDeviceEntity(
+    @PrimaryKey val id: String,
+    val name: String,
+    val locale: String
+) {
+    fun toDomainModel() = BlazeTargetingDevice(id, name)
+}
+
+@Entity(tableName = "BlazeTargetingTopics")
+data class BlazeTargetingTopicEntity(
+    @PrimaryKey val id: String,
+    val description: String,
+    val locale: String
+) {
+    fun toDomainModel() = BlazeTargetingTopic(id, description)
+}
+
+@Entity(tableName = "BlazeTargetingLanguages")
+data class BlazeTargetingLanguageEntity(
+    @PrimaryKey val id: String,
+    val name: String,
+    /**
+     * The locale used to localize the name of the language.
+     */
+    val locale: String
+) {
+    fun toDomainModel() = BlazeTargetingLanguage(id, name)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/bloggingprompts/BloggingPromptsDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/bloggingprompts/BloggingPromptsDao.kt
new file mode 100644
index 00000000000..d2b34a570ea
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/bloggingprompts/BloggingPromptsDao.kt
@@ -0,0 +1,84 @@
+package org.wordpress.android.fluxc.persistence.bloggingprompts
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.TypeConverters
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel
+import org.wordpress.android.fluxc.persistence.coverters.BloggingPromptDateConverter
+import java.util.Date
+
+@Dao
+@TypeConverters(BloggingPromptDateConverter::class)
+abstract class BloggingPromptsDao {
+    @Query("SELECT * FROM BloggingPrompts WHERE id = :promptId AND siteLocalId = :siteLocalId")
+    abstract fun getPrompt(siteLocalId: Int, promptId: Int): Flow<List<BloggingPromptEntity>>
+
+    @Query("SELECT * FROM BloggingPrompts WHERE date = :date AND siteLocalId = :siteLocalId")
+    @TypeConverters(BloggingPromptDateConverter::class)
+    abstract fun getPromptForDate(siteLocalId: Int, date: Date): Flow<List<BloggingPromptEntity>>
+
+    @Query("SELECT * FROM BloggingPrompts WHERE siteLocalId = :siteLocalId")
+    abstract fun getAllPrompts(siteLocalId: Int): Flow<List<BloggingPromptEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insert(prompts: List<BloggingPromptEntity>)
+
+    suspend fun insertForSite(siteLocalId: Int, prompts: List<BloggingPromptModel>) {
+        insert(prompts.map { BloggingPromptEntity.from(siteLocalId, it) })
+    }
+
+    @Query("DELETE FROM BloggingPrompts")
+    abstract fun clear()
+
+    @Entity(
+        tableName = "BloggingPrompts",
+        primaryKeys = ["date"]
+    )
+    @TypeConverters(BloggingPromptDateConverter::class)
+    data class BloggingPromptEntity(
+        val id: Int,
+        val siteLocalId: Int,
+        val text: String,
+        val date: Date,
+        val isAnswered: Boolean,
+        val respondentsCount: Int,
+        val attribution: String,
+        val respondentsAvatars: List<String>,
+        val answeredLink: String,
+        val bloganuaryId: String? = null,
+    ) {
+        fun toBloggingPrompt() = BloggingPromptModel(
+            id = id,
+            text = text,
+            date = date,
+            isAnswered = isAnswered,
+            attribution = attribution,
+            respondentsCount = respondentsCount,
+            respondentsAvatarUrls = respondentsAvatars,
+            answeredLink = answeredLink,
+            bloganuaryId = bloganuaryId,
+        )
+
+        companion object {
+            fun from(
+                siteLocalId: Int,
+                prompt: BloggingPromptModel
+            ) = BloggingPromptEntity(
+                id = prompt.id,
+                siteLocalId = siteLocalId,
+                text = prompt.text,
+                date = prompt.date,
+                isAnswered = prompt.isAnswered,
+                respondentsCount = prompt.respondentsCount,
+                attribution = prompt.attribution,
+                respondentsAvatars = prompt.respondentsAvatarUrls,
+                answeredLink = prompt.answeredLink,
+                bloganuaryId = prompt.bloganuaryId,
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/comments/CommentsDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/comments/CommentsDao.kt
new file mode 100644
index 00000000000..483023dcfb0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/comments/CommentsDao.kt
@@ -0,0 +1,306 @@
+package org.wordpress.android.fluxc.persistence.comments
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+
+typealias CommentEntityList = List<CommentEntity>
+
+@Dao
+abstract class CommentsDao {
+    // Public methods
+    @Transaction
+    open suspend fun insertOrUpdateComment(comment: CommentEntity): Long {
+        return insertOrUpdateCommentInternal(comment)
+    }
+
+    @Transaction
+    open suspend fun insertOrUpdateCommentForResult(comment: CommentEntity): CommentEntityList {
+        val entityId = insertOrUpdateCommentInternal(comment)
+        return getCommentById(entityId)
+    }
+
+    @Transaction
+    open suspend fun getFilteredComments(localSiteId: Int, statuses: List<String>): CommentEntityList {
+        return getFilteredCommentsInternal(localSiteId, statuses, statuses.isNotEmpty())
+    }
+
+    @Transaction
+    open suspend fun getCommentsByLocalSiteId(
+        localSiteId: Int,
+        statuses: List<String>,
+        limit: Int,
+        orderAscending: Boolean
+    ): CommentEntityList {
+        return getCommentsByLocalSiteIdInternal(
+                localSiteId = localSiteId,
+                filterByStatuses = statuses.isNotEmpty(),
+                statuses = statuses,
+                limit = limit,
+                orderAscending = orderAscending
+        )
+    }
+
+    @Transaction
+    open suspend fun deleteComment(comment: CommentEntity): Int {
+        val result = deleteById(comment.id)
+
+        return if (result > 0) {
+            result
+        } else {
+            deleteByLocalSiteAndRemoteIds(comment.localSiteId, comment.remoteCommentId)
+        }
+    }
+
+    @Transaction
+    open suspend fun removeGapsFromTheTop(
+        localSiteId: Int,
+        statuses: List<String>,
+        remoteIds: List<Long>,
+        startOfRange: Long
+    ): Int {
+        return removeGapsFromTheTopInternal(
+                localSiteId = localSiteId,
+                filterByStatuses = statuses.isNotEmpty(),
+                statuses = statuses,
+                filterByIds = remoteIds.isNotEmpty(),
+                remoteIds = remoteIds,
+                startOfRange = startOfRange
+        )
+    }
+
+    @Transaction
+    open suspend fun removeGapsFromTheBottom(
+        localSiteId: Int,
+        statuses: List<String>,
+        remoteIds: List<Long>,
+        endOfRange: Long
+    ): Int {
+        return removeGapsFromTheBottomInternal(
+                localSiteId = localSiteId,
+                filterByStatuses = statuses.isNotEmpty(),
+                statuses = statuses,
+                filterByIds = remoteIds.isNotEmpty(),
+                remoteIds = remoteIds,
+                endOfRange = endOfRange
+        )
+    }
+
+    @Transaction
+    open suspend fun removeGapsFromTheMiddle(
+        localSiteId: Int,
+        statuses: List<String>,
+        remoteIds: List<Long>,
+        startOfRange: Long,
+        endOfRange: Long
+    ): Int {
+        return removeGapsFromTheMiddleInternal(
+                localSiteId = localSiteId,
+                filterByStatuses = statuses.isNotEmpty(),
+                statuses = statuses,
+                filterByIds = remoteIds.isNotEmpty(),
+                remoteIds = remoteIds,
+                startOfRange = startOfRange,
+                endOfRange = endOfRange
+        )
+    }
+
+    @Query("SELECT * FROM Comments WHERE id = :localId LIMIT 1")
+    abstract suspend fun getCommentById(localId: Long): CommentEntityList
+
+    @Query("SELECT * FROM Comments WHERE localSiteId = :localSiteId AND remoteCommentId = :remoteCommentId")
+    abstract suspend fun getCommentsByLocalSiteAndRemoteCommentId(
+        localSiteId: Int,
+        remoteCommentId: Long
+    ): CommentEntityList
+
+    @Transaction
+    open suspend fun appendOrUpdateComments(comments: CommentEntityList): Int {
+        val affectedIdList = insertOrUpdateCommentsInternal(comments)
+        return affectedIdList.size
+    }
+
+    @Transaction
+    open suspend fun clearAllBySiteIdAndFilters(localSiteId: Int, statuses: List<String>): Int {
+        return clearAllBySiteIdAndFiltersInternal(
+                localSiteId = localSiteId,
+                filterByStatuses = statuses.isNotEmpty(),
+                statuses = statuses
+        )
+    }
+
+    // Protected methods
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    protected abstract fun insert(comment: CommentEntity): Long
+
+    @Update
+    protected abstract fun update(comment: CommentEntity): Int
+
+    @Query("""
+        SELECT * FROM Comments WHERE localSiteId = :localSiteId 
+        AND CASE WHEN :filterByStatuses = 1 THEN status IN (:statuses) ELSE 1 END 
+        ORDER BY datePublished DESC
+    """)
+    protected abstract fun getFilteredCommentsInternal(
+        localSiteId: Int,
+        statuses: List<String>,
+        filterByStatuses: Boolean
+    ): CommentEntityList
+
+    @Query("""
+        SELECT * FROM Comments 
+        WHERE localSiteId = :localSiteId 
+        AND CASE WHEN (:filterByStatuses = 1) THEN (status IN (:statuses)) ELSE 1 END
+        ORDER BY 
+        CASE WHEN :orderAscending = 1 THEN datePublished END ASC,
+        CASE WHEN :orderAscending = 0 THEN datePublished END DESC
+        LIMIT CASE WHEN :limit > 0 THEN :limit ELSE -1 END
+    """)
+    protected abstract fun getCommentsByLocalSiteIdInternal(
+        localSiteId: Int,
+        filterByStatuses: Boolean,
+        statuses: List<String>,
+        limit: Int,
+        orderAscending: Boolean
+    ): CommentEntityList
+
+    @Query("""
+        DELETE FROM Comments 
+        WHERE localSiteId = :localSiteId 
+        AND CASE WHEN (:filterByStatuses = 1) THEN (status IN (:statuses)) ELSE 1 END
+    """)
+    protected abstract fun clearAllBySiteIdAndFiltersInternal(
+        localSiteId: Int,
+        filterByStatuses: Boolean,
+        statuses: List<String>
+    ): Int
+
+    @Query("""
+        DELETE FROM Comments 
+        WHERE localSiteId = :localSiteId 
+        AND CASE WHEN (:filterByStatuses = 1) THEN (status IN (:statuses)) ELSE 1 END
+        AND CASE WHEN (:filterByIds = 1) THEN (remoteCommentId NOT IN (:remoteIds)) ELSE 1 END
+        AND publishedTimestamp >= :startOfRange
+    """)
+    @Suppress("LongParameterList")
+    protected abstract fun removeGapsFromTheTopInternal(
+        localSiteId: Int,
+        filterByStatuses: Boolean,
+        statuses: List<String>,
+        filterByIds: Boolean,
+        remoteIds: List<Long>,
+        startOfRange: Long
+    ): Int
+
+    @Query("""
+        DELETE FROM Comments 
+        WHERE localSiteId = :localSiteId 
+        AND CASE WHEN (:filterByStatuses = 1) THEN (status IN (:statuses)) ELSE 1 END
+        AND CASE WHEN (:filterByIds = 1) THEN (remoteCommentId NOT IN (:remoteIds)) ELSE 1 END
+        AND publishedTimestamp <= :endOfRange
+    """)
+    @Suppress("LongParameterList")
+    protected abstract fun removeGapsFromTheBottomInternal(
+        localSiteId: Int,
+        filterByStatuses: Boolean,
+        statuses: List<String>,
+        filterByIds: Boolean,
+        remoteIds: List<Long>,
+        endOfRange: Long
+    ): Int
+
+    @Query("""
+        DELETE FROM Comments 
+        WHERE localSiteId = :localSiteId 
+        AND CASE WHEN (:filterByStatuses = 1) THEN (status IN (:statuses)) ELSE 1 END
+        AND CASE WHEN (:filterByIds = 1) THEN (remoteCommentId NOT IN (:remoteIds)) ELSE 1 END
+        AND publishedTimestamp <= :startOfRange
+        AND publishedTimestamp >= :endOfRange
+    """)
+    @Suppress("LongParameterList")
+    protected abstract fun removeGapsFromTheMiddleInternal(
+        localSiteId: Int,
+        filterByStatuses: Boolean,
+        statuses: List<String>,
+        filterByIds: Boolean,
+        remoteIds: List<Long>,
+        startOfRange: Long,
+        endOfRange: Long
+    ): Int
+
+    @Query("DELETE FROM Comments WHERE id = :commentId")
+    protected abstract fun deleteById(commentId: Long): Int
+
+    @Query("DELETE FROM Comments WHERE localSiteId = :localSiteId AND remoteCommentId = :remoteCommentId")
+    protected abstract fun deleteByLocalSiteAndRemoteIds(localSiteId: Int, remoteCommentId: Long): Int
+
+    // Private methods
+    private suspend fun insertOrUpdateCommentsInternal(comments: CommentEntityList): List<Long> {
+        return comments.map { comment ->
+            insertOrUpdateCommentInternal(comment)
+        }
+    }
+
+    private suspend fun insertOrUpdateCommentInternal(comment: CommentEntity): Long {
+        val commentByLocalId = getCommentById(comment.id)
+
+        val matchingComments = if (commentByLocalId.isEmpty()) {
+            getCommentsByLocalSiteAndRemoteCommentId(comment.localSiteId, comment.remoteCommentId)
+        } else {
+            commentByLocalId
+        }
+
+        return if (matchingComments.isEmpty()) {
+            insert(comment)
+        } else {
+            // We are forcing the id of the matching comment so the update can
+            // act on the expected entity
+            val matchingComment = matchingComments.first()
+
+            update(comment.copy(id = matchingComment.id))
+            matchingComment.id
+        }
+    }
+
+    @Entity(
+            tableName = "Comments"
+    )
+    data class CommentEntity(
+        @PrimaryKey(autoGenerate = true)
+        val id: Long = 0,
+        val remoteCommentId: Long,
+        val remotePostId: Long,
+        val localSiteId: Int,
+        val remoteSiteId: Long,
+        val authorUrl: String?,
+        val authorName: String?,
+        val authorEmail: String?,
+        val authorProfileImageUrl: String?,
+        val authorId: Long,
+        val postTitle: String?,
+        val status: String?,
+        val datePublished: String?,
+        val publishedTimestamp: Long,
+        val content: String?,
+        val url: String?,
+        val hasParent: Boolean,
+        val parentId: Long,
+        val iLike: Boolean
+    ) {
+        @Ignore
+        @Suppress("DataClassShouldBeImmutable")
+        var level: Int = 0
+    }
+
+    companion object {
+        const val EMPTY_ID = -1L
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BlazeCampaignsDateConverter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BlazeCampaignsDateConverter.kt
new file mode 100644
index 00000000000..1de9318a1be
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BlazeCampaignsDateConverter.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.fluxc.persistence.coverters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsUtils
+import java.util.Date
+
+class BlazeCampaignsDateConverter {
+    @TypeConverter
+    fun stringToDate(value: String?) = value?.let { BlazeCampaignsUtils.stringToDate(it) }
+
+    @TypeConverter
+    fun dateToString(date: Date?) = date?.let { BlazeCampaignsUtils.dateToString(it) }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BloggingPromptDateConverter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BloggingPromptDateConverter.kt
new file mode 100644
index 00000000000..afc0942b4cf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/BloggingPromptDateConverter.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.fluxc.persistence.coverters
+
+import androidx.room.TypeConverter
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsUtils
+import java.util.Date
+
+/**
+ * A Room type converter for Blogging Prompt dates in YYYY-MM-DD format
+ */
+class BloggingPromptDateConverter {
+    @TypeConverter
+    fun stringToDate(value: String?) = value?.let { BloggingPromptsUtils.stringToDate(it) }
+
+    @TypeConverter
+    fun dateToString(date: Date?) = date?.let { BloggingPromptsUtils.dateToString(it) }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/StringListConverter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/StringListConverter.kt
new file mode 100644
index 00000000000..39a54199678
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/coverters/StringListConverter.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.persistence.coverters
+
+import androidx.room.TypeConverter
+
+class StringListConverter {
+    companion object {
+        private const val SEPARATOR = ","
+    }
+
+    @TypeConverter
+    fun listToString(value: List<String>): String = value.joinToString(separator = SEPARATOR)
+
+    @TypeConverter
+    fun stringToList(value: String): List<String> = if (value.isEmpty()) {
+        emptyList()
+    } else {
+        value.split(SEPARATOR).toList()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/dashboard/CardsDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/dashboard/CardsDao.kt
new file mode 100644
index 00000000000..ada34d7d346
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/dashboard/CardsDao.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.persistence.dashboard
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.dashboard.CardModel
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsUtils
+
+@Dao
+abstract class CardsDao {
+    @Query("SELECT * FROM DashboardCards WHERE siteLocalId = :siteLocalId")
+    abstract fun get(siteLocalId: Int): Flow<List<CardEntity>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insert(card: List<CardEntity>)
+
+    suspend fun insertWithDate(siteLocalId: Int, cards: List<CardModel>) {
+        val insertDate = CardsUtils.getInsertDate()
+        insert(cards.map { CardEntity.from(siteLocalId, it, insertDate) })
+    }
+
+    @Query("DELETE FROM DashboardCards")
+    abstract fun clear()
+
+    @Entity(
+            tableName = "DashboardCards",
+            primaryKeys = ["siteLocalId", "type"]
+    )
+    data class CardEntity(
+        val siteLocalId: Int,
+        val type: String,
+        val date: String,
+        val json: String
+    ) {
+        fun toCard() = CardsUtils.GSON.fromJson(json, CardModel.Type.valueOf(type).classOf) as CardModel
+
+        companion object {
+            fun from(
+                siteLocalId: Int,
+                card: CardModel,
+                insertDate: String
+            ) = CardEntity(
+                    siteLocalId = siteLocalId,
+                    type = card.type.name,
+                    date = insertDate,
+                    json = CardsUtils.GSON.toJson(card)
+            )
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/domains/DomainDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/domains/DomainDao.kt
new file mode 100644
index 00000000000..b66decaa9ff
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/domains/DomainDao.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.fluxc.persistence.domains
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
+import org.wordpress.android.fluxc.model.DomainModel
+import org.wordpress.android.fluxc.persistence.domains.DomainDao.DomainEntity
+
+/**
+ * DAO for [DomainEntity] access
+ */
+@Dao
+abstract class DomainDao {
+    @Transaction
+    @Query("SELECT * from Domains WHERE `siteLocalId` = :siteLocalId")
+    abstract fun getDomains(siteLocalId: Int): Flow<List<DomainEntity>>
+
+    suspend fun insert(siteLocalId: Int, domains: List<DomainModel>) {
+        insert(domains.map {
+            DomainEntity(
+                    siteLocalId = siteLocalId,
+                    domain = it.domain,
+                    primaryDomain = it.primaryDomain,
+                    wpcomDomain = it.wpcomDomain
+            )
+        })
+    }
+
+    @Transaction
+    @Query("DELETE FROM Domains")
+    abstract fun clear()
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun insert(domainEntity: List<DomainEntity>)
+
+    @Entity(
+            tableName = "Domains",
+            primaryKeys = ["domain"]
+    )
+    data class DomainEntity(
+        val siteLocalId: Int,
+        val domain: String,
+        val primaryDomain: Boolean,
+        val wpcomDomain: Boolean
+    ) {
+        fun toDomainModel() = DomainModel(
+                domain = domain,
+                primaryDomain = primaryDomain,
+                wpcomDomain = wpcomDomain
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/jetpacksocial/JetpackSocialDao.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/jetpacksocial/JetpackSocialDao.kt
new file mode 100644
index 00000000000..d8b5be0c33e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/jetpacksocial/JetpackSocialDao.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.fluxc.persistence.jetpacksocial
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface JetpackSocialDao {
+    @Query("SELECT * FROM JetpackSocial WHERE siteLocalId = :siteLocalId")
+    suspend fun getJetpackSocial(siteLocalId: Int): JetpackSocialEntity
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(jetpackSocialEntity: JetpackSocialEntity)
+
+    @Query("DELETE FROM JetpackSocial")
+    suspend fun clear()
+
+    @Entity(
+        tableName = "JetpackSocial",
+        primaryKeys = ["siteLocalId"]
+    )
+    data class JetpackSocialEntity(
+        val siteLocalId: Int,
+        val isShareLimitEnabled: Boolean,
+        val toBePublicizedCount: Int,
+        val shareLimit: Int,
+        val publicizedCount: Int,
+        val sharedPostsCount: Int,
+        val sharesRemaining: Int,
+        val isEnhancedPublishingEnabled: Boolean,
+        val isSocialImageGeneratorEnabled: Boolean,
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/AccountStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/AccountStore.java
new file mode 100644
index 00000000000..7e8e63c3288
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/AccountStore.java
@@ -0,0 +1,1534 @@
+package org.wordpress.android.fluxc.store;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONObject;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.AccountAction;
+import org.wordpress.android.fluxc.action.AuthenticationAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.AccountModel;
+import org.wordpress.android.fluxc.model.DomainContactModel;
+import org.wordpress.android.fluxc.model.SubscriptionModel;
+import org.wordpress.android.fluxc.model.SubscriptionsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.DiscoveryError;
+import org.wordpress.android.fluxc.network.discovery.SelfHostedEndpointFinder.DiscoveryResultPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountFetchUsernameSuggestionsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushSettingsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushSocialResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountPushUsernameResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.AccountRestPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.DomainContactPayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.FetchAuthOptionsResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.IsAvailable;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.IsAvailableResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.account.AccountRestClient.NewAccountResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator.AuthEmailResponsePayload;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator.OauthResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator.Token;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.Authenticator.TwoFactorResponse;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.webauthn.WebauthnToken;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType;
+import org.wordpress.android.fluxc.persistence.AccountSqlUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import static org.wordpress.android.fluxc.network.xmlrpc.XMLRPCRequest.XmlRpcErrorType.NOT_SET;
+
+/**
+ * In-memory based and persisted in SQLite.
+ */
+@Singleton
+public class AccountStore extends Store {
+    // Payloads
+    public static class AuthenticationRequestPayload extends Payload<BaseNetworkError> {
+        public Action nextAction;
+    }
+
+    public static class AuthenticatePayload extends AuthenticationRequestPayload {
+        public String username;
+        public String password;
+        public AuthenticatePayload(@NonNull String username, @NonNull String password) {
+            this.username = username;
+            this.password = password;
+        }
+    }
+
+    public static class AuthenticateTwoFactorPayload extends AuthenticationRequestPayload {
+        public String username;
+        public String password;
+        public String twoStepCode;
+        public boolean shouldSendTwoStepSms;
+        public AuthenticateTwoFactorPayload(@NonNull String username, @NonNull String password,
+                                            @NonNull String twoStepCode, boolean shouldSendTwoStepSms) {
+            this.username = username;
+            this.password = password;
+            this.twoStepCode = twoStepCode;
+            this.shouldSendTwoStepSms = shouldSendTwoStepSms;
+        }
+    }
+
+    public static class AuthenticateErrorPayload extends Payload<AuthenticationError> {
+        public AuthenticateErrorPayload(@NonNull AuthenticationError error) {
+            this.error = error;
+        }
+        public AuthenticateErrorPayload(@NonNull AuthenticationErrorType errorType) {
+            this.error = new AuthenticationError(errorType, "");
+        }
+        public AuthenticateErrorPayload(@NonNull AuthenticationErrorType errorType,
+                                        @NonNull XmlRpcErrorType xmlRpcErrorType) {
+            this.error = new AuthenticationError(errorType, "", xmlRpcErrorType);
+        }
+    }
+
+    public static class AuthEmailPayload extends Payload<BaseNetworkError> {
+        public AuthEmailPayloadScheme scheme;
+        public AuthEmailFlow flow;
+        public AuthEmailSource source;
+        public String emailOrUsername;
+        public String signupFlowName;
+        public boolean isSignup;
+
+        public AuthEmailPayload(String emailOrUsername, boolean isSignup, AuthEmailFlow flow,
+                                AuthEmailSource source, AuthEmailPayloadScheme scheme) {
+            this.emailOrUsername = emailOrUsername;
+            this.isSignup = isSignup;
+            this.flow = flow;
+            this.source = source;
+            this.scheme = scheme;
+        }
+
+        public AuthEmailPayload(String emailOrUsername, boolean isSignup, AuthEmailPayloadFlow flow,
+                                AuthEmailPayloadSource source, AuthEmailPayloadScheme scheme) {
+            this(emailOrUsername, isSignup, (AuthEmailFlow) flow, (AuthEmailSource) source, scheme);
+        }
+
+        public AuthEmailPayload(String emailOrUsername, boolean isSignup, AuthEmailFlow flow,
+                                AuthEmailSource source) {
+            this(emailOrUsername, isSignup, flow, source, null);
+        }
+
+        public AuthEmailPayload(String emailOrUsername, boolean isSignup, AuthEmailPayloadFlow flow,
+                                AuthEmailPayloadSource source) {
+            this(emailOrUsername, isSignup, (AuthEmailFlow) flow, (AuthEmailSource) source);
+        }
+    }
+
+    public enum AuthEmailPayloadScheme {
+        WORDPRESS("wordpress"),
+        WOOCOMMERCE("woocommerce"),
+        JETPACK("jetpack");
+
+        private final String mString;
+
+        AuthEmailPayloadScheme(final String s) {
+            mString = s;
+        }
+
+        @Override
+        public String toString() {
+            return mString;
+        }
+    }
+
+    public interface AuthEmailFlow {
+        @NonNull
+        String getName();
+    }
+
+    public enum AuthEmailPayloadFlow implements AuthEmailFlow {
+        JETPACK("jetpack");
+
+        private final String mName;
+
+        AuthEmailPayloadFlow(final String name) {
+            mName = name;
+        }
+
+        @Override
+        @NonNull
+        public String getName() {
+            return mName;
+        }
+    }
+
+    public interface AuthEmailSource {
+        @NonNull
+        String getName();
+    }
+
+    public enum AuthEmailPayloadSource implements AuthEmailSource {
+        NOTIFICATIONS("notifications"),
+        STATS("stats");
+
+        private final String mName;
+
+        AuthEmailPayloadSource(final String name) {
+            mName = name;
+        }
+
+        @Override
+        @NonNull
+        public String getName() {
+            return mName;
+        }
+    }
+
+    public static class FetchUsernameSuggestionsPayload extends Payload<BaseNetworkError> {
+        public String name;
+        public FetchUsernameSuggestionsPayload(@NonNull String name) {
+            this.name = name;
+        }
+    }
+
+    public static class PushAccountSettingsPayload extends Payload<BaseNetworkError> {
+        public Map<String, Object> params;
+        public PushAccountSettingsPayload() {
+        }
+    }
+
+    public static class PushSocialPayload extends Payload<BaseNetworkError> {
+        public String idToken;
+        public String service;
+        public PushSocialPayload(@NonNull String idToken, @NonNull String service) {
+            this.idToken = idToken;
+            this.service = service;
+        }
+    }
+
+    public static class PushSocialAuthPayload extends Payload<BaseNetworkError> {
+        public String code;
+        public String nonce;
+        public String type;
+        public String userId;
+        public PushSocialAuthPayload(@NonNull String userId, @NonNull String type, @NonNull String nonce,
+                                     @NonNull String code) {
+            this.userId = userId;
+            this.type = type;
+            this.nonce = nonce;
+            this.code = code;
+        }
+    }
+
+    public static class PushSocialSmsPayload extends Payload<BaseNetworkError> {
+        public String nonce;
+        public String userId;
+        public PushSocialSmsPayload(@NonNull String userId, @NonNull String nonce) {
+            this.userId = userId;
+            this.nonce = nonce;
+        }
+    }
+
+    public static class PushUsernamePayload extends Payload<BaseNetworkError> {
+        public AccountUsernameActionType actionType;
+        public String username;
+        public PushUsernamePayload(@NonNull String username, @NonNull AccountUsernameActionType actionType) {
+            this.username = username;
+            this.actionType = actionType;
+        }
+    }
+
+    public static class NewAccountPayload extends Payload<BaseNetworkError> {
+        public String username;
+        public String password;
+        public String email;
+        public boolean dryRun;
+        public NewAccountPayload(@NonNull String username, @NonNull String password, @NonNull String email,
+                                 boolean dryRun) {
+            this.username = username;
+            this.password = password;
+            this.email = email;
+            this.dryRun = dryRun;
+        }
+    }
+
+    public static class UpdateTokenPayload extends Payload<BaseNetworkError> {
+        public UpdateTokenPayload(String token) {
+            this.token = token;
+        }
+
+        public String token;
+    }
+
+    public static class AddOrDeleteSubscriptionPayload extends Payload<BaseNetworkError> {
+        public String site;
+        public SubscriptionAction action;
+        public AddOrDeleteSubscriptionPayload(@NonNull String site, @NonNull SubscriptionAction action) {
+            this.site = site;
+            this.action = action;
+        }
+        public enum SubscriptionAction {
+            DELETE("delete"),
+            NEW("new");
+
+            private final String mString;
+
+            SubscriptionAction(final String s) {
+                mString = s;
+            }
+
+            @Override
+            public String toString() {
+                return mString;
+            }
+        }
+    }
+
+    public static class FetchAuthOptionsPayload extends Payload<BaseNetworkError> {
+        public FetchAuthOptionsPayload(String emailOrUsername) {
+            this.emailOrUsername = emailOrUsername;
+        }
+
+        public String emailOrUsername;
+    }
+
+    public static class UpdateSubscriptionPayload extends Payload<BaseNetworkError> {
+        public String site;
+        public SubscriptionFrequency frequency;
+        public UpdateSubscriptionPayload(@NonNull String site, @NonNull SubscriptionFrequency frequency) {
+            this.site = site;
+            this.frequency = frequency;
+        }
+        public enum SubscriptionFrequency {
+            DAILY("daily"),
+            INSTANTLY("instantly"),
+            WEEKLY("weekly");
+
+            private final String mString;
+
+            SubscriptionFrequency(final String s) {
+                mString = s;
+            }
+
+            @Override
+            public String toString() {
+                return mString;
+            }
+        }
+    }
+
+    public static class SubscriptionResponsePayload extends Payload<SubscriptionError> {
+        public SubscriptionType type;
+        public boolean isSubscribed;
+        public SubscriptionResponsePayload() {
+        }
+        public SubscriptionResponsePayload(boolean isSubscribed) {
+            this.isSubscribed = isSubscribed;
+        }
+    }
+
+    public enum SubscriptionType {
+        EMAIL_COMMENT,
+        EMAIL_POST,
+        EMAIL_POST_FREQUENCY,
+        NOTIFICATION_POST
+    }
+
+    public static class StartWebauthnChallengePayload extends Payload<BaseNetworkError> {
+        public String mUserId;
+        public String mWebauthnNonce;
+
+        public StartWebauthnChallengePayload(String mUserId, String mWebauthnNonce) {
+            this.mUserId = mUserId;
+            this.mWebauthnNonce = mWebauthnNonce;
+        }
+    }
+
+    public static class WebauthnChallengeReceived extends OnChanged<AuthenticationError> {
+        private static final String TWO_STEP_NONCE_KEY = "two_step_nonce";
+
+        public JSONObject mJsonResponse;
+        public String mUserId;
+
+        public String getWebauthnNonce() {
+            return mJsonResponse.optString(TWO_STEP_NONCE_KEY);
+        }
+    }
+
+    public static class FinishWebauthnChallengePayload {
+        public String mUserId;
+        public String mTwoStepNonce;
+        public String mClientData;
+    }
+
+    public static class WebauthnPasskeyAuthenticated extends OnChanged<AuthenticationError> {
+        public WebauthnToken mWebauthnToken;
+    }
+
+    /**
+     * Error for any of these methods:
+     * {@link AccountRestClient#updateSubscriptionEmailComment(String,
+     *      AddOrDeleteSubscriptionPayload.SubscriptionAction)}
+     * {@link AccountRestClient#updateSubscriptionEmailPost(String,
+     *      AddOrDeleteSubscriptionPayload.SubscriptionAction)}
+     * {@link AccountRestClient#updateSubscriptionEmailPostFrequency(String,
+     *      UpdateSubscriptionPayload.SubscriptionFrequency)}
+     * {@link AccountRestClient#updateSubscriptionNotificationPost(String,
+     *      AddOrDeleteSubscriptionPayload.SubscriptionAction)}
+     */
+    public static class SubscriptionError implements OnChangedError {
+        public SubscriptionErrorType type;
+        public String message;
+
+        public SubscriptionError(@NonNull String type, @NonNull String message) {
+            this(SubscriptionErrorType.fromString(type), message);
+        }
+
+        public SubscriptionError(SubscriptionErrorType type, String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum SubscriptionErrorType {
+        ALREADY_SUBSCRIBED,
+        AUTHORIZATION_REQUIRED,
+        EMAIL_ADDRESS_MISSING,
+        REST_CANNOT_VIEW,
+        GENERIC_ERROR;
+
+        public static SubscriptionErrorType fromString(final String string) {
+            if (!TextUtils.isEmpty(string)) {
+                for (SubscriptionErrorType type : SubscriptionErrorType.values()) {
+                    if (string.equalsIgnoreCase(type.name())) {
+                        return type;
+                    }
+                }
+            }
+
+            return GENERIC_ERROR;
+        }
+    }
+
+    /**
+     * Error for {@link AccountRestClient#fetchSubscriptions()} method.
+     */
+    public static class SubscriptionsError implements OnChangedError {
+        public String message;
+
+        public SubscriptionsError(BaseNetworkError error) {
+            this.message = error.message;
+        }
+    }
+
+    // OnChanged Events
+    public static class OnAccountChanged extends OnChanged<AccountError> {
+        public boolean accountInfosChanged;
+        public AccountAction causeOfChange;
+    }
+
+    public static class OnAuthenticationChanged extends OnChanged<AuthenticationError> {
+        public String userName;
+        public boolean createdAccount;
+    }
+
+    public static class OnSocialChanged extends OnChanged<AccountSocialError> {
+        public List<String> twoStepTypes;
+        public String nonce;
+        public String nonceAuthenticator;
+        public String nonceBackup;
+        public String nonceSms;
+        public String nonceWebauthn;
+        public String notificationSent;
+        public String phoneNumber;
+        public String userId;
+        public boolean requiresTwoStepAuth;
+
+        public OnSocialChanged() {
+        }
+
+        public OnSocialChanged(@NonNull AccountPushSocialResponsePayload payload) {
+            this.twoStepTypes = payload.twoStepTypes;
+            this.nonce = payload.twoStepNonce;
+            this.nonceAuthenticator = payload.twoStepNonceAuthenticator;
+            this.nonceBackup = payload.twoStepNonceBackup;
+            this.nonceSms = payload.twoStepNonceSms;
+            this.nonceWebauthn = payload.twoStepNonceWebauthn;
+            this.notificationSent = payload.twoStepNotificationSent;
+            this.phoneNumber = payload.phoneNumber;
+            this.userId = payload.userId;
+        }
+    }
+
+    public static class OnUsernameChanged extends OnChanged<AccountUsernameError> {
+        public AccountUsernameActionType type;
+        public String username;
+    }
+
+    public static class OnTwoFactorAuthStarted extends OnChanged<AuthenticationError> {
+        public final String userId;
+        public final String webauthnNonce;
+        public final String mBackupNonce;
+        public final String authenticatorNonce;
+        public final String pushNonce;
+        public final List<String> mSupportedAuthTypes;
+
+        public OnTwoFactorAuthStarted(TwoFactorResponse response) {
+            userId = response.mUserId;
+            webauthnNonce = response.mWebauthnNonce;
+            mBackupNonce = response.mBackupNonce;
+            authenticatorNonce = response.mAuthenticatorNonce;
+            pushNonce = response.mPushNonce;
+            mSupportedAuthTypes = response.mSupportedAuthTypes;
+        }
+    }
+
+    public static class OnUsernameSuggestionsFetched extends OnChanged<AccountFetchUsernameSuggestionsError> {
+        public List<String> suggestions;
+    }
+
+    public static class OnDomainContactFetched extends OnChanged<DomainContactError> {
+        @Nullable public DomainContactModel contactModel;
+
+        public OnDomainContactFetched(@Nullable DomainContactModel contactModel, @Nullable DomainContactError error) {
+            this.contactModel = contactModel;
+            this.error = error;
+        }
+    }
+
+    public static class OnAuthOptionsFetched extends OnChanged<AuthOptionsError> {
+        public boolean isPasswordless;
+        public boolean isEmailVerified;
+    }
+
+    public static class OnDiscoveryResponse extends OnChanged<DiscoveryError> {
+        public String xmlRpcEndpoint;
+        public String wpRestEndpoint;
+        public String failedEndpoint;
+    }
+
+    public static class OnNewUserCreated extends OnChanged<NewUserError> {
+        public boolean dryRun;
+    }
+
+    public static class OnAvailabilityChecked extends OnChanged<IsAvailableError> {
+        public IsAvailable type;
+        public String value;
+        public boolean isAvailable;
+
+        public OnAvailabilityChecked(IsAvailable type, String value, boolean isAvailable) {
+            this.type = type;
+            this.value = value;
+            this.isAvailable = isAvailable;
+        }
+    }
+
+    public static class OnAuthEmailSent extends OnChanged<AuthEmailError> {
+        public final boolean isSignup;
+
+        public OnAuthEmailSent(boolean isSignup) {
+            this.isSignup = isSignup;
+        }
+    }
+
+    public static class AuthenticationError implements OnChangedError {
+        public AuthenticationErrorType type;
+        public String message;
+        public XmlRpcErrorType xmlRpcErrorType = NOT_SET;
+
+        public AuthenticationError(AuthenticationErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+        public AuthenticationError(AuthenticationErrorType type,
+                                   @NonNull String message,
+                                   XmlRpcErrorType xmlRpcErrorType) {
+            this.type = type;
+            this.message = message;
+            this.xmlRpcErrorType = xmlRpcErrorType;
+        }
+    }
+
+    public static class OnSubscriptionsChanged extends OnChanged<SubscriptionsError> {
+    }
+
+    public static class OnSubscriptionUpdated extends OnChanged<SubscriptionError> {
+        public SubscriptionType type;
+        public boolean subscribed;
+        public OnSubscriptionUpdated() {
+        }
+    }
+
+    // Enums
+    public enum AuthenticationErrorType {
+        // From response's "error" field
+        ACCESS_DENIED,
+        AUTHORIZATION_REQUIRED,
+        INVALID_CLIENT,
+        INVALID_GRANT,
+        INVALID_OTP,
+        INVALID_REQUEST,
+        INVALID_TOKEN,
+        NEEDS_2FA,
+        NEEDS_SECURITY_KEY,
+        UNSUPPORTED_GRANT_TYPE,
+        UNSUPPORTED_RESPONSE_TYPE,
+        UNKNOWN_TOKEN,
+        EMAIL_LOGIN_NOT_ALLOWED,
+        WEBAUTHN_FAILED,
+
+        // From response's "message" field - sadly... (be careful with i18n)
+        INCORRECT_USERNAME_OR_PASSWORD,
+
+        // .org specifics
+        INVALID_SSL_CERTIFICATE,
+        HTTP_AUTH_ERROR,
+        NOT_AUTHENTICATED,
+
+        // Generic error
+        GENERIC_ERROR;
+
+        public static AuthenticationErrorType fromString(String string) {
+            if (string != null) {
+                for (AuthenticationErrorType v : AuthenticationErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class AccountError implements OnChangedError {
+        public AccountErrorType type;
+        public String message;
+        public AccountError(AccountErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum AccountErrorType {
+        ACCOUNT_FETCH_ERROR,
+        SETTINGS_FETCH_GENERIC_ERROR,
+        SETTINGS_FETCH_REAUTHORIZATION_REQUIRED_ERROR,
+        SETTINGS_POST_ERROR,
+        SEND_VERIFICATION_EMAIL_ERROR,
+        GENERIC_ERROR
+    }
+
+    public static class IsAvailableError implements OnChangedError {
+        public IsAvailableErrorType type;
+        public String message;
+
+        public IsAvailableError(@NonNull String type, @NonNull String message) {
+            this.type = IsAvailableErrorType.fromString(type);
+            this.message = message;
+        }
+    }
+
+    public enum IsAvailableErrorType {
+        INVALID,
+        GENERIC_ERROR;
+
+        public static IsAvailableErrorType fromString(String string) {
+            if (string != null) {
+                for (IsAvailableErrorType v : IsAvailableErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class AccountSocialError implements OnChangedError {
+        public AccountSocialErrorType type;
+        public String message;
+        public String nonce;
+
+        public AccountSocialError(@NonNull String type, @NonNull String message) {
+            this.type = AccountSocialErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public AccountSocialError(@NonNull AccountSocialErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum AccountSocialErrorType {
+        INVALID_TOKEN,
+        INVALID_TWO_STEP_CODE,
+        INVALID_TWO_STEP_NONCE,
+        NO_PHONE_NUMBER_FOR_ACCOUNT,
+        SMS_AUTHENTICATION_UNAVAILABLE,
+        SMS_CODE_THROTTLED,
+        TWO_STEP_ENABLED,
+        UNABLE_CONNECT,
+        UNKNOWN_USER,
+        USER_ALREADY_ASSOCIATED,
+        USER_EXISTS,
+        GENERIC_ERROR;
+
+        public static AccountSocialErrorType fromString(String string) {
+            if (string != null) {
+                string = string.replace("2FA_enabled", "two_step_enabled");
+                for (AccountSocialErrorType type : AccountSocialErrorType.values()) {
+                    if (string.equalsIgnoreCase(type.name())) {
+                        return type;
+                    }
+                }
+            }
+
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum AccountUsernameActionType {
+        CREATE_NEW_SITE_AND_ADDRESS, // site and address remain unchanged plus empty site created with new username
+        KEEP_OLD_SITE_AND_ADDRESS, // site and address remain unchanged; only username is changed
+        RENAME_SITE_AND_DISCARD_OLD_ADDRESS, // site renamed and old site address discarded
+        RENAME_SITE_AND_KEEP_OLD_ADDRESS; // site renamed and new empty site belonging to user created with old address
+
+        public static String getStringFromType(AccountUsernameActionType type) {
+            switch (type) {
+                case CREATE_NEW_SITE_AND_ADDRESS:
+                    return "new";
+                case KEEP_OLD_SITE_AND_ADDRESS:
+                    return "none";
+                case RENAME_SITE_AND_DISCARD_OLD_ADDRESS:
+                    return "rename_discard";
+                case RENAME_SITE_AND_KEEP_OLD_ADDRESS:
+                    return "rename_keep";
+                default:
+                    return "";
+            }
+        }
+    }
+
+    public static class AccountUsernameError implements OnChangedError {
+        public AccountUsernameErrorType type;
+        public String message;
+
+        public AccountUsernameError(@NonNull String type, @NonNull String message) {
+            this.type = AccountUsernameErrorType.fromString(type);
+            this.message = message;
+        }
+    }
+
+    public enum AccountUsernameErrorType {
+        INVALID_ACTION,
+        INVALID_INPUT,
+        GENERIC_ERROR;
+
+        public static AccountUsernameErrorType fromString(String string) {
+            if (string != null) {
+                for (AccountUsernameErrorType type : AccountUsernameErrorType.values()) {
+                    if (string.equalsIgnoreCase(type.name())) {
+                        return type;
+                    }
+                }
+            }
+
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class AccountFetchUsernameSuggestionsError implements OnChangedError {
+        public AccountFetchUsernameSuggestionsErrorType type;
+        public String message;
+
+        public AccountFetchUsernameSuggestionsError(@NonNull String type, @NonNull String message) {
+            this.type = AccountFetchUsernameSuggestionsErrorType.fromString(type);
+            this.message = message;
+        }
+    }
+
+    public enum AccountFetchUsernameSuggestionsErrorType {
+        REST_MISSING_CALLBACK_PARAM,
+        REST_NO_NAME,
+        GENERIC_ERROR;
+
+        public static AccountFetchUsernameSuggestionsErrorType fromString(String string) {
+            if (string != null) {
+                for (AccountFetchUsernameSuggestionsErrorType type
+                        : AccountFetchUsernameSuggestionsErrorType.values()) {
+                    if (string.equalsIgnoreCase(type.name())) {
+                        return type;
+                    }
+                }
+            }
+
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class DomainContactError implements OnChangedError {
+        @NonNull public DomainContactErrorType type;
+        @Nullable public String message;
+
+        public DomainContactError(@NonNull DomainContactErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum DomainContactErrorType {
+        GENERIC_ERROR;
+    }
+
+    public static class AuthOptionsError implements OnChangedError {
+        @NonNull public AuthOptionsErrorType type;
+        @Nullable public String message;
+
+        public AuthOptionsError(@Nullable String type, @Nullable String message) {
+            this.type = AuthOptionsErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public AuthOptionsError(@NonNull AuthOptionsErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum AuthOptionsErrorType {
+        UNKNOWN_USER,
+        EMAIL_LOGIN_NOT_ALLOWED,
+        GENERIC_ERROR;
+
+        public static AuthOptionsErrorType fromString(String string) {
+            if (string != null) {
+                for (AuthOptionsErrorType v : AuthOptionsErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class AuthEmailError implements OnChangedError {
+        public AuthEmailErrorType type;
+        public String message;
+
+        public AuthEmailError(AuthEmailErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public AuthEmailError(@NonNull String type, @NonNull String message) {
+            this.type = AuthEmailErrorType.fromString(type);
+            this.message = message;
+        }
+    }
+
+    public enum AuthEmailErrorType {
+        INVALID_EMAIL,
+        USER_EXISTS,
+        UNSUCCESSFUL,
+        GENERIC_ERROR;
+
+        public static AuthEmailErrorType fromString(String string) {
+            if (string != null) {
+                for (AuthEmailErrorType v : AuthEmailErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public static class NewUserError implements OnChangedError {
+        public NewUserErrorType type;
+        public String message;
+        public NewUserError(NewUserErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public enum NewUserErrorType {
+        USERNAME_ONLY_LOWERCASE_LETTERS_AND_NUMBERS,
+        USERNAME_REQUIRED,
+        USERNAME_NOT_ALLOWED,
+        USERNAME_MUST_BE_AT_LEAST_FOUR_CHARACTERS,
+        USERNAME_CONTAINS_INVALID_CHARACTERS,
+        USERNAME_MUST_INCLUDE_LETTERS,
+        USERNAME_EXISTS,
+        USERNAME_RESERVED_BUT_MAY_BE_AVAILABLE,
+        USERNAME_INVALID,
+        PASSWORD_INVALID,
+        EMAIL_CANT_BE_USED_TO_SIGNUP,
+        EMAIL_INVALID,
+        EMAIL_NOT_ALLOWED,
+        EMAIL_EXISTS,
+        EMAIL_RESERVED,
+        GENERIC_ERROR;
+
+        public static NewUserErrorType fromString(String string) {
+            if (string != null) {
+                for (NewUserErrorType v : NewUserErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    // Fields
+    private AccountRestClient mAccountRestClient;
+    private Authenticator mAuthenticator;
+    private AccountModel mAccount;
+    private AccessToken mAccessToken;
+    private SelfHostedEndpointFinder mSelfHostedEndpointFinder;
+
+    @Inject public AccountStore(Dispatcher dispatcher, AccountRestClient accountRestClient,
+                        SelfHostedEndpointFinder selfHostedEndpointFinder, Authenticator authenticator,
+                        AccessToken accessToken) {
+        super(dispatcher);
+        mAuthenticator = authenticator;
+        mAccountRestClient = accountRestClient;
+        mSelfHostedEndpointFinder = selfHostedEndpointFinder;
+        mAccount = loadAccount();
+        mAccessToken = accessToken;
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(T.API, "AccountStore onRegister");
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (actionType instanceof AccountAction) {
+            onAccountAction((AccountAction) actionType, action.getPayload());
+        }
+        if (actionType instanceof AuthenticationAction) {
+            onAuthenticationAction((AuthenticationAction) actionType, action.getPayload());
+        }
+    }
+
+    private void onAccountAction(AccountAction actionType, Object payload) {
+        switch (actionType) {
+            case FETCH_ACCOUNT:
+                mAccountRestClient.fetchAccount();
+                break;
+            case FETCH_SETTINGS:
+                mAccountRestClient.fetchAccountSettings();
+                break;
+            case FETCH_USERNAME_SUGGESTIONS:
+                createFetchUsernameSuggestions((FetchUsernameSuggestionsPayload) payload);
+                break;
+            case SEND_VERIFICATION_EMAIL:
+                mAccountRestClient.sendVerificationEmail();
+                break;
+            case PUSH_SETTINGS:
+                mAccountRestClient.pushAccountSettings(((PushAccountSettingsPayload) payload).params);
+                break;
+            case PUSH_SOCIAL_AUTH:
+                createPushSocialAuth((PushSocialAuthPayload) payload);
+                break;
+            case PUSH_SOCIAL_CONNECT:
+                createPushSocialConnect((PushSocialPayload) payload);
+                break;
+            case PUSH_SOCIAL_LOGIN:
+                createPushSocialLogin((PushSocialPayload) payload);
+                break;
+            case PUSH_SOCIAL_SIGNUP:
+                createPushSocialSignup((PushSocialPayload) payload);
+                break;
+            case PUSH_SOCIAL_SMS:
+                createPushSocialSms((PushSocialSmsPayload) payload);
+                break;
+            case PUSH_USERNAME:
+                createPushUsername((PushUsernamePayload) payload);
+                break;
+            case UPDATE_ACCOUNT:
+                updateDefaultAccount((AccountModel) payload, AccountAction.UPDATE_ACCOUNT);
+                break;
+            case UPDATE_ACCESS_TOKEN:
+                updateToken((UpdateTokenPayload) payload);
+                break;
+            case SIGN_OUT:
+                signOut();
+                break;
+            case CREATE_NEW_ACCOUNT:
+                createNewAccount((NewAccountPayload) payload);
+                break;
+            case CREATED_NEW_ACCOUNT:
+                handleNewAccountCreated((NewAccountResponsePayload) payload);
+                break;
+            case PUSHED_SETTINGS:
+                handlePushSettingsCompleted((AccountPushSettingsResponsePayload) payload);
+                break;
+            case PUSHED_SOCIAL:
+                handlePushSocialCompleted((AccountPushSocialResponsePayload) payload);
+                break;
+            case PUSHED_USERNAME:
+                handlePushUsernameCompleted((AccountPushUsernameResponsePayload) payload);
+                break;
+            case FETCHED_SETTINGS:
+                handleFetchSettingsCompleted((AccountRestPayload) payload);
+                break;
+            case FETCHED_USERNAME_SUGGESTIONS:
+                handleFetchUsernameSuggestionsCompleted((AccountFetchUsernameSuggestionsResponsePayload) payload);
+                break;
+            case FETCHED_ACCOUNT:
+                handleFetchAccountCompleted((AccountRestPayload) payload);
+                break;
+            case SENT_VERIFICATION_EMAIL:
+                handleSentVerificationEmail((NewAccountResponsePayload) payload);
+                break;
+            case IS_AVAILABLE_BLOG:
+                mAccountRestClient.isAvailable((String) payload, IsAvailable.BLOG);
+                break;
+            case IS_AVAILABLE_EMAIL:
+                mAccountRestClient.isAvailable((String) payload, IsAvailable.EMAIL);
+                break;
+            case IS_AVAILABLE_USERNAME:
+                mAccountRestClient.isAvailable((String) payload, IsAvailable.USERNAME);
+                break;
+            case CHECKED_IS_AVAILABLE:
+                handleCheckedIsAvailable((IsAvailableResponsePayload) payload);
+                break;
+            case FETCH_SUBSCRIPTIONS:
+                mAccountRestClient.fetchSubscriptions();
+                break;
+            case FETCHED_SUBSCRIPTIONS:
+                updateSubscriptions((SubscriptionsModel) payload);
+                break;
+            case UPDATE_SUBSCRIPTION_EMAIL_COMMENT:
+                createAddOrDeleteSubscriptionEmailComment((AddOrDeleteSubscriptionPayload) payload);
+                break;
+            case UPDATE_SUBSCRIPTION_EMAIL_POST:
+                createAddOrDeleteSubscriptionEmailPost((AddOrDeleteSubscriptionPayload) payload);
+                break;
+            case UPDATE_SUBSCRIPTION_EMAIL_POST_FREQUENCY:
+                createUpdateSubscriptionEmailPostFrequency((UpdateSubscriptionPayload) payload);
+                break;
+            case UPDATE_SUBSCRIPTION_NOTIFICATION_POST:
+                createAddOrDeleteSubscriptionNotificationPost((AddOrDeleteSubscriptionPayload) payload);
+                break;
+            case UPDATED_SUBSCRIPTION:
+                handleUpdatedSubscription((SubscriptionResponsePayload) payload);
+                break;
+            case FETCH_DOMAIN_CONTACT:
+                mAccountRestClient.fetchDomainContact();
+                break;
+            case FETCHED_DOMAIN_CONTACT:
+                handleFetchedDomainContact((DomainContactPayload) payload);
+                break;
+            case FETCH_AUTH_OPTIONS:
+                createFetchAuthOptions((FetchAuthOptionsPayload) payload);
+                break;
+            case FETCHED_AUTH_OPTIONS:
+                handleFetchedAuthOptions((FetchAuthOptionsResponsePayload) payload);
+                break;
+        }
+    }
+
+    private void onAuthenticationAction(AuthenticationAction actionType, Object payload) {
+        switch (actionType) {
+            case AUTHENTICATE:
+                authenticate((AuthenticatePayload) payload);
+                break;
+            case AUTHENTICATE_TWO_FACTOR:
+                authenticateTwoFactor((AuthenticateTwoFactorPayload) payload);
+                break;
+            case AUTHENTICATE_ERROR:
+                handleAuthenticateError((AuthenticateErrorPayload) payload);
+                break;
+            case DISCOVER_ENDPOINT:
+                discoverEndPoint((String) payload);
+                break;
+            case DISCOVERY_RESULT:
+                discoveryResult((DiscoveryResultPayload) payload);
+                break;
+            case SEND_AUTH_EMAIL:
+                mAuthenticator.sendAuthEmail((AuthEmailPayload) payload);
+                break;
+            case SENT_AUTH_EMAIL:
+                handleSentAuthEmail((AuthEmailResponsePayload) payload);
+                break;
+            case START_SECURITY_KEY_CHALLENGE:
+                requestWebauthnChallenge((StartWebauthnChallengePayload) payload);
+                break;
+            case FINISH_SECURITY_KEY_CHALLENGE:
+                submitWebauthnChallengeResult((FinishWebauthnChallengePayload) payload);
+                break;
+        }
+    }
+
+    private void handleAuthenticateError(AuthenticateErrorPayload payload) {
+        if (payload.error.type == AuthenticationErrorType.INVALID_TOKEN) {
+            clearAccountAndAccessToken();
+        }
+        OnAuthenticationChanged event = new OnAuthenticationChanged();
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void discoverEndPoint(@NonNull String payload) {
+        mSelfHostedEndpointFinder.findEndpoint(payload);
+    }
+
+    private void discoveryResult(DiscoveryResultPayload payload) {
+        OnDiscoveryResponse discoveryResponse = new OnDiscoveryResponse();
+        if (payload.isError()) {
+            discoveryResponse.error = payload.error;
+            discoveryResponse.failedEndpoint = payload.failedEndpoint;
+        } else {
+            discoveryResponse.xmlRpcEndpoint = payload.xmlRpcEndpoint;
+            discoveryResponse.wpRestEndpoint = payload.wpRestEndpoint;
+        }
+        emitChange(discoveryResponse);
+    }
+
+    private void handleFetchAccountCompleted(AccountRestPayload payload) {
+        if (!hasAccessToken()) {
+            emitAccountChangeError(AccountErrorType.ACCOUNT_FETCH_ERROR);
+            return;
+        }
+        if (!checkError(payload, "Error fetching Account via REST API (/me)")) {
+            mAccount.copyAccountAttributes(payload.account);
+            updateDefaultAccount(mAccount, AccountAction.FETCH_ACCOUNT);
+        } else {
+            emitAccountChangeError(AccountErrorType.ACCOUNT_FETCH_ERROR);
+        }
+    }
+
+    private void handleFetchSettingsCompleted(AccountRestPayload payload) {
+        if (!hasAccessToken()) {
+            emitAccountChangeError(AccountErrorType.SETTINGS_FETCH_GENERIC_ERROR);
+            return;
+        }
+        if (!checkError(payload, "Error fetching Account Settings via REST API (/me/settings)")) {
+            mAccount.copyAccountSettingsAttributes(payload.account);
+            updateDefaultAccount(mAccount, AccountAction.FETCH_SETTINGS);
+        } else {
+            OnAccountChanged accountChanged = new OnAccountChanged();
+            accountChanged.causeOfChange = AccountAction.FETCH_SETTINGS;
+
+            AccountErrorType errorType;
+            if (payload.error.apiError.equals("reauthorization_required")) {
+                // This error will always occur for 2FA accounts when using a non-production WordPress.com OAuth client.
+                // Essentially, some APIs around account management are disabled in those cases for security reasons.
+                // The error is a bit generic from the server-side - it essentially means the user isn't privileged to
+                // do the action and needs to reauthorize. For bearer token-based login, there is no escalation of
+                // privileges possible, so the request just fails at that point.
+                errorType = AccountErrorType.SETTINGS_FETCH_REAUTHORIZATION_REQUIRED_ERROR;
+            } else {
+                errorType = AccountErrorType.SETTINGS_FETCH_GENERIC_ERROR;
+            }
+            accountChanged.error = new AccountError(errorType, payload.error.message);
+
+            emitChange(accountChanged);
+        }
+    }
+
+    private void handleFetchUsernameSuggestionsCompleted(AccountFetchUsernameSuggestionsResponsePayload payload) {
+        OnUsernameSuggestionsFetched event = new OnUsernameSuggestionsFetched();
+        event.error = payload.error;
+        event.suggestions = payload.suggestions;
+        emitChange(event);
+    }
+
+    private void handleSentVerificationEmail(NewAccountResponsePayload payload) {
+        OnAccountChanged accountChanged = new OnAccountChanged();
+        accountChanged.causeOfChange = AccountAction.SEND_VERIFICATION_EMAIL;
+        if (payload.isError()) {
+            accountChanged.error = new AccountError(AccountErrorType.SEND_VERIFICATION_EMAIL_ERROR, "");
+        }
+        emitChange(accountChanged);
+    }
+
+    private void handlePushSettingsCompleted(AccountPushSettingsResponsePayload payload) {
+        if (!hasAccessToken()) {
+            emitAccountChangeError(AccountErrorType.SETTINGS_POST_ERROR);
+            return;
+        }
+        if (!payload.isError()) {
+            boolean updated = AccountRestClient.updateAccountModelFromPushSettingsResponse(mAccount, payload.settings);
+            if (updated) {
+                updateDefaultAccount(mAccount, AccountAction.PUSH_SETTINGS);
+            } else {
+                OnAccountChanged accountChanged = new OnAccountChanged();
+                accountChanged.causeOfChange = AccountAction.PUSH_SETTINGS;
+                accountChanged.accountInfosChanged = false;
+                emitChange(accountChanged);
+            }
+        } else {
+            if (payload.error != null) {
+                OnAccountChanged accountChanged = new OnAccountChanged();
+                accountChanged.error = new AccountError(AccountErrorType.SETTINGS_POST_ERROR, payload.error.message);
+                emitChange(accountChanged);
+            } else {
+                emitAccountChangeError(AccountErrorType.SETTINGS_POST_ERROR);
+            }
+        }
+    }
+
+    private void handlePushSocialCompleted(AccountPushSocialResponsePayload payload) {
+        // Error; emit only social change.
+        if (payload.isError()) {
+            OnSocialChanged event = new OnSocialChanged();
+            event.error = payload.error;
+            emitChange(event);
+        // Two-factor authentication code sent via SMS; emit only social change.
+        } else if (payload.hasPhoneNumber()) {
+            OnSocialChanged event = new OnSocialChanged(payload);
+            emitChange(event);
+        // Two-factor authentication or social connect is required; emit only social change.
+        } else if (!payload.hasToken()) {
+            OnSocialChanged event = new OnSocialChanged(payload);
+            event.requiresTwoStepAuth = payload.hasTwoStepTypes();
+            emitChange(event);
+            // No error and two-factor authentication is not required; emit only authentication change.
+        } else {
+            // Social login or signup completed; update token and send boolean flag.
+            if (payload.hasUsername()) {
+                updateToken(new UpdateTokenPayload(payload.bearerToken), payload.createdAccount, payload.userName);
+            } else {
+                updateToken(new UpdateTokenPayload(payload.bearerToken));
+            }
+        }
+    }
+
+    private void handlePushUsernameCompleted(AccountPushUsernameResponsePayload payload) {
+        if (!payload.isError()) {
+            AccountSqlUtils.updateUsername(getAccount(), payload.username);
+            getAccount().setUserName(payload.username);
+        }
+
+        OnUsernameChanged onUsernameChanged = new OnUsernameChanged();
+        onUsernameChanged.username = payload.username;
+        onUsernameChanged.type = payload.type;
+        onUsernameChanged.error = payload.error;
+        emitChange(onUsernameChanged);
+    }
+
+    private void handleNewAccountCreated(NewAccountResponsePayload payload) {
+        OnNewUserCreated onNewUserCreated = new OnNewUserCreated();
+        onNewUserCreated.error = payload.error;
+        onNewUserCreated.dryRun = payload.dryRun;
+        emitChange(onNewUserCreated);
+    }
+
+    private void handleCheckedIsAvailable(IsAvailableResponsePayload payload) {
+        OnAvailabilityChecked event = new OnAvailabilityChecked(payload.type, payload.value, payload.isAvailable);
+
+        if (payload.isError()) {
+            event.error = payload.error;
+        }
+
+        emitChange(event);
+    }
+
+    private void emitAccountChangeError(AccountErrorType errorType) {
+        OnAccountChanged event = new OnAccountChanged();
+        event.error = new AccountError(errorType, "");
+        emitChange(event);
+    }
+
+    private void createFetchUsernameSuggestions(FetchUsernameSuggestionsPayload payload) {
+        mAccountRestClient.fetchUsernameSuggestions(payload.name);
+    }
+
+    private void createNewAccount(NewAccountPayload payload) {
+        mAccountRestClient.newAccount(payload.username, payload.password, payload.email, payload.dryRun);
+    }
+
+    private void createPushSocialAuth(PushSocialAuthPayload payload) {
+        mAccountRestClient.pushSocialAuth(payload.userId, payload.type, payload.nonce, payload.code);
+    }
+
+    private void createPushSocialConnect(PushSocialPayload payload) {
+        mAccountRestClient.pushSocialConnect(payload.idToken, payload.service);
+    }
+
+    private void createPushSocialLogin(PushSocialPayload payload) {
+        mAccountRestClient.pushSocialLogin(payload.idToken, payload.service);
+    }
+
+    private void createPushSocialSignup(PushSocialPayload payload) {
+        mAccountRestClient.pushSocialSignup(payload.idToken, payload.service);
+    }
+
+    private void createPushSocialSms(PushSocialSmsPayload payload) {
+        mAccountRestClient.pushSocialSms(payload.userId, payload.nonce);
+    }
+
+    private void createPushUsername(PushUsernamePayload payload) {
+        mAccountRestClient.pushUsername(payload.username, payload.actionType);
+    }
+
+    private void clearAccountAndAccessToken() {
+        // Remove Account
+        AccountSqlUtils.deleteAccount(mAccount);
+        mAccount.init();
+        // Remove authentication token
+        mAccessToken.set(null);
+    }
+
+    private void signOut() {
+        clearAccountAndAccessToken();
+        OnAccountChanged accountChanged = new OnAccountChanged();
+        accountChanged.causeOfChange = AccountAction.SIGN_OUT;
+        accountChanged.accountInfosChanged = true;
+        emitChange(accountChanged);
+        emitChange(new OnAuthenticationChanged());
+    }
+
+    public AccountModel getAccount() {
+        return mAccount;
+    }
+
+    /**
+     * Can be used to check if Account is signed into WordPress.com.
+     */
+    public boolean hasAccessToken() {
+        return mAccessToken.exists();
+    }
+
+    /**
+     * Should be used for very specific purpose (like forwarding the token to a Webview)
+     *
+     * @return the access token if it was already set, otherwise null
+     */
+    @Nullable
+    public String getAccessToken() {
+        return mAccessToken.get();
+    }
+
+    private void updateToken(UpdateTokenPayload updateTokenPayload) {
+        mAccessToken.set(updateTokenPayload.token);
+        emitChange(new OnAuthenticationChanged());
+    }
+
+    /**
+     * Update access token for account store for social login or signup.
+     *
+     * @param updateTokenPayload payload containing token to be updated
+     * @param createdAccount     flag to send in event to determine login or signup
+     * @param userName           username of created account
+     */
+    private void updateToken(UpdateTokenPayload updateTokenPayload, boolean createdAccount, String userName) {
+        mAccessToken.set(updateTokenPayload.token);
+        OnAuthenticationChanged event = new OnAuthenticationChanged();
+        event.createdAccount = createdAccount;
+        event.userName = userName;
+        emitChange(event);
+    }
+
+    private void updateDefaultAccount(AccountModel accountModel, AccountAction cause) {
+        // Update memory instance
+        mAccount = accountModel;
+        AccountSqlUtils.insertOrUpdateDefaultAccount(accountModel);
+        OnAccountChanged accountChanged = new OnAccountChanged();
+        accountChanged.accountInfosChanged = true;
+        accountChanged.causeOfChange = cause;
+        emitChange(accountChanged);
+    }
+
+    private AccountModel loadAccount() {
+        AccountModel account = AccountSqlUtils.getDefaultAccount();
+        return account == null ? new AccountModel() : account;
+    }
+
+    private void authenticate(final AuthenticatePayload payload) {
+        mAuthenticator.authenticate(payload.username, payload.password,
+                response -> handleAuthResponse(response, payload),
+                this::handleAuthError);
+    }
+
+    private void authenticateTwoFactor(final AuthenticateTwoFactorPayload payload) {
+        mAuthenticator.authenticate(payload.username, payload.password, payload.twoStepCode,
+                payload.shouldSendTwoStepSms,
+                response -> handleAuthResponse(response, payload),
+                this::handleAuthError);
+    }
+
+    private void handleAuthError(VolleyError volleyError) {
+        AppLog.e(T.API, "Authentication error");
+        OnAuthenticationChanged event = new OnAuthenticationChanged();
+        event.error = new AuthenticationError(
+                Authenticator.volleyErrorToAuthenticationError(volleyError),
+                Authenticator.volleyErrorToErrorMessage(volleyError));
+        emitChange(event);
+    }
+
+    private void handleAuthResponse(OauthResponse response, AuthenticationRequestPayload payload) {
+        // Oauth endpoint can return a Token or a WebauthnResponse
+        if (response instanceof Token) {
+            Token token = (Token) response;
+            mAccessToken.set(token.getAccessToken());
+            if (payload.nextAction != null) {
+                mDispatcher.dispatch(payload.nextAction);
+            }
+            emitChange(new OnAuthenticationChanged());
+        } else if (response instanceof TwoFactorResponse) {
+            TwoFactorResponse twoFactorResponse = (TwoFactorResponse) response;
+            OnTwoFactorAuthStarted event = new OnTwoFactorAuthStarted(twoFactorResponse);
+            if (payload.nextAction != null) {
+                mDispatcher.dispatch(payload.nextAction);
+            }
+            emitChange(event);
+        } else {
+            OnAuthenticationChanged event = new OnAuthenticationChanged();
+            event.error = new AuthenticationError(AuthenticationErrorType.GENERIC_ERROR, "");
+            emitChange(event);
+        }
+    }
+
+    private void handleSentAuthEmail(final AuthEmailResponsePayload payload) {
+        if (payload.isError()) {
+            OnAuthEmailSent event = new OnAuthEmailSent(payload.isSignup);
+            event.error = payload.error;
+            emitChange(event);
+        } else {
+            OnAuthEmailSent event = new OnAuthEmailSent(payload.isSignup);
+            emitChange(event);
+        }
+    }
+
+    private void requestWebauthnChallenge(final StartWebauthnChallengePayload payload) {
+        mAuthenticator.makeRequest(payload.mUserId, payload.mWebauthnNonce,
+                (Response.Listener<JSONObject>) response -> {
+                    WebauthnChallengeReceived event = new WebauthnChallengeReceived();
+                    event.mUserId = payload.mUserId;
+                    event.mJsonResponse = response;
+                    emitChange(event);
+                },
+                error -> {
+                    WebauthnChallengeReceived event = new WebauthnChallengeReceived();
+                    event.error = new AuthenticationError(AuthenticationErrorType.WEBAUTHN_FAILED,
+                            "Webauthn failed");
+                    emitChange(event);
+                });
+    }
+
+    private void submitWebauthnChallengeResult(final FinishWebauthnChallengePayload payload) {
+        mAuthenticator.makeRequest(payload.mUserId, payload.mTwoStepNonce, payload.mClientData,
+                token -> {
+                    WebauthnPasskeyAuthenticated event = new WebauthnPasskeyAuthenticated();
+                    event.mWebauthnToken = token;
+                    mAccessToken.set(token.getBearerToken());
+                    emitChange(event);
+                },
+                error -> {
+                    WebauthnPasskeyAuthenticated event = new WebauthnPasskeyAuthenticated();
+                    event.error = new AuthenticationError(AuthenticationErrorType.WEBAUTHN_FAILED,
+                            "Webauthn failed");
+                    emitChange(event);
+                });
+    }
+
+    private boolean checkError(AccountRestPayload payload, String log) {
+        if (payload.isError()) {
+            AppLog.w(T.API, log + "\nError: " + payload.error.volleyError);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get all subscriptions in store as a {@link SubscriptionModel} list.
+     *
+     * @return {@link List} of {@link SubscriptionModel}
+     */
+    public List<SubscriptionModel> getSubscriptions() {
+        return WellSql.select(SubscriptionModel.class).getAsModel();
+    }
+
+    /**
+     * Get all subscriptions in store matching {@param searchString} as a {@link SubscriptionModel} list.
+     *
+     * @param searchString      Text to filter subscriptions by
+     *
+     * @return {@link List} of {@link SubscriptionModel}
+     */
+    public List<SubscriptionModel> getSubscriptionsByNameOrUrlMatching(@NonNull String searchString) {
+        return AccountSqlUtils.getSubscriptionsByNameOrUrlMatching(searchString);
+    }
+
+    private void updateSubscriptions(SubscriptionsModel subscriptions) {
+        OnSubscriptionsChanged event = new OnSubscriptionsChanged();
+        if (subscriptions.isError()) {
+            event.error = new SubscriptionsError(subscriptions.error);
+        } else {
+            AccountSqlUtils.updateSubscriptions(subscriptions.getSubscriptions());
+        }
+        emitChange(event);
+    }
+
+    private void createAddOrDeleteSubscriptionEmailComment(AddOrDeleteSubscriptionPayload payload) {
+        mAccountRestClient.updateSubscriptionEmailComment(payload.site, payload.action);
+    }
+
+    private void createAddOrDeleteSubscriptionEmailPost(AddOrDeleteSubscriptionPayload payload) {
+        mAccountRestClient.updateSubscriptionEmailPost(payload.site, payload.action);
+    }
+
+    private void createUpdateSubscriptionEmailPostFrequency(UpdateSubscriptionPayload payload) {
+        mAccountRestClient.updateSubscriptionEmailPostFrequency(payload.site, payload.frequency);
+    }
+
+    private void createAddOrDeleteSubscriptionNotificationPost(AddOrDeleteSubscriptionPayload payload) {
+        mAccountRestClient.updateSubscriptionNotificationPost(payload.site, payload.action);
+    }
+
+    private void handleUpdatedSubscription(SubscriptionResponsePayload payload) {
+        OnSubscriptionUpdated event = new OnSubscriptionUpdated();
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            event.subscribed = payload.isSubscribed;
+            event.type = payload.type;
+        }
+        emitChange(event);
+    }
+
+    private void handleFetchedDomainContact(DomainContactPayload payload) {
+        emitChange(new OnDomainContactFetched(payload.contactModel, payload.error));
+    }
+
+    private void createFetchAuthOptions(FetchAuthOptionsPayload payload) {
+        mAccountRestClient.fetchAuthOptions(payload.emailOrUsername);
+    }
+
+    private void handleFetchedAuthOptions(FetchAuthOptionsResponsePayload payload) {
+        OnAuthOptionsFetched event = new OnAuthOptionsFetched();
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            event.isPasswordless = payload.isPasswordless;
+            event.isEmailVerified = payload.isEmailVerified;
+        }
+        emitChange(event);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ActivityLogStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ActivityLogStore.kt
new file mode 100644
index 00000000000..ba9c892bdde
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ActivityLogStore.kt
@@ -0,0 +1,566 @@
+package org.wordpress.android.fluxc.store
+
+import android.annotation.SuppressLint
+import com.yarolegovich.wellsql.SelectQuery
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.ActivityLogAction
+import org.wordpress.android.fluxc.action.ActivityLogAction.BACKUP_DOWNLOAD
+import org.wordpress.android.fluxc.action.ActivityLogAction.DISMISS_BACKUP_DOWNLOAD
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_ACTIVITIES
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_ACTIVITY_TYPES
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_BACKUP_DOWNLOAD_STATE
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_REWIND_STATE
+import org.wordpress.android.fluxc.action.ActivityLogAction.REWIND
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.activity.ActivityLogRestClient
+import org.wordpress.android.fluxc.persistence.ActivityLogSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val ACTIVITY_LOG_PAGE_SIZE = 100
+
+@Singleton
+class ActivityLogStore
+@Inject constructor(
+    private val activityLogRestClient: ActivityLogRestClient,
+    private val activityLogSqlUtils: ActivityLogSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? ActivityLogAction ?: return
+        when (actionType) {
+            FETCH_ACTIVITIES -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On FETCH_ACTIVITIES") {
+                    emitChange(fetchActivities(action.payload as FetchActivityLogPayload))
+                }
+            }
+            FETCH_REWIND_STATE -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On FETCH_REWIND_STATE") {
+                    emitChange(fetchActivitiesRewind(action.payload as FetchRewindStatePayload))
+                }
+            }
+            REWIND -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On REWIND") {
+                    emitChange(rewind(action.payload as RewindPayload))
+                }
+            }
+            BACKUP_DOWNLOAD -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On BACKUP_DOWNLOAD") {
+                    emitChange(backupDownload(action.payload as BackupDownloadPayload))
+                }
+            }
+            FETCH_BACKUP_DOWNLOAD_STATE -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On FETCH_BACKUP_DOWNLOAD_STATE") {
+                    emitChange(fetchBackupDownloadState(action.payload as FetchBackupDownloadStatePayload))
+                }
+            }
+            FETCH_ACTIVITY_TYPES -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On FETCH_ACTIVITY_TYPES") {
+                    emitChange(fetchActivityTypes(action.payload as FetchActivityTypesPayload))
+                }
+            }
+            DISMISS_BACKUP_DOWNLOAD -> {
+                coroutineEngine.launch(AppLog.T.API, this, "ActivityLog: On DISMISS_BACKUP_DOWNLOAD") {
+                    emitChange(dismissBackupDownload(action.payload as DismissBackupDownloadPayload))
+                }
+            }
+        }
+    }
+
+    @SuppressLint("WrongConstant")
+    fun getActivityLogForSite(
+        site: SiteModel,
+        ascending: Boolean = true,
+        rewindableOnly: Boolean = false
+    ): List<ActivityLogModel> {
+        val order = if (ascending) SelectQuery.ORDER_ASCENDING else SelectQuery.ORDER_DESCENDING
+        return if (rewindableOnly) {
+            activityLogSqlUtils.getRewindableActivitiesForSite(site, order)
+        } else {
+            activityLogSqlUtils.getActivitiesForSite(site, order)
+        }
+    }
+
+    fun getActivityLogItemByRewindId(rewindId: String): ActivityLogModel? {
+        return activityLogSqlUtils.getActivityByRewindId(rewindId)
+    }
+
+    fun getActivityLogItemByActivityId(activityId: String): ActivityLogModel? {
+        return activityLogSqlUtils.getActivityByActivityId(activityId)
+    }
+
+    fun getRewindStatusForSite(site: SiteModel): RewindStatusModel? {
+        return activityLogSqlUtils.getRewindStatusForSite(site)
+    }
+
+    fun getBackupDownloadStatusForSite(site: SiteModel): BackupDownloadStatusModel? {
+        return activityLogSqlUtils.getBackupDownloadStatusForSite(site)
+    }
+
+    fun clearActivityLogCache(site: SiteModel) {
+        activityLogSqlUtils.deleteActivityLog(site)
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, this.javaClass.name + ": onRegister")
+    }
+
+    @SuppressLint("WrongConstant")
+    suspend fun fetchActivities(fetchActivityLogPayload: FetchActivityLogPayload): OnActivityLogFetched {
+        var offset = 0
+        if (fetchActivityLogPayload.loadMore) {
+            offset = activityLogSqlUtils.getActivitiesForSite(
+                    fetchActivityLogPayload.site,
+                    SelectQuery.ORDER_ASCENDING
+            ).size
+        }
+        val payload = activityLogRestClient.fetchActivity(fetchActivityLogPayload, ACTIVITY_LOG_PAGE_SIZE, offset)
+        return storeActivityLog(payload, FETCH_ACTIVITIES)
+    }
+
+    suspend fun fetchActivitiesRewind(fetchActivitiesRewindPayload: FetchRewindStatePayload): OnRewindStatusFetched {
+        val payload = activityLogRestClient.fetchActivityRewind(fetchActivitiesRewindPayload.site)
+        return storeRewindState(payload, FETCH_REWIND_STATE)
+    }
+
+    suspend fun rewind(rewindPayload: RewindPayload): OnRewind {
+        val payload = activityLogRestClient.rewind(rewindPayload.site, rewindPayload.rewindId, rewindPayload.types)
+        return emitRewindResult(payload, REWIND)
+    }
+
+    suspend fun backupDownload(backupDownloadPayload: BackupDownloadPayload): OnBackupDownload {
+        val payload = activityLogRestClient.backupDownload(
+                backupDownloadPayload.site,
+                backupDownloadPayload.rewindId,
+                backupDownloadPayload.types)
+        return emitBackupDownloadResult(payload, BACKUP_DOWNLOAD)
+    }
+
+    suspend fun fetchBackupDownloadState(
+        fetchBackupDownloadPayload: FetchBackupDownloadStatePayload
+    ): OnBackupDownloadStatusFetched {
+        val payload = activityLogRestClient.fetchBackupDownloadState(fetchBackupDownloadPayload.site)
+        return storeBackupDownloadState(payload, FETCH_BACKUP_DOWNLOAD_STATE)
+    }
+
+    suspend fun fetchActivityTypes(fetchActivityTypesPayload: FetchActivityTypesPayload): OnActivityTypesFetched {
+        val payload = activityLogRestClient.fetchActivityTypes(
+                fetchActivityTypesPayload.remoteSiteId,
+                fetchActivityTypesPayload.after,
+                fetchActivityTypesPayload.before
+        )
+        return emitActivityTypesResult(payload, FETCH_ACTIVITY_TYPES)
+    }
+
+    suspend fun dismissBackupDownload(backupDownloadPayload: DismissBackupDownloadPayload): OnDismissBackupDownload {
+        val payload = activityLogRestClient.dismissBackupDownload(
+                backupDownloadPayload.site,
+                backupDownloadPayload.downloadId)
+        return emitDismissBackupDownloadResult(payload, DISMISS_BACKUP_DOWNLOAD)
+    }
+
+    private fun storeActivityLog(payload: FetchedActivityLogPayload, action: ActivityLogAction): OnActivityLogFetched {
+        return if (payload.error != null) {
+            OnActivityLogFetched(payload.error, action)
+        } else {
+            var rowsAffected = 0
+            if (payload.offset == 0) {
+                rowsAffected += activityLogSqlUtils.deleteActivityLog(payload.site)
+            }
+            if (payload.activityLogModels.isNotEmpty()) {
+                rowsAffected += activityLogSqlUtils.insertOrUpdateActivities(payload.site, payload.activityLogModels)
+            }
+            val canLoadMore = payload.activityLogModels.isNotEmpty() &&
+                    (payload.offset + payload.number) < payload.totalItems
+            OnActivityLogFetched(rowsAffected, canLoadMore, action)
+        }
+    }
+
+    private fun storeRewindState(payload: FetchedRewindStatePayload, action: ActivityLogAction): OnRewindStatusFetched {
+        return if (payload.error != null) {
+            OnRewindStatusFetched(payload.error, action)
+        } else {
+            if (payload.rewindStatusModelResponse != null) {
+                activityLogSqlUtils.replaceRewindStatus(payload.site, payload.rewindStatusModelResponse)
+            } else {
+                activityLogSqlUtils.deleteRewindStatus(payload.site)
+            }
+            OnRewindStatusFetched(action)
+        }
+    }
+
+    private fun storeBackupDownloadState(payload: FetchedBackupDownloadStatePayload, action: ActivityLogAction):
+            OnBackupDownloadStatusFetched {
+        return if (payload.error != null) {
+            OnBackupDownloadStatusFetched(payload.error, action)
+        } else {
+            if (payload.backupDownloadStatusModelResponse != null) {
+                activityLogSqlUtils.replaceBackupDownloadStatus(payload.site, payload.backupDownloadStatusModelResponse)
+            } else {
+                activityLogSqlUtils.deleteBackupDownloadStatus(payload.site)
+            }
+            OnBackupDownloadStatusFetched(action)
+        }
+    }
+
+    private fun emitRewindResult(payload: RewindResultPayload, action: ActivityLogAction): OnRewind {
+        return if (payload.error != null) {
+            OnRewind(payload.rewindId, payload.error, action)
+        } else {
+            OnRewind(rewindId = payload.rewindId, restoreId = payload.restoreId, causeOfChange = action)
+        }
+    }
+
+    private fun emitBackupDownloadResult(
+        payload: BackupDownloadResultPayload,
+        action: ActivityLogAction
+    ): OnBackupDownload {
+        return if (payload.error != null) {
+            OnBackupDownload(payload.rewindId, payload.error, action)
+        } else {
+            OnBackupDownload(
+                    rewindId = payload.rewindId,
+                    downloadId = payload.downloadId,
+                    backupPoint = payload.backupPoint,
+                    startedAt = payload.startedAt,
+                    progress = payload.progress,
+                    causeOfChange = action)
+        }
+    }
+
+    private fun emitActivityTypesResult(
+        payload: FetchedActivityTypesResultPayload,
+        action: ActivityLogAction
+    ): OnActivityTypesFetched {
+        return if (payload.error != null) {
+            OnActivityTypesFetched(payload.remoteSiteId, payload.error, action)
+        } else {
+            OnActivityTypesFetched(
+                    causeOfChange = action,
+                    remoteSiteId = payload.remoteSiteId,
+                    activityTypeModels = payload.activityTypeModels,
+                    totalItems = payload.totalItems
+            )
+        }
+    }
+
+    private fun emitDismissBackupDownloadResult(
+        payload: DismissBackupDownloadResultPayload,
+        action: ActivityLogAction
+    ): OnDismissBackupDownload {
+        return if (payload.error != null) {
+            OnDismissBackupDownload(payload.downloadId, payload.error, action)
+        } else {
+            OnDismissBackupDownload(
+                    downloadId = payload.downloadId,
+                    isDismissed = payload.isDismissed,
+                    causeOfChange = action
+            )
+        }
+    }
+
+    // Actions
+    data class OnActivityLogFetched(
+        val rowsAffected: Int,
+        val canLoadMore: Boolean,
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<ActivityError>() {
+        constructor(error: ActivityError, causeOfChange: ActivityLogAction) :
+                this(rowsAffected = 0, canLoadMore = true, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnRewindStatusFetched(
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<RewindStatusError>() {
+        constructor(error: RewindStatusError, causeOfChange: ActivityLogAction) :
+                this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnRewind(
+        val rewindId: String,
+        val restoreId: Long? = null,
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<RewindError>() {
+        constructor(rewindId: String, error: RewindError, causeOfChange: ActivityLogAction) :
+                this(rewindId = rewindId, restoreId = null, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnBackupDownload(
+        val rewindId: String,
+        val downloadId: Long? = null,
+        val backupPoint: String? = null,
+        val startedAt: String? = null,
+        val progress: Int = 0,
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<BackupDownloadError>() {
+        constructor(rewindId: String, error: BackupDownloadError, causeOfChange: ActivityLogAction) :
+                this(rewindId = rewindId, downloadId = null, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnBackupDownloadStatusFetched(
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<BackupDownloadStatusError>() {
+        constructor(error: BackupDownloadStatusError, causeOfChange: ActivityLogAction) :
+                this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnActivityTypesFetched(
+        val causeOfChange: ActivityLogAction,
+        val remoteSiteId: Long,
+        val activityTypeModels: List<ActivityTypeModel>,
+        val totalItems: Int = 0
+    ) : Store.OnChanged<ActivityTypesError>() {
+        constructor(
+            remoteSiteId: Long,
+            error: ActivityTypesError,
+            causeOfChange: ActivityLogAction
+        ) : this(remoteSiteId = remoteSiteId, causeOfChange = causeOfChange, activityTypeModels = listOf()) {
+            this.error = error
+        }
+    }
+
+    data class OnDismissBackupDownload(
+        val downloadId: Long,
+        val isDismissed: Boolean = false,
+        val causeOfChange: ActivityLogAction
+    ) : Store.OnChanged<DismissBackupDownloadError>() {
+        constructor(downloadId: Long, error: DismissBackupDownloadError, causeOfChange: ActivityLogAction) :
+                this(downloadId = downloadId, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    // Payloads
+    class FetchActivityLogPayload(
+        val site: SiteModel,
+        val loadMore: Boolean = false,
+        val after: Date? = null,
+        val before: Date? = null,
+        val groups: List<String> = listOf()
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class FetchRewindStatePayload(val site: SiteModel) : Payload<BaseRequest.BaseNetworkError>()
+
+    class RewindPayload(
+        val site: SiteModel,
+        val rewindId: String,
+        val types: RewindRequestTypes? = null
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class FetchedActivityLogPayload(
+        val activityLogModels: List<ActivityLogModel> = listOf(),
+        val site: SiteModel,
+        val totalItems: Int,
+        val number: Int,
+        val offset: Int
+    ) : Payload<ActivityError>() {
+        constructor(
+            error: ActivityError,
+            site: SiteModel,
+            totalItems: Int = 0,
+            number: Int,
+            offset: Int
+        ) : this(site = site, totalItems = totalItems, number = number, offset = offset) {
+            this.error = error
+        }
+    }
+
+    class FetchedRewindStatePayload(
+        val rewindStatusModelResponse: RewindStatusModel? = null,
+        val site: SiteModel
+    ) : Payload<RewindStatusError>() {
+        constructor(error: RewindStatusError, site: SiteModel) : this(site = site) {
+            this.error = error
+        }
+    }
+
+    class RewindResultPayload(
+        val rewindId: String,
+        val restoreId: Long? = null,
+        val site: SiteModel
+    ) : Payload<RewindError>() {
+        constructor(error: RewindError, rewindId: String, site: SiteModel) : this(rewindId = rewindId, site = site) {
+            this.error = error
+        }
+    }
+
+    class BackupDownloadPayload(
+        val site: SiteModel,
+        val rewindId: String,
+        val types: BackupDownloadRequestTypes
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class BackupDownloadResultPayload(
+        val rewindId: String,
+        val downloadId: Long? = null,
+        val backupPoint: String? = null,
+        val startedAt: String? = null,
+        val progress: Int = 0,
+        val site: SiteModel
+    ) : Payload<BackupDownloadError>() {
+        constructor(error: BackupDownloadError, rewindId: String, site: SiteModel) :
+                this(rewindId = rewindId, site = site) {
+            this.error = error
+        }
+    }
+
+    class FetchBackupDownloadStatePayload(val site: SiteModel) : Payload<BaseRequest.BaseNetworkError>()
+
+    class FetchedBackupDownloadStatePayload(
+        val backupDownloadStatusModelResponse: BackupDownloadStatusModel? = null,
+        val site: SiteModel
+    ) : Payload<BackupDownloadStatusError>() {
+        constructor(error: BackupDownloadStatusError, site: SiteModel) : this(site = site) {
+            this.error = error
+        }
+    }
+
+    class FetchActivityTypesPayload(
+        val remoteSiteId: Long,
+        val after: Date?,
+        val before: Date?
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class FetchedActivityTypesResultPayload(
+        val remoteSiteId: Long,
+        val activityTypeModels: List<ActivityTypeModel>,
+        val totalItems: Int = 0
+    ) : Payload<ActivityTypesError>() {
+        constructor(error: ActivityTypesError, remoteSiteId: Long) : this(
+                remoteSiteId = remoteSiteId,
+                activityTypeModels = listOf()
+        ) {
+            this.error = error
+        }
+    }
+
+    data class RewindRequestTypes(
+        val themes: Boolean,
+        val plugins: Boolean,
+        val uploads: Boolean,
+        val sqls: Boolean,
+        val roots: Boolean,
+        val contents: Boolean
+    )
+
+    data class BackupDownloadRequestTypes(
+        val themes: Boolean,
+        val plugins: Boolean,
+        val uploads: Boolean,
+        val sqls: Boolean,
+        val roots: Boolean,
+        val contents: Boolean
+    )
+
+    class DismissBackupDownloadPayload(
+        val site: SiteModel,
+        val downloadId: Long
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class DismissBackupDownloadResultPayload(
+        val siteId: Long,
+        val downloadId: Long,
+        val isDismissed: Boolean = false
+    ) : Payload<DismissBackupDownloadError>() {
+        constructor(
+            error: DismissBackupDownloadError,
+            siteId: Long,
+            downloadId: Long
+        ) : this(siteId = siteId, downloadId = downloadId) {
+            this.error = error
+        }
+    }
+
+    // Errors
+    enum class ActivityLogErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        MISSING_ACTIVITY_ID,
+        MISSING_SUMMARY,
+        MISSING_CONTENT_TEXT,
+        MISSING_PUBLISHED_DATE
+    }
+
+    class ActivityError(var type: ActivityLogErrorType, var message: String? = null) : OnChangedError
+
+    enum class RewindStatusErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        INVALID_REWIND_STATE,
+        MISSING_REWIND_ID,
+        MISSING_RESTORE_ID
+    }
+
+    class RewindStatusError(var type: RewindStatusErrorType, var message: String? = null) : OnChangedError
+
+    enum class RewindErrorType {
+        GENERIC_ERROR,
+        API_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        MISSING_STATE
+    }
+
+    class RewindError(var type: RewindErrorType, var message: String? = null) : OnChangedError
+
+    enum class BackupDownloadErrorType {
+        GENERIC_ERROR,
+        API_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class BackupDownloadError(var type: BackupDownloadErrorType, var message: String? = null) : OnChangedError
+
+    enum class BackupDownloadStatusErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class BackupDownloadStatusError(var type: BackupDownloadStatusErrorType, var message: String? = null) :
+            OnChangedError
+
+    enum class ActivityTypesErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class ActivityTypesError(var type: ActivityTypesErrorType, var message: String? = null) : OnChangedError
+
+    class DismissBackupDownloadError(var type: DismissBackupDownloadErrorType, var message: String? = null) :
+            OnChangedError
+
+    enum class DismissBackupDownloadErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/BloggingRemindersStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/BloggingRemindersStore.kt
new file mode 100644
index 00000000000..6d48abe1b0c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/BloggingRemindersStore.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.BloggingRemindersMapper
+import org.wordpress.android.fluxc.model.BloggingRemindersModel
+import org.wordpress.android.fluxc.persistence.BloggingRemindersDao
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BloggingRemindersStore
+@Inject constructor(
+    private val bloggingRemindersDao: BloggingRemindersDao,
+    private val mapper: BloggingRemindersMapper,
+    private val siteStore: SiteStore,
+    private val coroutineEngine: CoroutineEngine
+) {
+    fun getAll() = bloggingRemindersDao.getAll()
+        .map { dbModel -> dbModel.map { mapper.toDomainModel(it) } }
+
+    fun bloggingRemindersModel(siteId: Int): Flow<BloggingRemindersModel> {
+        return bloggingRemindersDao.liveGetBySiteId(siteId).map {
+            it?.let { dbModel -> mapper.toDomainModel(dbModel) } ?: BloggingRemindersModel(
+                siteId,
+                isPromptsCardEnabled = siteStore.getSiteByLocalId(siteId)
+                    ?.isPotentialBloggingSite
+                    ?: true
+            )
+        }
+    }
+
+    suspend fun hasModifiedBloggingReminders(siteId: Int) =
+        coroutineEngine.withDefaultContext(T.SETTINGS, this, "Has blogging reminders") {
+            bloggingRemindersDao.getBySiteId(siteId).isNotEmpty()
+        }
+
+    suspend fun updateBloggingReminders(model: BloggingRemindersModel) =
+        coroutineEngine.withDefaultContext(T.SETTINGS, this, "Updating blogging reminders") {
+            bloggingRemindersDao.insert(mapper.toDatabaseModel(model))
+        }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentStore.java
new file mode 100644
index 00000000000..b09dfd04735
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentStore.java
@@ -0,0 +1,616 @@
+package org.wordpress.android.fluxc.store;
+
+import android.annotation.SuppressLint;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.SelectQuery.Order;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.CommentAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.CommentStatus;
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.comment.CommentXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.CommentSqlUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class CommentStore extends Store {
+    private final CommentRestClient mCommentRestClient;
+    private final CommentXMLRPCClient mCommentXMLRPCClient;
+
+    // Payloads
+
+    public static class FetchCommentsPayload extends Payload<BaseNetworkError> {
+        @NonNull public final SiteModel site;
+        @NonNull public final CommentStatus status;
+        public final int number;
+        public final int offset;
+
+        public FetchCommentsPayload(@NonNull SiteModel site, int number, int offset) {
+            this.site = site;
+            this.status = CommentStatus.ALL;
+            this.number = number;
+            this.offset = offset;
+        }
+
+        @SuppressWarnings("unused")
+        public FetchCommentsPayload(@NonNull SiteModel site, @NonNull CommentStatus status, int number, int offset) {
+            this.site = site;
+            this.status = status;
+            this.number = number;
+            this.offset = offset;
+        }
+    }
+
+    public static class RemoteCommentPayload extends Payload<BaseNetworkError> {
+        @NonNull public final SiteModel site;
+        @Nullable public final CommentModel comment;
+        public final long remoteCommentId;
+
+        public RemoteCommentPayload(@NonNull SiteModel site, @NonNull CommentModel comment) {
+            this.site = site;
+            this.comment = comment;
+            this.remoteCommentId = 0;
+        }
+
+        public RemoteCommentPayload(@NonNull SiteModel site, long remoteCommentId) {
+            this.site = site;
+            this.comment = null;
+            this.remoteCommentId = remoteCommentId;
+        }
+    }
+
+    public static class RemoteLikeCommentPayload extends RemoteCommentPayload {
+        public final boolean like;
+        public RemoteLikeCommentPayload(@NonNull SiteModel site, @NonNull CommentModel comment, boolean like) {
+            super(site, comment);
+            this.like = like;
+        }
+
+        @SuppressWarnings("unused")
+        public RemoteLikeCommentPayload(@NonNull SiteModel site, long remoteCommentId, boolean like) {
+            super(site, remoteCommentId);
+            this.like = like;
+        }
+    }
+
+    public static class FetchCommentsResponsePayload extends Payload<CommentError> {
+        @NonNull public final List<CommentModel> comments;
+        @NonNull public final SiteModel site;
+        public final int number;
+        public final int offset;
+        @Nullable public final CommentStatus requestedStatus;
+
+        public FetchCommentsResponsePayload(@NonNull List<CommentModel> comments, @NonNull SiteModel site, int number,
+                                            int offset, @Nullable CommentStatus status) {
+            this.comments = comments;
+            this.site = site;
+            this.number = number;
+            this.offset = offset;
+            this.requestedStatus = status;
+        }
+    }
+
+    public static class RemoteCommentResponsePayload extends Payload<CommentError> {
+        @Nullable public final CommentModel comment;
+        public RemoteCommentResponsePayload(@Nullable CommentModel comment) {
+            this.comment = comment;
+        }
+    }
+
+    public static class RemoteCreateCommentPayload extends Payload<CommentError> {
+        @NonNull public final SiteModel site;
+        @NonNull public final CommentModel comment;
+        @Nullable public final CommentModel reply;
+        @Nullable public final PostModel post;
+
+        // Create a new comment on a specific Post
+        public RemoteCreateCommentPayload(@NonNull SiteModel site, @NonNull PostModel post,
+                                          @NonNull CommentModel comment) {
+            this.site = site;
+            this.post = post;
+            this.comment = comment;
+            this.reply = null;
+        }
+
+        // Create a new reply to a specific Comment
+        public RemoteCreateCommentPayload(@NonNull SiteModel site, @NonNull CommentModel comment,
+                                          @NonNull CommentModel reply) {
+            this.site = site;
+            this.comment = comment;
+            this.reply = reply;
+            this.post = null;
+        }
+    }
+
+    public static class FetchCommentLikesPayload extends Payload<BaseNetworkError> {
+        public final long siteId;
+        public final long remoteCommentId;
+        public final boolean requestNextPage;
+        public final int pageLength;
+
+        public FetchCommentLikesPayload(long siteId, long remoteCommentId, boolean requestNextPage, int pageLength) {
+            this.siteId = siteId;
+            this.remoteCommentId = remoteCommentId;
+            this.requestNextPage = requestNextPage;
+            this.pageLength = pageLength;
+        }
+    }
+
+    public static class FetchedCommentLikesResponsePayload extends Payload<CommentError> {
+        @NonNull public final List<LikeModel> likes;
+        public final long siteId;
+        public final long commentRemoteId;
+        public final boolean hasMore;
+        public final boolean isRequestNextPage;
+
+        public FetchedCommentLikesResponsePayload(
+                @NonNull List<LikeModel> likes,
+                long siteId,
+                long commentRemoteId,
+                boolean isRequestNextPage,
+                boolean hasMore
+        ) {
+            this.likes = likes;
+            this.siteId = siteId;
+            this.commentRemoteId = commentRemoteId;
+            this.hasMore = hasMore;
+            this.isRequestNextPage = isRequestNextPage;
+        }
+    }
+
+    // Errors
+
+    public enum CommentErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        INVALID_INPUT,
+        UNKNOWN_COMMENT,
+        UNKNOWN_POST,
+        DUPLICATE_COMMENT
+    }
+
+    public static class CommentError implements OnChangedError {
+        @NonNull public CommentErrorType type;
+        @NonNull public String message;
+        public CommentError(@NonNull CommentErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    // Actions
+
+    public static class OnCommentChanged extends OnChanged<CommentError> {
+        public int rowsAffected;
+        public int offset;
+        @NonNull public CommentAction causeOfChange;
+        @Nullable public CommentStatus requestedStatus;
+        @NonNull public List<Integer> changedCommentsLocalIds = new ArrayList<>();
+        public OnCommentChanged(int rowsAffected, @NonNull CommentAction causeOfChange) {
+            this.rowsAffected = rowsAffected;
+            this.causeOfChange = causeOfChange;
+        }
+    }
+
+    public static class OnCommentLikesChanged extends OnChanged<CommentError> {
+        @NonNull public CommentAction causeOfChange;
+        public final long siteId;
+        public final long commentId;
+        @NonNull public List<LikeModel> commentLikes = new ArrayList<>();
+        public final boolean hasMore;
+
+        public OnCommentLikesChanged(
+                long siteId,
+                long commentId,
+                boolean hasMore,
+                @NonNull CommentAction causeOfChange
+        ) {
+            this.siteId = siteId;
+            this.commentId = commentId;
+            this.hasMore = hasMore;
+            this.causeOfChange = causeOfChange;
+        }
+    }
+
+    // Constructor
+
+    @Inject public CommentStore(Dispatcher dispatcher, CommentRestClient commentRestClient,
+                        CommentXMLRPCClient commentXMLRPCClient) {
+        super(dispatcher);
+        mCommentRestClient = commentRestClient;
+        mCommentXMLRPCClient = commentXMLRPCClient;
+    }
+
+    // Getters
+
+    /**
+     * Get a list of comment for a specific site.
+     *
+     * @param site Site model to get comment for.
+     * @param orderByDateAscending If true order the results by ascending published date.
+     *                             If false, order the results by descending published date.
+     * @param statuses Array of status or CommentStatus.ALL to get all of them.
+     * @param limit Maximum number of comments to return. 0 is unlimited.
+     */
+    @NonNull
+    @SuppressLint("WrongConstant")
+    public List<CommentModel> getCommentsForSite(
+            @NonNull SiteModel site,
+            boolean orderByDateAscending,
+            int limit,
+            @NonNull CommentStatus... statuses) {
+        @Order int order = orderByDateAscending ? SelectQuery.ORDER_ASCENDING : SelectQuery.ORDER_DESCENDING;
+        return CommentSqlUtils.getCommentsForSite(site, order, limit, statuses);
+    }
+
+    public int getNumberOfCommentsForSite(
+            @NonNull SiteModel site,
+            @NonNull CommentStatus... statuses) {
+        return CommentSqlUtils.getCommentsCountForSite(site, statuses);
+    }
+
+    @Nullable
+    @SuppressWarnings("UnusedReturnValue")
+    public CommentModel getCommentBySiteAndRemoteId(@NonNull SiteModel site, long remoteCommentId) {
+        return CommentSqlUtils.getCommentBySiteAndRemoteId(site, remoteCommentId);
+    }
+
+    @Nullable
+    public CommentModel getCommentByLocalId(int localId) {
+        return CommentSqlUtils.getCommentByLocalCommentId(localId);
+    }
+
+    // Store Methods
+
+    @Override
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @SuppressWarnings("rawtypes")
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof CommentAction)) {
+            return;
+        }
+
+        switch ((CommentAction) actionType) {
+            case FETCH_COMMENTS:
+                fetchComments((FetchCommentsPayload) action.getPayload());
+                break;
+            case FETCHED_COMMENTS:
+                handleFetchCommentsResponse((FetchCommentsResponsePayload) action.getPayload());
+                break;
+            case FETCH_COMMENT:
+                fetchComment((RemoteCommentPayload) action.getPayload());
+                break;
+            case FETCHED_COMMENT:
+                handleFetchCommentResponse((RemoteCommentResponsePayload) action.getPayload());
+                break;
+            case CREATE_NEW_COMMENT:
+                createNewComment((RemoteCreateCommentPayload) action.getPayload());
+                break;
+            case CREATED_NEW_COMMENT:
+                handleCreatedNewComment((RemoteCommentResponsePayload) action.getPayload());
+                break;
+            case UPDATE_COMMENT:
+                updateComment((CommentModel) action.getPayload());
+                break;
+            case PUSH_COMMENT:
+                pushComment((RemoteCommentPayload) action.getPayload());
+                break;
+            case PUSHED_COMMENT:
+                handlePushCommentResponse((RemoteCommentResponsePayload) action.getPayload());
+                break;
+            case REMOVE_COMMENTS:
+                removeComments((SiteModel) action.getPayload());
+                break;
+            case REMOVE_COMMENT:
+                removeComment((CommentModel) action.getPayload());
+                break;
+            case REMOVE_ALL_COMMENTS:
+                removeAllComments();
+                break;
+            case DELETE_COMMENT:
+                deleteComment((RemoteCommentPayload) action.getPayload());
+                break;
+            case DELETED_COMMENT:
+                handleDeletedCommentResponse((RemoteCommentResponsePayload) action.getPayload());
+                break;
+            case LIKE_COMMENT:
+                likeComment((RemoteLikeCommentPayload) action.getPayload());
+                break;
+            case LIKED_COMMENT:
+                handleLikedCommentResponse((RemoteCommentResponsePayload) action.getPayload());
+                break;
+            case FETCH_COMMENT_LIKES:
+                fetchCommentLikes((FetchCommentLikesPayload) action.getPayload());
+                break;
+            case FETCHED_COMMENT_LIKES:
+                handleFetchedCommentLikes((FetchedCommentLikesResponsePayload) action.getPayload());
+                break;
+        }
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(T.API, this.getClass().getName() + ": onRegister");
+    }
+
+    // Private methods
+
+    private void createNewComment(@NonNull RemoteCreateCommentPayload payload) {
+        if (payload.post != null && payload.reply == null) {
+            // Create a new comment on a specific Post
+            if (payload.site.isUsingWpComRestApi()) {
+                mCommentRestClient.createNewComment(payload.site, payload.post, payload.comment);
+            } else {
+                mCommentXMLRPCClient.createNewComment(payload.site, payload.post, payload.comment);
+            }
+        } else if (payload.reply != null && payload.post == null) {
+            // Create a new reply to a specific Comment
+            if (payload.site.isUsingWpComRestApi()) {
+                mCommentRestClient.createNewReply(payload.site, payload.comment, payload.reply);
+            } else {
+                mCommentXMLRPCClient.createNewReply(payload.site, payload.comment, payload.reply);
+            }
+        } else {
+            throw new IllegalStateException(
+                    "Either post or reply must be not null and both can't be not null at the same time!"
+            );
+        }
+    }
+
+    private void handleCreatedNewComment(@NonNull RemoteCommentResponsePayload payload) {
+        OnCommentChanged event = new OnCommentChanged(1, CommentAction.CREATE_NEW_COMMENT);
+
+        // Update the comment from the DB
+        if (!payload.isError()) {
+            CommentSqlUtils.insertOrUpdateComment(payload.comment);
+        }
+        if (payload.comment != null) {
+            event.changedCommentsLocalIds.add(payload.comment.getId());
+        }
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void updateComment(@NonNull CommentModel payload) {
+        int rowsAffected = 0;
+        if (!payload.isError()) {
+            rowsAffected = CommentSqlUtils.insertOrUpdateComment(payload);
+        }
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.UPDATE_COMMENT);
+        event.changedCommentsLocalIds.add(payload.getId());
+        emitChange(event);
+    }
+
+    private void removeComment(@NonNull CommentModel payload) {
+        int rowsAffected = CommentSqlUtils.removeComment(payload);
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.REMOVE_COMMENT);
+        event.changedCommentsLocalIds.add(payload.getId());
+        emitChange(event);
+    }
+
+    private void removeComments(@NonNull SiteModel payload) {
+        int rowsAffected = CommentSqlUtils.removeComments(payload);
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.REMOVE_COMMENTS);
+        // Doesn't make sense to update here event.changedCommentsLocalIds
+        emitChange(event);
+    }
+
+    private void removeAllComments() {
+        int rowsAffected = CommentSqlUtils.deleteAllComments();
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.REMOVE_ALL_COMMENTS);
+        emitChange(event);
+    }
+
+    private void deleteComment(@NonNull RemoteCommentPayload payload) {
+        // If the comment is stored locally, we want to update it locally (needed because in some
+        // cases we use this to update comments by remote id).
+        CommentModel comment = payload.comment;
+        if (payload.comment == null) {
+            getCommentBySiteAndRemoteId(payload.site, payload.remoteCommentId);
+        }
+        if (payload.site.isUsingWpComRestApi()) {
+            mCommentRestClient.deleteComment(payload.site, getPrioritizedRemoteCommentId(payload), comment);
+        } else {
+            mCommentXMLRPCClient.deleteComment(payload.site, getPrioritizedRemoteCommentId(payload), comment);
+        }
+    }
+
+    private void handleDeletedCommentResponse(@NonNull RemoteCommentResponsePayload payload) {
+        OnCommentChanged event = new OnCommentChanged(0, CommentAction.DELETE_COMMENT);
+        if (payload.comment != null) {
+            event.changedCommentsLocalIds.add(payload.comment.getId());
+        }
+        event.error = payload.error;
+        if (!payload.isError()) {
+            // Delete once means "send to trash", so we don't want to remove it from the DB, just update it's
+            // status. Delete twice means "farewell comment, we won't see you ever again". Only delete from the DB if
+            // the status is "deleted".
+            if (payload.comment != null && payload.comment.getStatus().equals(CommentStatus.DELETED.toString())) {
+                CommentSqlUtils.removeComment(payload.comment);
+            } else {
+                // Update the local copy, only the status should have changed ("trash")
+                CommentSqlUtils.insertOrUpdateComment(payload.comment);
+            }
+        }
+        emitChange(event);
+    }
+
+    private void fetchComments(@NonNull FetchCommentsPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mCommentRestClient.fetchComments(payload.site, payload.number, payload.offset, payload.status);
+        } else {
+            mCommentXMLRPCClient.fetchComments(payload.site, payload.number, payload.offset, payload.status);
+        }
+    }
+
+    private void handleFetchCommentsResponse(@NonNull FetchCommentsResponsePayload payload) {
+        int rowsAffected = 0;
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.FETCH_COMMENTS);
+        if (!payload.isError()) {
+            // Find comments that were deleted or moved to a different status on the server and remove them from
+            // local DB.
+            CommentSqlUtils.removeCommentGaps(
+                    payload.site, payload.comments, payload.number, payload.offset, payload.requestedStatus);
+
+            for (CommentModel comment : payload.comments) {
+                rowsAffected += CommentSqlUtils.insertOrUpdateComment(comment);
+                event.changedCommentsLocalIds.add(comment.getId());
+            }
+        }
+        event.error = payload.error;
+        event.requestedStatus = payload.requestedStatus;
+        event.offset = payload.offset;
+        emitChange(event);
+    }
+
+    private void pushComment(@NonNull RemoteCommentPayload payload) {
+        if (payload.comment != null) {
+            if (payload.site.isUsingWpComRestApi()) {
+                mCommentRestClient.pushComment(payload.site, payload.comment);
+            } else {
+                mCommentXMLRPCClient.pushComment(payload.site, payload.comment);
+            }
+        } else {
+            OnCommentChanged event = new OnCommentChanged(0, CommentAction.PUSH_COMMENT);
+            event.error = new CommentError(CommentErrorType.INVALID_INPUT, "Comment can't be null");
+            emitChange(event);
+        }
+    }
+
+    private void handlePushCommentResponse(@NonNull RemoteCommentResponsePayload payload) {
+        int rowsAffected = 0;
+        if (!payload.isError()) {
+            rowsAffected = CommentSqlUtils.insertOrUpdateComment(payload.comment);
+        }
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.PUSH_COMMENT);
+        if (payload.comment != null) {
+            event.changedCommentsLocalIds.add(payload.comment.getId());
+        }
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void fetchComment(@NonNull RemoteCommentPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mCommentRestClient.fetchComment(payload.site, getPrioritizedRemoteCommentId(payload), payload.comment);
+        } else {
+            mCommentXMLRPCClient.fetchComment(payload.site, getPrioritizedRemoteCommentId(payload), payload.comment);
+        }
+    }
+
+    private long getPrioritizedRemoteCommentId(@NonNull RemoteCommentPayload payload) {
+        if (payload.comment != null) {
+            return payload.comment.getRemoteCommentId();
+        } else {
+            return payload.remoteCommentId;
+        }
+    }
+
+    private void handleFetchCommentResponse(@NonNull RemoteCommentResponsePayload payload) {
+        int rowsAffected = 0;
+        if (!payload.isError()) {
+            rowsAffected = CommentSqlUtils.insertOrUpdateComment(payload.comment);
+        }
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.FETCH_COMMENT);
+        if (payload.comment != null) {
+            event.changedCommentsLocalIds.add(payload.comment.getId());
+        }
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void likeComment(@NonNull RemoteLikeCommentPayload payload) {
+        // If the comment is stored locally, we want to update it locally (needed because in some
+        // cases we use this to update comments by remote id).
+        CommentModel comment = payload.comment;
+        if (payload.comment == null) {
+            getCommentBySiteAndRemoteId(payload.site, payload.remoteCommentId);
+        }
+        if (payload.site.isUsingWpComRestApi()) {
+            mCommentRestClient.likeComment(payload.site, getPrioritizedRemoteCommentId(payload), comment, payload.like);
+        } else {
+            OnCommentChanged event = new OnCommentChanged(0, CommentAction.LIKE_COMMENT);
+            if (payload.comment != null) {
+                event.changedCommentsLocalIds.add(payload.comment.getId());
+            }
+            event.error = new CommentError(CommentErrorType.INVALID_INPUT, "Can't like a comment on XMLRPC API");
+            emitChange(event);
+        }
+    }
+
+    private void handleLikedCommentResponse(@NonNull RemoteCommentResponsePayload payload) {
+        int rowsAffected = 0;
+        if (!payload.isError()) {
+            rowsAffected = CommentSqlUtils.insertOrUpdateComment(payload.comment);
+        }
+        OnCommentChanged event = new OnCommentChanged(rowsAffected, CommentAction.LIKE_COMMENT);
+        if (payload.comment != null) {
+            event.changedCommentsLocalIds.add(payload.comment.getId());
+        }
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void fetchCommentLikes(@NonNull FetchCommentLikesPayload payload) {
+        mCommentRestClient.fetchCommentLikes(
+                payload.siteId,
+                payload.remoteCommentId,
+                payload.requestNextPage,
+                payload.pageLength
+        );
+    }
+
+    private void handleFetchedCommentLikes(@NonNull FetchedCommentLikesResponsePayload payload) {
+        OnCommentLikesChanged event = new OnCommentLikesChanged(
+                payload.siteId,
+                payload.commentRemoteId,
+                payload.hasMore,
+                CommentAction.FETCHED_COMMENT_LIKES
+        );
+        if (!payload.isError()) {
+            if (!payload.isRequestNextPage) {
+                CommentSqlUtils.deleteCommentLikesAndPurgeExpired(payload.siteId, payload.commentRemoteId);
+            }
+
+            for (LikeModel like : payload.likes) {
+                CommentSqlUtils.insertOrUpdateCommentLikes(payload.siteId, payload.commentRemoteId, like);
+            }
+            event.commentLikes.addAll(CommentSqlUtils.getCommentLikesByCommentId(
+                    payload.siteId,
+                    payload.commentRemoteId
+            ));
+        } else {
+            List<LikeModel> cachedLikes = CommentSqlUtils.getCommentLikesByCommentId(
+                    payload.siteId,
+                    payload.commentRemoteId
+            );
+            event.commentLikes.addAll(cachedLikes);
+        }
+
+        event.error = payload.error;
+        emitChange(event);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentsStore.kt
new file mode 100644
index 00000000000..1da5a809a78
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/CommentsStore.kt
@@ -0,0 +1,864 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.CommentAction
+import org.wordpress.android.fluxc.action.CommentsAction
+import org.wordpress.android.fluxc.action.CommentsAction.CREATED_NEW_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.CREATE_NEW_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.DELETED_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.DELETE_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.FETCHED_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.FETCHED_COMMENTS
+import org.wordpress.android.fluxc.action.CommentsAction.FETCH_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.FETCH_COMMENTS
+import org.wordpress.android.fluxc.action.CommentsAction.LIKED_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.LIKE_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.PUSHED_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.PUSH_COMMENT
+import org.wordpress.android.fluxc.action.CommentsAction.UPDATE_COMMENT
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.CommentStatus.ALL
+import org.wordpress.android.fluxc.model.CommentStatus.APPROVED
+import org.wordpress.android.fluxc.model.CommentStatus.DELETED
+import org.wordpress.android.fluxc.model.CommentStatus.TRASH
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.comments.CommentsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.comment.CommentsRestClient
+import org.wordpress.android.fluxc.network.xmlrpc.comment.CommentsXMLRPCClient
+import org.wordpress.android.fluxc.persistence.comments.CommentEntityList
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao
+import org.wordpress.android.fluxc.persistence.comments.CommentsDao.CommentEntity
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.INVALID_INPUT
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsPayload
+import org.wordpress.android.fluxc.store.CommentStore.OnCommentChanged
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCreateCommentPayload
+import org.wordpress.android.fluxc.store.CommentStore.RemoteLikeCommentPayload
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.CommentsActionData
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.CommentsActionEntityIds
+import org.wordpress.android.fluxc.store.CommentsStore.CommentsData.PagingData
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import org.wordpress.android.util.AppLog.T.COMMENTS
+import java.lang.IllegalStateException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Suppress("LargeClass")
+@Singleton
+class CommentsStore @Inject constructor(
+    private val commentsRestClient: CommentsRestClient,
+    private val commentsXMLRPCClient: CommentsXMLRPCClient,
+    private val commentsDao: CommentsDao,
+    private val commentsMapper: CommentsMapper,
+    private val coroutineEngine: CoroutineEngine,
+    private val appLogWrapper: AppLogWrapper,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    data class CommentsActionPayload<T>(
+        val data: T? = null
+    ) : Payload<CommentError>() {
+        constructor(error: CommentError) : this() {
+            this.error = error
+        }
+
+        constructor(error: CommentError, data: T?) : this(data) {
+            this.error = error
+        }
+    }
+
+    sealed class CommentsData {
+        data class PagingData(val comments: CommentEntityList, val hasMore: Boolean) : CommentsData() {
+            companion object {
+                fun empty() = PagingData(comments = listOf(), hasMore = false)
+            }
+        }
+        data class CommentsActionData(val comments: CommentEntityList, val rowsAffected: Int) : CommentsData()
+        data class CommentsActionEntityIds(val entityIds: List<Long>, val rowsAffected: Int) : CommentsData()
+        object DoNotCare : CommentsData()
+    }
+
+    suspend fun getCommentsForSite(
+        site: SiteModel?,
+        orderByDateAscending: Boolean,
+        limit: Int,
+        vararg statuses: CommentStatus
+    ): CommentEntityList {
+        if (site == null) return listOf()
+
+        return commentsDao.getCommentsByLocalSiteId(
+                localSiteId = site.id,
+                statuses = if (statuses.asList().contains(ALL)) listOf() else statuses.map { it.toString() },
+                limit = limit,
+                orderAscending = orderByDateAscending
+        )
+    }
+
+    suspend fun fetchComments(
+        site: SiteModel,
+        number: Int,
+        offset: Int,
+        networkStatusFilter: CommentStatus
+    ): CommentsActionPayload<CommentsActionEntityIds> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.fetchCommentsPage(
+                    site = site,
+                    number = number,
+                    offset = offset,
+                    status = networkStatusFilter
+            )
+        } else {
+            commentsXMLRPCClient.fetchCommentsPage(
+                    site = site,
+                    number = number,
+                    offset = offset,
+                    status = networkStatusFilter
+            )
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error)
+        } else {
+            payload.response?.let { comments ->
+                removeCommentGaps(site, comments, number, offset, networkStatusFilter)
+
+                val entityIds = comments.map { comment ->
+                    commentsDao.insertOrUpdateComment(comment)
+                }
+                CommentsActionPayload(CommentsActionEntityIds(entityIds, entityIds.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun fetchComment(
+        site: SiteModel,
+        remoteCommentId: Long,
+        comment: CommentEntity?
+    ): CommentsActionPayload<CommentsActionData> {
+        val remoteCommentIdToFetch = comment?.remoteCommentId ?: remoteCommentId
+
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.fetchComment(site, remoteCommentIdToFetch)
+        } else {
+            commentsXMLRPCClient.fetchComment(site, remoteCommentIdToFetch)
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(comment.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let {
+                val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(it)
+                CommentsActionPayload(CommentsActionData(cachedCommentAsList, cachedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun createNewComment(site: SiteModel, comment: CommentEntity): CommentsActionPayload<CommentsActionData> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.createNewComment(site, comment.remotePostId, comment.content)
+        } else {
+            commentsXMLRPCClient.createNewComment(site, comment.remotePostId, comment)
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(comment.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let {
+                val commentUpdated = it.copy(id = comment.id)
+                val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(commentUpdated)
+                CommentsActionPayload(CommentsActionData(cachedCommentAsList, cachedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun createNewReply(
+        site: SiteModel,
+        comment: CommentEntity,
+        reply: CommentEntity
+    ): CommentsActionPayload<CommentsActionData> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.createNewReply(site, comment.remoteCommentId, reply.content)
+        } else {
+            commentsXMLRPCClient.createNewReply(site, comment, reply)
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(reply.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let {
+                val commentUpdated = it.copy(id = reply.id)
+                val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(commentUpdated)
+                CommentsActionPayload(CommentsActionData(cachedCommentAsList, cachedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun pushComment(site: SiteModel, comment: CommentEntity): CommentsActionPayload<CommentsActionData> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.pushComment(site, comment)
+        } else {
+            commentsXMLRPCClient.pushComment(site, comment)
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(comment.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let {
+                val commentUpdated = it.copy(id = comment.id)
+                val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(commentUpdated)
+                CommentsActionPayload(CommentsActionData(cachedCommentAsList, cachedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun updateEditComment(site: SiteModel, comment: CommentEntity): CommentsActionPayload<CommentsActionData> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.updateEditComment(site, comment)
+        } else {
+            commentsXMLRPCClient.updateEditComment(site, comment)
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(comment.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let {
+                val commentUpdated = it.copy(id = comment.id)
+                val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(commentUpdated)
+                CommentsActionPayload(CommentsActionData(cachedCommentAsList, cachedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    @Suppress("ComplexMethod", "ReturnCount")
+    suspend fun deleteComment(
+        site: SiteModel,
+        remoteCommentId: Long,
+        comment: CommentEntity?
+    ): CommentsActionPayload<CommentsActionData> {
+        // If the comment is stored locally, we want to update it locally (needed because in some
+        // cases we use this to update comments by remote id).
+        val commentToDelete = comment ?: commentsDao.getCommentsByLocalSiteAndRemoteCommentId(
+                site.id,
+                remoteCommentId
+        ).firstOrNull()
+
+        val remoteCommentIdToDelete = commentToDelete?.remoteCommentId ?: remoteCommentId
+
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.deleteComment(site, remoteCommentIdToDelete)
+        } else {
+            commentsXMLRPCClient.deleteComment(site, remoteCommentIdToDelete)
+        }
+
+        if (payload.isError) {
+            return CommentsActionPayload(payload.error, CommentsActionData(commentToDelete.toListOrEmpty(), 0))
+        } else {
+            val targetComment = when {
+                site.isUsingWpComRestApi && payload.response == null -> {
+                    return CommentsActionPayload(CommentError(
+                            INVALID_RESPONSE,
+                            "Network response was valid but empty!"
+                    ))
+                }
+                site.isUsingWpComRestApi && payload.response != null -> {
+                    val commentFromEndpoint: CommentEntity = payload.response
+                    commentToDelete?.let { entity ->
+                        commentFromEndpoint.copy(id = entity.id)
+                    } ?: commentFromEndpoint
+                }
+                else -> { // this means !site.isUsingWpComRestApi is true
+                    // This is ugly but the XMLRPC response doesn't contain any info about the update comment.
+                    // So we're copying the logic here: if the comment status was "trash" before and the delete
+                    // call is successful, then we want to delete this comment. Setting the "deleted" status
+                    // will ensure the comment is deleted in the rest of the logic.
+                    commentToDelete?.let {
+                        it.copy(
+                                status = if (DELETED.toString() == it.status || TRASH.toString() == it.status) {
+                                    DELETED.toString()
+                                } else {
+                                    TRASH.toString()
+                                }
+                        )
+                    }
+                }
+            }
+
+            return targetComment?.let {
+                // Delete once means "send to trash", so we don't want to remove it from the DB, just update it's
+                // status. Delete twice means "farewell comment, we won't see you ever again". Only delete from the
+                // DB if the status is "deleted".
+                val deletedCommentAsList = if (it.status?.equals(DELETED.toString()) == true) {
+                    commentsDao.deleteComment(it)
+                    it.toListOrEmpty()
+                } else {
+                    // Update the local copy, only the status should have changed ("trash")
+                    commentsDao.insertOrUpdateCommentForResult(it)
+                }
+
+                CommentsActionPayload(CommentsActionData(deletedCommentAsList, deletedCommentAsList.size))
+            } ?: CommentsActionPayload(CommentsActionData(listOf(), 0))
+        }
+    }
+
+    suspend fun likeComment(
+        site: SiteModel,
+        remoteCommentId: Long,
+        comment: CommentEntity?,
+        isLike: Boolean
+    ): CommentsActionPayload<CommentsActionData> {
+        // If the comment is stored locally, we want to update it locally (needed because in some
+        // cases we use this to update comments by remote id).
+        val commentToLike = comment ?: commentsDao.getCommentsByLocalSiteAndRemoteCommentId(
+                site.id,
+                remoteCommentId
+        ).firstOrNull()
+        val remoteCommentIdToLike = commentToLike?.remoteCommentId ?: remoteCommentId
+
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.likeComment(site, remoteCommentIdToLike, isLike)
+        } else {
+            return CommentsActionPayload(
+                    CommentError(
+                            INVALID_INPUT,
+                            "Can't like a comment on XMLRPC API"
+                    ),
+                    CommentsActionData(
+                            commentToLike.toListOrEmpty(),
+                            0
+                    )
+            )
+        }
+
+        return if (payload.isError) {
+            CommentsActionPayload(payload.error, CommentsActionData(commentToLike.toListOrEmpty(), 0))
+        } else {
+            payload.response?.let { endpointResponse ->
+                val updatedComment = commentToLike?.copy(iLike = endpointResponse.i_like)
+
+                val (rowsAffected, likedCommentAsList) = updatedComment?.let {
+                    Pair(1, commentsDao.insertOrUpdateCommentForResult(it))
+                } ?: Pair(0, updatedComment.toListOrEmpty())
+
+                CommentsActionPayload(CommentsActionData(likedCommentAsList, rowsAffected))
+            } ?: CommentsActionPayload(CommentError(INVALID_RESPONSE, "Network response was valid but empty!"))
+        }
+    }
+
+    suspend fun updateComment(
+        isError: Boolean,
+        commentId: Long,
+        comment: CommentEntity
+    ): CommentsActionPayload<CommentsActionEntityIds> {
+        val (entityId, rowsAffected) = if (isError) {
+            Pair(commentId, 0)
+        } else {
+            Pair(commentsDao.insertOrUpdateComment(comment), 1)
+        }
+
+        return CommentsActionPayload(CommentsActionEntityIds(listOf(entityId), rowsAffected))
+    }
+
+    suspend fun fetchCommentsPage(
+        site: SiteModel,
+        number: Int,
+        offset: Int,
+        networkStatusFilter: CommentStatus,
+        cacheStatuses: List<CommentStatus>
+    ): CommentsActionPayload<PagingData> {
+        val payload = if (site.isUsingWpComRestApi) {
+            commentsRestClient.fetchCommentsPage(
+                    site = site,
+                    number = number,
+                    offset = offset,
+                    status = networkStatusFilter
+            )
+        } else {
+            commentsXMLRPCClient.fetchCommentsPage(
+                    site = site,
+                    number = number,
+                    offset = offset,
+                    status = networkStatusFilter
+            )
+        }
+
+        return if (payload.isError) {
+            val cachedComments = if (offset > 0) {
+                commentsDao.getCommentsByLocalSiteId(
+                        localSiteId = site.id,
+                        statuses = cacheStatuses.map { it.toString() },
+                        limit = offset,
+                        orderAscending = false
+                )
+            } else {
+                listOf()
+            }
+            CommentsActionPayload(payload.error, PagingData(
+                    comments = cachedComments,
+                    hasMore = cachedComments.isNotEmpty()
+            ))
+        } else {
+            val comments = payload.response?.map { it } ?: listOf()
+
+            removeCommentGaps(site, comments, number, offset, networkStatusFilter)
+
+            commentsDao.appendOrUpdateComments(comments = comments)
+
+            val cachedComments = commentsDao.getCommentsByLocalSiteId(
+                    localSiteId = site.id,
+                    statuses = cacheStatuses.map { it.toString() },
+                    limit = offset + comments.size,
+                    orderAscending = false
+            )
+
+            CommentsActionPayload(PagingData(comments = cachedComments, hasMore = comments.size == number))
+        }
+    }
+
+    suspend fun moderateCommentLocally(
+        site: SiteModel,
+        remoteCommentId: Long,
+        newStatus: CommentStatus
+    ): CommentsActionPayload<CommentsActionData> {
+        val comment = commentsDao.getCommentsByLocalSiteAndRemoteCommentId(
+                site.id,
+                remoteCommentId
+        ).firstOrNull() ?: return CommentsActionPayload(CommentError(INVALID_INPUT, "Comment cannot be null!"))
+
+        val commentToModerate = comment.copy(status = newStatus.toString())
+        val cachedCommentAsList = commentsDao.insertOrUpdateCommentForResult(commentToModerate)
+
+        return CommentsActionPayload(CommentsActionData(
+                comments = cachedCommentAsList,
+                rowsAffected = cachedCommentAsList.size
+        ))
+    }
+
+    suspend fun getCommentByLocalId(localId: Long) = commentsDao.getCommentById(localId)
+
+    suspend fun getCommentByLocalSiteAndRemoteId(localSiteId: Int, remoteCommentId: Long) =
+            commentsDao.getCommentsByLocalSiteAndRemoteCommentId(localSiteId, remoteCommentId)
+
+    suspend fun pushLocalCommentByRemoteId(
+        site: SiteModel,
+        remoteCommentId: Long
+    ): CommentsActionPayload<CommentsActionData> {
+        val comment = commentsDao.getCommentsByLocalSiteAndRemoteCommentId(
+                site.id,
+                remoteCommentId
+        ).firstOrNull() ?: return CommentsActionPayload(CommentError(INVALID_INPUT, "Comment cannot be null!"))
+
+        return pushComment(site, comment)
+    }
+
+    suspend fun getCachedComments(
+        site: SiteModel,
+        cacheStatuses: List<CommentStatus>,
+        imposeHasMore: Boolean
+    ): CommentsActionPayload<PagingData> {
+        val cachedComments = commentsDao.getFilteredComments(
+                localSiteId = site.id,
+                statuses = cacheStatuses.map { it.toString() }
+        )
+
+        return CommentsActionPayload(PagingData(comments = cachedComments, imposeHasMore))
+    }
+
+    @Deprecated(
+            "Action and event bus support should be gradually replaced while the Comments Unification project proceeds"
+    )
+    override fun onRegister() {
+        // We cannot use the AppLogWrapper here since it's still null at this point
+        AppLog.d(API, this.javaClass.name + ": onRegister")
+    }
+
+    @Deprecated(
+            "Action and event bus support should be gradually replaced while the Comments Unification project proceeds"
+    )
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? CommentsAction ?: return
+
+        when (actionType) {
+            FETCH_COMMENTS -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On FETCH_COMMENTS") {
+                    emitChange(onFetchComments(action.payload as FetchCommentsPayload))
+                }
+            }
+            FETCH_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On FETCH_COMMENT") {
+                    emitChange(onFetchComment(action.payload as RemoteCommentPayload))
+                }
+            }
+            CREATE_NEW_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On CREATE_NEW_COMMENT") {
+                    emitChange(onCreateNewComment(action.payload as RemoteCreateCommentPayload))
+                }
+            }
+            PUSH_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On PUSH_COMMENT") {
+                    emitChange(onPushComment(action.payload as RemoteCommentPayload))
+                }
+            }
+            DELETE_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On DELETE_COMMENT") {
+                    emitChange(onDeleteComment(action.payload as RemoteCommentPayload))
+                }
+            }
+            LIKE_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On LIKE_COMMENT") {
+                    emitChange(onLikeComment(action.payload as RemoteLikeCommentPayload))
+                }
+            }
+            UPDATE_COMMENT -> {
+                coroutineEngine.launch(API, this, "CommentsStore: On UPDATE_COMMENT") {
+                    emitChange(onUpdateComment(action.payload as CommentModel))
+                }
+            }
+            FETCHED_COMMENTS,
+            FETCHED_COMMENT,
+            CREATED_NEW_COMMENT,
+            PUSHED_COMMENT,
+            DELETED_COMMENT,
+            LIKED_COMMENT -> throw IllegalArgumentException(
+                    "CommentsStore > onAction: received illegal action type [$actionType]"
+            )
+        }
+    }
+
+    @Deprecated(
+            "Action and event bus support should be gradually replaced while the Comments Unification project proceeds",
+            ReplaceWith("use fetchComments suspend fun directly")
+    )
+    private suspend fun onFetchComments(payload: FetchCommentsPayload): OnCommentChanged {
+        val response = fetchComments(
+                site = payload.site,
+                number = payload.number,
+                offset = payload.offset,
+                networkStatusFilter = payload.status
+        )
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.FETCH_COMMENTS,
+                response.error,
+                response.data.toCommentIdsListOrEmpty(),
+                payload.status,
+                payload.offset
+        )
+    }
+
+    @Deprecated(
+        message = "Action and event bus support should be gradually replaced while the " +
+                "Comments Unification project proceeds",
+        replaceWith = ReplaceWith("use fetchComment suspend fun directly")
+    )
+    private suspend fun onFetchComment(payload: RemoteCommentPayload): OnCommentChanged {
+        val response = fetchComment(
+                payload.site,
+                payload.remoteCommentId,
+                payload.comment?.let { commentsMapper.commentLegacyModelToEntity(it) }
+        )
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.FETCH_COMMENT,
+                response.error,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    @Deprecated(
+            message = "Action and event bus support should be gradually replaced while the " +
+                    "Comments Unification project proceeds",
+            replaceWith = ReplaceWith("use updateComment suspend fun directly")
+    )
+    private suspend fun onUpdateComment(payload: CommentModel): OnCommentChanged {
+        val response = updateComment(
+                isError = payload.isError,
+                commentId = payload.id.toLong(),
+                comment = commentsMapper.commentLegacyModelToEntity(payload)
+        )
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.UPDATE_COMMENT,
+                null,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    @Deprecated(
+            message = "Action and event bus support should be gradually replaced while the " +
+                    "Comments Unification project proceeds",
+            replaceWith = ReplaceWith("use deleteComment suspend fun directly")
+    )
+    private suspend fun onDeleteComment(payload: RemoteCommentPayload): OnCommentChanged {
+        val response = deleteComment(
+                payload.site,
+                payload.remoteCommentId,
+                payload.comment?.let { commentsMapper.commentLegacyModelToEntity(it) }
+        )
+
+        return createOnCommentChangedEvent(
+                // Keeping here the rowsAffected set to 0 as it is in original handleDeletedCommentResponse
+                0,
+                CommentAction.DELETE_COMMENT,
+                response.error,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    @Deprecated(
+            message = "Action and event bus support should be gradually replaced while the " +
+                    "Comments Unification project proceeds",
+            replaceWith = ReplaceWith("use likeComment suspend fun directly")
+    )
+    private suspend fun onLikeComment(payload: RemoteLikeCommentPayload): OnCommentChanged {
+        val response = likeComment(
+                payload.site,
+                payload.remoteCommentId,
+                payload.comment?.let { commentsMapper.commentLegacyModelToEntity(it) },
+                payload.like
+        )
+
+        if (!response.isError) {
+            response.data?.comments?.firstOrNull()?.let { entity ->
+                payload.comment?.apply {
+                    this.iLike = entity.iLike
+                }
+            }
+        }
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.LIKE_COMMENT,
+                response.error,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    @Deprecated(
+            message = "Action and event bus support should be gradually replaced while the " +
+                    "Comments Unification project proceeds",
+            replaceWith = ReplaceWith("use pushComment suspend fun directly")
+    )
+    private suspend fun onPushComment(payload: RemoteCommentPayload): OnCommentChanged {
+        if (payload.comment == null) {
+            return OnCommentChanged(0, CommentAction.PUSH_COMMENT).apply {
+                this.error = CommentError(INVALID_INPUT, "Comment can't be null")
+            }
+        }
+
+        val response = pushComment(
+                payload.site,
+                commentsMapper.commentLegacyModelToEntity(payload.comment)
+        )
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.PUSH_COMMENT,
+                response.error,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    @Deprecated(
+            message = "Action and event bus support should be gradually replaced while the " +
+                    "Comments Unification project proceeds",
+            replaceWith = ReplaceWith("use createNewComment suspend fun directly")
+    )
+    @Suppress("UseCheckOrError")
+    private suspend fun onCreateNewComment(payload: RemoteCreateCommentPayload): OnCommentChanged {
+        val response = if (payload.post != null && payload.reply == null) {
+            // Create a new comment on a specific Post
+            createNewComment(
+                    payload.site,
+                    commentsMapper.commentLegacyModelToEntity(payload.comment)
+            )
+        } else if (payload.reply != null && payload.post == null) {
+            // Create a new reply to a specific Comment
+            createNewReply(
+                    payload.site,
+                    commentsMapper.commentLegacyModelToEntity(payload.comment),
+                    commentsMapper.commentLegacyModelToEntity(payload.reply)
+            )
+        } else {
+            throw IllegalStateException(
+                "Either post or reply must be not null and both can't be not null at the same time!"
+            )
+        }
+
+        return createOnCommentChangedEvent(
+                response.data?.rowsAffected.orNone(),
+                CommentAction.CREATE_NEW_COMMENT,
+                response.error,
+                response.data.toCommentIdsListOrEmpty()
+        )
+    }
+
+    private fun createOnCommentChangedEvent(
+        rowsAffected: Int,
+        actionType: CommentAction,
+        error: CommentError?,
+        commentLocalIds: List<Int>,
+        status: CommentStatus? = null,
+        offset: Int? = null
+    ): OnCommentChanged {
+        return OnCommentChanged(rowsAffected, actionType).apply {
+            this.changedCommentsLocalIds.addAll(commentLocalIds)
+            this.error = error
+            status?.let {
+                this.requestedStatus = it
+            }
+            offset?.let {
+                this.offset = offset
+            }
+        }
+    }
+
+    private fun CommentsActionData?.toCommentIdsListOrEmpty(): List<Int> {
+        return this?.comments?.map { it.id.toInt() } ?: listOf()
+    }
+
+    private fun CommentsActionEntityIds?.toCommentIdsListOrEmpty(): List<Int> {
+        return this?.entityIds?.map { it.toInt() } ?: listOf()
+    }
+
+    private fun CommentEntity?.toListOrEmpty(): List<CommentEntity> {
+        return this?.let {
+            listOf(it)
+        } ?: listOf()
+    }
+
+    private fun Int?.orNone(): Int {
+        return this ?: 0
+    }
+
+    @Suppress("LongMethod", "ReturnCount")
+    private suspend fun removeCommentGaps(
+        site: SiteModel?,
+        commentsList: CommentEntityList?,
+        maxEntriesInResponse: Int,
+        requestOffset: Int,
+        vararg statuses: CommentStatus
+    ): Int {
+        if (site == null || commentsList == null) {
+            return 0
+        }
+
+        val targetStatuses = if (listOf(*statuses).contains(ALL)) {
+            listOf(APPROVED, UNAPPROVED)
+        } else {
+            listOf(*statuses)
+        }.map { it.toString() }
+
+        appLogWrapper.d(
+                COMMENTS,
+                "removeCommentGaps -> siteId [${site.siteId}]  targetStatuses [$targetStatuses]"
+        )
+
+        if (commentsList.isEmpty()) {
+            return if (requestOffset == 0) {
+                val numOfDeletedComments = commentsDao.clearAllBySiteIdAndFilters(
+                        localSiteId = site.id,
+                        statuses = targetStatuses
+                )
+
+                appLogWrapper.d(
+                        COMMENTS,
+                        "removeCommentGaps -> commentsList empty deleted $numOfDeletedComments items"
+                )
+
+                numOfDeletedComments
+            } else {
+                appLogWrapper.d(
+                        COMMENTS,
+                        "removeCommentGaps -> commentsList empty and requestOffset != 0"
+                )
+                0
+            }
+        }
+
+        val comments = mutableListOf<CommentEntity>().apply { addAll(commentsList) }
+
+        comments.sortWith { o1, o2 ->
+            val x = o2.publishedTimestamp
+            val y = o1.publishedTimestamp
+            when {
+                x < y -> -1
+                x == y -> 0
+                else -> 1
+            }
+        }
+
+        val remoteIds = comments.map { it.remoteCommentId }
+
+        val startOfRange = comments.first().publishedTimestamp
+        val endOfRange = comments.last().publishedTimestamp
+
+        appLogWrapper.d(
+                COMMENTS,
+                "removeCommentGaps -> startOfRange [" + startOfRange + " - " +
+                        comments.first().datePublished + "] " + "endOfRange [" + endOfRange + " - " +
+                        comments.last().datePublished + "]"
+        )
+
+        var numOfDeletedComments = 0
+
+        // try to trim comments from the top
+        if (requestOffset == 0) {
+            numOfDeletedComments += commentsDao.removeGapsFromTheTop(
+                    localSiteId = site.id,
+                    statuses = targetStatuses,
+                    remoteIds = remoteIds,
+                    startOfRange = startOfRange
+            )
+            appLogWrapper.d(
+                    COMMENTS,
+                    "removeCommentGaps -> requestOffset == 0 -> numOfDeletedComments $numOfDeletedComments"
+            )
+        }
+
+        // try to trim comments from the bottom
+        if (comments.size < maxEntriesInResponse) {
+            numOfDeletedComments += commentsDao.removeGapsFromTheBottom(
+                    localSiteId = site.id,
+                    statuses = targetStatuses,
+                    remoteIds = remoteIds,
+                    endOfRange = endOfRange
+            )
+            appLogWrapper.d(
+                    COMMENTS,
+                    "removeCommentGaps -> comments.size() [" +
+                            comments.size + "] < maxEntriesInResponse [" +
+                            maxEntriesInResponse + "]" + "-> numOfDeletedComments " + numOfDeletedComments
+            )
+        }
+
+        // remove comments from the middle
+        numOfDeletedComments += commentsDao.removeGapsFromTheMiddle(
+                localSiteId = site.id,
+                statuses = targetStatuses,
+                remoteIds = remoteIds,
+                startOfRange = startOfRange,
+                endOfRange = endOfRange
+        )
+
+        appLogWrapper.d(
+                COMMENTS,
+                "removeCommentGaps -> removing from middle -> numOfDeletedComments $numOfDeletedComments"
+        )
+
+        return numOfDeletedComments
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EditorThemeStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EditorThemeStore.kt
new file mode 100644
index 00000000000..b8e9de1e32f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EditorThemeStore.kt
@@ -0,0 +1,188 @@
+package org.wordpress.android.fluxc.store
+
+import com.google.gson.Gson
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.EditorThemeAction
+import org.wordpress.android.fluxc.action.EditorThemeAction.FETCH_EDITOR_THEME
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.BlockEditorSettings
+import org.wordpress.android.fluxc.model.EditorTheme
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.persistence.EditorThemeSqlUtils
+import org.wordpress.android.fluxc.store.EditorThemeStore.ThemeChangedEndpoint.BLOCK_EDITOR
+import org.wordpress.android.fluxc.store.EditorThemeStore.ThemeChangedEndpoint.THEME_SUPPORTS
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Error
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Success
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.VersionUtils
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val THEME_REQUEST_PATH = "/wp/v2/themes?status=active"
+private const val EDITOR_SETTINGS_REQUEST_PATH = "wp-block-editor/v1/settings?context=mobile"
+private const val EDITOR_SETTINGS_WP_VERSION = "5.8"
+
+@Singleton
+class EditorThemeStore
+@Inject constructor(
+    private val reactNativeStore: ReactNativeStore,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    private val editorThemeSqlUtils = EditorThemeSqlUtils()
+
+    class FetchEditorThemePayload @JvmOverloads constructor(val site: SiteModel, val gssEnabled: Boolean = false) :
+            Payload<BaseNetworkError>()
+
+    data class OnEditorThemeChanged(
+        val editorTheme: EditorTheme?,
+        val siteId: Int,
+        val causeOfChange: EditorThemeAction,
+        val endpoint: ThemeChangedEndpoint
+    ) : Store.OnChanged<EditorThemeError>() {
+        constructor(error: EditorThemeError, causeOfChange: EditorThemeAction, endpoint: ThemeChangedEndpoint) :
+                this(editorTheme = null, siteId = -1, causeOfChange = causeOfChange, endpoint = endpoint) {
+            this.error = error
+        }
+    }
+
+    enum class ThemeChangedEndpoint(val value: String) {
+        THEME_SUPPORTS("theme_supports"),
+        BLOCK_EDITOR("wp-block-editor"),
+    }
+
+    class EditorThemeError(var message: String? = null) : OnChangedError
+
+    fun getEditorThemeForSite(site: SiteModel): EditorTheme? {
+        return editorThemeSqlUtils.getEditorThemeForSite(site)
+    }
+
+    fun getIsBlockBasedTheme(site: SiteModel): Boolean =
+        getEditorThemeForSite(site)?.themeSupport?.isEditorThemeBlockBased() ?: false
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? EditorThemeAction ?: return
+        when (actionType) {
+            FETCH_EDITOR_THEME -> {
+                coroutineEngine.launch(
+                        AppLog.T.API,
+                        this,
+                        EditorThemeStore::class.java.simpleName + ": On FETCH_EDITOR_THEME"
+                ) {
+                    val payload = action.payload as FetchEditorThemePayload
+                    if (editorSettingsAvailable(payload.site, payload.gssEnabled)) {
+                        fetchEditorSettings(payload.site, actionType)
+                    } else {
+                        fetchEditorTheme(payload.site, actionType)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, EditorThemeStore::class.java.simpleName + " onRegister")
+    }
+
+    private suspend fun fetchEditorTheme(site: SiteModel, action: EditorThemeAction) {
+        val response = reactNativeStore.executeGetRequest(site, THEME_REQUEST_PATH, false)
+
+        when (response) {
+            is Success -> {
+                val noThemeError = OnEditorThemeChanged(
+                        EditorThemeError("Response does not contain a theme"),
+                        action,
+                        THEME_SUPPORTS
+                )
+                if (response.result == null || !response.result.isJsonArray) {
+                    emitChange(noThemeError)
+                    return
+                }
+
+                val responseTheme = response.result.asJsonArray.firstOrNull()
+                if (responseTheme == null) {
+                    emitChange(noThemeError)
+                    return
+                }
+
+                val newTheme = Gson().fromJson(responseTheme, EditorTheme::class.java)
+                val existingTheme = editorThemeSqlUtils.getEditorThemeForSite(site)
+                if (newTheme != existingTheme) {
+                    editorThemeSqlUtils.replaceEditorThemeForSite(site, newTheme)
+                    val onChanged = OnEditorThemeChanged(newTheme, site.id, action, THEME_SUPPORTS)
+                    emitChange(onChanged)
+                }
+            }
+            is Error -> {
+                val onChanged = OnEditorThemeChanged(EditorThemeError(response.error.message), action, THEME_SUPPORTS)
+                emitChange(onChanged)
+            }
+        }
+    }
+
+    private suspend fun fetchEditorSettings(site: SiteModel, action: EditorThemeAction) {
+        val response = reactNativeStore.executeGetRequest(site, EDITOR_SETTINGS_REQUEST_PATH, false)
+
+        when (response) {
+            is Success -> {
+                response.handleFetchEditorSettingsResponse(site, action, BLOCK_EDITOR)
+            }
+            is Error -> {
+                if (response.error.type == NOT_FOUND) {
+                    /**
+                     * We tried the editor settings call first but since that failed we fall back to the themes endpoint
+                     * since the user may not have the gutenberg plugin installed.
+                     */
+                    fetchEditorTheme(site, action)
+                } else {
+                    response.handleFetchEditorSettingsResponse(action, BLOCK_EDITOR)
+                }
+            }
+        }
+    }
+
+    private fun ReactNativeFetchResponse.Success.handleFetchEditorSettingsResponse(
+        site: SiteModel,
+        action: EditorThemeAction,
+        endpoint: ThemeChangedEndpoint
+    ) {
+        val noGssError = OnEditorThemeChanged(EditorThemeError("Response does not contain GSS"), action, endpoint)
+        if (result == null || !result.isJsonObject) {
+            emitChange(noGssError)
+            return
+        }
+
+        val responseTheme = result.asJsonObject
+        if (responseTheme == null) {
+            emitChange(noGssError)
+            return
+        }
+
+        val blockEditorSettings = Gson().fromJson(responseTheme, BlockEditorSettings::class.java)
+        val newTheme = EditorTheme(blockEditorSettings)
+        val existingTheme = editorThemeSqlUtils.getEditorThemeForSite(site)
+        if (newTheme != existingTheme) {
+            editorThemeSqlUtils.replaceEditorThemeForSite(site, newTheme)
+            val onChanged = OnEditorThemeChanged(newTheme, site.id, action, endpoint)
+            emitChange(onChanged)
+        }
+    }
+
+    private fun ReactNativeFetchResponse.Error.handleFetchEditorSettingsResponse(
+        action: EditorThemeAction,
+        endpoint: ThemeChangedEndpoint
+    ) {
+        val onChanged = OnEditorThemeChanged(EditorThemeError(error.message), action, endpoint)
+        emitChange(onChanged)
+    }
+
+    private fun editorSettingsAvailable(site: SiteModel, gssEnabled: Boolean) =
+            gssEnabled && VersionUtils.checkMinimalVersion(site.softwareVersion, EDITOR_SETTINGS_WP_VERSION)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EncryptedLogStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EncryptedLogStore.kt
new file mode 100644
index 00000000000..8550fe110e3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/EncryptedLogStore.kt
@@ -0,0 +1,309 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.delay
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.EncryptedLogAction
+import org.wordpress.android.fluxc.action.EncryptedLogAction.RESET_UPLOAD_STATES
+import org.wordpress.android.fluxc.action.EncryptedLogAction.UPLOAD_LOG
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLog
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.FAILED
+import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLogUploadState.UPLOADING
+import org.wordpress.android.fluxc.model.encryptedlogging.LogEncrypter
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog.EncryptedLogRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog.UploadEncryptedLogResult.LogUploadFailed
+import org.wordpress.android.fluxc.network.rest.wpcom.encryptedlog.UploadEncryptedLogResult.LogUploaded
+import org.wordpress.android.fluxc.persistence.EncryptedLogSqlUtils
+import org.wordpress.android.fluxc.store.EncryptedLogStore.EncryptedLogUploadFailureType.CLIENT_FAILURE
+import org.wordpress.android.fluxc.store.EncryptedLogStore.EncryptedLogUploadFailureType.CONNECTION_FAILURE
+import org.wordpress.android.fluxc.store.EncryptedLogStore.EncryptedLogUploadFailureType.IRRECOVERABLE_FAILURE
+import org.wordpress.android.fluxc.store.EncryptedLogStore.OnEncryptedLogUploaded.EncryptedLogFailedToUpload
+import org.wordpress.android.fluxc.store.EncryptedLogStore.OnEncryptedLogUploaded.EncryptedLogUploadedSuccessfully
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.InvalidRequest
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.MissingFile
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.NoConnection
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.OutOfMemoryException
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.TooManyRequests
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.Unknown
+import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogError.UnsatisfiedLinkException
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.API
+import java.io.File
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Depending on the error type, we'll keep a record of the earliest date we can try another encrypted log upload.
+ *
+ * The most important example of this is `TOO_MANY_REQUESTS` error which results in server refusing any uploads for
+ * an hour.
+ */
+private const val ENCRYPTED_LOG_UPLOAD_UNAVAILABLE_UNTIL_DATE = "ENCRYPTED_LOG_UPLOAD_UNAVAILABLE_UNTIL_DATE_PREF_KEY"
+private const val UPLOAD_NEXT_DELAY = 3000L // 3 seconds
+private const val TOO_MANY_REQUESTS_ERROR_DELAY = 60 * 60 * 1000L // 1 hour
+private const val REGULAR_UPLOAD_FAILURE_DELAY = 60 * 1000L // 1 minute
+private const val MAX_RETRY_COUNT = 3
+
+private const val HTTP_STATUS_CODE_500 = 500
+private const val HTTP_STATUS_CODE_599 = 599
+
+@Singleton
+class EncryptedLogStore @Inject constructor(
+    private val encryptedLogRestClient: EncryptedLogRestClient,
+    private val encryptedLogSqlUtils: EncryptedLogSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    private val logEncrypter: LogEncrypter,
+    private val preferenceUtils: PreferenceUtilsWrapper,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    override fun onRegister() {
+        AppLog.d(API, this.javaClass.name + ": onRegister")
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? EncryptedLogAction ?: return
+        when (actionType) {
+            UPLOAD_LOG -> {
+                coroutineEngine.launch(API, this, "EncryptedLogStore: On UPLOAD_LOG") {
+                    queueLogForUpload(action.payload as UploadEncryptedLogPayload)
+                }
+            }
+            RESET_UPLOAD_STATES -> {
+                coroutineEngine.launch(API, this, "EncryptedLogStore: On RESET_UPLOAD_STATES") {
+                    resetUploadStates()
+                }
+            }
+        }
+    }
+
+    /**
+     * A method for the client to use to start uploading any encrypted logs that might have been queued.
+     *
+     * This method should be called within a coroutine, possibly in GlobalScope so it's not attached to any one context.
+     */
+    @Suppress("unused")
+    suspend fun uploadQueuedEncryptedLogs() {
+        uploadNext()
+    }
+
+    private suspend fun queueLogForUpload(payload: UploadEncryptedLogPayload) {
+        // If the log file is not valid, there is nothing we can do
+        if (!isValidFile(payload.file)) {
+            emitChange(
+                    EncryptedLogFailedToUpload(
+                            uuid = payload.uuid,
+                            file = payload.file,
+                            error = MissingFile,
+                            willRetry = false
+                    )
+            )
+            return
+        }
+        val encryptedLog = EncryptedLog(
+                uuid = payload.uuid,
+                file = payload.file
+        )
+        encryptedLogSqlUtils.insertOrUpdateEncryptedLog(encryptedLog)
+
+        if (payload.shouldStartUploadImmediately) {
+            uploadNext()
+        }
+    }
+
+    private fun resetUploadStates() {
+        encryptedLogSqlUtils.insertOrUpdateEncryptedLogs(encryptedLogSqlUtils.getUploadingEncryptedLogs().map {
+            it.copy(uploadState = FAILED)
+        })
+    }
+
+    private suspend fun uploadNextWithDelay(delay: Long) {
+        addUploadDelay(delay)
+        // Add a few seconds buffer to avoid possible millisecond comparison issues
+        delay(delay + UPLOAD_NEXT_DELAY)
+        uploadNext()
+    }
+
+    private suspend fun uploadNext() {
+        if (!isUploadAvailable()) {
+            return
+        }
+        // We want to upload a single file at a time
+        encryptedLogSqlUtils.getEncryptedLogsForUpload().firstOrNull()?.let {
+            uploadEncryptedLog(it)
+        }
+    }
+
+    @Suppress("SwallowedException")
+    private suspend fun uploadEncryptedLog(encryptedLog: EncryptedLog) {
+        // If the log file doesn't exist, fail immediately and try the next log file
+        if (!isValidFile(encryptedLog.file)) {
+            handleFailedUpload(encryptedLog, MissingFile)
+            uploadNext()
+            return
+        }
+        try {
+            val encryptedText = logEncrypter.encrypt(text = encryptedLog.file.readText(), uuid = encryptedLog.uuid)
+
+            // Update the upload state of the log
+            encryptedLog.copy(uploadState = UPLOADING).let {
+                encryptedLogSqlUtils.insertOrUpdateEncryptedLog(it)
+            }
+
+            when (val result = encryptedLogRestClient.uploadLog(encryptedLog.uuid, encryptedText)) {
+                is LogUploaded -> handleSuccessfulUpload(encryptedLog)
+                is LogUploadFailed -> handleFailedUpload(encryptedLog, result.error)
+            }
+        } catch (e: UnsatisfiedLinkError) {
+            handleFailedUpload(encryptedLog, UnsatisfiedLinkException)
+        } catch (e: OutOfMemoryError) {
+            handleFailedUpload(encryptedLog, OutOfMemoryException)
+        }
+    }
+
+    private suspend fun handleSuccessfulUpload(encryptedLog: EncryptedLog) {
+        deleteEncryptedLog(encryptedLog)
+        emitChange(EncryptedLogUploadedSuccessfully(uuid = encryptedLog.uuid, file = encryptedLog.file))
+        uploadNext()
+    }
+
+    private suspend fun handleFailedUpload(encryptedLog: EncryptedLog, error: UploadEncryptedLogError) {
+        val failureType = mapUploadEncryptedLogError(error)
+
+        val (isFinalFailure, finalFailureCount) = when (failureType) {
+            IRRECOVERABLE_FAILURE -> {
+                Pair(true, encryptedLog.failedCount + 1)
+            }
+            CONNECTION_FAILURE -> {
+                Pair(false, encryptedLog.failedCount)
+            }
+            CLIENT_FAILURE -> {
+                val newFailedCount = encryptedLog.failedCount + 1
+                Pair(newFailedCount >= MAX_RETRY_COUNT, newFailedCount)
+            }
+        }
+
+        if (isFinalFailure) {
+            deleteEncryptedLog(encryptedLog)
+        } else {
+            encryptedLogSqlUtils.insertOrUpdateEncryptedLog(
+                    encryptedLog.copy(
+                            uploadState = FAILED,
+                            failedCount = finalFailureCount
+                    )
+            )
+        }
+
+        emitChange(
+                EncryptedLogFailedToUpload(
+                        uuid = encryptedLog.uuid,
+                        file = encryptedLog.file,
+                        error = error,
+                        willRetry = !isFinalFailure
+                )
+        )
+        // If a log failed to upload for the final time, we don't need to add any delay since the log is the problem.
+        // Otherwise, the only special case that requires an extra long delay is `TOO_MANY_REQUESTS` upload error.
+        if (isFinalFailure) {
+            uploadNext()
+        } else {
+            if (error is TooManyRequests) {
+                uploadNextWithDelay(TOO_MANY_REQUESTS_ERROR_DELAY)
+            } else {
+                uploadNextWithDelay(REGULAR_UPLOAD_FAILURE_DELAY)
+            }
+        }
+    }
+
+    private fun mapUploadEncryptedLogError(error: UploadEncryptedLogError): EncryptedLogUploadFailureType {
+        return when (error) {
+            NoConnection, TooManyRequests -> CONNECTION_FAILURE
+            InvalidRequest, MissingFile, UnsatisfiedLinkException, OutOfMemoryException -> IRRECOVERABLE_FAILURE
+            is Unknown -> if ((HTTP_STATUS_CODE_500..HTTP_STATUS_CODE_599).contains(error.statusCode)) {
+                CONNECTION_FAILURE
+            } else {
+                CLIENT_FAILURE
+            }
+        }
+    }
+
+    private fun deleteEncryptedLog(encryptedLog: EncryptedLog) {
+        encryptedLogSqlUtils.deleteEncryptedLogs(listOf(encryptedLog))
+    }
+
+    private fun isValidFile(file: File): Boolean = file.exists() && file.canRead()
+
+    /**
+     * Checks if encrypted logs can be uploaded at this time.
+     *
+     * If we are already uploading another encrypted log or if we are manually delaying the uploads due to server errors
+     * encrypted log uploads will not be available.
+     */
+    private fun isUploadAvailable(): Boolean {
+        if (encryptedLogSqlUtils.getNumberOfUploadingEncryptedLogs() > 0) {
+            // We are already uploading another log file
+            return false
+        }
+        preferenceUtils.getFluxCPreferences().getLong(ENCRYPTED_LOG_UPLOAD_UNAVAILABLE_UNTIL_DATE, -1L).let {
+            return it <= Date().time
+        }
+    }
+
+    private fun addUploadDelay(delayDuration: Long) {
+        val date = Date().time + delayDuration
+        preferenceUtils.getFluxCPreferences().edit().putLong(ENCRYPTED_LOG_UPLOAD_UNAVAILABLE_UNTIL_DATE, date).apply()
+    }
+
+    /**
+     * Payload to be used to queue a file to be encrypted and uploaded.
+     *
+     * [shouldStartUploadImmediately] property will be used by [EncryptedLogStore] to decide whether the encryption and
+     * upload should be initiated immediately. Since the main use case to queue a log file to be uploaded is a crash,
+     * the default value is `false`. If we try to upload the log file during a crash, there won't be enough time to
+     * encrypt and upload it, which means it'll just fail. On the other hand, for developer initiated crash monitoring
+     * events, it'd be good, but not essential, to set it to `true` so we can upload it as soon as possible.
+     */
+    class UploadEncryptedLogPayload(
+        val uuid: String,
+        val file: File,
+        val shouldStartUploadImmediately: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    sealed class OnEncryptedLogUploaded(val uuid: String, val file: File) : Store.OnChanged<UploadEncryptedLogError>() {
+        class EncryptedLogUploadedSuccessfully(uuid: String, file: File) : OnEncryptedLogUploaded(uuid, file)
+        class EncryptedLogFailedToUpload(
+            uuid: String,
+            file: File,
+            error: UploadEncryptedLogError,
+            val willRetry: Boolean
+        ) : OnEncryptedLogUploaded(uuid, file) {
+            init {
+                this.error = error
+            }
+        }
+    }
+
+    sealed class UploadEncryptedLogError : OnChangedError {
+        class Unknown(val statusCode: Int? = null, val message: String? = null) : UploadEncryptedLogError()
+        object InvalidRequest : UploadEncryptedLogError()
+        object TooManyRequests : UploadEncryptedLogError()
+        object NoConnection : UploadEncryptedLogError()
+        object MissingFile : UploadEncryptedLogError()
+        object UnsatisfiedLinkException : UploadEncryptedLogError()
+        object OutOfMemoryException : UploadEncryptedLogError()
+    }
+
+    /**
+     * These are internal failure types to make it easier to deal with encrypted log upload errors.
+     */
+    private enum class EncryptedLogUploadFailureType {
+        IRRECOVERABLE_FAILURE, CONNECTION_FAILURE, CLIENT_FAILURE
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ExperimentStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ExperimentStore.kt
new file mode 100644
index 00000000000..7b2794c8f8f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ExperimentStore.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.fluxc.store
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.experiments.Assignments
+import org.wordpress.android.fluxc.model.experiments.AssignmentsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.experiments.ExperimentRestClient
+import org.wordpress.android.fluxc.store.Store.OnChanged
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ExperimentStore @Inject constructor(
+    private val experimentRestClient: ExperimentRestClient,
+    private val preferenceUtils: PreferenceUtilsWrapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    companion object {
+        const val EXPERIMENT_ASSIGNMENTS_KEY = "EXPERIMENT_ASSIGNMENTS_KEY"
+    }
+
+    private val gson: Gson by lazy { GsonBuilder().serializeNulls().create() }
+
+    suspend fun fetchAssignments(
+        platform: Platform,
+        experimentNames: List<String>,
+        anonymousId: String? = null
+    ) = coroutineEngine.withDefaultContext(API, this, "fetchAssignments") {
+        val fetchedPayload = experimentRestClient.fetchAssignments(platform, experimentNames, anonymousId)
+        if (!fetchedPayload.isError) {
+            storeFetchedAssignments(fetchedPayload.assignments)
+            OnAssignmentsFetched(assignments = Assignments.fromModel(fetchedPayload.assignments))
+        } else {
+            OnAssignmentsFetched(error = fetchedPayload.error)
+        }
+    }
+
+    private fun storeFetchedAssignments(model: AssignmentsModel) {
+        val json = gson.toJson(model, AssignmentsModel::class.java)
+        preferenceUtils.getFluxCPreferences().edit().putString(EXPERIMENT_ASSIGNMENTS_KEY, json).apply()
+    }
+
+    fun getCachedAssignments(): Assignments? {
+        val json = preferenceUtils.getFluxCPreferences().getString(EXPERIMENT_ASSIGNMENTS_KEY, null)
+        val model = gson.fromJson(json, AssignmentsModel::class.java)
+        return model?.let { Assignments.fromModel(it) }
+    }
+
+    fun clearCachedAssignments() {
+        preferenceUtils.getFluxCPreferences().edit().remove(EXPERIMENT_ASSIGNMENTS_KEY).apply()
+    }
+
+    data class FetchedAssignmentsPayload(
+        val assignments: AssignmentsModel
+    ) : Payload<FetchAssignmentsError>() {
+        constructor(error: FetchAssignmentsError) : this(AssignmentsModel()) {
+            this.error = error
+        }
+    }
+
+    data class OnAssignmentsFetched(
+        val assignments: Assignments
+    ) : OnChanged<FetchAssignmentsError>() {
+        constructor(error: FetchAssignmentsError) : this(Assignments()) {
+            this.error = error
+        }
+    }
+
+    data class FetchAssignmentsError(
+        val type: ExperimentErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class ExperimentErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class Platform(val value: String) {
+        WORDPRESS_COM("wpcom"),
+        CALYPSO("calypso"),
+        JETPACK("jetpack"),
+        WOOCOMMERCE("woocommerce"),
+        WORDPRESS_IOS("wpios"),
+        WORDPRESS_ANDROID("wpandroid"),
+        WOOCOMMERCE_IOS("woocommerceios"),
+        WOOCOMMERCE_ANDROID("woocommerceandroid");
+
+        companion object {
+            fun fromValue(value: String): Platform? {
+                return values().firstOrNull { it.value == value }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatus.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatus.kt
new file mode 100644
index 00000000000..5d55b6521a7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/GetDeviceRegistrationStatus.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.fluxc.store
+
+import javax.inject.Inject
+import org.wordpress.android.fluxc.utils.PreferenceUtils
+
+class GetDeviceRegistrationStatus @Inject constructor(
+    private val prefsWrapper: PreferenceUtils.PreferenceUtilsWrapper
+) {
+    operator fun invoke(): Status {
+        val deviceId = prefsWrapper.getFluxCPreferences().getString(NotificationStore.WPCOM_PUSH_DEVICE_SERVER_ID, null)
+        return if (deviceId.isNullOrEmpty()) {
+            Status.UNREGISTERED
+        } else {
+            Status.REGISTERED
+        }
+    }
+
+    enum class Status {
+        REGISTERED, UNREGISTERED
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistration.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistration.kt
new file mode 100644
index 00000000000..f84e37edd3e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/InvalidateDeviceRegistration.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.utils.PreferenceUtils
+import javax.inject.Inject
+
+class InvalidateDeviceRegistration @Inject constructor(
+    private val prefsWrapper: PreferenceUtils.PreferenceUtilsWrapper
+) {
+    operator fun invoke() {
+        prefsWrapper.getFluxCPreferences()
+            .edit()
+            .remove(NotificationStore.WPCOM_PUSH_DEVICE_SERVER_ID)
+            .apply()
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/JetpackStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/JetpackStore.kt
new file mode 100644
index 00000000000..ced3a48a3e9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/JetpackStore.kt
@@ -0,0 +1,312 @@
+package org.wordpress.android.fluxc.store
+
+import com.android.volley.VolleyError
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.JetpackAction
+import org.wordpress.android.fluxc.action.JetpackAction.ACTIVATE_STATS_MODULE
+import org.wordpress.android.fluxc.action.JetpackAction.INSTALL_JETPACK
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.jetpack.JetpackUser
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.jetpack.JetpackWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpacktunnel.JetpackRestClient
+import org.wordpress.android.fluxc.store.JetpackStore.ActivateStatsModuleErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.net.URI
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+private const val RELOAD_SITE_DELAY = 5000L
+private const val JETPACK_DOMAIN = "jetpack.wordpress.com"
+
+@Singleton
+class JetpackStore
+@Inject constructor(
+    private val jetpackRestClient: JetpackRestClient,
+    private val jetpackWPAPIRestClient: JetpackWPAPIRestClient,
+    private val siteStore: SiteStore,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    private var siteContinuation: Continuation<Unit>? = null
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? JetpackAction ?: return
+        when (actionType) {
+            INSTALL_JETPACK -> {
+                coroutineEngine.launch(T.SETTINGS, this, "JetpackAction.INSTALL_JETPACK") {
+                    install(
+                        action.payload as SiteModel,
+                        actionType
+                    )
+                }
+            }
+
+            ACTIVATE_STATS_MODULE -> {
+                coroutineEngine.launch(T.SETTINGS, this, "JetpackAction.ACTIVATE_STATS_MODULE") {
+                    emitChange(activateStatsModule(action.payload as ActivateStatsModulePayload))
+                }
+            }
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(T.API, "JetpackStore onRegister")
+    }
+
+    suspend fun install(
+        site: SiteModel,
+        action: JetpackAction = INSTALL_JETPACK
+    ) = coroutineEngine.withDefaultContext(T.SETTINGS, this, "install") {
+        val installedPayload = jetpackRestClient.installJetpack(site)
+        reloadSite(site)
+        val reloadedSite = siteStore.getSiteByLocalId(site.id)
+        val isJetpackInstalled = reloadedSite?.isJetpackInstalled == true
+        return@withDefaultContext if (!installedPayload.isError || isJetpackInstalled) {
+            val onJetpackInstall = OnJetpackInstalled(
+                installedPayload.success ||
+                    isJetpackInstalled, action
+            )
+            emitChange(onJetpackInstall)
+            onJetpackInstall
+        } else {
+            val errorPayload = OnJetpackInstalled(installedPayload.error, action)
+            emitChange(errorPayload)
+            errorPayload
+        }
+    }
+
+    private suspend fun reloadSite(site: SiteModel) = suspendCancellableCoroutine<Unit> { cont ->
+        siteStore.onAction(SiteActionBuilder.newFetchSiteAction(site))
+        siteContinuation = cont
+        val job = coroutineEngine.launch(T.SETTINGS, this, "reloadSite") {
+            delay(RELOAD_SITE_DELAY)
+            if (siteContinuation != null && siteContinuation == cont) {
+                siteContinuation?.resume(Unit)
+                siteContinuation = null
+            }
+        }
+        cont.invokeOnCancellation {
+            siteContinuation = null
+            job.cancel()
+        }
+    }
+
+    class JetpackInstalledPayload(
+        val site: SiteModel,
+        val success: Boolean
+    ) : Payload<JetpackInstallError>() {
+        constructor(
+            error: JetpackInstallError,
+            site: SiteModel
+        ) : this(site = site, success = false) {
+            this.error = error
+        }
+    }
+
+    data class OnJetpackInstalled(
+        val success: Boolean,
+        val causeOfChange: JetpackAction
+    ) : Store.OnChanged<JetpackInstallError>() {
+        constructor(error: JetpackInstallError, causeOfChange: JetpackAction) :
+            this(success = false, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    enum class JetpackInstallErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        USERNAME_OR_PASSWORD_MISSING,
+        SITE_IS_JETPACK
+    }
+
+    class JetpackInstallError(
+        val type: JetpackInstallErrorType,
+        val apiError: String? = null,
+        val message: String? = null
+    ) : OnChangedError
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    fun onSiteChanged(event: OnSiteChanged) {
+        if (event.rowsAffected > 0) {
+            siteContinuation?.resume(Unit)
+            siteContinuation = null
+        }
+    }
+
+    // Activate Jetpack Stats Module
+    suspend fun activateStatsModule(requestPayload: ActivateStatsModulePayload): OnActivateStatsModule {
+        val payload = jetpackRestClient.activateStatsModule(requestPayload)
+        if (payload.success) {
+            reloadSite(requestPayload.site)
+            val reloadedSite = siteStore.getSiteByLocalId(requestPayload.site.id)
+            val isStatsModuleActive = reloadedSite?.activeModules?.contains("stats") ?: false
+            return emitActivateStatsModuleResult(payload, isStatsModuleActive)
+        }
+        return emitActivateStatsModuleResult(payload, false)
+    }
+
+    private fun emitActivateStatsModuleResult(
+        payload: ActivateStatsModuleResultPayload,
+        isStatsModuleActive: Boolean
+    ): OnActivateStatsModule {
+        return if (!payload.isError && isStatsModuleActive) {
+            OnActivateStatsModule(ACTIVATE_STATS_MODULE)
+        } else {
+            OnActivateStatsModule(
+                ActivateStatsModuleError(GENERIC_ERROR, "Unable to activate stats"),
+                ACTIVATE_STATS_MODULE
+            )
+        }
+    }
+
+    class ActivateStatsModulePayload(val site: SiteModel) : Payload<BaseNetworkError>()
+
+    data class ActivateStatsModuleResultPayload(
+        val success: Boolean,
+        val site: SiteModel
+    ) : Payload<ActivateStatsModuleError>() {
+        constructor(error: ActivateStatsModuleError, site: SiteModel) : this(success = false, site = site) {
+            this.error = error
+        }
+    }
+
+    enum class ActivateStatsModuleErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        API_ERROR
+    }
+
+    class ActivateStatsModuleError(
+        val type: ActivateStatsModuleErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    suspend fun fetchJetpackConnectionUrl(
+        site: SiteModel,
+        autoRegisterSiteIfNeeded: Boolean = false,
+        useApplicationPasswords: Boolean = false
+    ): JetpackConnectionUrlResult {
+        if (site.isUsingWpComRestApi) error("This function supports only self-hosted site using WPAPI")
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchJetpackConnectionUrl") {
+            val result = jetpackWPAPIRestClient.fetchJetpackConnectionUrl(site, useApplicationPasswords)
+
+            when {
+                result.isError -> JetpackConnectionUrlResult(
+                    JetpackConnectionUrlError(
+                        message = result.error?.message,
+                        errorCode = result.error?.volleyError?.networkResponse?.statusCode
+                    )
+                )
+
+                result.result.isNullOrEmpty() -> JetpackConnectionUrlResult(
+                    JetpackConnectionUrlError("Response Empty")
+                )
+
+                else -> {
+                    val url = result.result.trim('"').replace("\\", "")
+                    val connectionUri = URI.create(url)
+                    if (!autoRegisterSiteIfNeeded || connectionUri.host == JETPACK_DOMAIN || useApplicationPasswords) {
+                        JetpackConnectionUrlResult(url)
+                    } else {
+                        registerJetpackSite(url).fold(
+                            onSuccess = {
+                                JetpackConnectionUrlResult(it)
+                            },
+                            onFailure = {
+                                val errorCode = (it as? VolleyError)?.networkResponse?.statusCode
+                                JetpackConnectionUrlResult(
+                                    JetpackConnectionUrlError(
+                                        message = it.message,
+                                        errorCode = errorCode
+                                    )
+                                )
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun registerJetpackSite(registrationUrl: String): Result<String> =
+        jetpackWPAPIRestClient.registerJetpackSite(registrationUrl)
+
+    data class JetpackConnectionUrlResult(
+        val url: String
+    ) : Payload<JetpackConnectionUrlError>() {
+        constructor(error: JetpackConnectionUrlError) : this("") {
+            this.error = error
+        }
+    }
+
+    class JetpackConnectionUrlError(
+        val message: String? = null,
+        val errorCode: Int? = null
+    ) : OnChangedError
+
+    suspend fun fetchJetpackUser(site: SiteModel, useApplicationPasswords: Boolean = false): JetpackUserResult {
+        if (site.isUsingWpComRestApi) error("This function is not implemented yet for Jetpack tunnel")
+        return coroutineEngine.withDefaultContext(T.API, this, "fetchJetpackUser") {
+            val result = jetpackWPAPIRestClient.fetchJetpackUser(site, useApplicationPasswords)
+
+            when {
+                result.isError -> JetpackUserResult(
+                    JetpackUserError(
+                        message = result.error?.message,
+                        errorCode = result.error?.volleyError?.networkResponse?.statusCode
+                    )
+                )
+
+                result.result == null -> JetpackUserResult(
+                    JetpackUserError("Response Empty")
+                )
+
+                else -> {
+                    JetpackUserResult(result.result)
+                }
+            }
+        }
+    }
+
+    data class JetpackUserResult(
+        val user: JetpackUser?
+    ) : Payload<JetpackUserError>() {
+        constructor(error: JetpackUserError) : this(null) {
+            this.error = error
+        }
+    }
+
+    class JetpackUserError(
+        val message: String? = null,
+        val errorCode: Int? = null
+    ) : OnChangedError
+
+    // Actions
+    data class OnActivateStatsModule(
+        val causeOfChange: JetpackAction
+    ) : Store.OnChanged<ActivateStatsModuleError>() {
+        constructor(
+            error: ActivateStatsModuleError,
+            causeOfChange: JetpackAction
+        ) : this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
new file mode 100644
index 00000000000..aa7870c0a35
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
@@ -0,0 +1,475 @@
+package org.wordpress.android.fluxc.store
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LiveData
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import androidx.paging.PagedList.BoundaryCallback
+import com.yarolegovich.wellsql.WellSql
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.ListAction
+import org.wordpress.android.fluxc.action.ListAction.FETCHED_LIST_ITEMS
+import org.wordpress.android.fluxc.action.ListAction.LIST_DATA_INVALIDATED
+import org.wordpress.android.fluxc.action.ListAction.LIST_ITEMS_REMOVED
+import org.wordpress.android.fluxc.action.ListAction.LIST_REQUIRES_REFRESH
+import org.wordpress.android.fluxc.action.ListAction.REMOVE_ALL_LISTS
+import org.wordpress.android.fluxc.action.ListAction.REMOVE_EXPIRED_LISTS
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.list.LIST_STATE_TIMEOUT
+import org.wordpress.android.fluxc.model.list.ListDescriptor
+import org.wordpress.android.fluxc.model.list.ListDescriptorTypeIdentifier
+import org.wordpress.android.fluxc.model.list.ListItemModel
+import org.wordpress.android.fluxc.model.list.ListModel
+import org.wordpress.android.fluxc.model.list.ListState
+import org.wordpress.android.fluxc.model.list.ListState.FETCHED
+import org.wordpress.android.fluxc.model.list.PagedListFactory
+import org.wordpress.android.fluxc.model.list.PagedListWrapper
+import org.wordpress.android.fluxc.model.list.datasource.InternalPagedListDataSource
+import org.wordpress.android.fluxc.model.list.datasource.ListItemDataSourceInterface
+import org.wordpress.android.fluxc.persistence.ListItemSqlUtils
+import org.wordpress.android.fluxc.persistence.ListSqlUtils
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged.CauseOfListChange
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.CoroutineContext
+
+// How long a list should stay in DB if it hasn't been updated
+const val DEFAULT_EXPIRATION_DURATION = 1000L * 60 * 60 * 24 * 7
+
+/**
+ * This Store is responsible for managing lists and their metadata. One of the designs goals for this Store is expose
+ * as little as possible to the consumers and make sure the exposed parts are immutable. This not only moves the
+ * responsibility of mutation to the Store but also makes it much easier to use the exposed data.
+ */
+@Singleton
+class ListStore @Inject constructor(
+    private val listSqlUtils: ListSqlUtils,
+    private val listItemSqlUtils: ListItemSqlUtils,
+    private val coroutineContext: CoroutineContext,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? ListAction ?: return
+
+        when (actionType) {
+            FETCHED_LIST_ITEMS -> handleFetchedListItems(action.payload as FetchedListItemsPayload)
+            LIST_ITEMS_REMOVED -> handleListItemsRemoved(action.payload as ListItemsRemovedPayload)
+            LIST_REQUIRES_REFRESH -> handleListRequiresRefresh(action.payload as ListDescriptorTypeIdentifier)
+            LIST_DATA_INVALIDATED -> handleListDataInvalidated(action.payload as ListDescriptorTypeIdentifier)
+            REMOVE_EXPIRED_LISTS -> handleRemoveExpiredLists(action.payload as RemoveExpiredListsPayload)
+            REMOVE_ALL_LISTS -> handleRemoveAllLists()
+            ListAction.LIST_DATA_FAILURE -> handleDataFailure(action.payload as OnListDataFailure)
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, ListStore::class.java.simpleName + " onRegister")
+    }
+
+    /**
+     * This is the function that'll be used to consume lists.
+     *
+     * @param listDescriptor Describes which list will be consumed
+     * @param dataSource Describes how to take certain actions such as fetching a list for the item type [LIST_ITEM].
+     * @param lifecycle The lifecycle of the client that'll be consuming this list. It's used to make sure everything
+     * is cleaned up properly once the client is destroyed.
+     *
+     * @return A [PagedListWrapper] that provides all the necessary information to consume a list such as its data,
+     * whether the first page is being fetched, whether there are any errors etc. in `LiveData` format.
+     */
+    fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any> getList(
+        listDescriptor: LIST_DESCRIPTOR,
+        dataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>,
+        lifecycle: Lifecycle
+    ): PagedListWrapper<LIST_ITEM> {
+        val factory = createPagedListFactory(listDescriptor, dataSource)
+        val pagedListData = createPagedListLiveData(
+                listDescriptor = listDescriptor,
+                dataSource = dataSource,
+                pagedListFactory = factory
+        )
+        return PagedListWrapper(
+                data = pagedListData,
+                dispatcher = mDispatcher,
+                listDescriptor = listDescriptor,
+                lifecycle = lifecycle,
+                refresh = {
+                    handleFetchList(listDescriptor, loadMore = false) { offset ->
+                        dataSource.fetchList(listDescriptor, offset)
+                    }
+                },
+                invalidate = factory::invalidate,
+                parentCoroutineContext = coroutineContext
+        )
+    }
+
+    /**
+     * A helper function that creates a [PagedList] [LiveData] for the given [LIST_DESCRIPTOR], [dataSource] and the
+     * [PagedListFactory].
+     */
+    private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM : Any> createPagedListLiveData(
+        listDescriptor: LIST_DESCRIPTOR,
+        dataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>,
+        pagedListFactory: PagedListFactory<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
+    ): LiveData<PagedList<LIST_ITEM>> {
+        val pagedListConfig = PagedList.Config.Builder()
+                .setEnablePlaceholders(true)
+                .setInitialLoadSizeHint(listDescriptor.config.initialLoadSize)
+                .setPageSize(listDescriptor.config.dbPageSize)
+                .build()
+        val boundaryCallback = object : BoundaryCallback<LIST_ITEM>() {
+            override fun onItemAtEndLoaded(itemAtEnd: LIST_ITEM) {
+                // Load more items if we are near the end of list
+                coroutineEngine.launch(AppLog.T.API, this, "ListStore: Loading next page") {
+                    handleFetchList(listDescriptor, loadMore = true) { offset ->
+                        dataSource.fetchList(listDescriptor, offset)
+                    }
+                }
+                super.onItemAtEndLoaded(itemAtEnd)
+            }
+        }
+        return LivePagedListBuilder<Int, LIST_ITEM>(pagedListFactory, pagedListConfig)
+                .setBoundaryCallback(boundaryCallback).build()
+    }
+
+    /**
+     * A helper function that creates a [PagedListFactory] for the given [LIST_DESCRIPTOR] and [dataSource].
+     */
+    private fun <LIST_DESCRIPTOR : ListDescriptor, ITEM_IDENTIFIER, LIST_ITEM> createPagedListFactory(
+        listDescriptor: LIST_DESCRIPTOR,
+        dataSource: ListItemDataSourceInterface<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM>
+    ): PagedListFactory<LIST_DESCRIPTOR, ITEM_IDENTIFIER, LIST_ITEM> {
+        val getRemoteItemIds = { getListItems(listDescriptor).map { RemoteId(value = it) } }
+        val getIsListFullyFetched = { getListState(listDescriptor) == FETCHED }
+        return PagedListFactory(
+                createDataSource = {
+                    InternalPagedListDataSource(
+                            listDescriptor = listDescriptor,
+                            remoteItemIds = getRemoteItemIds(),
+                            isListFullyFetched = getIsListFullyFetched(),
+                            itemDataSource = dataSource
+                    )
+                })
+    }
+
+    /**
+     * A helper function that returns the list items for the given [ListDescriptor].
+     */
+    private fun getListItems(listDescriptor: ListDescriptor): List<Long> {
+        val listModel = listSqlUtils.getList(listDescriptor)
+        return if (listModel != null) {
+            listItemSqlUtils.getListItems(listModel.id).map { it.remoteItemId }
+        } else emptyList()
+    }
+
+    /**
+     * A helper function that initiates the fetch from remote for the given [ListDescriptor].
+     *
+     * Before fetching the list, it'll first check if this is a valid fetch depending on the list's state. Then, it'll
+     * update the list's state and emit that change. Finally, it'll calculate the offset and initiate the fetch with
+     * the given [fetchList] function.
+     */
+    private fun handleFetchList(
+        listDescriptor: ListDescriptor,
+        loadMore: Boolean,
+        fetchList: (Long) -> Unit
+    ) {
+        val currentState = getListState(listDescriptor)
+        if (!loadMore && currentState.isFetchingFirstPage()) {
+            // already fetching the first page
+            return
+        } else if (loadMore && !currentState.canLoadMore()) {
+            // we can only load more if there is more data to be loaded
+            return
+        }
+
+        val newState = if (loadMore) ListState.LOADING_MORE else ListState.FETCHING_FIRST_PAGE
+        listSqlUtils.insertOrUpdateList(listDescriptor, newState)
+        handleListStateChange(listDescriptor, newState)
+
+        val listModel = requireNotNull(listSqlUtils.getList(listDescriptor)) {
+            "The `ListModel` can never be `null` here since either a new list is inserted or existing one updated"
+        }
+        val offset = if (loadMore) listItemSqlUtils.getListItemsCount(listModel.id) else 0L
+        fetchList(offset)
+    }
+
+    /**
+     * A helper function that emits the latest [ListState] for the given [ListDescriptor].
+     */
+    private fun handleListStateChange(listDescriptor: ListDescriptor, newState: ListState, error: ListError? = null) {
+        emitChange(OnListStateChanged(listDescriptor, newState, error))
+    }
+
+    /**
+     * Handles the [ListAction.FETCHED_LIST_ITEMS] action.
+     *
+     * Here is how it works:
+     * 1. If there was an error, update the list's state and emit the change. Otherwise:
+     * 2. If the first page is fetched, delete the existing [ListItemModel]s.
+     * 3. Update the [ListModel]'s state depending on whether there is more data to be fetched
+     * 4. Insert the [ListItemModel]s and emit the change
+     *
+     * See [handleFetchList] to see how items are fetched.
+     */
+    private fun handleFetchedListItems(payload: FetchedListItemsPayload) {
+        val newState = when {
+            payload.isError -> ListState.ERROR
+            payload.canLoadMore -> ListState.CAN_LOAD_MORE
+            else -> FETCHED
+        }
+        listSqlUtils.insertOrUpdateList(payload.listDescriptor, newState)
+
+        if (!payload.isError) {
+            val db = WellSql.giveMeWritableDb()
+            db.beginTransaction()
+            try {
+                if (!payload.loadedMore) {
+                    deleteListItems(payload.listDescriptor)
+                }
+                val listModel = requireNotNull(listSqlUtils.getList(payload.listDescriptor)) {
+                    "The `ListModel` can never be `null` here since either a new list is inserted or existing one " +
+                            "updated"
+                }
+                listItemSqlUtils.insertItemList(payload.remoteItemIds.map { remoteItemId ->
+                    val listItemModel = ListItemModel()
+                    listItemModel.listId = listModel.id
+                    listItemModel.remoteItemId = remoteItemId
+                    return@map listItemModel
+                })
+                db.setTransactionSuccessful()
+            } finally {
+                db.endTransaction()
+            }
+        }
+        val causeOfChange = if (payload.isError) {
+            CauseOfListChange.ERROR
+        } else {
+            if (payload.loadedMore) CauseOfListChange.LOADED_MORE else CauseOfListChange.FIRST_PAGE_FETCHED
+        }
+        emitChange(OnListChanged(listOf(payload.listDescriptor), causeOfChange, payload.error))
+        handleListStateChange(payload.listDescriptor, newState, payload.error)
+    }
+
+    suspend fun saveListFetched(
+        listDescriptor: ListDescriptor,
+        remoteItemIds: List<Long>,
+        canLoadMore: Boolean
+    ) {
+        val newState = if (canLoadMore) ListState.CAN_LOAD_MORE else FETCHED
+
+        listSqlUtils.insertOrUpdateList(listDescriptor, newState)
+
+        val listModel = requireNotNull(listSqlUtils.getList(listDescriptor)) {
+            "The `ListModel` can never be `null` here since either a new list is inserted or existing one " +
+                    "updated"
+        }
+
+        val listItems = remoteItemIds.map { remoteItemId ->
+            val listItemModel = ListItemModel()
+            listItemModel.listId = listModel.id
+            listItemModel.remoteItemId = remoteItemId
+            listItemModel
+        }
+        listItemSqlUtils.insertItemList(listItems)
+        emitChange(OnListRequiresRefresh(listDescriptor.typeIdentifier))
+    }
+
+    /**
+     * Handles the [ListAction.LIST_ITEMS_REMOVED] action.
+     *
+     * Items in [ListItemsRemovedPayload.remoteItemIds] will be removed from lists with
+     * [ListDescriptorTypeIdentifier] after which [OnListDataInvalidated] event will be emitted.
+     */
+    private fun handleListItemsRemoved(payload: ListItemsRemovedPayload) {
+        val lists = listSqlUtils.getListsWithTypeIdentifier(payload.type)
+        listItemSqlUtils.deleteItemsFromLists(lists.map { it.id }, payload.remoteItemIds)
+        emitChange(OnListDataInvalidated(payload.type))
+    }
+
+    /**
+     * Handles the [ListAction.LIST_REQUIRES_REFRESH] action.
+     *
+     * Whenever a type of list needs to be refreshed, [OnListRequiresRefresh] event will be emitted so the listening
+     * lists can refresh themselves.
+     */
+    private fun handleListRequiresRefresh(typeIdentifier: ListDescriptorTypeIdentifier) {
+        emitChange(OnListRequiresRefresh(type = typeIdentifier))
+    }
+
+    /**
+     * Handles the [ListAction.LIST_DATA_INVALIDATED] action.
+     *
+     * Whenever the data of a list is invalidated, [OnListDataInvalidated] event will be emitted so the listening
+     * lists can invalidate their data.
+     */
+    private fun handleListDataInvalidated(typeIdentifier: ListDescriptorTypeIdentifier) {
+        emitChange(OnListDataInvalidated(type = typeIdentifier))
+    }
+
+    /**
+     * Handles the [ListAction.REMOVE_EXPIRED_LISTS] action.
+     *
+     * It deletes [ListModel]s that hasn't been updated for the given [RemoveExpiredListsPayload.expirationDuration].
+     */
+    private fun handleRemoveExpiredLists(payload: RemoveExpiredListsPayload) {
+        listSqlUtils.deleteExpiredLists(payload.expirationDuration)
+    }
+
+    /**
+     * Handles the [ListAction.REMOVE_ALL_LISTS] action.
+     *
+     * It simply deletes every [ListModel] in the DB.
+     */
+    private fun handleRemoveAllLists() {
+        listSqlUtils.deleteAllLists()
+    }
+
+    private fun handleDataFailure(event : OnListDataFailure){
+        emitChange(event)
+    }
+
+    /**
+     * Deletes all the items for the given [ListDescriptor].
+     */
+    private fun deleteListItems(listDescriptor: ListDescriptor) {
+        listSqlUtils.getList(listDescriptor)?.let {
+            listItemSqlUtils.deleteItems(it.id)
+        }
+    }
+
+    /**
+     * A helper function that returns the [ListState] for the given [ListDescriptor].
+     */
+     fun getListState(listDescriptor: ListDescriptor): ListState {
+        val listModel = listSqlUtils.getList(listDescriptor)
+        val currentState = listModel?.let {
+            requireNotNull(ListState.entries.firstOrNull { it.value == listModel.stateDbValue }) {
+                "The stateDbValue of the ListModel didn't match any of the `ListState`s. This likely happened " +
+                        "because the ListState values were altered without a DB migration."
+            }
+        }
+        val isListStateValid = currentState != null
+                && (isListStateOutdated(listModel).not() || (currentState in ListState.notExpiredStates))
+        return if (isListStateValid) currentState!! else ListState.defaultState
+    }
+
+    /**
+     * A helper function that returns whether it has been more than a certain time has passed since it's `lastModified`.
+     *
+     * Since we keep the state in the DB, in the case of application being closed during a fetch, it'll carry
+     * over to the next session. To prevent such cases, we use a timeout approach. If it has been more than a
+     * certain time since the list is last updated, we should ignore the state.
+     */
+    private fun isListStateOutdated(listModel: ListModel): Boolean {
+        listModel.lastModified?.let {
+            val lastModified = DateTimeUtils.dateUTCFromIso8601(it)
+            val timePassed = (Date().time - lastModified.time)
+            return timePassed > LIST_STATE_TIMEOUT
+        }
+        // If a list is null, it means we have never fetched it before, so it can't be outdated
+        return false
+    }
+
+    /**
+     * The event to be emitted when there is a change to a [ListModel].
+     */
+    class OnListChanged(
+        val listDescriptors: List<ListDescriptor>,
+        val causeOfChange: CauseOfListChange,
+        error: ListError?
+    ) : Store.OnChanged<ListError>() {
+        enum class CauseOfListChange {
+            ERROR, FIRST_PAGE_FETCHED, LOADED_MORE
+        }
+
+        init {
+            this.error = error
+        }
+    }
+
+    /**
+     * The event to be emitted whenever there is a change to the [ListState]
+     */
+    class OnListStateChanged(
+        val listDescriptor: ListDescriptor,
+        val newState: ListState,
+        error: ListError?
+    ) : Store.OnChanged<ListError>() {
+        init {
+            this.error = error
+        }
+    }
+
+    /**
+     * The event to be emitted when a list needs to be refresh for a specific [ListDescriptorTypeIdentifier].
+     */
+    class OnListRequiresRefresh(val type: ListDescriptorTypeIdentifier) : Store.OnChanged<ListError>()
+
+    /**
+     * The event to be emitted when a list's data is invalidated for a specific [ListDescriptorTypeIdentifier].
+     */
+    class OnListDataInvalidated(val type: ListDescriptorTypeIdentifier) : Store.OnChanged<ListError>()
+
+    /**
+     * This is the payload for [ListAction.LIST_ITEMS_REMOVED].
+     *
+     * @property type [ListDescriptorTypeIdentifier] which will tell [ListStore] and the clients which
+     * [ListDescriptor]s are updated.
+     * @property remoteItemIds Remote item ids to be removed from the lists matching the [ListDescriptorTypeIdentifier].
+     */
+    class ListItemsRemovedPayload(val type: ListDescriptorTypeIdentifier, val remoteItemIds: List<Long>)
+
+    class OnListDataFailure(val type: ListDescriptorTypeIdentifier) : Store.OnChanged<ListError>()
+
+    /**
+     * This is the payload for [ListAction.FETCHED_LIST_ITEMS].
+     *
+     * @property listDescriptor List descriptor will be provided when the action to fetch items will be dispatched
+     * from other Stores. The same list descriptor will need to be used in this payload so [ListStore] can decide
+     * which list to update.
+     * @property remoteItemIds Fetched item ids
+     * @property loadedMore Indicates whether the first page is fetched or we loaded more data
+     * @property canLoadMore Indicates whether there is more data to be loaded from the server.
+     */
+    class FetchedListItemsPayload(
+        val listDescriptor: ListDescriptor,
+        val remoteItemIds: List<Long>,
+        val loadedMore: Boolean,
+        val canLoadMore: Boolean,
+        error: ListError?
+    ) : Payload<ListError>() {
+        init {
+            this.error = error
+        }
+    }
+
+    /**
+     * This is the payload for [ListAction.REMOVE_EXPIRED_LISTS].
+     *
+     * @property expirationDuration Tells how long a list should be kept in the DB if it hasn't been updated
+     */
+    class RemoveExpiredListsPayload(val expirationDuration: Long = DEFAULT_EXPIRATION_DURATION)
+
+    class ListError(
+        val type: ListErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class ListErrorType {
+        GENERIC_ERROR,
+        PERMISSION_ERROR,
+        PARSE_ERROR,
+        TIMEOUT_ERROR
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MediaStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MediaStore.java
new file mode 100644
index 00000000000..1b16372a614
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MediaStore.java
@@ -0,0 +1,1151 @@
+package org.wordpress.android.fluxc.store;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.MediaModelTable;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.MediaAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.PostImmutableModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.StockMediaModel;
+import org.wordpress.android.fluxc.network.BaseRequest;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration;
+import org.wordpress.android.fluxc.network.rest.wpapi.media.ApplicationPasswordsMediaRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.media.MediaRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.media.wpv2.WPComV2MediaRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.media.MediaXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+import org.wordpress.android.fluxc.utils.MimeType;
+import org.wordpress.android.util.AppLog;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class MediaStore extends Store {
+    public static final int DEFAULT_NUM_MEDIA_PER_FETCH = 50;
+
+    public static final List<String> NOT_DELETED_STATES = new ArrayList<>();
+
+    static {
+        NOT_DELETED_STATES.add(MediaUploadState.DELETING.toString());
+        NOT_DELETED_STATES.add(MediaUploadState.FAILED.toString());
+        NOT_DELETED_STATES.add(MediaUploadState.QUEUED.toString());
+        NOT_DELETED_STATES.add(MediaUploadState.UPLOADED.toString());
+        NOT_DELETED_STATES.add(MediaUploadState.UPLOADING.toString());
+    }
+
+    //
+    // Payloads
+    //
+
+    /**
+     * Actions: FETCH(ED)_MEDIA, PUSH(ED)_MEDIA, UPLOADED_MEDIA, DELETE(D)_MEDIA, UPDATE_MEDIA, and REMOVE_MEDIA
+     */
+    public static class MediaPayload extends Payload<MediaError> {
+        @NonNull public SiteModel site;
+        @Nullable public MediaModel media;
+
+        public MediaPayload(@NonNull SiteModel site, @NonNull MediaModel media) {
+            this(site, media, null);
+        }
+
+        public MediaPayload(@NonNull SiteModel site, @Nullable MediaModel media, @Nullable MediaError error) {
+            this.site = site;
+            this.media = media;
+            this.error = error;
+        }
+    }
+
+    /**
+     * Action: UPLOAD_MEDIA
+     */
+    public static class UploadMediaPayload extends MediaPayload {
+        public final boolean stripLocation;
+
+        public UploadMediaPayload(
+                @NonNull SiteModel site,
+                @Nullable MediaModel media,
+                boolean stripLocation) {
+            super(site, media, null);
+            this.stripLocation = stripLocation;
+        }
+
+        public UploadMediaPayload(
+                @NonNull SiteModel site,
+                @Nullable MediaModel media,
+                @Nullable MediaError error,
+                boolean stripLocation) {
+            super(site, media, error);
+            this.stripLocation = stripLocation;
+        }
+    }
+
+    /**
+     * Actions: FETCH_MEDIA_LIST
+     */
+    public static class FetchMediaListPayload extends Payload<BaseNetworkError> {
+        @NonNull public SiteModel site;
+        public boolean loadMore;
+        @Nullable public MimeType.Type mimeType;
+        public int number = DEFAULT_NUM_MEDIA_PER_FETCH;
+
+        @SuppressWarnings("unused")
+        public FetchMediaListPayload(@NonNull SiteModel site) {
+            this.site = site;
+        }
+
+        public FetchMediaListPayload(
+                @NonNull SiteModel site,
+                int number,
+                boolean loadMore) {
+            this.site = site;
+            this.loadMore = loadMore;
+            this.number = number;
+        }
+
+        public FetchMediaListPayload(
+                @NonNull SiteModel site,
+                int number,
+                boolean loadMore,
+                @NonNull MimeType.Type mimeType) {
+            this.site = site;
+            this.loadMore = loadMore;
+            this.mimeType = mimeType;
+            this.number = number;
+        }
+    }
+
+    /**
+     * Actions: FETCHED_MEDIA_LIST
+     */
+    public static class FetchMediaListResponsePayload extends Payload<MediaError> {
+        @NonNull public SiteModel site;
+        @NonNull public List<MediaModel> mediaList;
+        public boolean loadedMore;
+        public boolean canLoadMore;
+        @Nullable public MimeType.Type mimeType;
+
+        public FetchMediaListResponsePayload(
+                @NonNull SiteModel site,
+                @NonNull List<MediaModel> mediaList,
+                boolean loadedMore,
+                boolean canLoadMore,
+                @Nullable MimeType.Type mimeType) {
+            this.site = site;
+            this.mediaList = mediaList;
+            this.loadedMore = loadedMore;
+            this.canLoadMore = canLoadMore;
+            this.mimeType = mimeType;
+        }
+
+        public FetchMediaListResponsePayload(
+                @NonNull SiteModel site,
+                @NonNull MediaError error,
+                @Nullable MimeType.Type mimeType) {
+            this.mediaList = new ArrayList<>();
+            this.site = site;
+            this.error = error;
+            this.mimeType = mimeType;
+        }
+    }
+
+    /**
+     * Actions: UPLOADED_MEDIA, CANCELED_MEDIA_UPLOAD
+     */
+    public static class ProgressPayload extends Payload<MediaError> {
+        @Nullable public MediaModel media;
+        public float progress;
+        public boolean completed;
+        public boolean canceled;
+
+        public ProgressPayload(
+                @NonNull MediaModel media,
+                float progress,
+                boolean completed,
+                boolean canceled) {
+            this(media, progress, completed, null);
+            this.canceled = canceled;
+        }
+
+        public ProgressPayload(
+                @Nullable MediaModel media,
+                float progress,
+                boolean completed,
+                @Nullable MediaError error) {
+            this.media = media;
+            this.progress = progress;
+            this.completed = completed;
+            this.error = error;
+        }
+    }
+
+    /**
+     * Actions: CANCEL_MEDIA_UPLOAD
+     */
+    public static class CancelMediaPayload extends Payload<BaseNetworkError> {
+        @NonNull public SiteModel site;
+        @NonNull public MediaModel media;
+        public boolean delete;
+
+        public CancelMediaPayload(@NonNull SiteModel site, @NonNull MediaModel media) {
+            this(site, media, true);
+        }
+
+        public CancelMediaPayload(@NonNull SiteModel site, @NonNull MediaModel media, boolean delete) {
+            this.site = site;
+            this.media = media;
+            this.delete = delete;
+        }
+    }
+
+    /**
+     * Actions: UPLOAD_STOCK_MEDIA
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static class UploadStockMediaPayload extends Payload<BaseNetworkError> {
+        public @NonNull List<StockMediaModel> stockMediaList;
+        public @NonNull SiteModel site;
+
+        public UploadStockMediaPayload(@NonNull SiteModel site, @NonNull List<StockMediaModel> stockMediaList) {
+            this.stockMediaList = stockMediaList;
+            this.site = site;
+        }
+    }
+
+    /**
+     * Actions: UPLOADED_STOCK_MEDIA
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static class UploadedStockMediaPayload extends Payload<UploadStockMediaError> {
+        @NonNull public List<MediaModel> mediaList;
+        @NonNull public SiteModel site;
+
+        public UploadedStockMediaPayload(@NonNull SiteModel site, @NonNull List<MediaModel> mediaList) {
+            this.site = site;
+            this.mediaList = mediaList;
+        }
+
+        public UploadedStockMediaPayload(@NonNull SiteModel site, @NonNull UploadStockMediaError error) {
+            this.site = site;
+            this.error = error;
+            this.mediaList = new ArrayList<>();
+        }
+    }
+
+    //
+    // OnChanged events
+    //
+
+    public static class MediaError implements OnChangedError {
+        @NonNull public MediaErrorType type;
+        @Nullable public MediaErrorSubType mErrorSubType;
+        @Nullable public String message;
+        public int statusCode;
+        @Nullable public String logMessage;
+
+        public MediaError(@NonNull MediaErrorType type) {
+            this.type = type;
+        }
+
+        public MediaError(@NonNull MediaErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public MediaError(
+                @NonNull MediaErrorType type,
+                @Nullable String message,
+                @NonNull MediaErrorSubType errorSubType) {
+            this.type = type;
+            this.message = message;
+            this.mErrorSubType = errorSubType;
+        }
+
+        @NonNull
+        public static MediaError fromIOException(@NonNull IOException e) {
+            MediaError mediaError = new MediaError(MediaErrorType.GENERIC_ERROR);
+            mediaError.message = e.getLocalizedMessage();
+            mediaError.logMessage = e.getMessage();
+
+            if (e instanceof SocketTimeoutException) {
+                mediaError.type = MediaErrorType.TIMEOUT;
+            }
+
+            if (e instanceof ConnectException || e instanceof UnknownHostException) {
+                mediaError.type = MediaErrorType.CONNECTION_ERROR;
+            }
+
+            String errorMessage = e.getMessage();
+            if (TextUtils.isEmpty(errorMessage)) {
+                return mediaError;
+            }
+
+            errorMessage = errorMessage.toLowerCase(Locale.US);
+            if (errorMessage.contains("broken pipe") || errorMessage.contains("epipe")) {
+                // do not use the real error message.
+                mediaError.message = "";
+            }
+
+            return mediaError;
+        }
+
+        @NonNull
+        public String getApiUserMessageIfAvailable() {
+            if (TextUtils.isEmpty(message)) {
+                return "";
+            }
+
+            if (type == MediaErrorType.BAD_REQUEST) {
+                String[] splitMsg = message.split("\\|", 2);
+
+                if (splitMsg.length > 1) {
+                    String userMessage = splitMsg[1];
+
+                    if (TextUtils.isEmpty(userMessage)) {
+                        return message;
+                    }
+
+                    // NOTE: It seems the backend is sending a final " Back" string in the message
+                    // Note that the real string depends on current locale; this is not optimal and we thought to
+                    // try to filter it out in the client app but at the end it can be not reliable so we are
+                    // keeping it. We can try to get it filtered on the backend side.
+
+                    return userMessage;
+                } else {
+                    return message;
+                }
+            } else {
+                return message;
+            }
+        }
+    }
+
+    public static class UploadStockMediaError implements OnChangedError {
+        @NonNull public UploadStockMediaErrorType type;
+        @Nullable public String message;
+
+        public UploadStockMediaError(
+                @NonNull UploadStockMediaErrorType type,
+                @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public static class OnMediaChanged extends OnChanged<MediaError> {
+        @NonNull public MediaAction cause;
+        @NonNull public List<MediaModel> mediaList;
+
+        public OnMediaChanged(@NonNull MediaAction cause) {
+            this(cause, new ArrayList<>(), null);
+        }
+
+        public OnMediaChanged(
+                @NonNull MediaAction cause,
+                @NonNull List<MediaModel> mediaList) {
+            this(cause, mediaList, null);
+        }
+
+        public OnMediaChanged(
+                @NonNull MediaAction cause,
+                @Nullable MediaError error) {
+            this(cause, new ArrayList<>(), error);
+        }
+
+        public OnMediaChanged(
+                @NonNull MediaAction cause,
+                @NonNull List<MediaModel> mediaList,
+                @Nullable MediaError error) {
+            this.cause = cause;
+            this.mediaList = mediaList;
+            this.error = error;
+        }
+    }
+
+    public static class OnMediaListFetched extends OnChanged<MediaError> {
+        @NonNull public SiteModel site;
+        public boolean canLoadMore;
+        @Nullable public MimeType.Type mimeType;
+
+        public OnMediaListFetched(
+                @NonNull SiteModel site,
+                boolean canLoadMore,
+                @Nullable MimeType.Type mimeType) {
+            this.site = site;
+            this.canLoadMore = canLoadMore;
+            this.mimeType = mimeType;
+        }
+
+        public OnMediaListFetched(
+                @NonNull SiteModel site,
+                @Nullable MediaError error,
+                @Nullable MimeType.Type mimeType) {
+            this.site = site;
+            this.error = error;
+            this.mimeType = mimeType;
+        }
+    }
+
+    public static class OnMediaUploaded extends OnChanged<MediaError> {
+        @Nullable public MediaModel media;
+        public float progress;
+        public boolean completed;
+        public boolean canceled;
+
+        public OnMediaUploaded(
+                @Nullable MediaModel media,
+                float progress,
+                boolean completed,
+                boolean canceled) {
+            this.media = media;
+            this.progress = progress;
+            this.completed = completed;
+            this.canceled = canceled;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnStockMediaUploaded extends OnChanged<UploadStockMediaError> {
+        @NonNull public List<MediaModel> mediaList;
+        @Nullable public SiteModel site;
+
+        public OnStockMediaUploaded(@NonNull SiteModel site, @NonNull List<MediaModel> mediaList) {
+            this.site = site;
+            this.mediaList = mediaList;
+        }
+
+        public OnStockMediaUploaded(@NonNull SiteModel site, @NonNull UploadStockMediaError error) {
+            this.site = site;
+            this.error = error;
+            this.mediaList = new ArrayList<>();
+        }
+    }
+
+    //
+    // Errors
+    //
+
+    public enum MediaErrorType {
+        // local errors, occur before sending network requests
+        FS_READ_PERMISSION_DENIED,
+        NULL_MEDIA_ARG,
+        MALFORMED_MEDIA_ARG,
+        DB_QUERY_FAILURE,
+        EXCEEDS_FILESIZE_LIMIT,
+        EXCEEDS_MEMORY_LIMIT,
+        EXCEEDS_SITE_SPACE_QUOTA_LIMIT,
+
+        // network errors, occur in response to network requests
+        AUTHORIZATION_REQUIRED,
+        CONNECTION_ERROR,
+        NOT_AUTHENTICATED,
+        NOT_FOUND,
+        PARSE_ERROR,
+        REQUEST_TOO_LARGE,
+        SERVER_ERROR, // this is also returned when PHP max_execution_time or memory_limit is reached
+        TIMEOUT,
+        BAD_REQUEST,
+        XMLRPC_OPERATION_NOT_ALLOWED,
+        XMLRPC_UPLOAD_ERROR,
+
+        // logic constraints errors
+        INVALID_ID,
+
+        // unknown/unspecified
+        GENERIC_ERROR;
+
+        @NonNull
+        public static MediaErrorType fromBaseNetworkError(@NonNull BaseNetworkError baseError) {
+            switch (baseError.type) {
+                case NOT_FOUND:
+                    return MediaErrorType.NOT_FOUND;
+                case NOT_AUTHENTICATED:
+                    return MediaErrorType.NOT_AUTHENTICATED;
+                case AUTHORIZATION_REQUIRED:
+                    return MediaErrorType.AUTHORIZATION_REQUIRED;
+                case PARSE_ERROR:
+                    return MediaErrorType.PARSE_ERROR;
+                case SERVER_ERROR:
+                    return MediaErrorType.SERVER_ERROR;
+                case TIMEOUT:
+                    return MediaErrorType.TIMEOUT;
+                case NO_CONNECTION:
+                case NETWORK_ERROR:
+                case CENSORED:
+                case INVALID_SSL_CERTIFICATE:
+                case HTTP_AUTH_ERROR:
+                case INVALID_RESPONSE:
+                case UNKNOWN:
+                default:
+                    return MediaErrorType.GENERIC_ERROR;
+            }
+        }
+
+        @NonNull
+        public static MediaErrorType fromHttpStatusCode(int code) {
+            switch (code) {
+                case 400:
+                    return MediaErrorType.BAD_REQUEST;
+                case 404:
+                    return MediaErrorType.NOT_FOUND;
+                case 403:
+                    return MediaErrorType.NOT_AUTHENTICATED;
+                case 413:
+                    return MediaErrorType.REQUEST_TOO_LARGE;
+                case 500:
+                    return MediaErrorType.SERVER_ERROR;
+                default:
+                    return MediaErrorType.GENERIC_ERROR;
+            }
+        }
+
+        @NonNull
+        public static MediaErrorType fromString(@Nullable String string) {
+            if (string != null) {
+                for (MediaErrorType v : MediaErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum UploadStockMediaErrorType {
+        INVALID_INPUT,
+        UNKNOWN,
+        GENERIC_ERROR;
+
+        @NonNull
+        public static UploadStockMediaErrorType fromNetworkError(@NonNull WPComGsonNetworkError wpError) {
+            // invalid upload request
+            if (wpError.apiError.equalsIgnoreCase("invalid_input")) {
+                return INVALID_INPUT;
+            }
+            // can happen if invalid pexels image url is passed
+            if (wpError.type == BaseRequest.GenericErrorType.UNKNOWN) {
+                return UNKNOWN;
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    private final MediaRestClient mMediaRestClient;
+    private final MediaXMLRPCClient mMediaXmlrpcClient;
+    private final WPComV2MediaRestClient mWPComV2MediaRestClient;
+    private final ApplicationPasswordsMediaRestClient mApplicationPasswordsMediaRestClient;
+
+    private final ApplicationPasswordsConfiguration mApplicationPasswordsConfiguration;
+
+    // Ensures that the UploadStore is initialized whenever the MediaStore is,
+    // to ensure actions are shadowed and repeated by the UploadStore
+    @SuppressWarnings("unused")
+    @Inject UploadStore mUploadStore;
+
+    @Inject public MediaStore(
+            Dispatcher dispatcher,
+            MediaRestClient restClient,
+            MediaXMLRPCClient xmlrpcClient,
+            WPComV2MediaRestClient wpv2MediaRestClient,
+            ApplicationPasswordsMediaRestClient applicationPasswordsMediaRestClient,
+            ApplicationPasswordsConfiguration applicationPasswordsConfiguration) {
+        super(dispatcher);
+        mMediaRestClient = restClient;
+        mMediaXmlrpcClient = xmlrpcClient;
+        mWPComV2MediaRestClient = wpv2MediaRestClient;
+        mApplicationPasswordsMediaRestClient = applicationPasswordsMediaRestClient;
+        mApplicationPasswordsConfiguration = applicationPasswordsConfiguration;
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof MediaAction)) {
+            return;
+        }
+
+        switch ((MediaAction) actionType) {
+            case PUSH_MEDIA:
+                performPushMedia((MediaPayload) action.getPayload());
+                break;
+            case UPLOAD_MEDIA:
+                performUploadMedia((UploadMediaPayload) action.getPayload());
+                break;
+            case FETCH_MEDIA_LIST:
+                performFetchMediaList((FetchMediaListPayload) action.getPayload());
+                break;
+            case FETCH_MEDIA:
+                performFetchMedia((MediaPayload) action.getPayload());
+                break;
+            case DELETE_MEDIA:
+                performDeleteMedia((MediaPayload) action.getPayload());
+                break;
+            case CANCEL_MEDIA_UPLOAD:
+                performCancelUpload((CancelMediaPayload) action.getPayload());
+                break;
+            case PUSHED_MEDIA:
+                handleMediaPushed((MediaPayload) action.getPayload());
+                break;
+            case UPLOADED_MEDIA:
+                handleMediaUploaded((ProgressPayload) action.getPayload());
+                break;
+            case FETCHED_MEDIA_LIST:
+                handleMediaListFetched((FetchMediaListResponsePayload) action.getPayload());
+                break;
+            case FETCHED_MEDIA:
+                handleMediaFetched((MediaPayload) action.getPayload());
+                break;
+            case DELETED_MEDIA:
+                handleMediaDeleted((MediaPayload) action.getPayload());
+                break;
+            case CANCELED_MEDIA_UPLOAD:
+                handleMediaCanceled((ProgressPayload) action.getPayload());
+                break;
+            case UPDATE_MEDIA:
+                updateMedia(((MediaModel) action.getPayload()), true);
+                break;
+            case REMOVE_MEDIA:
+                removeMedia(((MediaModel) action.getPayload()));
+                break;
+            case REMOVE_ALL_MEDIA:
+                removeAllMedia();
+                break;
+            case UPLOAD_STOCK_MEDIA:
+                performUploadStockMedia((UploadStockMediaPayload) action.getPayload());
+                break;
+            case UPLOADED_STOCK_MEDIA:
+                handleStockMediaUploaded(((UploadedStockMediaPayload) action.getPayload()));
+                break;
+        }
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(AppLog.T.MEDIA, "MediaStore onRegister");
+    }
+
+    //
+    // Getters
+    //
+
+    @Nullable
+    public MediaModel instantiateMediaModel(@NonNull MediaModel media) {
+        MediaModel insertedMedia = MediaSqlUtils.insertMediaForResult(media);
+
+        if (insertedMedia.getId() == -1) {
+            return null;
+        }
+
+        return insertedMedia;
+    }
+
+    @NonNull
+    public List<MediaModel> getAllSiteMedia(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.getAllSiteMedia(siteModel);
+    }
+
+    public int getSiteMediaCount(@NonNull SiteModel siteModel) {
+        return getAllSiteMedia(siteModel).size();
+    }
+
+    public boolean hasSiteMediaWithId(@NonNull SiteModel siteModel, long mediaId) {
+        return getSiteMediaWithId(siteModel, mediaId) != null;
+    }
+
+    @Nullable
+    public MediaModel getSiteMediaWithId(@NonNull SiteModel siteModel, long mediaId) {
+        List<MediaModel> media = MediaSqlUtils.getSiteMediaWithId(siteModel, mediaId);
+        return media.size() > 0 ? media.get(0) : null;
+    }
+
+    @Nullable
+    public MediaModel getMediaWithLocalId(int localMediaId) {
+        return MediaSqlUtils.getMediaWithLocalId(localMediaId);
+    }
+
+    @NonNull
+    public List<MediaModel> getSiteMediaWithIds(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> mediaIds) {
+        return MediaSqlUtils.getSiteMediaWithIds(siteModel, mediaIds);
+    }
+
+    @NonNull
+    public List<MediaModel> getSiteImages(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.getSiteImages(siteModel);
+    }
+
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<MediaModel> getSiteVideos(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.getSiteVideos(siteModel);
+    }
+
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<MediaModel> getSiteAudio(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.getSiteAudio(siteModel);
+    }
+
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<MediaModel> getSiteDocuments(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.getSiteDocuments(siteModel);
+    }
+
+    @NonNull
+    public List<MediaModel> getSiteImagesExcludingIds(
+            @NonNull SiteModel siteModel,
+            @NonNull List<Long> filter) {
+        return MediaSqlUtils.getSiteImagesExcluding(siteModel, filter);
+    }
+
+    @NonNull
+    public List<MediaModel> getUnattachedSiteMedia(@NonNull SiteModel siteModel) {
+        return MediaSqlUtils.matchSiteMedia(siteModel, MediaModelTable.POST_ID, 0);
+    }
+
+    @NonNull
+    public List<MediaModel> getLocalSiteMedia(@NonNull SiteModel siteModel) {
+        MediaUploadState expectedState = MediaUploadState.UPLOADED;
+        return MediaSqlUtils.getSiteMediaExcluding(siteModel, MediaModelTable.UPLOAD_STATE, expectedState);
+    }
+
+    @NonNull
+    public List<MediaModel> getSiteMediaWithState(
+            @NonNull SiteModel siteModel,
+            @NonNull MediaUploadState expectedState) {
+        return MediaSqlUtils.matchSiteMedia(siteModel, MediaModelTable.UPLOAD_STATE, expectedState);
+    }
+
+    @Nullable
+    public String getUrlForSiteVideoWithVideoPressGuid(
+            @NonNull SiteModel siteModel,
+            @NonNull String videoPressGuid) {
+        List<MediaModel> media =
+                MediaSqlUtils.matchSiteMedia(siteModel, MediaModelTable.VIDEO_PRESS_GUID, videoPressGuid);
+        return media.size() > 0 ? media.get(0).getUrl() : null;
+    }
+
+    @Nullable
+    public String getThumbnailUrlForSiteMediaWithId(@NonNull SiteModel siteModel, long mediaId) {
+        List<MediaModel> media = MediaSqlUtils.getSiteMediaWithId(siteModel, mediaId);
+        return media.size() > 0 ? media.get(0).getThumbnailUrl() : null;
+    }
+
+    @NonNull
+    public List<MediaModel> searchSiteMedia(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return MediaSqlUtils.searchSiteMedia(siteModel, searchTerm);
+    }
+
+    @NonNull
+    public List<MediaModel> searchSiteImages(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return MediaSqlUtils.searchSiteImages(siteModel, searchTerm);
+    }
+
+    @NonNull
+    public List<MediaModel> searchSiteVideos(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return MediaSqlUtils.searchSiteVideos(siteModel, searchTerm);
+    }
+
+    @NonNull
+    public List<MediaModel> searchSiteAudio(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return MediaSqlUtils.searchSiteAudio(siteModel, searchTerm);
+    }
+
+    @NonNull
+    public List<MediaModel> searchSiteDocuments(
+            @NonNull SiteModel siteModel,
+            @NonNull String searchTerm) {
+        return MediaSqlUtils.searchSiteDocuments(siteModel, searchTerm);
+    }
+
+    @Nullable
+    public MediaModel getMediaForPostWithPath(
+            @NonNull PostImmutableModel postModel,
+            @NonNull String filePath) {
+        List<MediaModel> media = MediaSqlUtils.matchPostMedia(postModel.getId(), MediaModelTable.FILE_PATH, filePath);
+        return media.size() > 0 ? media.get(0) : null;
+    }
+
+    @NonNull
+    public List<MediaModel> getMediaForPost(@NonNull PostImmutableModel postModel) {
+        return MediaSqlUtils.matchPostMedia(postModel.getId());
+    }
+
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<MediaModel> getMediaForPostWithState(
+            @NonNull PostImmutableModel postModel,
+            @NonNull MediaUploadState expectedState) {
+        return MediaSqlUtils.matchPostMedia(postModel.getId(), MediaModelTable.UPLOAD_STATE, expectedState);
+    }
+
+    @Nullable
+    public MediaModel getNextSiteMediaToDelete(@NonNull SiteModel siteModel) {
+        List<MediaModel> media = MediaSqlUtils.matchSiteMedia(siteModel,
+                MediaModelTable.UPLOAD_STATE, MediaUploadState.DELETING.toString());
+        return media.size() > 0 ? media.get(0) : null;
+    }
+
+    public boolean hasSiteMediaToDelete(@NonNull SiteModel siteModel) {
+        return getNextSiteMediaToDelete(siteModel) != null;
+    }
+
+    private void removeAllMedia() {
+        MediaSqlUtils.deleteAllMedia();
+        OnMediaChanged event = new OnMediaChanged(MediaAction.REMOVE_ALL_MEDIA);
+        emitChange(event);
+    }
+
+    //
+    // Action implementations
+    //
+
+    void updateMedia(@Nullable MediaModel media, boolean emit) {
+        OnMediaChanged event = new OnMediaChanged(MediaAction.UPDATE_MEDIA);
+
+        if (media == null) {
+            event.error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+        } else if (MediaSqlUtils.insertOrUpdateMedia(media) > 0) {
+            event.mediaList.add(media);
+        } else {
+            event.error = new MediaError(MediaErrorType.DB_QUERY_FAILURE);
+        }
+
+        if (emit) {
+            emitChange(event);
+        }
+    }
+
+    private void removeMedia(@Nullable MediaModel media) {
+        OnMediaChanged event = new OnMediaChanged(MediaAction.REMOVE_MEDIA);
+
+        if (media == null) {
+            event.error = new MediaError(MediaErrorType.NULL_MEDIA_ARG);
+        } else if (MediaSqlUtils.deleteMedia(media) > 0) {
+            event.mediaList.add(media);
+        } else {
+            event.error = new MediaError(MediaErrorType.DB_QUERY_FAILURE);
+        }
+        emitChange(event);
+    }
+
+    //
+    // Helper methods that choose the appropriate network client to perform an action
+    //
+
+    private void performPushMedia(@NonNull MediaPayload payload) {
+        if (payload.media == null) {
+            // null or empty media list -or- list contains a null value
+            notifyMediaError(MediaErrorType.NULL_MEDIA_ARG, MediaAction.PUSH_MEDIA, null);
+            return;
+        } else if (payload.media.getMediaId() <= 0) {
+            // need media ID to push changes
+            notifyMediaError(MediaErrorType.MALFORMED_MEDIA_ARG, MediaAction.PUSH_MEDIA, payload.media);
+            return;
+        }
+
+        if (payload.site.isUsingWpComRestApi()) {
+            mMediaRestClient.pushMedia(payload.site, payload.media);
+        } else {
+            mMediaXmlrpcClient.pushMedia(payload.site, payload.media);
+        }
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private void notifyMediaUploadError(
+            @NonNull MediaErrorType errorType,
+            @Nullable String errorMessage,
+            @Nullable MediaModel media,
+            @NonNull String logMessage,
+            @NonNull MalformedMediaArgSubType argErrorType) {
+        OnMediaUploaded onMediaUploaded = new OnMediaUploaded(media, 1, false, false);
+        MediaError mediaError = new MediaError(errorType, errorMessage, argErrorType);
+        mediaError.logMessage = logMessage;
+        onMediaUploaded.error = mediaError;
+        emitChange(onMediaUploaded);
+    }
+
+    private void performUploadMedia(@NonNull UploadMediaPayload payload) {
+        if (payload.media == null) {
+            // null or empty media list -or- list contains a null value
+            notifyMediaError(MediaErrorType.NULL_MEDIA_ARG, MediaAction.UPLOAD_MEDIA, null);
+            return;
+        }
+
+        MalformedMediaArgSubType argError = MediaUtils.getMediaValidationErrorType(payload.media);
+
+        if (argError.getType() != Type.NO_ERROR) {
+            String message = "Media doesn't have required data: " + argError.getType().getErrorLogDescription();
+            AppLog.e(AppLog.T.MEDIA, message);
+            payload.media.setUploadState(MediaUploadState.FAILED);
+            MediaSqlUtils.insertOrUpdateMedia(payload.media);
+            notifyMediaUploadError(
+                    MediaErrorType.MALFORMED_MEDIA_ARG,
+                    argError.getType().getErrorLogDescription(),
+                    payload.media,
+                    message,
+                    argError);
+            return;
+        }
+
+        payload.media.setUploadState(MediaUploadState.UPLOADING);
+        MediaSqlUtils.insertOrUpdateMedia(payload.media);
+
+        if (payload.stripLocation) {
+            MediaUtils.stripLocation(payload.media.getFilePath());
+        }
+
+        if (payload.site.getOrigin() == SiteModel.ORIGIN_WPCOM_REST) {
+            mWPComV2MediaRestClient.uploadMedia(payload.site, payload.media);
+        } else if (payload.site.getOrigin() == SiteModel.ORIGIN_WPAPI
+                   && mApplicationPasswordsConfiguration.isEnabled()) {
+            mApplicationPasswordsMediaRestClient.uploadMedia(payload.site, payload.media);
+        } else {
+            mMediaXmlrpcClient.uploadMedia(payload.site, payload.media);
+        }
+    }
+
+    private void performFetchMediaList(@NonNull FetchMediaListPayload payload) {
+        int offset = 0;
+        if (payload.loadMore) {
+            List<String> list = new ArrayList<>();
+            list.add(MediaUploadState.UPLOADED.toString());
+            if (payload.mimeType != null) {
+                offset = MediaSqlUtils.getMediaWithStatesAndMimeType(payload.site, list, payload.mimeType.getValue())
+                                      .size();
+            } else {
+                offset = MediaSqlUtils.getMediaWithStates(payload.site, list).size();
+            }
+        }
+        if (payload.site.getOrigin() == SiteModel.ORIGIN_WPCOM_REST) {
+            mWPComV2MediaRestClient.fetchMediaList(payload.site, payload.number, offset, payload.mimeType);
+        } else if (payload.site.getOrigin() == SiteModel.ORIGIN_WPAPI
+                   && mApplicationPasswordsConfiguration.isEnabled()) {
+            mApplicationPasswordsMediaRestClient.fetchMediaList(payload.site, payload.number, offset, payload.mimeType);
+        } else {
+            mMediaXmlrpcClient.fetchMediaList(payload.site, payload.number, offset, payload.mimeType);
+        }
+    }
+
+    private void performFetchMedia(@NonNull MediaPayload payload) {
+        if (payload.media == null) {
+            // null or empty media list -or- list contains a null value
+            notifyMediaError(MediaErrorType.NULL_MEDIA_ARG, MediaAction.FETCH_MEDIA, null);
+            return;
+        }
+
+        if (payload.site.getOrigin() == SiteModel.ORIGIN_WPCOM_REST) {
+            mWPComV2MediaRestClient.fetchMedia(payload.site, payload.media);
+        } else {
+            mMediaXmlrpcClient.fetchMedia(payload.site, payload.media);
+        }
+    }
+
+    private void performDeleteMedia(@NonNull MediaPayload payload) {
+        if (payload.media == null) {
+            notifyMediaError(MediaErrorType.NULL_MEDIA_ARG, MediaAction.DELETE_MEDIA, null);
+            return;
+        }
+
+        if (payload.site.isUsingWpComRestApi()) {
+            mMediaRestClient.deleteMedia(payload.site, payload.media);
+        } else {
+            mMediaXmlrpcClient.deleteMedia(payload.site, payload.media);
+        }
+    }
+
+    private void performCancelUpload(@NonNull CancelMediaPayload payload) {
+        MediaModel media = payload.media;
+        if (payload.delete) {
+            MediaSqlUtils.deleteMedia(media);
+        } else {
+            media.setUploadState(MediaUploadState.FAILED);
+            MediaSqlUtils.insertOrUpdateMedia(media);
+        }
+
+        if (payload.site.getOrigin() == SiteModel.ORIGIN_WPCOM_REST) {
+            mWPComV2MediaRestClient.cancelUpload(media);
+        } else if (payload.site.getOrigin() == SiteModel.ORIGIN_WPAPI
+                   && mApplicationPasswordsConfiguration.isEnabled()) {
+            mApplicationPasswordsMediaRestClient.cancelUpload(media);
+        } else {
+            mMediaXmlrpcClient.cancelUpload(media);
+        }
+    }
+
+    private void handleMediaPushed(@NonNull MediaPayload payload) {
+        OnMediaChanged onMediaChanged = new OnMediaChanged(MediaAction.PUSH_MEDIA, payload.error);
+        if (payload.media != null) {
+            updateMedia(payload.media, false);
+            onMediaChanged.mediaList = new ArrayList<>();
+            onMediaChanged.mediaList.add(payload.media);
+        }
+        emitChange(onMediaChanged);
+    }
+
+    private void handleMediaUploaded(@NonNull ProgressPayload payload) {
+        if (payload.isError() || payload.canceled || payload.completed) {
+            updateMedia(payload.media, false);
+        }
+        OnMediaUploaded onMediaUploaded = new OnMediaUploaded(
+                payload.media,
+                payload.progress,
+                payload.completed,
+                payload.canceled
+        );
+        onMediaUploaded.error = payload.error;
+        emitChange(onMediaUploaded);
+    }
+
+    private void handleMediaCanceled(@NonNull ProgressPayload payload) {
+        OnMediaUploaded onMediaUploaded = new OnMediaUploaded(
+                payload.media,
+                payload.progress,
+                payload.completed,
+                payload.canceled
+        );
+        onMediaUploaded.error = payload.error;
+
+        emitChange(onMediaUploaded);
+    }
+
+    private void updateFetchedMediaList(@NonNull FetchMediaListResponsePayload payload) {
+        // if we loaded another page, simply add the fetched media and be done
+        if (payload.loadedMore) {
+            for (MediaModel media : payload.mediaList) {
+                updateMedia(media, false);
+            }
+            return;
+        }
+
+        // build separate lists of existing and new media
+        List<MediaModel> existingMediaList = new ArrayList<>();
+        List<MediaModel> newMediaList = new ArrayList<>();
+        for (MediaModel fetchedMedia : payload.mediaList) {
+            MediaModel media = getSiteMediaWithId(payload.site, fetchedMedia.getMediaId());
+            if (media != null) {
+                // retain the local ID, then update this media item
+                fetchedMedia.setId(media.getId());
+                existingMediaList.add(fetchedMedia);
+                updateMedia(fetchedMedia, false);
+            } else {
+                newMediaList.add(fetchedMedia);
+            }
+        }
+
+        // remove media that is NOT in the existing list
+        String mimeTypeValue = "";
+        if (payload.mimeType != null) {
+            mimeTypeValue = payload.mimeType.getValue();
+        }
+        MediaSqlUtils.deleteUploadedSiteMediaNotInList(payload.site, existingMediaList, mimeTypeValue);
+
+        // add new media
+        for (MediaModel media : newMediaList) {
+            updateMedia(media, false);
+        }
+    }
+
+    private void handleMediaListFetched(@NonNull FetchMediaListResponsePayload payload) {
+        OnMediaListFetched onMediaListFetched;
+
+        if (payload.isError()) {
+            onMediaListFetched = new OnMediaListFetched(payload.site, payload.error, payload.mimeType);
+        } else {
+            updateFetchedMediaList(payload);
+            onMediaListFetched = new OnMediaListFetched(payload.site, payload.canLoadMore, payload.mimeType);
+        }
+
+        emitChange(onMediaListFetched);
+    }
+
+    private void handleMediaFetched(@NonNull MediaPayload payload) {
+        OnMediaChanged onMediaChanged = new OnMediaChanged(MediaAction.FETCH_MEDIA, payload.error);
+        if (payload.media != null) {
+            MediaSqlUtils.insertOrUpdateMedia(payload.media);
+            onMediaChanged.mediaList = new ArrayList<>();
+            onMediaChanged.mediaList.add(payload.media);
+        }
+        emitChange(onMediaChanged);
+    }
+
+    private void handleMediaDeleted(@NonNull MediaPayload payload) {
+        OnMediaChanged onMediaChanged = new OnMediaChanged(MediaAction.DELETE_MEDIA, payload.error);
+        if (payload.media != null) {
+            MediaSqlUtils.deleteMedia(payload.media);
+            onMediaChanged.mediaList = new ArrayList<>();
+            onMediaChanged.mediaList.add(payload.media);
+        }
+        emitChange(onMediaChanged);
+    }
+
+    private void notifyMediaError(
+            @NonNull MediaErrorType errorType,
+            @NonNull MediaAction cause,
+            @Nullable MediaModel media) {
+        List<MediaModel> mediaList = new ArrayList<>();
+        mediaList.add(media);
+        OnMediaChanged mediaChange = new OnMediaChanged(cause, mediaList);
+        mediaChange.error = new MediaError(errorType, null);
+        emitChange(mediaChange);
+    }
+
+    private void performUploadStockMedia(@NonNull UploadStockMediaPayload payload) {
+        mMediaRestClient.uploadStockMedia(payload.site, payload.stockMediaList);
+    }
+
+    private void handleStockMediaUploaded(@NonNull UploadedStockMediaPayload payload) {
+        OnStockMediaUploaded onStockMediaUploaded;
+
+        if (payload.isError()) {
+            onStockMediaUploaded = new OnStockMediaUploaded(payload.site, payload.error);
+        } else {
+            // add uploaded media to the store
+            for (MediaModel media : payload.mediaList) {
+                updateMedia(media, false);
+            }
+            onStockMediaUploaded = new OnStockMediaUploaded(payload.site, payload.mediaList);
+        }
+
+        emitChange(onStockMediaUploaded);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MobilePayStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MobilePayStore.kt
new file mode 100644
index 00000000000..40ffc91226e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/MobilePayStore.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.network.rest.wpcom.mobilepay.MobilePayRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobilePayStore @Inject constructor(
+    private val restClient: MobilePayRestClient,
+    private val coroutineEngine: CoroutineEngine
+) {
+    @Suppress("LongParameterList")
+    suspend fun createOrder(
+        productIdentifier: String,
+        priceInCents: Int,
+        currency: String,
+        purchaseToken: String,
+        appId: String,
+        siteId: Long,
+        customUrl: String? = null,
+    ) = coroutineEngine.withDefaultContext(API, this, "createOrder") {
+        restClient.createOrder(
+            productIdentifier,
+            priceInCents,
+            currency,
+            purchaseToken,
+            appId,
+            siteId,
+            customUrl,
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt
new file mode 100644
index 00000000000..755ae0fb986
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt
@@ -0,0 +1,656 @@
+package org.wordpress.android.fluxc.store
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.yarolegovich.wellsql.SelectQuery.ORDER_DESCENDING
+import kotlinx.coroutines.flow.Flow
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.NotificationAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.notification.NoteIdSet
+import org.wordpress.android.fluxc.model.notification.NotificationModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationRestClient.DevicesDto
+import org.wordpress.android.fluxc.network.rest.wpcom.notifications.NotificationRestClient.SiteNotificationSettingDto
+import org.wordpress.android.fluxc.persistence.NotificationSqlUtils
+import org.wordpress.android.fluxc.store.NotificationStore.NotificationSettingErrorType.UnregisteredDevice
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.NOTIFS
+import java.util.Date
+import java.util.Locale
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationStore @Inject constructor(
+    dispatcher: Dispatcher,
+    private val context: Context,
+    private val notificationRestClient: NotificationRestClient,
+    private val notificationSqlUtils: NotificationSqlUtils,
+    private val coroutineEngine: CoroutineEngine
+) : Store(dispatcher) {
+    companion object {
+        const val WPCOM_PUSH_DEVICE_UUID = "NOTIFICATIONS_UUID_PREF_KEY"
+        const val WPCOM_PUSH_DEVICE_SERVER_ID = "NOTIFICATIONS_SERVER_ID_PREF_KEY"
+    }
+
+    private val preferences by lazy { PreferenceUtils.getFluxCPreferences(context) }
+
+    class RegisterDevicePayload(
+        val gcmToken: String,
+        val appKey: NotificationAppKey,
+        val site: SiteModel?
+    ) : Payload<BaseNetworkError>()
+
+    enum class NotificationAppKey(val value: String) {
+        WORDPRESS("org.wordpress.android"),
+        WOOCOMMERCE("com.woocommerce.android")
+    }
+
+    class RegisterDeviceResponsePayload(
+        val deviceId: String? = null
+    ) : Payload<DeviceRegistrationError>() {
+        constructor(error: DeviceRegistrationError, deviceId: String? = null) : this(deviceId) {
+            this.error = error
+        }
+    }
+
+    class UnregisterDeviceResponsePayload() : Payload<DeviceUnregistrationError>() {
+        constructor(error: DeviceUnregistrationError) : this() {
+            this.error = error
+        }
+    }
+
+    class DeviceRegistrationError(
+        val type: DeviceRegistrationErrorType = DeviceRegistrationErrorType.GENERIC_ERROR,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class DeviceRegistrationErrorType {
+        INVALID_RESPONSE,
+        MISSING_DEVICE_ID,
+        GENERIC_ERROR;
+
+        companion object {
+            private val reverseMap = values().associateBy(DeviceRegistrationErrorType::name)
+            fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR
+        }
+    }
+
+    class DeviceUnregistrationError(
+        val type: DeviceUnregistrationErrorType = DeviceUnregistrationErrorType.GENERIC_ERROR,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class DeviceUnregistrationErrorType { GENERIC_ERROR; }
+
+    class FetchNotificationsPayload : Payload<BaseNetworkError>()
+
+    @Suppress("unused")
+    class FetchNotificationsResponsePayload(
+        val notifs: List<NotificationModel> = emptyList(),
+        val lastSeen: Date? = null
+    ) : Payload<NotificationError>() {
+        constructor(error: NotificationError) : this() {
+            this.error = error
+        }
+    }
+
+    class FetchNotificationPayload(
+        val remoteNoteId: Long
+    ) : Payload<BaseNetworkError>()
+
+    class FetchNotificationResponsePayload(
+        val notification: NotificationModel? = null
+    ) : Payload<NotificationError>() {
+        @Suppress("unused")
+        constructor(error: NotificationError) : this() {
+            this.error = error
+        }
+    }
+
+    class FetchNotificationHashesResponsePayload(
+        val hashesMap: Map<Long, Long> = emptyMap()
+    ) : Payload<NotificationError>() {
+        @Suppress("unused")
+        constructor(error: NotificationError) : this() {
+            this.error = error
+        }
+    }
+
+    class MarkNotificationsSeenPayload(
+        val lastSeenTime: Long
+    ) : Payload<BaseNetworkError>()
+
+    class MarkNotificationSeenResponsePayload(
+        val success: Boolean = false,
+        val lastSeenTime: Long? = null
+    ) : Payload<NotificationError>() {
+        @Suppress("unused")
+        constructor(error: NotificationError) : this() {
+            this.error = error
+        }
+    }
+
+    class MarkNotificationsReadPayload(
+        val notifications: List<NotificationModel>
+    ) : Payload<BaseNetworkError>()
+
+    class MarkNotificationsReadResponsePayload(
+        val notifications: List<NotificationModel>? = null,
+        val success: Boolean = false
+    ) : Payload<NotificationError>() {
+        @Suppress("unused")
+        constructor(error: NotificationError) : this() {
+            this.error = error
+        }
+    }
+
+    class NotificationError(val type: NotificationErrorType, val message: String = "") :
+        OnChangedError
+
+    enum class NotificationErrorType {
+        BAD_REQUEST,
+        NOT_FOUND,
+        AUTHORIZATION_REQUIRED,
+        GENERIC_ERROR;
+
+        companion object {
+            private val reverseMap = values().associateBy(NotificationErrorType::name)
+            fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR
+        }
+    }
+
+    // OnChanged events
+    @Suppress("unused")
+    class OnDeviceRegistered(val deviceId: String?) : OnChanged<DeviceRegistrationError>()
+
+    class OnDeviceUnregistered : OnChanged<DeviceUnregistrationError>()
+
+    class OnNotificationChanged(var rowsAffected: Int) : OnChanged<NotificationError>() {
+        var causeOfChange: NotificationAction? = null
+        var lastSeenTime: Long? = null
+        var success: Boolean = true
+        val changedNotificationLocalIds = mutableListOf<Int>()
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? NotificationAction ?: return
+        when (actionType) {
+            // remote actions
+            NotificationAction.REGISTER_DEVICE -> registerDevice(action.payload as RegisterDevicePayload)
+            NotificationAction.UNREGISTER_DEVICE -> unregisterDevice()
+            NotificationAction.FETCH_NOTIFICATIONS -> synchronizeNotifications()
+            NotificationAction.FETCH_NOTIFICATION -> fetchNotification(action.payload as FetchNotificationPayload)
+            NotificationAction.MARK_NOTIFICATIONS_SEEN ->
+                markNotificationSeen(action.payload as MarkNotificationsSeenPayload)
+            // remote responses
+            NotificationAction.REGISTERED_DEVICE ->
+                handleRegisteredDevice(action.payload as RegisterDeviceResponsePayload)
+
+            NotificationAction.UNREGISTERED_DEVICE ->
+                handleUnregisteredDevice(action.payload as UnregisterDeviceResponsePayload)
+
+            NotificationAction.FETCHED_NOTIFICATIONS ->
+                handleFetchNotificationsCompleted(action.payload as FetchNotificationsResponsePayload)
+
+            NotificationAction.FETCHED_NOTIFICATION_HASHES ->
+                handleFetchNotificationHashesCompleted(action.payload as FetchNotificationHashesResponsePayload)
+
+            NotificationAction.FETCHED_NOTIFICATION ->
+                handleFetchNotificationCompleted(action.payload as FetchNotificationResponsePayload)
+
+            NotificationAction.MARKED_NOTIFICATIONS_SEEN ->
+                handleMarkedNotificationSeen(action.payload as MarkNotificationSeenResponsePayload)
+            // local actions
+            NotificationAction.UPDATE_NOTIFICATION -> updateNotification(action.payload as NotificationModel)
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(T.API, NotificationStore::class.java.simpleName + " onRegister")
+    }
+
+    /**
+     * Fetch all notifications from the database.
+     *
+     * Filtering. Filtering is done by fetching all records that match the strings in [filterByType] OR
+     * [filterBySubtype].
+     *
+     * @param filterByType Optional. A list of notification type strings to filter by
+     * @param filterBySubtype Optional. A list of notification subtype strings to filter by
+     */
+    @SuppressLint("WrongConstant")
+    fun getNotifications(
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): List<NotificationModel> =
+        notificationSqlUtils.getNotifications(ORDER_DESCENDING, filterByType, filterBySubtype)
+
+    /**
+     * Fetch all notifications for the given site.
+     *
+     * Filtering. Filtering is done by fetching all records that match the strings in [filterByType] OR
+     * [filterBySubtype].
+     *
+     * @param site The [SiteModel] to fetch notifications for
+     * @param filterByType Optional. A list of notification type strings to filter by
+     * @param filterBySubtype Optional. A list of notification subtype strings to filter by
+     */
+    @SuppressLint("WrongConstant")
+    fun getNotificationsForSite(
+        site: SiteModel,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): List<NotificationModel> =
+        notificationSqlUtils.getNotificationsForSite(
+            site,
+            ORDER_DESCENDING,
+            filterByType,
+            filterBySubtype
+        )
+
+    fun observeNotificationsForSite(
+        site: SiteModel,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): Flow<List<NotificationModel>> =
+        notificationSqlUtils.observeNotificationsForSite(
+            site,
+            ORDER_DESCENDING,
+            filterByType,
+            filterBySubtype
+        )
+
+    /**
+     * Returns true if the given site has unread notifications
+     *
+     * @param site The [SiteModel] to check notifications for
+     * @param filterByType Optional. A list of notification type strings to filter by
+     * @param filterBySubtype Optional. A list of notification subtype strings to filter by
+     */
+    fun hasUnreadNotificationsForSite(
+        site: SiteModel,
+        filterByType: List<String>? = null,
+        filterBySubtype: List<String>? = null
+    ): Boolean =
+        notificationSqlUtils.hasUnreadNotificationsForSite(site, filterByType, filterBySubtype)
+
+    /**
+     * Fetch the first notification matching the parameters specified in [NoteIdSet].
+     *
+     * @param idSet A [NoteIdSet] containing the localSiteId, remoteNoteId, and localNoteId
+     */
+    @Suppress("unused")
+    fun getNotificationByIdSet(idSet: NoteIdSet) =
+        notificationSqlUtils.getNotificationByIdSet(idSet)
+
+    /**
+     * Fetch a notification from the database by the remote notification ID.
+     */
+    @Suppress("unused")
+    fun getNotificationByRemoteId(remoteNoteId: Long) =
+        notificationSqlUtils.getNotificationByRemoteId(remoteNoteId)
+
+    /**
+     * Fetch a notification from the database by it's local notification id.
+     */
+    fun getNotificationByLocalId(noteId: Int) =
+        notificationSqlUtils.getNotificationByIdSet(NoteIdSet(noteId, 0, 0))
+
+    suspend fun registerDevice(
+        token: String,
+        appKey: NotificationAppKey
+    ): RegisterDeviceResponsePayload {
+        return coroutineEngine.withDefaultContext(T.API, this, "registerDevice") {
+            val uuid = preferences.getString(WPCOM_PUSH_DEVICE_UUID, null) ?: generateAndStoreUUID()
+
+            notificationRestClient.registerDevice(
+                fcmToken = token,
+                appKey = appKey,
+                uuid = uuid
+            ).apply {
+                if (isError || deviceId.isNullOrEmpty()) {
+                    when (error.type) {
+                        DeviceRegistrationErrorType.MISSING_DEVICE_ID ->
+                            AppLog.e(
+                                T.NOTIFS,
+                                "Server response missing device_id - registration skipped!"
+                            )
+
+                        DeviceRegistrationErrorType.GENERIC_ERROR ->
+                            AppLog.e(
+                                T.NOTIFS,
+                                "Error trying to register device: ${error.type} - ${error.message}"
+                            )
+
+                        DeviceRegistrationErrorType.INVALID_RESPONSE ->
+                            AppLog.e(
+                                T.NOTIFS,
+                                "Server response missing response object: ${error.type} - ${error.message}"
+                            )
+                    }
+                } else {
+                    preferences.edit().putString(WPCOM_PUSH_DEVICE_SERVER_ID, deviceId).apply()
+                    AppLog.i(T.NOTIFS, "Server response OK. Device ID: $deviceId")
+                }
+            }
+        }
+    }
+
+    @Deprecated("EventBus is deprecated.", ReplaceWith("registerDevice(token, appKey)"))
+    private fun registerDevice(payload: RegisterDevicePayload) {
+        val uuid = preferences.getString(WPCOM_PUSH_DEVICE_UUID, null) ?: generateAndStoreUUID()
+
+        with(payload) {
+            notificationRestClient.registerDeviceForPushNotifications(gcmToken, appKey, uuid, site)
+        }
+    }
+
+    private fun unregisterDevice() {
+        val deviceId = requireNotNull(preferences.getString(WPCOM_PUSH_DEVICE_SERVER_ID, ""), {
+            "Because we are giving it a default value, preferences.getString shouldn't return null"
+        })
+        notificationRestClient.unregisterDeviceForPushNotifications(deviceId)
+    }
+
+    private fun handleRegisteredDevice(payload: RegisterDeviceResponsePayload) {
+        val onDeviceRegistered = OnDeviceRegistered(payload.deviceId)
+
+        with(payload) {
+            if (isError || deviceId.isNullOrEmpty()) {
+                when (error.type) {
+                    DeviceRegistrationErrorType.MISSING_DEVICE_ID ->
+                        AppLog.e(
+                            T.NOTIFS,
+                            "Server response missing device_id - registration skipped!"
+                        )
+
+                    DeviceRegistrationErrorType.GENERIC_ERROR ->
+                        AppLog.e(
+                            T.NOTIFS,
+                            "Error trying to register device: ${error.type} - ${error.message}"
+                        )
+
+                    DeviceRegistrationErrorType.INVALID_RESPONSE ->
+                        AppLog.e(
+                            T.NOTIFS,
+                            "Server response missing response object: ${error.type} - ${error.message}"
+                        )
+                }
+                onDeviceRegistered.error = payload.error
+            } else {
+                preferences.edit().putString(WPCOM_PUSH_DEVICE_SERVER_ID, deviceId).apply()
+                AppLog.i(T.NOTIFS, "Server response OK. Device ID: $deviceId")
+            }
+        }
+
+        emitChange(onDeviceRegistered)
+    }
+
+    private fun handleUnregisteredDevice(payload: UnregisterDeviceResponsePayload) {
+        val onDeviceUnregistered = OnDeviceUnregistered()
+
+        preferences.edit().apply {
+            remove(WPCOM_PUSH_DEVICE_SERVER_ID)
+            remove(WPCOM_PUSH_DEVICE_UUID)
+            apply()
+        }
+
+        if (payload.isError) {
+            with(payload.error) {
+                AppLog.e(T.NOTIFS, "Unregister device action failed: $type - $message")
+            }
+            onDeviceUnregistered.error = payload.error
+        } else {
+            AppLog.i(T.NOTIFS, "Unregister device action succeeded")
+        }
+
+        emitChange(onDeviceUnregistered)
+    }
+
+    private fun generateAndStoreUUID(): String {
+        return UUID.randomUUID().toString().also {
+            preferences.edit().putString(WPCOM_PUSH_DEVICE_UUID, it).apply()
+        }
+    }
+
+    /**
+     * Determines the optimal route for fetching new notifications and synchronizing the local database.
+     *
+     * No cached notifications in the database: skip fetching hashes and just fetch full notifications
+     * from the remote.
+     *
+     * Cached notifications exist: fetch only the notification id and note_hash from the remote API
+     * and use the smaller, faster results to build a list of notifications to be fetched, and delete
+     * notifications in the database that no longer exist.
+     */
+    private fun synchronizeNotifications() {
+        val cachedCount = notificationSqlUtils.getNotificationsCount()
+
+        if (cachedCount > 0) {
+            // Fetch only the hashes to determine which notifications need to be fully fetched, and which
+            // should be deleted
+            notificationRestClient.fetchNotificationHashes()
+        } else {
+            // Fetch all notifications from the remote
+            notificationRestClient.fetchNotifications()
+        }
+    }
+
+    /**
+     * Use the condensed map of newly fetched notification ids and hashes to determine which notifications are missing
+     * from cache, require updates, or should be deleted.
+     */
+    private fun handleFetchNotificationHashesCompleted(payload: FetchNotificationHashesResponsePayload) {
+        if (payload.isError) {
+            // Unable to synchronize notifications with remote. Emit error event.
+            val onNotificationChanged = OnNotificationChanged(0).also {
+                it.error = payload.error
+                it.causeOfChange = NotificationAction.FETCH_NOTIFICATIONS
+            }
+            emitChange(onNotificationChanged)
+            return
+        }
+
+        // Create a mutable copy of freshly fetched notifications map
+        val notifsToFetch = payload.hashesMap.toMutableMap()
+
+        // Pull cached notifications from the database and build a map of remoteNoteId to noteHash
+        val existingNotifsByRemoteIdMap = notificationSqlUtils
+            .getNotifications().associateBy { it.remoteNoteId }.toMap()
+
+        // Scrub the newly fetched list against the cached db records. Remove any entries for records that
+        // do not require an update from the remote API
+        existingNotifsByRemoteIdMap.entries.forEach { cached ->
+            // Compare new note_hash values against cached values. Delete from db if
+            // cached notification not present in new list
+            notifsToFetch[cached.key]?.let { newNoteHash ->
+                if (cached.value.noteHash == newNoteHash) {
+                    // Notifications are identical. No update needed, remove from
+                    // list of notifs to fetch
+                    notifsToFetch.remove(cached.key)
+                }
+            }
+                ?: notificationSqlUtils.deleteNotificationByRemoteId(cached.key) // Delete notification from the db
+        }
+
+        // Fetch new and updated notifications from the remote api
+        notificationRestClient.fetchNotifications(notifsToFetch.keys.toList())
+    }
+
+    private fun handleFetchNotificationsCompleted(payload: FetchNotificationsResponsePayload) {
+        val onNotificationChanged = if (payload.isError) {
+            // Notification error
+            OnNotificationChanged(0).also { it.error = payload.error }
+        } else {
+            // Save notifications to the database
+            val rowsAffected =
+                payload.notifs.sumBy { notificationSqlUtils.insertOrUpdateNotification(it) }
+
+            OnNotificationChanged(rowsAffected)
+        }.apply {
+            causeOfChange = NotificationAction.FETCH_NOTIFICATIONS
+        }
+
+        emitChange(onNotificationChanged)
+    }
+
+    private fun fetchNotification(payload: FetchNotificationPayload) {
+        notificationRestClient.fetchNotification(payload.remoteNoteId)
+    }
+
+    private fun handleFetchNotificationCompleted(payload: FetchNotificationResponsePayload) {
+        val onNotificationChanged = if (payload.isError) {
+            OnNotificationChanged(0).also { it.error = payload.error }
+        } else {
+            // Update the localSiteId and save to the db
+            val rows = payload.notification?.let {
+                notificationSqlUtils.insertOrUpdateNotification(it)
+            } ?: 0
+            // Fetch inserted/updated local notification id
+            val dbNotification = payload.notification?.let {
+                notificationSqlUtils.getNotificationByRemoteId(it.remoteNoteId)
+            }
+            OnNotificationChanged(rows).apply {
+                dbNotification?.let { changedNotificationLocalIds.add(it.noteId) }
+            }
+        }.apply {
+            causeOfChange = NotificationAction.FETCH_NOTIFICATION
+        }
+        emitChange(onNotificationChanged)
+    }
+
+    private fun markNotificationSeen(payload: MarkNotificationsSeenPayload) {
+        notificationRestClient.markNotificationsSeen(payload.lastSeenTime)
+    }
+
+    private fun handleMarkedNotificationSeen(payload: MarkNotificationSeenResponsePayload) {
+        val onNotificationChanged = if (payload.isError) {
+            // Notification error
+            OnNotificationChanged(0).apply {
+                error = payload.error
+                success = false
+            }
+        } else {
+            OnNotificationChanged(0).apply {
+                success = payload.success
+                lastSeenTime = payload.lastSeenTime
+            }
+        }.apply {
+            causeOfChange = NotificationAction.MARK_NOTIFICATIONS_SEEN
+        }
+        emitChange(onNotificationChanged)
+    }
+
+    @Suppress("MemberVisibilityCanBePrivate")
+    suspend fun markNotificationsRead(payload: MarkNotificationsReadPayload): OnNotificationChanged {
+        return coroutineEngine.withDefaultContext(T.API, this, "markNotificationsRead") {
+            val result = notificationRestClient.markNotificationRead(payload.notifications)
+            // Update the notification in the database
+            var rowsAffected = 0
+            if (result.success) {
+                result.notifications?.forEach {
+                    // Just in case it wasn't set by the calling client
+                    val note = it.copy(read = true)
+                    rowsAffected += notificationSqlUtils.insertOrUpdateNotification(note)
+                }
+            }
+
+            // Create and dispatch result
+            val onNotificationChanged = if (result.isError) {
+                OnNotificationChanged(rowsAffected).apply {
+                    error = result.error
+                    success = false
+                }
+            } else {
+                OnNotificationChanged(rowsAffected).apply {
+                    success = true
+                }
+            }.apply {
+                result.notifications?.forEach {
+                    changedNotificationLocalIds.add(it.noteId)
+                }
+            }
+            onNotificationChanged
+        }
+    }
+
+    private fun updateNotification(payload: NotificationModel) {
+        // save notification to the db
+        val rowsAffected = notificationSqlUtils.insertOrUpdateNotification(payload)
+        val onNotificationChanged = OnNotificationChanged(rowsAffected).apply {
+            changedNotificationLocalIds.add(payload.noteId)
+            causeOfChange = NotificationAction.UPDATE_NOTIFICATION
+        }
+        emitChange(onNotificationChanged)
+    }
+
+    suspend fun updateNotificationSettingsFor(
+        siteNotificationsEnabled: List<SiteNotificationSetting>
+    ): Result<Unit> = coroutineEngine.withDefaultContext(
+        T.API,
+        this,
+        "Update notification settings for sites: ${siteNotificationsEnabled.joinToString(",")}}"
+    ) {
+        val deviceId = preferences.getString(WPCOM_PUSH_DEVICE_SERVER_ID, null)
+            ?: return@withDefaultContext Result.failure(
+                NotificationSettingsUpdateError(type = UnregisteredDevice)
+            )
+
+        val payload = siteNotificationsEnabled.map {
+            SiteNotificationSettingDto(
+                siteId = it.siteId,
+                devices = listOf(
+                    DevicesDto(
+                        deviceId = deviceId,
+                        newComment = it.newCommentEnabled,
+                        storeOrder = it.storeOrderEnabled
+                    )
+                )
+            )
+        }
+        when (val result = notificationRestClient.disableNotificationsFor(payload)) {
+            is Success -> {
+                AppLog.i(NOTIFS, "Server response OK. Notifications disabled for device: $deviceId")
+                Result.success(Unit)
+            }
+
+            is Response.Error -> {
+                AppLog.e(NOTIFS, "Error updating notification settings: ${result.error} - ${result.error.message}")
+                Result.failure(
+                    NotificationSettingsUpdateError(
+                        type = NotificationSettingErrorType.ApiError(result.error.message)
+                    )
+                )
+            }
+        }
+    }
+
+    data class SiteNotificationSetting(
+        val siteId: Long,
+        val newCommentEnabled: Boolean,
+        val storeOrderEnabled: Boolean
+    )
+
+    data class NotificationSettingsUpdateError(
+        val type: NotificationSettingErrorType
+    ) : Exception()
+
+    sealed interface NotificationSettingErrorType {
+        object UnregisteredDevice : NotificationSettingErrorType
+        data class ApiError(val message: String) : NotificationSettingErrorType
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt
new file mode 100644
index 00000000000..2e1e8b51277
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt
@@ -0,0 +1,291 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.PostActionBuilder
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.page.PageModel
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.network.utils.CurrentDateUtils
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.store.PageStore.OnPageChanged.Error
+import org.wordpress.android.fluxc.store.PageStore.UploadRequestResult.ERROR_NON_EXISTING_PAGE
+import org.wordpress.android.fluxc.store.PageStore.UploadRequestResult.SUCCESS
+import org.wordpress.android.fluxc.store.PostStore.FetchPostsPayload
+import org.wordpress.android.fluxc.store.PostStore.OnPostChanged
+import org.wordpress.android.fluxc.store.PostStore.PostError
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType.UNKNOWN_POST
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload
+import org.wordpress.android.fluxc.store.Store.OnChanged
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+@Singleton
+class PageStore @Inject constructor(
+    private val postStore: PostStore,
+    private val postSqlUtils: PostSqlUtils,
+    private val dispatcher: Dispatcher,
+    private val currentDateUtils: CurrentDateUtils,
+    private val coroutineEngine: CoroutineEngine
+) {
+    companion object {
+        val PAGE_TYPES = listOf(
+                PostStatus.DRAFT,
+                PostStatus.PUBLISHED,
+                PostStatus.SCHEDULED,
+                PostStatus.PENDING,
+                PostStatus.PRIVATE,
+                PostStatus.TRASHED
+        )
+    }
+
+    private var postLoadContinuations: MutableList<Continuation<OnPageChanged>> = mutableListOf()
+    private var deletePostContinuation: Continuation<OnPageChanged>? = null
+    private var updatePostContinuation: Continuation<OnPageChanged>? = null
+
+    private var lastFetchTime: Calendar? = null
+    private var fetchingSite: SiteModel? = null
+
+    init {
+        dispatcher.register(this)
+    }
+
+    suspend fun getPageByLocalId(pageId: Int, site: SiteModel): PageModel? =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "getPageByLocalId") {
+                val post = postStore.getPostByLocalPostId(pageId)
+                return@withDefaultContext post?.let {
+                    PageModel(it, site, getPageByRemoteId(it.parentId, site))
+                }
+            }
+
+    suspend fun getPageByRemoteId(remoteId: Long, site: SiteModel): PageModel? =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "getPageByRemoteId") {
+                if (remoteId <= 0L) {
+                    return@withDefaultContext null
+                }
+                val post = postStore.getPostByRemotePostId(remoteId, site)
+                return@withDefaultContext post?.let {
+                    PageModel(it, site, getPageByRemoteId(it.parentId, site))
+                }
+            }
+
+    suspend fun search(site: SiteModel, searchQuery: String): List<PageModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "search") {
+                getPagesFromDb(site).filter {
+                    it.title.toLowerCase(Locale.ROOT)
+                            .contains(searchQuery.toLowerCase(Locale.ROOT))
+                }
+            }
+
+    suspend fun updatePageInDb(page: PageModel): OnPageChanged = suspendCoroutine { cont ->
+        val post = postStore.getPostByRemotePostId(page.remoteId, page.site)
+                ?: postStore.getPostByLocalPostId(page.pageId)
+        if (post != null) {
+            post.updatePageData(page)
+
+            val updateAction = PostActionBuilder.newUpdatePostAction(post)
+            updatePostContinuation = cont
+            dispatcher.dispatch(updateAction)
+        } else {
+            cont.resume(Error(PostError(UNKNOWN_POST)))
+        }
+    }
+
+    suspend fun uploadPageToServer(page: PageModel): UploadRequestResult =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "uploadPageToServer") {
+                val post = postStore.getPostByRemotePostId(page.remoteId, page.site)
+                        ?: postStore.getPostByLocalPostId(page.pageId)
+                if (post != null) {
+                    post.updatePageData(page)
+
+                    val action = PostActionBuilder.newPushPostAction(RemotePostPayload(post, page.site))
+                    dispatcher.dispatch(action)
+
+                    return@withDefaultContext SUCCESS
+                } else {
+                    return@withDefaultContext ERROR_NON_EXISTING_PAGE
+                }
+            }
+
+    enum class UploadRequestResult {
+        SUCCESS,
+        ERROR_NON_EXISTING_PAGE
+    }
+
+    suspend fun getPagesFromDb(site: SiteModel): List<PageModel> {
+        // We don't want to return data from the database when it's still being loaded
+        if (postLoadContinuations.isNotEmpty()) {
+            return listOf()
+        }
+        return coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "getPagesFromDb") {
+            val posts = postStore.getPagesForSite(site)
+                    .asSequence()
+                    .filterNotNull()
+                    .filter { PAGE_TYPES.contains(PostStatus.fromPost(it)) }
+                    .map {
+                        // local DB pages have a non-unique remote ID value of 0
+                        // to keep the apart we replace it with page ID (still unique)
+                        // and make it negative (to easily tell it's a temporary value)
+                        if (it.remotePostId == 0L) {
+                            /**
+                             * This hack is breaking the approach which we use for making sure we upload only changes
+                             * which were explicitly confirmed by the user. We are modifying the PostModel and we need
+                             * to make sure to retain the confirmation.
+                             */
+                            val changesConfirmed = it.contentHashcode() == it.changesConfirmedContentHashcode
+                            it.setRemotePostId(-it.id.toLong())
+                            if (changesConfirmed) {
+                                it.setChangesConfirmedContentHashcode(it.contentHashcode())
+                            }
+                        }
+                        it
+                    }
+                    .associateBy { it.remotePostId }
+
+            return@withDefaultContext posts.map { getPageFromPost(it.key, site, posts, false) }
+                    .filterNotNull()
+                    .sortedBy { it.remoteId }
+        }
+    }
+
+    private fun getPageFromPost(
+        postId: Long,
+        site: SiteModel,
+        posts: Map<Long, PostModel>,
+        skipLocalPages: Boolean = true
+    ): PageModel? {
+        if (skipLocalPages && (postId <= 0L || !posts.containsKey(postId))) {
+            return null
+        }
+        val post = posts[postId]!!
+        return PageModel(post, site, getPageFromPost(post.parentId, site, posts))
+    }
+
+    suspend fun deletePageFromServer(page: PageModel): OnPageChanged = suspendCoroutine { cont ->
+        val post = postStore.getPostByLocalPostId(page.pageId)
+        if (post != null) {
+            deletePostContinuation = cont
+            val payload = RemotePostPayload(post, page.site)
+            dispatcher.dispatch(PostActionBuilder.newDeletePostAction(payload))
+        } else {
+            cont.resume(Error(PostError(UNKNOWN_POST)))
+        }
+    }
+
+    suspend fun deletePageFromDb(page: PageModel): Boolean =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "deletePageFromDb") {
+                val post = postStore.getPostByLocalPostId(page.pageId)
+                return@withDefaultContext if (post != null) {
+                    postSqlUtils.deletePost(post) > 0
+                } else {
+                    false
+                }
+            }
+
+    suspend fun requestPagesFromServer(site: SiteModel, forced: Boolean): OnPageChanged {
+        if (!forced && hasRecentCall() && getPagesFromDb(site).isNotEmpty()) {
+            return OnPageChanged.Success
+        }
+        return suspendCoroutine { cont ->
+            fetchingSite = site
+            if (postLoadContinuations.isEmpty()) {
+                lastFetchTime = currentDateUtils.getCurrentCalendar()
+                fetchPages(site, false)
+            }
+            postLoadContinuations.add(cont)
+        }
+    }
+
+    private fun hasRecentCall(): Boolean {
+        val currentCalendar = currentDateUtils.getCurrentCalendar()
+        currentCalendar.add(Calendar.HOUR, -1)
+        return lastFetchTime?.after(currentCalendar) ?: false
+    }
+
+    /**
+     * Get local draft pages that have not been uploaded to the server yet.
+     *
+     * This returns [PostModel] instead of [PageModel] to accommodate the `UploadService` in WPAndroid which relies
+     * heavily on [PostModel]. When `UploadService` gets refactored, we should change this back to using [PageModel].
+     */
+    suspend fun getLocalDraftPages(site: SiteModel): List<PostModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "getLocalDraftPages") {
+                return@withDefaultContext postSqlUtils.getLocalDrafts(site.id, true)
+            }
+
+    /**
+     * Get pages that have not been uploaded to the server yet.
+     *
+     * This returns [PostModel] instead of [PageModel] to accommodate the `UploadService` in WPAndroid which relies
+     * heavily on [PostModel]. When `UploadService` gets refactored, we should change this back to using [PageModel].
+     */
+    suspend fun getPagesWithLocalChanges(site: SiteModel): List<PostModel> =
+            coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "getPagesWithLocalChanges") {
+                return@withDefaultContext postSqlUtils.getPostsWithLocalChanges(site.id, true)
+            }
+
+    private fun fetchPages(site: SiteModel, loadMore: Boolean) {
+        val payload = FetchPostsPayload(site, loadMore, PAGE_TYPES)
+        dispatcher.dispatch(PostActionBuilder.newFetchPagesAction(payload))
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onPostChanged(event: OnPostChanged) {
+        when (event.causeOfChange) {
+            is CauseOfOnPostChanged.FetchPages -> {
+                if (event.canLoadMore && fetchingSite != null) {
+                    fetchPages(fetchingSite!!, true)
+                } else {
+                    val onPageChanged = event.toOnPageChangedEvent()
+                    postLoadContinuations.forEach { it.resume(onPageChanged) }
+                    postLoadContinuations.clear()
+                    fetchingSite = null
+                }
+            }
+            is CauseOfOnPostChanged.DeletePost -> {
+                deletePostContinuation?.resume(event.toOnPageChangedEvent())
+                deletePostContinuation = null
+            }
+            is CauseOfOnPostChanged.UpdatePost -> {
+                updatePostContinuation?.resume(event.toOnPageChangedEvent())
+                updatePostContinuation = null
+            }
+            else -> {
+            }
+        }
+    }
+
+    private fun PostModel.updatePageData(page: PageModel) {
+        this.setId(page.pageId)
+        this.setTitle(page.title)
+        this.setStatus(page.status.toPostStatus().toString())
+        this.setParentId(page.parent?.remoteId ?: 0)
+        this.setRemotePostId(page.remoteId)
+        this.setDateCreated(DateTimeUtils.iso8601FromDate(page.date))
+    }
+
+    sealed class OnPageChanged : OnChanged<PostError>() {
+        object Success : OnPageChanged()
+        data class Error(val postError: PostError) : OnPageChanged() {
+            init {
+                this.error = postError
+            }
+        }
+    }
+
+    private fun OnPostChanged.toOnPageChangedEvent(): OnPageChanged {
+        return if (this.isError) Error(this.error) else OnPageChanged.Success
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlanOffersStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlanOffersStore.kt
new file mode 100644
index 00000000000..6fa309d8620
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlanOffersStore.kt
@@ -0,0 +1,84 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.PlanOffersAction
+import org.wordpress.android.fluxc.action.PlanOffersAction.FETCH_PLAN_OFFERS
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.plans.PlanOffersModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.planoffers.PlanOffersRestClient
+import org.wordpress.android.fluxc.persistence.PlanOffersSqlUtils
+import org.wordpress.android.fluxc.store.PlanOffersStore.PlanOffersErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PlanOffersStore @Inject constructor(
+    private val planOffersRestClient: PlanOffersRestClient,
+    private val planOffersSqlUtils: PlanOffersSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? PlanOffersAction ?: return
+        when (actionType) {
+            FETCH_PLAN_OFFERS -> {
+                coroutineEngine.launch(AppLog.T.PLANS, this, "FETCH_PLAN_OFFERS") {
+                    emitChange(fetchPlanOffers())
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchPlanOffers(): OnPlanOffersFetched {
+        val fetchedPlanOffersPayload = planOffersRestClient.fetchPlanOffers()
+
+        return if (!fetchedPlanOffersPayload.isError) {
+            planOffersSqlUtils.storePlanOffers(fetchedPlanOffersPayload.planOffers!!)
+            OnPlanOffersFetched(fetchedPlanOffersPayload.planOffers)
+        } else {
+            OnPlanOffersFetched(
+                    getCachedPlanOffers(),
+                    PlansFetchError(GENERIC_ERROR, fetchedPlanOffersPayload.error.message)
+            )
+        }
+    }
+
+    fun getCachedPlanOffers(): List<PlanOffersModel> {
+        return planOffersSqlUtils.getPlanOffers()
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, PlanOffersStore::class.java.simpleName + " onRegister")
+    }
+
+    class PlanOffersFetchedPayload(
+        val planOffers: List<PlanOffersModel>? = null
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    data class OnPlanOffersFetched(
+        val planOffers: List<PlanOffersModel>? = null,
+        val fetchError: PlansFetchError? = null
+    ) : Store.OnChanged<PlansFetchError>() {
+        init {
+            // we allow setting error from constructor, so it will be a part of data class
+            // and used during comparison, so we can test error events
+            this.error = fetchError
+        }
+    }
+
+    data class PlansFetchError(
+        val type: PlanOffersErrorType,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class PlanOffersErrorType {
+        GENERIC_ERROR
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlansStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlansStore.kt
new file mode 100644
index 00000000000..32f5335ef18
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PlansStore.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.plans.full.Plan
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.plans.PlansRestClient
+import org.wordpress.android.fluxc.store.Store.OnChanged
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PlansStore @Inject constructor(
+    private val restClient: PlansRestClient,
+    private val coroutineEngine: CoroutineEngine,
+) {
+    suspend fun fetchPlans(): OnPlansFetched =
+        coroutineEngine.withDefaultContext(T.API, this, "Fetch plans") {
+            return@withDefaultContext when (val response = restClient.fetchPlans()) {
+                is Success -> {
+                    OnPlansFetched(response.data.toList())
+                }
+                is Error -> {
+                    OnPlansFetched(
+                        FetchPlansError(response.error.volleyError.message ?: "Unknown error")
+                    )
+                }
+            }
+        }
+
+    data class OnPlansFetched(val plans: List<Plan>? = null) : OnChanged<FetchPlansError>() {
+        constructor(error: FetchPlansError) : this() {
+            this.error = error
+        }
+    }
+
+    data class FetchPlansError(
+        val message: String,
+    ) : OnChangedError
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginCoroutineStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginCoroutineStore.kt
new file mode 100644
index 00000000000..ababa84b48e
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginCoroutineStore.kt
@@ -0,0 +1,166 @@
+package org.wordpress.android.fluxc.store
+
+import kotlinx.coroutines.delay
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType.SITE
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.plugin.PluginWPAPIRestClient
+import org.wordpress.android.fluxc.persistence.PluginSqlUtilsWrapper
+import org.wordpress.android.fluxc.store.PluginStore.ConfigureSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.DeleteSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.DeleteSitePluginErrorType.UNKNOWN_PLUGIN
+import org.wordpress.android.fluxc.store.PluginStore.FetchSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.FetchedSitePluginPayload
+import org.wordpress.android.fluxc.store.PluginStore.InstallSitePluginError
+import org.wordpress.android.fluxc.store.PluginStore.OnPluginDirectoryFetched
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginConfigured
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginDeleted
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginFetched
+import org.wordpress.android.fluxc.store.PluginStore.OnSitePluginInstalled
+import org.wordpress.android.fluxc.store.PluginStore.PluginDirectoryError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+
+private const val PLUGIN_CONFIGURATION_DELAY = 1000L
+
+class PluginCoroutineStore
+@Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val dispatcher: Dispatcher,
+    private val pluginWPAPIRestClient: PluginWPAPIRestClient,
+    private val pluginSqlUtils: PluginSqlUtilsWrapper
+) {
+    fun fetchWPApiPlugins(siteModel: SiteModel) =
+        coroutineEngine.launch(T.PLUGINS, this, "Fetching WPAPI plugins") {
+            val event = syncFetchWPApiPlugins(siteModel)
+            dispatcher.emitChange(event)
+        }
+
+    suspend fun syncFetchWPApiPlugins(
+        siteModel: SiteModel
+    ): OnPluginDirectoryFetched {
+        val payload = pluginWPAPIRestClient.fetchPlugins(siteModel)
+        val event = OnPluginDirectoryFetched(SITE, false)
+        val error = payload.error
+        if (error != null) {
+            event.error = PluginDirectoryError(error.type, error.message)
+        } else if (!payload.data.isNullOrEmpty()) {
+            event.canLoadMore = false
+            pluginSqlUtils.insertOrReplaceSitePlugins(siteModel, payload.data)
+        }
+        return event
+    }
+
+    fun fetchWPApiPlugin(site: SiteModel, pluginName: String) =
+        coroutineEngine.launch(T.PLUGINS, this, "Fetching WPAPI plugin") {
+            val event = syncFetchWPApiPlugin(site, pluginName)
+            dispatcher.emitChange(event)
+        }
+
+    suspend fun syncFetchWPApiPlugin(site: SiteModel, pluginName: String): OnSitePluginFetched {
+        val payload = pluginWPAPIRestClient.fetchPlugin(site, pluginName)
+        val error = payload.error
+        return if (error != null) {
+            val fetchError = FetchSitePluginError(error.type, error.message)
+            OnSitePluginFetched(FetchedSitePluginPayload(pluginName, fetchError))
+                .apply {
+                    this.error = fetchError
+                }
+        } else {
+            pluginSqlUtils.insertOrUpdateSitePlugin(site, payload.data)
+            OnSitePluginFetched(
+                FetchedSitePluginPayload(payload.data)
+            )
+        }
+    }
+
+    fun deleteSitePlugin(site: SiteModel, pluginName: String, slug: String) =
+            coroutineEngine.launch(T.PLUGINS, this, "Deleting WPAPI plugin") {
+                val event = syncDeleteSitePlugin(site, pluginName, slug)
+                dispatcher.emitChange(event)
+            }
+
+    suspend fun syncDeleteSitePlugin(
+        site: SiteModel,
+        pluginName: String,
+        slug: String
+    ): OnSitePluginDeleted {
+        val plugin = pluginSqlUtils.getSitePluginBySlug(site, slug)
+        val payload = pluginWPAPIRestClient.deletePlugin(site, plugin?.name ?: pluginName)
+        val event = OnSitePluginDeleted(payload.site, pluginName, slug)
+        val error = payload.error?.let {
+            DeleteSitePluginError(it.type, it.message)
+        }
+        if (error != null && error.type != UNKNOWN_PLUGIN) {
+            event.error = error
+        } else {
+            pluginSqlUtils.deleteSitePlugin(site, slug)
+        }
+        return event
+    }
+
+    fun configureSitePlugin(site: SiteModel, pluginName: String, slug: String, isActive: Boolean) =
+            coroutineEngine.launch(T.PLUGINS, this, "Configuring WPAPI plugin") {
+                val event = syncConfigureSitePlugin(site, pluginName, slug, isActive)
+                dispatcher.emitChange(event)
+            }
+
+    suspend fun syncConfigureSitePlugin(
+        site: SiteModel,
+        pluginName: String,
+        slug: String,
+        isActive: Boolean
+    ): OnSitePluginConfigured {
+        val plugin = pluginSqlUtils.getSitePluginBySlug(site, slug)
+        val payload = pluginWPAPIRestClient.updatePlugin(site, plugin?.name ?: pluginName, isActive)
+        val event = OnSitePluginConfigured(payload.site, pluginName, slug)
+        val error = payload.error
+        if (error != null) {
+            event.error = ConfigureSitePluginError(error, isActive)
+        } else {
+            pluginSqlUtils.insertOrUpdateSitePlugin(site, payload.data)
+        }
+        return event
+    }
+
+    fun installSitePlugin(site: SiteModel, slug: String) =
+            coroutineEngine.launch(T.PLUGINS, this, "Installing WPAPI plugin") {
+                syncInstallSitePlugin(site, slug)
+            }
+
+    suspend fun syncInstallSitePlugin(
+        site: SiteModel,
+        slug: String
+    ): OnSitePluginInstalled {
+        val payload = pluginWPAPIRestClient.installPlugin(site, slug)
+        val event = OnSitePluginInstalled(payload.site, payload.data?.slug ?: slug)
+        val error = payload.error
+        if (error != null) {
+            event.error = InstallSitePluginError(error)
+        } else {
+            pluginSqlUtils.insertOrUpdateSitePlugin(site, payload.data)
+        }
+        dispatcher.emitChange(event)
+
+        // Once the plugin is installed activate it and enable auto-updates
+        if (!payload.isError && payload.data != null) {
+            // Give a second to the server as otherwise the following configure call may fail
+            delay(PLUGIN_CONFIGURATION_DELAY)
+            val configureEvent = syncConfigureSitePlugin(site, payload.data.name, payload.data.slug, true)
+            dispatcher.emitChange(configureEvent)
+        }
+        return event
+    }
+
+    class WPApiPluginsPayload<T>(
+        val site: SiteModel?,
+        val data: T?
+    ) : Payload<BaseNetworkError?>() {
+        constructor(error: BaseNetworkError) : this(null, null) {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginStore.java
new file mode 100644
index 00000000000..08139b2cb0c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PluginStore.java
@@ -0,0 +1,1185 @@
+package org.wordpress.android.fluxc.store;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.PluginAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.generated.PluginActionBuilder;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.plugin.ImmutablePluginModel;
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryModel;
+import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType;
+import org.wordpress.android.fluxc.model.plugin.SitePluginModel;
+import org.wordpress.android.fluxc.model.plugin.WPOrgPluginModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType;
+import org.wordpress.android.fluxc.network.rest.wpcom.plugin.PluginJetpackTunnelRestClient;
+import org.wordpress.android.fluxc.network.rest.wpcom.plugin.PluginRestClient;
+import org.wordpress.android.fluxc.network.wporg.plugin.PluginWPOrgClient;
+import org.wordpress.android.fluxc.persistence.PluginSqlUtils;
+import org.wordpress.android.util.AppLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class PluginStore extends Store {
+    // Request payloads
+    @SuppressWarnings("WeakerAccess")
+    public static class ConfigureSitePluginPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+        public boolean isActive;
+        public boolean isAutoUpdateEnabled;
+
+        public ConfigureSitePluginPayload(SiteModel site, String pluginName, String slug, boolean isActive,
+                                          boolean isAutoUpdateEnabled) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+            this.isActive = isActive;
+            this.isAutoUpdateEnabled = isAutoUpdateEnabled;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class DeleteSitePluginPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public String slug;
+        public String pluginName;
+
+        public DeleteSitePluginPayload(SiteModel site, String pluginName, String slug) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchPluginDirectoryPayload extends Payload<BaseNetworkError> {
+        public PluginDirectoryType type;
+        public @Nullable SiteModel site;
+        public boolean loadMore;
+
+        public FetchPluginDirectoryPayload(PluginDirectoryType type, @Nullable SiteModel site, boolean loadMore) {
+            this.type = type;
+            this.site = site;
+            this.loadMore = loadMore;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchSitePluginPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public String pluginName;
+
+        public FetchSitePluginPayload(SiteModel site, String pluginName) {
+            this.site = site;
+            this.pluginName = pluginName;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class InstallSitePluginPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public String slug;
+
+        public InstallSitePluginPayload(SiteModel site, String slug) {
+            this.site = site;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class SearchPluginDirectoryPayload extends Payload<BaseNetworkError> {
+        public SiteModel site; // required to add the SitePluginModels to the OnPluginDirectorySearched
+        public String searchTerm;
+        public int page;
+
+        public SearchPluginDirectoryPayload(@Nullable SiteModel site, String searchTerm, int page) {
+            this.site = site;
+            this.searchTerm = searchTerm;
+            this.page = page;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class UpdateSitePluginPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+
+        public UpdateSitePluginPayload(SiteModel site, String pluginName, String slug) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+        }
+    }
+
+    // Response payloads
+
+    @SuppressWarnings("WeakerAccess")
+    public static class ConfiguredSitePluginPayload extends Payload<ConfigureSitePluginError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+        public SitePluginModel plugin;
+
+        public ConfiguredSitePluginPayload(SiteModel site, SitePluginModel plugin) {
+            this.site = site;
+            this.plugin = plugin;
+            this.pluginName = this.plugin.getName();
+            this.slug = this.plugin.getSlug();
+        }
+
+        public ConfiguredSitePluginPayload(SiteModel site, String pluginName, ConfigureSitePluginError error) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.error = error;
+        }
+
+        public ConfiguredSitePluginPayload(SiteModel site, String pluginName, String slug,
+                                           ConfigureSitePluginError error) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+            this.error = error;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class DeletedSitePluginPayload extends Payload<DeleteSitePluginError> {
+        public SiteModel site;
+        public String slug;
+        public String pluginName;
+
+        public DeletedSitePluginPayload(SiteModel site, String slug, String pluginName) {
+            this.site = site;
+            this.slug = slug;
+            this.pluginName = pluginName;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchedPluginDirectoryPayload extends Payload<PluginDirectoryError> {
+        public PluginDirectoryType type;
+        public boolean loadMore = false;
+        public boolean canLoadMore = false;
+
+        // Used for PluginDirectoryType.NEW & PluginDirectoryType.Popular
+        public int page;
+        public List<WPOrgPluginModel> wpOrgPlugins;
+
+        // Used for PluginDirectoryType.SITE
+        public SiteModel site;
+        public List<SitePluginModel> sitePlugins;
+
+        public FetchedPluginDirectoryPayload(PluginDirectoryType type, List<WPOrgPluginModel> wpOrgPlugins,
+                                             boolean loadMore, boolean canLoadMore, int page) {
+            this.type = type;
+            this.wpOrgPlugins = wpOrgPlugins;
+            this.loadMore = loadMore;
+            this.canLoadMore = canLoadMore;
+            this.page = page;
+        }
+
+        public FetchedPluginDirectoryPayload(SiteModel site, List<SitePluginModel> sitePlugins) {
+            this.type = PluginDirectoryType.SITE;
+            this.site = site;
+            this.sitePlugins = sitePlugins;
+        }
+
+        public FetchedPluginDirectoryPayload(PluginDirectoryType type, boolean loadMore, PluginDirectoryError error) {
+            this.type = type;
+            this.loadMore = loadMore;
+            this.error = error;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchedWPOrgPluginPayload extends Payload<FetchWPOrgPluginError> {
+        public String pluginSlug;
+        public WPOrgPluginModel wpOrgPlugin;
+
+        public FetchedWPOrgPluginPayload(String pluginSlug, FetchWPOrgPluginError error) {
+            this.pluginSlug = pluginSlug;
+            this.error = error;
+        }
+
+        public FetchedWPOrgPluginPayload(String pluginSlug, WPOrgPluginModel plugin) {
+            this.pluginSlug = pluginSlug;
+            this.wpOrgPlugin = plugin;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchedSitePluginPayload extends Payload<FetchSitePluginError> {
+        public SitePluginModel plugin;
+        public String pluginName;
+
+        public FetchedSitePluginPayload(SitePluginModel plugin) {
+            this.plugin = plugin;
+        }
+
+        public FetchedSitePluginPayload(String pluginName, FetchSitePluginError error) {
+            this.pluginName = pluginName;
+            this.error = error;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class InstalledSitePluginPayload extends Payload<InstallSitePluginError> {
+        public SiteModel site;
+        public String slug;
+        public SitePluginModel plugin;
+
+        public InstalledSitePluginPayload(SiteModel site, SitePluginModel plugin) {
+            this.site = site;
+            this.plugin = plugin;
+            this.slug = this.plugin.getSlug();
+        }
+
+        public InstalledSitePluginPayload(SiteModel site, String slug, InstallSitePluginError error) {
+            this.site = site;
+            this.slug = slug;
+            this.error = error;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class SearchedPluginDirectoryPayload extends Payload<PluginDirectoryError> {
+        public SiteModel site;
+        public String searchTerm;
+        public int page;
+        public boolean canLoadMore;
+        public List<WPOrgPluginModel> plugins;
+
+        public SearchedPluginDirectoryPayload(@Nullable SiteModel site, String searchTerm, int page) {
+            this.site = site;
+            this.searchTerm = searchTerm;
+            this.page = page;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class UpdatedSitePluginPayload extends Payload<UpdateSitePluginError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+        public SitePluginModel plugin;
+
+        public UpdatedSitePluginPayload(SiteModel site, SitePluginModel plugin) {
+            this.site = site;
+            this.plugin = plugin;
+            this.pluginName = this.plugin.getName();
+            this.slug = this.plugin.getSlug();
+        }
+
+        public UpdatedSitePluginPayload(SiteModel site, String pluginName, String slug, UpdateSitePluginError error) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+            this.error = error;
+        }
+    }
+
+    // Errors
+
+    public static class ConfigureSitePluginError implements OnChangedError {
+        public ConfigureSitePluginErrorType type;
+        @Nullable public Integer errorCode;
+        @Nullable public String message;
+
+        ConfigureSitePluginError(ConfigureSitePluginErrorType type) {
+            this.type = type;
+        }
+
+        public ConfigureSitePluginError(String type, @Nullable String message) {
+            this.type = ConfigureSitePluginErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public ConfigureSitePluginError(BaseNetworkError error, boolean isActivating) {
+            this.type = ConfigureSitePluginErrorType.fromGenericErrorType(error.type, isActivating);
+            this.message = error.message;
+            if (error.hasVolleyError() && error.volleyError.networkResponse != null) {
+                this.errorCode = error.volleyError.networkResponse.statusCode;
+            }
+        }
+    }
+
+    public static class DeleteSitePluginError implements OnChangedError {
+        public DeleteSitePluginErrorType type;
+        @Nullable public String message;
+
+        DeleteSitePluginError(DeleteSitePluginErrorType type) {
+            this.type = type;
+        }
+
+        public DeleteSitePluginError(String type, @Nullable String message) {
+            this.type = DeleteSitePluginErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public DeleteSitePluginError(GenericErrorType type, @Nullable String message) {
+            this.type = DeleteSitePluginErrorType.fromGenericErrorType(type);
+            this.message = message;
+        }
+    }
+
+    public static class PluginDirectoryError implements OnChangedError {
+        public PluginDirectoryErrorType type;
+        @Nullable public String message;
+
+        public PluginDirectoryError(PluginDirectoryErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public PluginDirectoryError(String type, @Nullable String message) {
+            this.type = PluginDirectoryErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public PluginDirectoryError(GenericErrorType type, @Nullable String message) {
+            this.type = PluginDirectoryErrorType.fromGenericErrorType(type);
+            this.message = message;
+        }
+    }
+
+    public static class FetchWPOrgPluginError implements OnChangedError {
+        public FetchWPOrgPluginErrorType type;
+
+        public FetchWPOrgPluginError(FetchWPOrgPluginErrorType type) {
+            this.type = type;
+        }
+    }
+
+    public static class FetchSitePluginError implements OnChangedError {
+        public FetchSitePluginErrorType type;
+        @Nullable public String message;
+
+        public FetchSitePluginError(FetchSitePluginErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public FetchSitePluginError(GenericErrorType type, @Nullable String message) {
+            this.type = FetchSitePluginErrorType.fromGenericErrorType(type);
+            this.message = message;
+        }
+    }
+
+    public static class InstallSitePluginError implements OnChangedError {
+        public InstallSitePluginErrorType type;
+        @Nullable public Integer errorCode;
+        @Nullable public String message;
+
+        InstallSitePluginError(InstallSitePluginErrorType type) {
+            this(type, null);
+        }
+
+        InstallSitePluginError(InstallSitePluginErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public InstallSitePluginError(String type, @Nullable String message) {
+            this.type = InstallSitePluginErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public InstallSitePluginError(BaseNetworkError error) {
+            this.type = InstallSitePluginErrorType.fromNetworkError(error);
+            this.message = error.message;
+            if (error.hasVolleyError() && error.volleyError.networkResponse != null) {
+                this.errorCode = error.volleyError.networkResponse.statusCode;
+            }
+        }
+    }
+
+    public static class UpdateSitePluginError implements OnChangedError {
+        public UpdateSitePluginErrorType type;
+        @Nullable public String message;
+
+        UpdateSitePluginError(UpdateSitePluginErrorType type) {
+            this.type = type;
+        }
+
+        public UpdateSitePluginError(String type, @Nullable String message) {
+            this.type = UpdateSitePluginErrorType.fromString(type);
+            this.message = message;
+        }
+    }
+
+    static class RemoveSitePluginsError implements OnChangedError {
+    }
+
+    // Error types
+
+    public enum ConfigureSitePluginErrorType {
+        GENERIC_ERROR,
+        ACTIVATION_ERROR,
+        DEACTIVATION_ERROR,
+        NOT_AVAILABLE, // Return for non-jetpack sites
+        UNAUTHORIZED,
+        UNKNOWN_PLUGIN;
+
+        public static ConfigureSitePluginErrorType fromString(String string) {
+            if (string != null) {
+                for (ConfigureSitePluginErrorType v : ConfigureSitePluginErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+
+        public static ConfigureSitePluginErrorType fromGenericErrorType(GenericErrorType genericErrorType,
+                                                                        boolean isActivating) {
+            if (genericErrorType != null) {
+                switch (genericErrorType) {
+                    case TIMEOUT:
+                    case NO_CONNECTION:
+                    case NETWORK_ERROR:
+                    case SERVER_ERROR:
+                        if (isActivating) {
+                            return ACTIVATION_ERROR;
+                        } else {
+                            return DEACTIVATION_ERROR;
+                        }
+                    case NOT_FOUND:
+                    case CENSORED:
+                        return UNKNOWN_PLUGIN;
+                    case INVALID_SSL_CERTIFICATE:
+                    case HTTP_AUTH_ERROR:
+                    case AUTHORIZATION_REQUIRED:
+                    case NOT_AUTHENTICATED:
+                        return UNAUTHORIZED;
+                    case INVALID_RESPONSE:
+                    case PARSE_ERROR:
+                    case UNKNOWN:
+                        return GENERIC_ERROR;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum DeleteSitePluginErrorType {
+        GENERIC_ERROR,
+        UNAUTHORIZED,
+        DELETE_PLUGIN_ERROR,
+        NOT_AVAILABLE, // Return for non-jetpack sites
+        UNKNOWN_PLUGIN;
+
+        public static DeleteSitePluginErrorType fromString(String string) {
+            if (string != null) {
+                for (DeleteSitePluginErrorType v : DeleteSitePluginErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+
+        public static DeleteSitePluginErrorType fromGenericErrorType(GenericErrorType genericErrorType) {
+            if (genericErrorType != null) {
+                switch (genericErrorType) {
+                    case TIMEOUT:
+                    case NO_CONNECTION:
+                    case NETWORK_ERROR:
+                    case SERVER_ERROR:
+                        return DELETE_PLUGIN_ERROR;
+                    case NOT_FOUND:
+                    case CENSORED:
+                        return UNKNOWN_PLUGIN;
+                    case INVALID_SSL_CERTIFICATE:
+                    case HTTP_AUTH_ERROR:
+                    case AUTHORIZATION_REQUIRED:
+                    case NOT_AUTHENTICATED:
+                        return DeleteSitePluginErrorType.UNAUTHORIZED;
+                    case INVALID_RESPONSE:
+                    case PARSE_ERROR:
+                    case UNKNOWN:
+                        return GENERIC_ERROR;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum PluginDirectoryErrorType {
+        EMPTY_RESPONSE, // Should be used for NEW & POPULAR plugin directory
+        GENERIC_ERROR,
+        NOT_AVAILABLE, // Return for non-jetpack sites for SITE plugin directory
+        UNAUTHORIZED; // Should only be used for SITE plugin directory
+
+        public static PluginDirectoryErrorType fromString(String string) {
+            if (string != null) {
+                for (PluginDirectoryErrorType v : PluginDirectoryErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+
+        public static PluginDirectoryErrorType fromGenericErrorType(GenericErrorType genericErrorType) {
+            if (genericErrorType != null) {
+                switch (genericErrorType) {
+                    case INVALID_SSL_CERTIFICATE:
+                    case HTTP_AUTH_ERROR:
+                    case AUTHORIZATION_REQUIRED:
+                    case NOT_AUTHENTICATED:
+                        return UNAUTHORIZED;
+                    case NO_CONNECTION:
+                    case TIMEOUT:
+                    case NETWORK_ERROR:
+                    case SERVER_ERROR:
+                    case NOT_FOUND:
+                    case CENSORED:
+                    case INVALID_RESPONSE:
+                    case PARSE_ERROR:
+                    case UNKNOWN:
+                        return GENERIC_ERROR;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum FetchWPOrgPluginErrorType {
+        EMPTY_RESPONSE,
+        GENERIC_ERROR,
+        PLUGIN_DOES_NOT_EXIST
+    }
+
+    public enum FetchSitePluginErrorType {
+        UNAUTHORIZED,
+        NOT_AVAILABLE,
+        EMPTY_RESPONSE,
+        GENERIC_ERROR,
+        PLUGIN_DOES_NOT_EXIST;
+
+        public static FetchSitePluginErrorType fromGenericErrorType(GenericErrorType genericErrorType) {
+            if (genericErrorType != null) {
+                switch (genericErrorType) {
+                    case INVALID_SSL_CERTIFICATE:
+                    case HTTP_AUTH_ERROR:
+                    case AUTHORIZATION_REQUIRED:
+                    case NOT_AUTHENTICATED:
+                        return UNAUTHORIZED;
+                    case NOT_FOUND:
+                        return PLUGIN_DOES_NOT_EXIST;
+                    case NO_CONNECTION:
+                    case TIMEOUT:
+                    case NETWORK_ERROR:
+                    case SERVER_ERROR:
+                    case CENSORED:
+                    case INVALID_RESPONSE:
+                    case PARSE_ERROR:
+                    case UNKNOWN:
+                        return GENERIC_ERROR;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum InstallSitePluginErrorType {
+        GENERIC_ERROR,
+        INSTALL_FAILURE,
+        LOCAL_FILE_DOES_NOT_EXIST,
+        NO_PACKAGE,
+        NO_PLUGIN_INSTALLED,
+        NOT_AVAILABLE, // Return for non-jetpack sites
+        PLUGIN_ALREADY_INSTALLED,
+        UNAUTHORIZED;
+
+        private static final String PLUGIN_ALREADY_EXISTS = "Destination folder already exists.";
+
+        public static InstallSitePluginErrorType fromString(String string) {
+            if (string != null) {
+                if (string.equalsIgnoreCase("local-file-does-not-exist")) {
+                    return LOCAL_FILE_DOES_NOT_EXIST;
+                }
+                for (InstallSitePluginErrorType v : InstallSitePluginErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+
+        public static InstallSitePluginErrorType fromNetworkError(BaseNetworkError error) {
+            if (PLUGIN_ALREADY_EXISTS.equalsIgnoreCase(error.message)) {
+                return PLUGIN_ALREADY_INSTALLED;
+            }
+            GenericErrorType genericErrorType = error.type;
+            if (genericErrorType != null) {
+                switch (genericErrorType) {
+                    case TIMEOUT:
+                    case NO_CONNECTION:
+                    case NETWORK_ERROR:
+                    case SERVER_ERROR:
+                        return INSTALL_FAILURE;
+                    case NOT_FOUND:
+                    case CENSORED:
+                        return NO_PLUGIN_INSTALLED;
+                    case INVALID_SSL_CERTIFICATE:
+                    case HTTP_AUTH_ERROR:
+                    case AUTHORIZATION_REQUIRED:
+                    case NOT_AUTHENTICATED:
+                        return UNAUTHORIZED;
+                    case INVALID_RESPONSE:
+                    case PARSE_ERROR:
+                    case UNKNOWN:
+                        return GENERIC_ERROR;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum UpdateSitePluginErrorType {
+        GENERIC_ERROR,
+        NOT_AVAILABLE, // Return for non-jetpack sites
+        UPDATE_FAIL;
+
+        public static UpdateSitePluginErrorType fromString(String string) {
+            if (string != null) {
+                for (UpdateSitePluginErrorType v : UpdateSitePluginErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.name())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    // OnChanged Events
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnPluginDirectoryFetched extends OnChanged<PluginDirectoryError> {
+        public PluginDirectoryType type;
+        public boolean loadMore;
+        public boolean canLoadMore;
+
+        public OnPluginDirectoryFetched(PluginDirectoryType type, boolean loadMore) {
+            this.type = type;
+            this.loadMore = loadMore;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnPluginDirectorySearched extends OnChanged<PluginDirectoryError> {
+        public @Nullable SiteModel site;
+        public String searchTerm;
+        public int page;
+        public boolean canLoadMore;
+        public List<ImmutablePluginModel> plugins;
+
+        public OnPluginDirectorySearched(@Nullable SiteModel site, String searchTerm, int page) {
+            this.site = site;
+            this.searchTerm = searchTerm;
+            this.page = page;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSitePluginConfigured extends OnChanged<ConfigureSitePluginError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+
+        public OnSitePluginConfigured(SiteModel site, String pluginName, String slug) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSitePluginDeleted extends OnChanged<DeleteSitePluginError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+
+        public OnSitePluginDeleted(SiteModel site, String pluginName, String slug) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSitePluginInstalled extends OnChanged<InstallSitePluginError> {
+        public SiteModel site;
+        public String slug;
+
+        public OnSitePluginInstalled(SiteModel site, String slug) {
+            this.site = site;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSitePluginUpdated extends OnChanged<UpdateSitePluginError> {
+        public SiteModel site;
+        public String pluginName;
+        public String slug;
+
+        public OnSitePluginUpdated(SiteModel site, String pluginName, String slug) {
+            this.site = site;
+            this.pluginName = pluginName;
+            this.slug = slug;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnWPOrgPluginFetched extends OnChanged<FetchWPOrgPluginError> {
+        public String pluginSlug;
+
+        public OnWPOrgPluginFetched(String pluginSlug) {
+            this.pluginSlug = pluginSlug;
+        }
+    }
+
+    public static class OnSitePluginFetched extends OnChanged<FetchSitePluginError> {
+        public SitePluginModel plugin;
+        public String pluginName;
+
+        public OnSitePluginFetched(FetchedSitePluginPayload payload) {
+            this.plugin = payload.plugin;
+            this.pluginName = payload.pluginName;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSitePluginsRemoved extends OnChanged<RemoveSitePluginsError> {
+        public SiteModel site;
+        public int rowsAffected;
+
+        public OnSitePluginsRemoved(SiteModel site, int rowsAffected) {
+            this.site = site;
+            this.rowsAffected = rowsAffected;
+        }
+    }
+
+    private final PluginRestClient mPluginRestClient;
+    private final PluginWPOrgClient mPluginWPOrgClient;
+    private final PluginCoroutineStore mPluginCoroutineStore;
+    private final PluginJetpackTunnelRestClient mPluginJetpackTunnelRestClient;
+
+    @Inject public PluginStore(Dispatcher dispatcher,
+                               PluginRestClient pluginRestClient,
+                               PluginWPOrgClient pluginWPOrgClient,
+                               PluginCoroutineStore pluginCoroutineStore,
+                               PluginJetpackTunnelRestClient pluginJetpackTunnelRestClient) {
+        super(dispatcher);
+        mPluginRestClient = pluginRestClient;
+        mPluginWPOrgClient = pluginWPOrgClient;
+        mPluginCoroutineStore = pluginCoroutineStore;
+        mPluginJetpackTunnelRestClient = pluginJetpackTunnelRestClient;
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(AppLog.T.API, "PluginStore onRegister");
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof PluginAction)) {
+            return;
+        }
+        switch ((PluginAction) actionType) {
+            // Remote actions
+            case CONFIGURE_SITE_PLUGIN:
+                configureSitePlugin((ConfigureSitePluginPayload) action.getPayload());
+                break;
+            case DELETE_SITE_PLUGIN:
+                deleteSitePlugin((DeleteSitePluginPayload) action.getPayload());
+                break;
+            case FETCH_PLUGIN_DIRECTORY:
+                fetchPluginDirectory((FetchPluginDirectoryPayload) action.getPayload());
+                break;
+            case FETCH_WPORG_PLUGIN:
+                fetchWPOrgPlugin((String) action.getPayload());
+                break;
+            case FETCH_SITE_PLUGIN:
+                fetchSitePlugin((FetchSitePluginPayload) action.getPayload());
+                break;
+            case INSTALL_SITE_PLUGIN:
+                installSitePlugin((InstallSitePluginPayload) action.getPayload());
+                break;
+            case INSTALL_JP_FOR_INDIVIDUAL_PLUGIN_SITE:
+                installJPForIndividualPluginSite((InstallSitePluginPayload) action.getPayload());
+                break;
+            case SEARCH_PLUGIN_DIRECTORY:
+                searchPluginDirectory((SearchPluginDirectoryPayload) action.getPayload());
+                break;
+            case UPDATE_SITE_PLUGIN:
+                updateSitePlugin((UpdateSitePluginPayload) action.getPayload());
+                break;
+            // Local actions
+            case REMOVE_SITE_PLUGINS:
+                removeSitePlugins((SiteModel) action.getPayload());
+                break;
+            // Network callbacks
+            case CONFIGURED_SITE_PLUGIN:
+                configuredSitePlugin((ConfiguredSitePluginPayload) action.getPayload());
+                break;
+            case DELETED_SITE_PLUGIN:
+                deletedSitePlugin((DeletedSitePluginPayload) action.getPayload());
+                break;
+            case FETCHED_PLUGIN_DIRECTORY:
+                fetchedPluginDirectory((FetchedPluginDirectoryPayload) action.getPayload());
+                break;
+            case FETCHED_WPORG_PLUGIN:
+                fetchedWPOrgPlugin((FetchedWPOrgPluginPayload) action.getPayload());
+                break;
+            case FETCHED_SITE_PLUGIN:
+                fetchedSitePlugin((FetchedSitePluginPayload) action.getPayload());
+                break;
+            case INSTALLED_SITE_PLUGIN:
+                installedSitePlugin((InstalledSitePluginPayload) action.getPayload());
+                break;
+            case INSTALLED_JP_FOR_INDIVIDUAL_PLUGIN_SITE:
+                installedJPForIndividualPluginSite((InstalledSitePluginPayload) action.getPayload());
+                break;
+            case SEARCHED_PLUGIN_DIRECTORY:
+                searchedPluginDirectory((SearchedPluginDirectoryPayload) action.getPayload());
+                break;
+            case UPDATED_SITE_PLUGIN:
+                updatedSitePlugin((UpdatedSitePluginPayload) action.getPayload());
+                break;
+        }
+    }
+
+    public @NonNull List<ImmutablePluginModel> getPluginDirectory(@NonNull SiteModel site, PluginDirectoryType type) {
+        // Site plugins are handled differently
+        if (type == PluginDirectoryType.SITE) {
+            return getSitePlugins(site);
+        }
+        List<ImmutablePluginModel> immutablePlugins = new ArrayList<>();
+        List<WPOrgPluginModel> wpOrgPlugins = PluginSqlUtils.getWPOrgPluginsForDirectory(type);
+        for (WPOrgPluginModel wpOrgPlugin : wpOrgPlugins) {
+            String slug = wpOrgPlugin.getSlug();
+            SitePluginModel sitePlugin = PluginSqlUtils.getSitePluginBySlug(site, slug);
+            immutablePlugins.add(ImmutablePluginModel.newInstance(sitePlugin, wpOrgPlugin));
+        }
+        return immutablePlugins;
+    }
+
+    public @Nullable ImmutablePluginModel getImmutablePluginBySlug(@NonNull SiteModel site, String slug) {
+        SitePluginModel sitePlugin = PluginSqlUtils.getSitePluginBySlug(site, slug);
+        WPOrgPluginModel wpOrgPlugin = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+        return ImmutablePluginModel.newInstance(sitePlugin, wpOrgPlugin);
+    }
+
+    private @NonNull List<ImmutablePluginModel> getSitePlugins(@NonNull SiteModel site) {
+        List<ImmutablePluginModel> immutablePlugins = new ArrayList<>();
+        List<SitePluginModel> sitePlugins = PluginSqlUtils.getSitePlugins(site);
+        for (SitePluginModel sitePluginModel : sitePlugins) {
+            String slug = sitePluginModel.getSlug();
+            WPOrgPluginModel wpOrgPluginModel = PluginSqlUtils.getWPOrgPluginBySlug(slug);
+            if (wpOrgPluginModel == null) {
+                mDispatcher.dispatch(PluginActionBuilder.newFetchWporgPluginAction(slug));
+            }
+            immutablePlugins.add(ImmutablePluginModel.newInstance(sitePluginModel, wpOrgPluginModel));
+        }
+        return immutablePlugins;
+    }
+
+    // Remote actions
+
+    private void configureSitePlugin(ConfigureSitePluginPayload payload) {
+        if (payload.site.isUsingWpComRestApi() && payload.site.isJetpackConnected()) {
+            mPluginRestClient.configureSitePlugin(payload.site, payload.pluginName, payload.slug, payload.isActive,
+                    payload.isAutoUpdateEnabled);
+        } else if (payload.site.isJetpackCPConnected()) {
+            mPluginJetpackTunnelRestClient.configurePlugin(payload.site, payload.pluginName, payload.isActive);
+        } else if (!payload.site.isUsingWpComRestApi()) {
+            mPluginCoroutineStore.configureSitePlugin(payload.site, payload.pluginName, payload.slug, payload.isActive);
+        } else {
+            ConfigureSitePluginError error = new ConfigureSitePluginError(ConfigureSitePluginErrorType.NOT_AVAILABLE);
+            ConfiguredSitePluginPayload errorPayload = new ConfiguredSitePluginPayload(payload.site, payload.slug,
+                    payload.pluginName, error);
+            mDispatcher.dispatch(PluginActionBuilder.newConfiguredSitePluginAction(errorPayload));
+        }
+    }
+
+    private void deleteSitePlugin(DeleteSitePluginPayload payload) {
+        if (payload.site.isUsingWpComRestApi() && payload.site.isJetpackConnected()) {
+            mPluginRestClient.deleteSitePlugin(payload.site, payload.pluginName, payload.slug);
+        } else if (!payload.site.isUsingWpComRestApi()) {
+            mPluginCoroutineStore.deleteSitePlugin(payload.site, payload.pluginName, payload.slug);
+        } else {
+            DeleteSitePluginError error = new DeleteSitePluginError(DeleteSitePluginErrorType.NOT_AVAILABLE);
+            DeletedSitePluginPayload errorPayload = new DeletedSitePluginPayload(payload.site, payload.slug,
+                    payload.pluginName);
+            errorPayload.error = error;
+            mDispatcher.dispatch(PluginActionBuilder.newDeletedSitePluginAction(errorPayload));
+        }
+    }
+
+    private void fetchPluginDirectory(FetchPluginDirectoryPayload payload) {
+        if (payload.type == PluginDirectoryType.SITE) {
+            fetchSitePlugins(payload.site);
+        } else if (payload.type == PluginDirectoryType.FEATURED) {
+            mPluginWPOrgClient.fetchFeaturedPlugins();
+        } else {
+            int page = 1;
+            if (payload.loadMore) {
+                page = PluginSqlUtils.getLastRequestedPageForDirectoryType(payload.type) + 1;
+            }
+            mPluginWPOrgClient.fetchPluginDirectory(payload.type, page);
+        }
+    }
+
+    private void fetchSitePlugins(@Nullable SiteModel site) {
+        if (site != null && site.isUsingWpComRestApi() && site.isJetpackConnected()) {
+            mPluginRestClient.fetchSitePlugins(site);
+        } else if (site != null && !site.isUsingWpComRestApi()) {
+            mPluginCoroutineStore.fetchWPApiPlugins(site);
+        } else {
+            PluginDirectoryError error = new PluginDirectoryError(PluginDirectoryErrorType.NOT_AVAILABLE, null);
+            FetchedPluginDirectoryPayload errorPayload = new FetchedPluginDirectoryPayload(PluginDirectoryType.SITE,
+                    false, error);
+            mDispatcher.dispatch(PluginActionBuilder.newFetchedPluginDirectoryAction(errorPayload));
+        }
+    }
+
+    private void fetchWPOrgPlugin(String pluginSlug) {
+        mPluginWPOrgClient.fetchWPOrgPlugin(pluginSlug);
+    }
+
+    /* Fetch a single plugin from a site, to get its information and whether it exists or not.
+       Currently this is only supported on sites connected using Jetpack plugin or Jetpack Connection Package.
+     */
+    private void fetchSitePlugin(FetchSitePluginPayload payload) {
+        if (payload.site.isJetpackConnected() || payload.site.isJetpackCPConnected()) {
+            mPluginJetpackTunnelRestClient.fetchPlugin(payload.site, payload.pluginName);
+        } else if (!payload.site.isUsingWpComRestApi()) {
+            mPluginCoroutineStore.fetchWPApiPlugin(payload.site, payload.pluginName);
+        } else {
+            FetchSitePluginError error = new FetchSitePluginError(FetchSitePluginErrorType.NOT_AVAILABLE, null);
+            FetchedSitePluginPayload errorPayload =
+                    new FetchedSitePluginPayload(payload.pluginName, error);
+            mDispatcher.dispatch(PluginActionBuilder.newFetchedSitePluginAction(errorPayload));
+        }
+    }
+
+    private void installSitePlugin(InstallSitePluginPayload payload) {
+        if (payload.site.isUsingWpComRestApi() && payload.site.isJetpackConnected()) {
+            mPluginRestClient.installSitePlugin(payload.site, payload.slug);
+        } else if (payload.site.isJetpackCPConnected()) {
+            mPluginJetpackTunnelRestClient.installPlugin(payload.site, payload.slug);
+        } else if (!payload.site.isUsingWpComRestApi()) {
+            mPluginCoroutineStore.installSitePlugin(payload.site, payload.slug);
+        } else {
+            InstallSitePluginError error = new InstallSitePluginError(InstallSitePluginErrorType.NOT_AVAILABLE);
+            InstalledSitePluginPayload errorPayload = new InstalledSitePluginPayload(payload.site,
+                    payload.slug, error);
+            mDispatcher.dispatch(PluginActionBuilder.newInstalledSitePluginAction(errorPayload));
+        }
+    }
+
+    private void installJPForIndividualPluginSite(InstallSitePluginPayload payload) {
+        mPluginJetpackTunnelRestClient.installJetpackOnIndividualPluginSite(payload.site);
+    }
+
+    private void searchPluginDirectory(SearchPluginDirectoryPayload payload) {
+        mPluginWPOrgClient.searchPluginDirectory(payload.site, payload.searchTerm, payload.page);
+    }
+
+    private void updateSitePlugin(UpdateSitePluginPayload payload) {
+        if (payload.site.isUsingWpComRestApi() && payload.site.isJetpackConnected()) {
+            mPluginRestClient.updateSitePlugin(payload.site, payload.pluginName, payload.slug);
+        } else {
+            UpdateSitePluginError error = new UpdateSitePluginError(
+                    UpdateSitePluginErrorType.NOT_AVAILABLE);
+            UpdatedSitePluginPayload errorPayload = new UpdatedSitePluginPayload(payload.site,
+                    payload.pluginName, payload.slug, error);
+            mDispatcher.dispatch(PluginActionBuilder.newUpdatedSitePluginAction(errorPayload));
+        }
+    }
+
+    // Local actions
+    private void removeSitePlugins(SiteModel site) {
+        if (site == null) {
+            return;
+        }
+        int rowsAffected = PluginSqlUtils.deleteSitePlugins(site);
+        emitChange(new OnSitePluginsRemoved(site, rowsAffected));
+    }
+
+    // Network callbacks
+
+    private void configuredSitePlugin(ConfiguredSitePluginPayload payload) {
+        OnSitePluginConfigured event = new OnSitePluginConfigured(payload.site, payload.pluginName, payload.slug);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            PluginSqlUtils.insertOrUpdateSitePlugin(payload.site, payload.plugin);
+        }
+        emitChange(event);
+    }
+
+    private void deletedSitePlugin(DeletedSitePluginPayload payload) {
+        OnSitePluginDeleted event = new OnSitePluginDeleted(payload.site, payload.pluginName, payload.slug);
+        // If the remote returns `UNKNOWN_PLUGIN` error, it means the plugin is not installed in remote anymore
+        // most likely because the plugin is already removed on a different client and it was not synced yet.
+        // Since we are trying to remove an already removed plugin, we should just remove it from DB and treat it as a
+        // successful action.
+        if (payload.isError() && payload.error.type != DeleteSitePluginErrorType.UNKNOWN_PLUGIN) {
+            event.error = payload.error;
+        } else {
+            PluginSqlUtils.deleteSitePlugin(payload.site, payload.slug);
+        }
+        emitChange(event);
+    }
+
+    private void fetchedPluginDirectory(FetchedPluginDirectoryPayload payload) {
+        OnPluginDirectoryFetched event = new OnPluginDirectoryFetched(payload.type, payload.loadMore);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            event.canLoadMore = payload.canLoadMore;
+            if (event.type == PluginDirectoryType.SITE) {
+                PluginSqlUtils.insertOrReplaceSitePlugins(payload.site, payload.sitePlugins);
+            } else {
+                if (!payload.loadMore) {
+                    // This is a fresh list, we need to remove the directory records for the fetched type
+                    PluginSqlUtils.deletePluginDirectoryForType(payload.type);
+                }
+                if (payload.wpOrgPlugins != null) {
+                    // For pagination to work correctly, we need to separate the actual plugin data from the list of
+                    // plugins for each directory type. This is important because the same data will be fetched from
+                    // multiple sources. We fetch different directory types (same plugin can be in both new and popular)
+                    // as well as do standalone fetches for plugins with `FETCH_WPORG_PLUGIN` action. We also need to
+                    // keep track of the page the plugin belongs to, because the `per_page` parameter is unreliable.
+                    PluginSqlUtils.insertPluginDirectoryList(
+                            pluginDirectoryListFromWPOrgPlugins(payload.wpOrgPlugins, payload.type, payload.page));
+                    PluginSqlUtils.insertOrUpdateWPOrgPluginList(payload.wpOrgPlugins);
+                }
+            }
+        }
+        emitChange(event);
+    }
+
+    private void fetchedWPOrgPlugin(FetchedWPOrgPluginPayload payload) {
+        OnWPOrgPluginFetched event = new OnWPOrgPluginFetched(payload.pluginSlug);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else if (event.pluginSlug != null) {
+            PluginSqlUtils.insertOrUpdateWPOrgPlugin(payload.wpOrgPlugin);
+        }
+        emitChange(event);
+    }
+
+    private void fetchedSitePlugin(FetchedSitePluginPayload payload) {
+        OnSitePluginFetched event = new OnSitePluginFetched(payload);
+        if (payload.isError()) {
+            event.error = payload.error;
+        }
+        emitChange(event);
+    }
+
+    private void installedSitePlugin(InstalledSitePluginPayload payload) {
+        emitPluginInstalledEvent(payload);
+        // Once the plugin is installed activate it and enable auto-updates
+        if (!payload.isError() && payload.plugin != null) {
+            try {
+                // Give a second to the server as otherwise the following configure call may fail
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // https://www.javaspecialists.eu/archive/Issue056-Shutting-down-Threads-Cleanly.html
+                Thread.currentThread().interrupt();
+            }
+
+            ConfigureSitePluginPayload configurePayload = new ConfigureSitePluginPayload(payload.site,
+                    payload.plugin.getName(), payload.plugin.getSlug(), true, true);
+            mDispatcher.dispatch(PluginActionBuilder.newConfigureSitePluginAction(configurePayload));
+        }
+    }
+
+    private void emitPluginInstalledEvent(InstalledSitePluginPayload payload) {
+        OnSitePluginInstalled event = new OnSitePluginInstalled(payload.site, payload.slug);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            PluginSqlUtils.insertOrUpdateSitePlugin(payload.site, payload.plugin);
+        }
+        emitChange(event);
+    }
+
+    private void installedJPForIndividualPluginSite(InstalledSitePluginPayload payload) {
+        emitPluginInstalledEvent(payload);
+    }
+
+    private void searchedPluginDirectory(SearchedPluginDirectoryPayload payload) {
+        OnPluginDirectorySearched event = new OnPluginDirectorySearched(payload.site, payload.searchTerm, payload.page);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            event.canLoadMore = payload.canLoadMore;
+            PluginSqlUtils.insertOrUpdateWPOrgPluginList(payload.plugins);
+            List<ImmutablePluginModel> immutablePluginList = new ArrayList<>();
+            for (WPOrgPluginModel wpOrgPlugin : payload.plugins) {
+                SitePluginModel sitePlugin = null;
+                if (payload.site != null) {
+                    sitePlugin = PluginSqlUtils.getSitePluginBySlug(payload.site, wpOrgPlugin.getSlug());
+                }
+                immutablePluginList.add(ImmutablePluginModel.newInstance(sitePlugin, wpOrgPlugin));
+            }
+            event.plugins = immutablePluginList;
+        }
+        emitChange(event);
+    }
+
+    private void updatedSitePlugin(UpdatedSitePluginPayload payload) {
+        OnSitePluginUpdated event = new OnSitePluginUpdated(payload.site, payload.pluginName, payload.slug);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            PluginSqlUtils.insertOrUpdateSitePlugin(payload.site, payload.plugin);
+        }
+        emitChange(event);
+    }
+
+    // Helpers
+
+    private List<PluginDirectoryModel> pluginDirectoryListFromWPOrgPlugins(@NonNull List<WPOrgPluginModel> wpOrgPlugins,
+                                                                           PluginDirectoryType directoryType,
+                                                                           int page) {
+        List<PluginDirectoryModel> directoryList = new ArrayList<>(wpOrgPlugins.size());
+        for (WPOrgPluginModel wpOrgPluginModel : wpOrgPlugins) {
+            PluginDirectoryModel pluginDirectoryModel = new PluginDirectoryModel();
+            pluginDirectoryModel.setSlug(wpOrgPluginModel.getSlug());
+            pluginDirectoryModel.setDirectoryType(directoryType.toString());
+            pluginDirectoryModel.setPage(page);
+            directoryList.add(pluginDirectoryModel);
+        }
+        return directoryList;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStore.kt
new file mode 100644
index 00000000000..ca30722c534
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostSchedulingNotificationStore.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.persistence.PostSchedulingNotificationSqlUtils
+import org.wordpress.android.fluxc.persistence.PostSchedulingNotificationSqlUtils.SchedulingReminderDbModel
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel.Period
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel.Period.OFF
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel.Period.ONE_HOUR
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel.Period.TEN_MINUTES
+import org.wordpress.android.fluxc.store.PostSchedulingNotificationStore.SchedulingReminderModel.Period.WHEN_PUBLISHED
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PostSchedulingNotificationStore
+@Inject constructor(private val sqlUtils: PostSchedulingNotificationSqlUtils) {
+    fun schedule(postId: Int, schedulingReminderPeriod: Period): Int? {
+        val dbModel = schedulingReminderPeriod.toDbModel()
+        sqlUtils.deleteSchedulingReminders(postId)
+        return dbModel?.let { sqlUtils.insert(postId, dbModel) }
+    }
+
+    fun deleteSchedulingReminders(postId: Int) {
+        sqlUtils.deleteSchedulingReminders(postId)
+    }
+
+    fun getSchedulingReminder(notificationId: Int): SchedulingReminderModel? {
+        val dmModel = sqlUtils.getSchedulingReminder(notificationId)
+        return dmModel?.let {
+            SchedulingReminderModel(
+                    it.notificationId,
+                    it.postId,
+                    it.period.toSchedulingReminderPeriod()
+            )
+        }
+    }
+
+    fun getSchedulingReminderPeriod(postId: Int): Period {
+        return when (sqlUtils.getSchedulingReminderPeriodDbModel(postId)) {
+            SchedulingReminderDbModel.Period.ONE_HOUR -> ONE_HOUR
+            SchedulingReminderDbModel.Period.TEN_MINUTES -> TEN_MINUTES
+            SchedulingReminderDbModel.Period.WHEN_PUBLISHED -> WHEN_PUBLISHED
+            null -> OFF
+        }
+    }
+
+    private fun SchedulingReminderDbModel.Period?.toSchedulingReminderPeriod(): Period {
+        return when (this) {
+            SchedulingReminderDbModel.Period.ONE_HOUR -> ONE_HOUR
+            SchedulingReminderDbModel.Period.TEN_MINUTES -> TEN_MINUTES
+            SchedulingReminderDbModel.Period.WHEN_PUBLISHED -> WHEN_PUBLISHED
+            null -> OFF
+        }
+    }
+
+    private fun Period.toDbModel(): SchedulingReminderDbModel.Period? {
+        return when (this) {
+            ONE_HOUR -> SchedulingReminderDbModel.Period.ONE_HOUR
+            TEN_MINUTES -> SchedulingReminderDbModel.Period.TEN_MINUTES
+            WHEN_PUBLISHED -> SchedulingReminderDbModel.Period.WHEN_PUBLISHED
+            OFF -> null
+        }
+    }
+
+    data class SchedulingReminderModel(
+        val notificationId: Int,
+        val postId: Int,
+        val scheduledTime: Period
+    ) {
+        enum class Period {
+            OFF, ONE_HOUR, TEN_MINUTES, WHEN_PUBLISHED
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostStore.java
new file mode 100644
index 00000000000..4cac6c8ade4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PostStore.java
@@ -0,0 +1,1319 @@
+package org.wordpress.android.fluxc.store;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.wellsql.generated.PostModelTable;
+import com.yarolegovich.wellsql.SelectQuery;
+import com.yarolegovich.wellsql.WellSql;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.BuildConfig;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.PostAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.generated.ListActionBuilder;
+import org.wordpress.android.fluxc.generated.PostActionBuilder;
+import org.wordpress.android.fluxc.generated.UploadActionBuilder;
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged;
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPages;
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPostLikes;
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPosts;
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.RemoveAllPosts;
+import org.wordpress.android.fluxc.model.LikeModel;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId;
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostsModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.list.ListOrder;
+import org.wordpress.android.fluxc.model.list.PostListDescriptor;
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForRestSite;
+import org.wordpress.android.fluxc.model.list.PostListDescriptor.PostListDescriptorForXmlRpcSite;
+import org.wordpress.android.fluxc.model.post.PostStatus;
+import org.wordpress.android.fluxc.model.revisions.Diff;
+import org.wordpress.android.fluxc.model.revisions.LocalDiffModel;
+import org.wordpress.android.fluxc.model.revisions.LocalDiffType;
+import org.wordpress.android.fluxc.model.revisions.LocalRevisionModel;
+import org.wordpress.android.fluxc.model.revisions.RevisionModel;
+import org.wordpress.android.fluxc.model.revisions.RevisionsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRemoteAutoSaveModel;
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.post.PostXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.PostSqlUtils;
+import org.wordpress.android.fluxc.store.ListStore.FetchedListItemsPayload;
+import org.wordpress.android.fluxc.store.ListStore.ListError;
+import org.wordpress.android.fluxc.store.ListStore.ListErrorType;
+import org.wordpress.android.fluxc.store.ListStore.ListItemsRemovedPayload;
+import org.wordpress.android.fluxc.utils.ObjectsUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.DateTimeUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class PostStore extends Store {
+    public static final int NUM_POSTS_PER_FETCH = 20;
+
+    public static final List<PostStatus> DEFAULT_POST_STATUS_LIST = Collections.unmodifiableList(Arrays.asList(
+            PostStatus.DRAFT,
+            PostStatus.PENDING,
+            PostStatus.PRIVATE,
+            PostStatus.PUBLISHED,
+            PostStatus.SCHEDULED));
+
+    public static class FetchPostListPayload extends Payload<BaseNetworkError> {
+        public PostListDescriptor listDescriptor;
+        public long offset;
+
+        public FetchPostListPayload(PostListDescriptor listDescriptor, long offset) {
+            this.listDescriptor = listDescriptor;
+            this.offset = offset;
+        }
+    }
+
+    public static class PostListItem {
+        public Long remotePostId;
+        public String lastModified;
+        public String status;
+        public String autoSaveModified;
+
+        public PostListItem(Long remotePostId, String lastModified, String status, String autoSaveModified) {
+            this.remotePostId = remotePostId;
+            this.lastModified = lastModified;
+            this.status = status;
+            this.autoSaveModified = autoSaveModified;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class FetchPostListResponsePayload extends Payload<PostError> {
+        @NonNull public PostListDescriptor listDescriptor;
+        @NonNull public List<PostListItem> postListItems;
+        public boolean loadedMore;
+        public boolean canLoadMore;
+
+        public FetchPostListResponsePayload(@NonNull PostListDescriptor listDescriptor,
+                                            @NonNull List<PostListItem> postListItems,
+                                            boolean loadedMore,
+                                            boolean canLoadMore,
+                                            @Nullable PostError error) {
+            this.listDescriptor = listDescriptor;
+            this.postListItems = postListItems;
+            this.loadedMore = loadedMore;
+            this.canLoadMore = canLoadMore;
+            this.error = error;
+        }
+    }
+
+    public static class FetchPostsPayload extends Payload<BaseNetworkError> {
+        public SiteModel site;
+        public boolean loadMore;
+        public List<PostStatus> statusTypes;
+
+        public FetchPostsPayload(SiteModel site) {
+            this(site, false);
+        }
+
+        public FetchPostsPayload(SiteModel site, boolean loadMore) {
+            this(site, loadMore, DEFAULT_POST_STATUS_LIST);
+        }
+
+        public FetchPostsPayload(SiteModel site, boolean loadMore, List<PostStatus> statusTypes) {
+            this.site = site;
+            this.loadMore = loadMore;
+            this.statusTypes = statusTypes;
+        }
+    }
+
+    public static class FetchPostsResponsePayload extends Payload<PostError> {
+        public PostsModel posts;
+        public SiteModel site;
+        public boolean isPages;
+        public boolean loadedMore;
+        public boolean canLoadMore;
+
+        public FetchPostsResponsePayload(PostsModel posts, SiteModel site, boolean isPages, boolean loadedMore,
+                                         boolean canLoadMore) {
+            this.posts = posts;
+            this.site = site;
+            this.isPages = isPages;
+            this.loadedMore = loadedMore;
+            this.canLoadMore = canLoadMore;
+        }
+
+        public FetchPostsResponsePayload(PostError error, boolean isPages) {
+            this.error = error;
+            this.isPages = isPages;
+        }
+    }
+
+    public static class RemotePostPayload extends Payload<PostError> {
+        public PostModel post;
+        public SiteModel site;
+        public boolean isFirstTimePublish;
+
+        // if this is true, the post will overwrite the existing one, even if it is not the last revision
+        public boolean shouldSkipConflictResolutionCheck;
+
+        public String lastModifiedForConflictResolution;
+
+        public RemotePostPayload(PostModel post, SiteModel site) {
+            this.post = post;
+            this.site = site;
+        }
+    }
+
+    public static class FetchPostLikesPayload extends Payload<BaseNetworkError> {
+        public final long siteId;
+        public final long remotePostId;
+        public final boolean requestNextPage;
+        public final int pageLength;
+
+        public FetchPostLikesPayload(long siteId, long remotePostId, boolean requestNextPage, int pageLength) {
+            this.siteId = siteId;
+            this.remotePostId = remotePostId;
+            this.requestNextPage = requestNextPage;
+            this.pageLength = pageLength;
+        }
+    }
+
+    public static class FetchedPostLikesResponsePayload extends Payload<PostError> {
+        @NonNull public final List<LikeModel> likes;
+        public final long siteId;
+        public final long remotePostId;
+        public final boolean hasMore;
+        public final boolean isRequestNextPage;
+
+        public FetchedPostLikesResponsePayload(
+                @NonNull List<LikeModel> likes,
+                long siteId,
+                long remotePostId,
+                boolean isRequestNextPage,
+                boolean hasMore
+        ) {
+            this.likes = likes;
+            this.siteId = siteId;
+            this.remotePostId = remotePostId;
+            this.hasMore = hasMore;
+            this.isRequestNextPage = isRequestNextPage;
+        }
+
+        public FetchedPostLikesResponsePayload(
+                long siteId,
+                long remotePostId,
+                boolean isRequestNextPage,
+                boolean hasMore
+        ) {
+            this.likes = new ArrayList<>();
+            this.siteId = siteId;
+            this.remotePostId = remotePostId;
+            this.hasMore = hasMore;
+            this.isRequestNextPage = isRequestNextPage;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class DeletedPostPayload extends Payload<PostError> {
+        @NonNull public PostModel postToBeDeleted;
+        @NonNull public SiteModel site;
+        @NonNull public PostDeleteActionType postDeleteActionType;
+        @Nullable public PostModel deletedPostResponse;
+
+        public DeletedPostPayload(@NonNull PostModel postToBeDeleted, @NonNull SiteModel site,
+                                  @NonNull PostDeleteActionType postDeleteActionType,
+                                  @Nullable PostModel deletedPostResponse) {
+            this.postToBeDeleted = postToBeDeleted;
+            this.site = site;
+            this.postDeleteActionType = postDeleteActionType;
+            this.deletedPostResponse = deletedPostResponse;
+        }
+
+        public DeletedPostPayload(@NonNull PostModel postToBeDeleted, @NonNull SiteModel site,
+                                  @NonNull PostDeleteActionType postDeleteActionType,
+                                  @NonNull PostError deletePostError) {
+            this.postToBeDeleted = postToBeDeleted;
+            this.site = site;
+            this.postDeleteActionType = postDeleteActionType;
+            this.deletedPostResponse = null;
+            this.error = deletePostError;
+        }
+    }
+
+    public static class FetchRevisionsPayload extends Payload<BaseNetworkError> {
+        public PostModel post;
+        public SiteModel site;
+
+        public FetchRevisionsPayload(PostModel post, SiteModel site) {
+            this.post = post;
+            this.site = site;
+        }
+    }
+
+    public static class FetchPostResponsePayload extends RemotePostPayload {
+        public PostAction origin = PostAction.FETCH_POST; // Only used to track fetching newly uploaded XML-RPC posts
+
+        public FetchPostResponsePayload(PostModel post, SiteModel site) {
+            super(post, site);
+        }
+    }
+
+    public static class FetchRevisionsResponsePayload extends Payload<BaseNetworkError> {
+        public PostModel post;
+        public RevisionsModel revisionsModel;
+
+        public FetchRevisionsResponsePayload(PostModel post, RevisionsModel revisionsModel) {
+            this.post = post;
+            this.revisionsModel = revisionsModel;
+        }
+    }
+
+    public static class RemoteAutoSavePostPayload extends Payload<PostError> {
+        public PostRemoteAutoSaveModel autoSaveModel;
+        public int localPostId;
+        public long remotePostId;
+        public SiteModel site;
+
+        public RemoteAutoSavePostPayload(int localPostId, long remotePostId,
+                                         @NonNull PostRemoteAutoSaveModel autoSaveModel, @NonNull SiteModel site) {
+            this.localPostId = localPostId;
+            this.remotePostId = remotePostId;
+            this.autoSaveModel = autoSaveModel;
+            this.site = site;
+        }
+
+        public RemoteAutoSavePostPayload(int localPostId, long remotePostId, @NonNull PostError error) {
+            this.localPostId = localPostId;
+            this.remotePostId = remotePostId;
+            this.error = error;
+        }
+    }
+
+    public static class FetchPostStatusResponsePayload extends Payload<PostError> {
+        public PostModel post;
+        public SiteModel site;
+        public String remotePostStatus;
+
+        public FetchPostStatusResponsePayload(PostModel post, SiteModel site) {
+            this.post = post;
+            this.site = site;
+        }
+    }
+
+    public static class PostError implements OnChangedError {
+        public PostErrorType type;
+        public String message;
+
+        public PostError(PostErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public PostError(@NonNull String type, @NonNull String message) {
+            this.type = PostErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public PostError(PostErrorType type) {
+            this(type, "");
+        }
+    }
+
+    public static class RevisionError implements OnChangedError {
+        @NonNull public RevisionsErrorType type;
+        @Nullable public String message;
+
+        public RevisionError(@NonNull RevisionsErrorType type, @Nullable String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    // OnChanged events
+    public static class OnPostChanged extends OnChanged<PostError> {
+        public final int rowsAffected;
+        public final boolean canLoadMore;
+        public final CauseOfOnPostChanged causeOfChange;
+
+        public OnPostChanged(CauseOfOnPostChanged causeOfChange, int rowsAffected) {
+            this.causeOfChange = causeOfChange;
+            this.rowsAffected = rowsAffected;
+            this.canLoadMore = false;
+        }
+
+        public OnPostChanged(CauseOfOnPostChanged causeOfChange, int rowsAffected, boolean canLoadMore) {
+            this.causeOfChange = causeOfChange;
+            this.rowsAffected = rowsAffected;
+            this.canLoadMore = canLoadMore;
+        }
+    }
+
+    public static class OnPostLikesChanged extends OnChanged<PostError> {
+        public final CauseOfOnPostChanged causeOfChange;
+        public final long siteId;
+        public final long postId;
+        public List<LikeModel> postLikes = new ArrayList<>();
+        public final boolean hasMore;
+
+        public OnPostLikesChanged(CauseOfOnPostChanged causeOfChange, long siteId, long postId, boolean hasMore) {
+            this.causeOfChange = causeOfChange;
+            this.siteId = siteId;
+            this.postId = postId;
+            this.hasMore = hasMore;
+        }
+    }
+
+    public static class OnPostUploaded extends OnChanged<PostError> {
+        public PostModel post;
+        public boolean isFirstTimePublish;
+
+        public OnPostUploaded(PostModel post, boolean isFirstTimePublish) {
+            this.post = post;
+            this.isFirstTimePublish = isFirstTimePublish;
+        }
+    }
+
+    public static class OnRevisionsFetched extends OnChanged<RevisionError> {
+        public PostModel post;
+        public RevisionsModel revisionsModel;
+
+        OnRevisionsFetched(PostModel post, RevisionsModel revisionsModel) {
+            this.post = post;
+            this.revisionsModel = revisionsModel;
+        }
+    }
+
+    public static class OnPostStatusFetched extends OnChanged<PostError> {
+        public PostModel post;
+        public String remotePostStatus;
+
+        OnPostStatusFetched(PostModel post, String remotePostStatus, PostError error) {
+            this.post = post;
+            this.remotePostStatus = remotePostStatus;
+            this.error = error;
+        }
+    }
+
+    public enum PostDeleteActionType {
+        TRASH,
+        DELETE
+    }
+
+    public enum PostErrorType {
+        UNKNOWN_POST("unknown_post"),
+        UNKNOWN_POST_TYPE("unknown_post_type"),
+        UNSUPPORTED_ACTION("unsupported_action"),
+        UNAUTHORIZED("unauthorized"),
+        INVALID_RESPONSE("invalid_response"),
+        OLD_REVISION("old-revision"), // Custom string value
+        GENERIC_ERROR("generic_error");
+
+        private final String mStringValue;
+
+        PostErrorType(String stringValue) {
+            this.mStringValue = stringValue;
+        }
+
+        @NonNull @Override public String toString() {
+            return this.mStringValue;
+        }
+
+        public static PostErrorType fromString(String string) {
+            if (string != null) {
+                for (PostErrorType v : PostErrorType.values()) {
+                    if (string.equalsIgnoreCase(v.toString())) {
+                        return v;
+                    }
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    public enum RevisionsErrorType {
+        GENERIC_ERROR
+    }
+
+    private final PostRestClient mPostRestClient;
+    private final PostXMLRPCClient mPostXMLRPCClient;
+    private final PostSqlUtils mPostSqlUtils;
+    // Ensures that the UploadStore is initialized whenever the PostStore is,
+    // to ensure actions are shadowed and repeated by the UploadStore
+    @SuppressWarnings("unused")
+    @Inject UploadStore mUploadStore;
+
+    @Inject public PostStore(Dispatcher dispatcher, PostRestClient postRestClient, PostXMLRPCClient postXMLRPCClient,
+                     PostSqlUtils postSqlUtils) {
+        super(dispatcher);
+        mPostRestClient = postRestClient;
+        mPostXMLRPCClient = postXMLRPCClient;
+        mPostSqlUtils = postSqlUtils;
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(AppLog.T.API, "PostStore onRegister");
+    }
+
+    public PostModel instantiatePostModel(SiteModel site, boolean isPage) {
+        return instantiatePostModel(site, isPage, null, null, null, null, null, false);
+    }
+
+    public PostModel instantiatePostModel(SiteModel site, boolean isPage, List<Long> categoryIds, String postFormat) {
+        return instantiatePostModel(site, isPage, null, null, null, categoryIds, postFormat, false);
+    }
+
+    public PostModel instantiatePostModel(SiteModel site, boolean isPage, String title, String content, String status,
+                                          List<Long> categoryIds, String postFormat, boolean refreshListOnFinish) {
+        PostModel post = new PostModel();
+        post.setLocalSiteId(site.getId());
+        post.setIsLocalDraft(true);
+        post.setIsPage(isPage);
+        post.setDateLocallyChanged((DateTimeUtils.iso8601UTCFromDate(new Date())));
+        if (title != null) {
+            post.setTitle(title);
+        }
+        if (content != null) {
+            post.setContent(content);
+        }
+        if (status != null) {
+            post.setStatus(status);
+        }
+        if (categoryIds != null && !categoryIds.isEmpty()) {
+            post.setCategoryIdList(categoryIds);
+        }
+        post.setPostFormat(postFormat);
+
+        // Insert the post into the db, updating the object to include the local ID
+        post = mPostSqlUtils.insertPostForResult(post);
+
+        // id is set to -1 if insertion fails
+        if (post.getId() == -1) {
+            return null;
+        }
+        if (refreshListOnFinish) {
+            mDispatcher.dispatch(ListActionBuilder.newListRequiresRefreshAction(
+                    PostListDescriptor.calculateTypeIdentifier(post.getLocalSiteId())));
+        }
+        return post;
+    }
+
+    /**
+     * Returns all posts in the store for the given site as a {@link PostModel} list.
+     */
+    public List<PostModel> getPostsForSite(SiteModel site) {
+        return mPostSqlUtils.getPostsForSite(site, false);
+    }
+
+    /**
+     * Returns posts with given format in the store for the given site as a {@link PostModel} list.
+     */
+    public List<PostModel> getPostsForSiteWithFormat(SiteModel site, List<String> postFormat) {
+        return mPostSqlUtils.getPostsForSiteWithFormat(site, postFormat, false);
+    }
+
+    /**
+     * Returns all pages in the store for the given site as a {@link PostModel} list.
+     */
+    public List<PostModel> getPagesForSite(SiteModel site) {
+        return mPostSqlUtils.getPostsForSite(site, true);
+    }
+
+    /**
+     * Returns the number of posts in the store for the given site.
+     */
+    public int getPostsCountForSite(SiteModel site) {
+        return getPostsForSite(site).size();
+    }
+
+    /**
+     * Returns the number of pages in the store for the given site.
+     */
+    public int getPagesCountForSite(SiteModel site) {
+        return getPagesForSite(site).size();
+    }
+
+    /**
+     * Returns all uploaded posts in the store for the given site.
+     */
+    public List<PostModel> getUploadedPostsForSite(SiteModel site) {
+        return mPostSqlUtils.getUploadedPostsForSite(site, false);
+    }
+
+    /**
+     * Returns all uploaded pages in the store for the given site.
+     */
+    public List<PostModel> getUploadedPagesForSite(SiteModel site) {
+        return mPostSqlUtils.getUploadedPostsForSite(site, true);
+    }
+
+    /**
+     * Returns the number of uploaded posts in the store for the given site.
+     */
+    public int getUploadedPostsCountForSite(SiteModel site) {
+        return getUploadedPostsForSite(site).size();
+    }
+
+    /**
+     * Returns the number of uploaded pages in the store for the given site.
+     */
+    public int getUploadedPagesCountForSite(SiteModel site) {
+        return getUploadedPagesForSite(site).size();
+    }
+
+    /**
+     * Returns all posts that are local drafts for the given site.
+     */
+    public List<PostModel> getLocalDraftPosts(@NonNull SiteModel site) {
+        return mPostSqlUtils.getLocalDrafts(site.getId(), false);
+    }
+
+    /**
+     * Returns all posts that are local drafts or has been locally changed.
+     */
+    public List<PostModel> getPostsWithLocalChanges(@NonNull SiteModel site) {
+        return mPostSqlUtils.getPostsWithLocalChanges(site.getId(), false);
+    }
+
+    /**
+     * Given a local ID for a post, returns that post as a {@link PostModel}.
+     */
+    public PostModel getPostByLocalPostId(int localId) {
+        List<PostModel> result = WellSql.select(PostModel.class)
+                                        .where().equals(PostModelTable.ID, localId).endWhere()
+                                        .getAsModel();
+
+        if (result.isEmpty()) {
+            return null;
+        } else {
+            return result.get(0);
+        }
+    }
+
+    public List<PostModel> getPostsByLocalOrRemotePostIds(List<? extends LocalOrRemoteId> localOrRemoteIds,
+                                                          SiteModel site) {
+        if (localOrRemoteIds == null || site == null) {
+            return Collections.emptyList();
+        }
+        return mPostSqlUtils.getPostsByLocalOrRemotePostIds(localOrRemoteIds, site.getId());
+    }
+
+    /**
+     * Given a list of remote IDs for a post and the site to which it belongs, returns the posts as map where the
+     * key is the remote post ID and the value is the {@link PostModel}.
+     */
+    private Map<Long, PostModel> getPostsByRemotePostIds(List<Long> remoteIds, SiteModel site) {
+        if (site == null) {
+            return Collections.emptyMap();
+        }
+        List<PostModel> postList = mPostSqlUtils.getPostsByRemoteIds(remoteIds, site.getId());
+        Map<Long, PostModel> postMap = new HashMap<>(postList.size());
+        for (PostModel post : postList) {
+            postMap.put(post.getRemotePostId(), post);
+        }
+        return postMap;
+    }
+
+    /**
+     * Given a remote ID for a post and the site to which it belongs, returns that post as a {@link PostModel}.
+     */
+    public PostModel getPostByRemotePostId(long remoteId, SiteModel site) {
+        List<PostModel> result = WellSql.select(PostModel.class)
+                                        .where().equals(PostModelTable.REMOTE_POST_ID, remoteId)
+                                        .equals(PostModelTable.LOCAL_SITE_ID, site.getId()).endWhere()
+                                        .getAsModel();
+
+        if (result.isEmpty()) {
+            return null;
+        } else {
+            return result.get(0);
+        }
+    }
+
+    /**
+     * Returns the local posts for the given post list descriptor.
+     */
+    public @NonNull List<LocalId> getLocalPostIdsForDescriptor(PostListDescriptor postListDescriptor) {
+        String searchQuery = null;
+        if (postListDescriptor instanceof PostListDescriptorForRestSite) {
+            PostListDescriptorForRestSite descriptor = (PostListDescriptorForRestSite) postListDescriptor;
+            searchQuery = descriptor.getSearchQuery();
+            if (!(descriptor.getStatusList().contains(PostStatus.DRAFT))) {
+                // Drafts should not be included
+                return Collections.emptyList();
+            }
+        }
+        String orderBy = null;
+        switch (postListDescriptor.getOrderBy()) {
+            case DATE:
+                orderBy = PostModelTable.DATE_CREATED;
+                break;
+            case LAST_MODIFIED:
+                orderBy = PostModelTable.DATE_LOCALLY_CHANGED;
+                break;
+            case TITLE:
+                orderBy = PostModelTable.TITLE;
+                break;
+            case COMMENT_COUNT:
+                // Local drafts can't have comments
+                orderBy = PostModelTable.DATE_CREATED;
+                break;
+            case ID:
+                orderBy = PostModelTable.ID;
+                break;
+        }
+        int order;
+        if (postListDescriptor.getOrder() == ListOrder.ASC) {
+            order = SelectQuery.ORDER_ASCENDING;
+        } else {
+            order = SelectQuery.ORDER_DESCENDING;
+        }
+        return mPostSqlUtils.getLocalPostIdsForFilter(postListDescriptor.getSite(), false, searchQuery, orderBy, order);
+    }
+
+    /**
+     * returns the total number of posts with local changes across all sites
+     */
+    public int getNumLocalChanges() {
+        return mPostSqlUtils.getNumLocalChanges();
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof PostAction)) {
+            return;
+        }
+
+        switch ((PostAction) actionType) {
+            case FETCH_POST_LIST:
+                handleFetchPostList((FetchPostListPayload) action.getPayload());
+                break;
+            case FETCHED_POST_LIST:
+                handleFetchedPostList((FetchPostListResponsePayload) action.getPayload());
+                break;
+            case FETCH_POSTS:
+                fetchPosts((FetchPostsPayload) action.getPayload(), false);
+                break;
+            case FETCH_PAGES:
+                fetchPosts((FetchPostsPayload) action.getPayload(), true);
+                break;
+            case FETCHED_POSTS:
+                handleFetchPostsCompleted((FetchPostsResponsePayload) action.getPayload());
+                break;
+            case FETCH_POST:
+                fetchPost((RemotePostPayload) action.getPayload());
+                break;
+            case FETCH_POST_STATUS:
+                fetchPostStatus((RemotePostPayload) action.getPayload());
+                break;
+            case FETCHED_POST:
+                handleFetchSinglePostCompleted((FetchPostResponsePayload) action.getPayload());
+                break;
+            case FETCHED_POST_STATUS:
+                handleFetchPostStatusCompleted((FetchPostStatusResponsePayload) action.getPayload());
+                break;
+            case PUSH_POST:
+                pushPost((RemotePostPayload) action.getPayload());
+                break;
+            case PUSHED_POST:
+                handlePushPostCompleted((RemotePostPayload) action.getPayload());
+                break;
+            case UPDATE_POST:
+                updatePost((PostModel) action.getPayload(), true);
+                break;
+            case DELETE_POST:
+                deletePost((RemotePostPayload) action.getPayload());
+                break;
+            case DELETED_POST:
+                handleDeletePostCompleted((DeletedPostPayload) action.getPayload());
+                break;
+            case RESTORE_POST:
+                handleRestorePost((RemotePostPayload) action.getPayload());
+                break;
+            case RESTORED_POST:
+                handleRestorePostCompleted((RemotePostPayload) action.getPayload(), false);
+                break;
+            case REMOVE_POST:
+                removePost((PostModel) action.getPayload());
+                break;
+            case REMOVE_ALL_POSTS:
+                removeAllPosts();
+                break;
+            case REMOTE_AUTO_SAVE_POST:
+                remoteAutoSavePost((RemotePostPayload) action.getPayload());
+                break;
+            case REMOTE_AUTO_SAVED_POST:
+                handleRemoteAutoSavedPost((RemoteAutoSavePostPayload) action.getPayload());
+                break;
+            case FETCH_REVISIONS:
+                fetchRevisions((FetchRevisionsPayload) action.getPayload());
+                break;
+            case FETCHED_REVISIONS:
+                handleFetchedRevisions((FetchRevisionsResponsePayload) action.getPayload());
+                break;
+            case FETCH_POST_LIKES:
+                fetchPostLikes((FetchPostLikesPayload) action.getPayload());
+                break;
+            case FETCHED_POST_LIKES:
+                handleFetchedPostLikes((FetchedPostLikesResponsePayload) action.getPayload());
+                break;
+        }
+    }
+
+    private void fetchPostLikes(FetchPostLikesPayload payload) {
+        mPostRestClient.fetchPostLikes(
+                payload.siteId,
+                payload.remotePostId,
+                payload.requestNextPage,
+                payload.pageLength
+        );
+    }
+
+    private void handleFetchedPostLikes(FetchedPostLikesResponsePayload payload) {
+        OnPostLikesChanged event = new OnPostLikesChanged(
+                FetchPostLikes.INSTANCE,
+                payload.siteId,
+                payload.remotePostId,
+                payload.hasMore
+        );
+        if (!payload.isError()) {
+            if (payload.likes != null) {
+                if (!payload.isRequestNextPage) {
+                    mPostSqlUtils.deletePostLikesAndPurgeExpired(payload.siteId, payload.remotePostId);
+                }
+
+                for (LikeModel like : payload.likes) {
+                    mPostSqlUtils.insertOrUpdatePostLikes(payload.siteId, payload.remotePostId, like);
+                }
+
+                event.postLikes.addAll(mPostSqlUtils.getPostLikesByPostId(payload.siteId, payload.remotePostId));
+            }
+        } else {
+            List<LikeModel> cachedLikes = mPostSqlUtils.getPostLikesByPostId(payload.siteId, payload.remotePostId);
+            event.postLikes.addAll(cachedLikes);
+        }
+        event.error = payload.error;
+        emitChange(event);
+    }
+
+    private void deletePost(RemotePostPayload payload) {
+        PostDeleteActionType postDeleteActionType = PostStatus.fromPost(payload.post) == PostStatus.TRASHED
+                ? PostDeleteActionType.DELETE : PostDeleteActionType.TRASH;
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.deletePost(payload.post, payload.site, postDeleteActionType);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mPostXMLRPCClient.deletePost(payload.post, payload.site, postDeleteActionType);
+        }
+    }
+
+    private void handleRestorePost(RemotePostPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.restorePost(payload.post, payload.site);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            PostModel postToRestore = payload.post;
+            if (PostStatus.fromPost(postToRestore) == PostStatus.TRASHED) {
+                postToRestore.setStatus(PostStatus.PUBLISHED.toString());
+            }
+            mPostXMLRPCClient.restorePost(postToRestore, payload.site);
+        }
+    }
+
+    private void fetchPost(RemotePostPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.fetchPost(payload.post, payload.site);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mPostXMLRPCClient.fetchPost(payload.post, payload.site);
+        }
+    }
+
+    private void fetchPostStatus(RemotePostPayload payload) {
+        if (payload.post.isLocalDraft()) {
+            // If the post is a local draft, it won't have a remote post status
+            FetchPostStatusResponsePayload responsePayload =
+                    new FetchPostStatusResponsePayload(payload.post, payload.site);
+            responsePayload.error = new PostError(PostErrorType.UNKNOWN_POST);
+            mDispatcher.dispatch(PostActionBuilder.newFetchedPostStatusAction(responsePayload));
+            return;
+        }
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.fetchPostStatus(payload.post, payload.site);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mPostXMLRPCClient.fetchPostStatus(payload.post, payload.site);
+        }
+    }
+
+    private void handleFetchPostList(FetchPostListPayload payload) {
+        if (payload.listDescriptor instanceof PostListDescriptorForRestSite) {
+            PostListDescriptorForRestSite descriptor = (PostListDescriptorForRestSite) payload.listDescriptor;
+            mPostRestClient.fetchPostList(descriptor, payload.offset);
+        } else if (payload.listDescriptor instanceof PostListDescriptorForXmlRpcSite) {
+            PostListDescriptorForXmlRpcSite descriptor = (PostListDescriptorForXmlRpcSite) payload.listDescriptor;
+            mPostXMLRPCClient.fetchPostList(descriptor, payload.offset);
+        }
+    }
+
+    private void handleFetchedPostList(FetchPostListResponsePayload payload) {
+        ListError fetchedListItemsError = null;
+        List<Long> postIds;
+        if (payload.isError()) {
+            ListErrorType errorType = payload.error.type == PostErrorType.UNAUTHORIZED ? ListErrorType.PERMISSION_ERROR
+                    : ListErrorType.GENERIC_ERROR;
+            fetchedListItemsError = new ListError(errorType, payload.error.message);
+            postIds = Collections.emptyList();
+        } else {
+            postIds = new ArrayList<>(payload.postListItems.size());
+            SiteModel site = payload.listDescriptor.getSite();
+            for (PostListItem item : payload.postListItems) {
+                postIds.add(item.remotePostId);
+            }
+            Map<Long, PostModel> posts = getPostsByRemotePostIds(postIds, site);
+            for (PostListItem item : payload.postListItems) {
+                PostModel post = posts.get(item.remotePostId);
+                if (post == null) {
+                    // Post doesn't exist in the DB, nothing to do.
+                    continue;
+                }
+
+                boolean isAutoSaveChanged = !ObjectsUtils.equals(post.getAutoSaveModified(), item.autoSaveModified);
+
+                // Check if the post's last modified date or status have changed.
+                // We need to check status separately because when a scheduled post is published, its modified date
+                // will not be updated.
+                boolean isPostChanged =
+                        !post.getLastModified().equals(item.lastModified)
+                        || !post.getStatus().equals(item.status);
+
+                /*
+                 * This is a hacky workaround. When `/autosave` endpoint is invoked on a draft, the server
+                 * automatically updates the post content and clears autosave object instead of just updating the
+                 * autosave object. This results in a false-positive conflict as the PostModel.lastModified date field
+                 * gets updated and on the next post list fetch the app thinks the post has been changed both in remote
+                 * and locally.
+                 *
+                 * Since the app doesn't know the current status in the remote, it can't assume what
+                  * was updated. However, if we know the last modified date is equal to the date we have in local
+                  * autosave object we are sure that our invocation of /autosave updated the post directly.
+                 */
+                if (isPostChanged && item.lastModified.equals(post.getAutoSaveModified())
+                    && item.autoSaveModified == null) {
+                    isPostChanged = false;
+                    isAutoSaveChanged = false;
+                }
+
+                if (isPostChanged || isAutoSaveChanged) {
+                    // Dispatch a fetch action for the posts that are changed, but not for posts with local changes
+                    // as we'd otherwise overwrite and lose these local changes forever
+                    if (!post.isLocallyChanged()) {
+                        mDispatcher.dispatch(PostActionBuilder.newFetchPostAction(new RemotePostPayload(post, site)));
+                    } else if (isPostChanged) {
+                        // at this point we know there's a potential version conflict (the post has been modified
+                        // both locally and on the remote), so flag the local version of the Post so the
+                        // hosting app can inform the user and the user can decide and take action
+                        post.setRemoteLastModified(item.lastModified);
+                        mDispatcher.dispatch(PostActionBuilder.newUpdatePostAction(post));
+                    } else if (isAutoSaveChanged) {
+                        // We currently don't want to do anything - we can't fetch the post from the remote as we'd
+                        // override the local changes. The plan is to introduce improved conflict resolution on the
+                        // UI and handle even the scenario for cases when the only thing that has changed is the
+                        // autosave object. We'll probably need to introduce something like `remoteAutoSaveModified`
+                        // field.
+                        // Btw we'll also need to add `else if (isPostChanged && isAutoSaveChanged) case in front of
+                        // `else if (isPostChanged)` in v2.
+                    }
+                }
+            }
+        }
+
+        FetchedListItemsPayload fetchedListItemsPayload =
+                new FetchedListItemsPayload(payload.listDescriptor, postIds,
+                        payload.loadedMore, payload.canLoadMore, fetchedListItemsError);
+        mDispatcher.dispatch(ListActionBuilder.newFetchedListItemsAction(fetchedListItemsPayload));
+    }
+
+    private void fetchPosts(FetchPostsPayload payload, boolean pages) {
+        int offset = 0;
+        if (payload.loadMore) {
+            offset = mPostSqlUtils.getUploadedPostsForSite(payload.site, pages).size();
+        }
+
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.fetchPosts(payload.site, pages, payload.statusTypes, offset, NUM_POSTS_PER_FETCH);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mPostXMLRPCClient.fetchPosts(payload.site, pages, payload.statusTypes, offset);
+        }
+    }
+
+    private void fetchRevisions(FetchRevisionsPayload payload) {
+        mPostRestClient.fetchRevisions(payload.post, payload.site);
+    }
+
+    private void handleFetchedRevisions(FetchRevisionsResponsePayload payload) {
+        OnRevisionsFetched onRevisionsFetched = new OnRevisionsFetched(payload.post, payload.revisionsModel);
+
+        if (payload.isError()) {
+            onRevisionsFetched.error = new RevisionError(RevisionsErrorType.GENERIC_ERROR, payload.error.message);
+        }
+
+        emitChange(onRevisionsFetched);
+    }
+
+    private void handleDeletePostCompleted(DeletedPostPayload payload) {
+        CauseOfOnPostChanged causeOfChange = new CauseOfOnPostChanged.DeletePost(payload.postToBeDeleted.getId(),
+                payload.postToBeDeleted.getRemotePostId(), payload.postDeleteActionType);
+        OnPostChanged event = new OnPostChanged(causeOfChange, 0);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            if (payload.postDeleteActionType == PostDeleteActionType.TRASH) {
+                handlePostSuccessfullyTrashed(payload);
+            } else {
+                // If the post is completely removed from the server, remove it from the local DB as well
+                mDispatcher.dispatch(PostActionBuilder.newRemovePostAction(payload.postToBeDeleted));
+            }
+        }
+        emitChange(event);
+    }
+
+    /**
+     * Saves the changes for the trashed post in the DB, lets ListStore know about updated lists.
+     * <p>
+     * If the trashed post is for an XML-RPC site, it'll also fetch the updated post from remote since XML-RPC delete
+     * call doesn't return the updated post.
+     */
+    private void handlePostSuccessfullyTrashed(DeletedPostPayload payload) {
+        mDispatcher.dispatch(ListActionBuilder.newListRequiresRefreshAction(
+                PostListDescriptor.calculateTypeIdentifier(payload.postToBeDeleted.getLocalSiteId())));
+
+        PostModel postToSave;
+        if (payload.deletedPostResponse != null) {
+            postToSave = payload.deletedPostResponse;
+        } else {
+            /*
+             * XML-RPC delete request doesn't return the updated post, so we need to manually change the status
+             * and then fetch the post from remote to ensure post is properly synced.
+             */
+            postToSave = payload.postToBeDeleted;
+            postToSave.setStatus(PostStatus.TRASHED.toString());
+            mDispatcher.dispatch(
+                    PostActionBuilder.newFetchPostAction(new RemotePostPayload(postToSave, payload.site)));
+        }
+        mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postToSave);
+    }
+
+    private void handleFetchPostsCompleted(FetchPostsResponsePayload payload) {
+        OnPostChanged onPostChanged;
+
+        CauseOfOnPostChanged causeOfChange;
+        if (payload.isPages) {
+            causeOfChange = FetchPages.INSTANCE;
+        } else {
+            causeOfChange = FetchPosts.INSTANCE;
+        }
+
+        if (payload.isError()) {
+            onPostChanged = new OnPostChanged(causeOfChange, 0);
+            onPostChanged.error = payload.error;
+        } else {
+            // Clear existing uploading posts if this is a fresh fetch (loadMore = false in the original request)
+            // This is the simplest way of keeping our local posts in sync with remote posts (in case of deletions,
+            // or if the user manual changed some post IDs)
+            if (!payload.loadedMore) {
+                mPostSqlUtils.deleteUploadedPostsForSite(payload.site, payload.isPages);
+            }
+
+            int rowsAffected = 0;
+            for (PostModel post : payload.posts.getPosts()) {
+                rowsAffected += mPostSqlUtils.insertOrUpdatePostKeepingLocalChanges(post);
+            }
+
+            onPostChanged = new OnPostChanged(causeOfChange, rowsAffected, payload.canLoadMore);
+        }
+
+        emitChange(onPostChanged);
+    }
+
+    private void handleFetchSinglePostCompleted(FetchPostResponsePayload payload) {
+        if (payload.origin == PostAction.PUSH_POST) {
+            OnPostUploaded onPostUploaded = new OnPostUploaded(payload.post, payload.isFirstTimePublish);
+            if (payload.isError()) {
+                onPostUploaded.error = payload.error;
+            } else {
+                updatePost(payload.post, false);
+            }
+            emitChange(onPostUploaded);
+            return;
+        } else if (payload.origin == PostAction.RESTORE_POST) {
+            handleRestorePostCompleted(payload, true);
+            return;
+        }
+
+        if (payload.isError()) {
+            OnPostChanged event = new OnPostChanged(
+                    new CauseOfOnPostChanged.UpdatePost(
+                            payload.post.getId(),
+                            payload.post.getRemotePostId(),
+                            false),
+                    0
+            );
+            event.error = payload.error;
+            emitChange(event);
+        } else {
+            updatePost(payload.post, false);
+        }
+    }
+
+    private void handleFetchPostStatusCompleted(FetchPostStatusResponsePayload payload) {
+        emitChange(new OnPostStatusFetched(payload.post, payload.remotePostStatus, payload.error));
+    }
+
+    private void handlePushPostCompleted(RemotePostPayload payload) {
+        if (payload.isError()) {
+            OnPostUploaded onPostUploaded = new OnPostUploaded(payload.post, payload.isFirstTimePublish);
+            onPostUploaded.error = payload.error;
+            emitChange(onPostUploaded);
+        } else {
+            if (payload.site.isUsingWpComRestApi()) {
+                // The WP.COM REST API response contains the modified post, so we're already in sync with the server
+                // All we need to do is store it and emit OnPostChanged
+                updatePost(payload.post, false);
+                emitChange(new OnPostUploaded(payload.post, payload.isFirstTimePublish));
+            } else {
+                // XML-RPC does not respond to new/edit post calls with the modified post
+                // Update the post locally to reflect its uploaded status, but also request a fresh copy
+                // from the server to ensure local copy matches server
+                mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(payload.post);
+                mPostXMLRPCClient
+                        .fetchPost(payload.post, payload.site, PostAction.PUSH_POST, payload.isFirstTimePublish);
+            }
+        }
+    }
+
+    private void handleRestorePostCompleted(RemotePostPayload payload, boolean syncingNonWpComPost) {
+        if (payload.isError()) {
+            OnPostChanged event = new OnPostChanged(
+                    new CauseOfOnPostChanged.RestorePost(payload.post.getId(), payload.post.getRemotePostId()), 0);
+            event.error = payload.error;
+            emitChange(event);
+        } else {
+            if (payload.site.isUsingWpComRestApi() || syncingNonWpComPost) {
+                restorePost(payload.post);
+            } else {
+                // XML-RPC responds to post restore request with status boolean
+                // Update the post locally to reflect its published state, and request a fresh copy
+                // from the server to ensure local copy matches server
+                mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(payload.post);
+                mPostXMLRPCClient.fetchPost(payload.post, payload.site, PostAction.RESTORE_POST);
+            }
+        }
+    }
+
+    private void pushPost(RemotePostPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.pushPost(
+                    payload.post,
+                    payload.site,
+                    payload.isFirstTimePublish,
+                    payload.shouldSkipConflictResolutionCheck,
+                    payload.lastModifiedForConflictResolution
+            );
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            PostModel postToPush = payload.post;
+            // empty status indicates that the post is new
+            if (TextUtils.isEmpty(postToPush.getStatus())) {
+                postToPush.setStatus(PostStatus.PUBLISHED.toString());
+            }
+            mPostXMLRPCClient.pushPost(
+                    postToPush,
+                    payload.site,
+                    payload.isFirstTimePublish,
+                    payload.shouldSkipConflictResolutionCheck,
+                    payload.lastModifiedForConflictResolution);
+        }
+    }
+
+    private void updatePost(PostModel post, boolean isLocalUpdate) {
+        if (isLocalUpdate) {
+            post.setDateLocallyChanged((DateTimeUtils.iso8601UTCFromDate(new Date())));
+        }
+        int rowsAffected = mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(post);
+        CauseOfOnPostChanged causeOfChange = new CauseOfOnPostChanged.UpdatePost(
+                post.getId(),
+                post.getRemotePostId(),
+                isLocalUpdate
+        );
+        OnPostChanged onPostChanged = new OnPostChanged(causeOfChange, rowsAffected);
+        emitChange(onPostChanged);
+
+        mDispatcher.dispatch(ListActionBuilder.newListDataInvalidatedAction(
+                PostListDescriptor.calculateTypeIdentifier(post.getLocalSiteId())));
+    }
+
+    private void removePost(PostModel post) {
+        if (post == null) {
+            return;
+        }
+        mDispatcher.dispatch(ListActionBuilder.newListItemsRemovedAction(
+                new ListItemsRemovedPayload(PostListDescriptor.calculateTypeIdentifier(post.getLocalSiteId()),
+                        Collections.singletonList(post.getRemotePostId()))));
+        int rowsAffected = mPostSqlUtils.deletePost(post);
+        deleteLocalRevisionOfAPostOrPage(post);
+
+        CauseOfOnPostChanged causeOfChange = new CauseOfOnPostChanged.RemovePost(post.getId(), post.getRemotePostId());
+        OnPostChanged onPostChanged = new OnPostChanged(causeOfChange, rowsAffected);
+        emitChange(onPostChanged);
+    }
+
+    private void removeAllPosts() {
+        int rowsAffected = mPostSqlUtils.deleteAllPosts();
+        deleteAllLocalRevisionAndDiffs();
+        OnPostChanged event = new OnPostChanged(RemoveAllPosts.INSTANCE, rowsAffected);
+        emitChange(event);
+    }
+
+    private void restorePost(PostModel postModel) {
+        int rowsAffected = mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(postModel);
+        CauseOfOnPostChanged causeOfChange =
+                new CauseOfOnPostChanged.RestorePost(postModel.getId(), postModel.getRemotePostId());
+        OnPostChanged onPostChanged = new OnPostChanged(causeOfChange, rowsAffected);
+        emitChange(onPostChanged);
+
+        mDispatcher.dispatch(ListActionBuilder
+                .newListRequiresRefreshAction(PostListDescriptor.calculateTypeIdentifier(postModel.getLocalSiteId())));
+    }
+
+    private void remoteAutoSavePost(RemotePostPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mPostRestClient.remoteAutoSavePost(payload.post, payload.site);
+        } else {
+            PostError postError = new PostError(
+                    PostErrorType.UNSUPPORTED_ACTION,
+                    "Remote-auto-save not support on self-hosted sites."
+            );
+            RemoteAutoSavePostPayload response =
+                    new RemoteAutoSavePostPayload(payload.post.getId(), payload.post.getRemotePostId(), postError);
+            mDispatcher.dispatch(UploadActionBuilder.newRemoteAutoSavedPostAction(response));
+        }
+    }
+
+    private void handleRemoteAutoSavedPost(RemoteAutoSavePostPayload payload) {
+        CauseOfOnPostChanged causeOfChange =
+                new CauseOfOnPostChanged.RemoteAutoSavePost(payload.localPostId, payload.remotePostId);
+        OnPostChanged onPostChanged;
+
+        if (payload.isError()) {
+            onPostChanged = new OnPostChanged(causeOfChange, 0);
+            onPostChanged.error = payload.error;
+        } else {
+            int rowsAffected = mPostSqlUtils.updatePostsAutoSave(payload.site, payload.autoSaveModel);
+            if (rowsAffected != 1) {
+                String errorMsg = "Updating fields of a single post affected: " + rowsAffected + " rows";
+                AppLog.e(AppLog.T.API, errorMsg);
+                if (BuildConfig.DEBUG) {
+                    throw new RuntimeException(errorMsg);
+                }
+            }
+            onPostChanged = new OnPostChanged(causeOfChange, rowsAffected);
+        }
+        emitChange(onPostChanged);
+    }
+
+    public void setLocalRevision(RevisionModel model, SiteModel site, PostModel post) {
+        LocalRevisionModel localRevision = LocalRevisionModel.fromRevisionModel(model, site, post);
+
+        ArrayList<LocalDiffModel> localDiffs = new ArrayList<>();
+
+        for (Diff titleDiff : model.getTitleDiffs()) {
+            localDiffs.add(LocalDiffModel.fromDiffAndLocalRevision(
+                    titleDiff, LocalDiffType.TITLE, localRevision));
+        }
+
+        for (Diff contentDiff : model.getContentDiffs()) {
+            localDiffs.add(LocalDiffModel.fromDiffAndLocalRevision(
+                    contentDiff, LocalDiffType.CONTENT, localRevision));
+        }
+
+        mPostSqlUtils.insertOrUpdateLocalRevision(localRevision, localDiffs);
+    }
+
+    public void removeLocalRevision(PostModel post) {
+        post.setDateLocallyChanged((DateTimeUtils.iso8601UTCFromDate(new Date())));
+        int rowsAffected = mPostSqlUtils.insertOrUpdatePostOverwritingLocalChanges(post);
+        CauseOfOnPostChanged causeOfChange = new CauseOfOnPostChanged.UpdatePost(
+                post.getId(),
+                post.getRemotePostId(),
+                false
+        );
+        OnPostChanged onPostChanged = new OnPostChanged(causeOfChange, rowsAffected);
+        emitChange(onPostChanged);
+
+        mDispatcher.dispatch(ListActionBuilder.newListDataInvalidatedAction(
+                PostListDescriptor.calculateTypeIdentifier(post.getLocalSiteId())));
+    }
+
+
+
+    public RevisionModel getLocalRevision(SiteModel site, PostModel post) {
+        List<LocalRevisionModel> localRevisions = mPostSqlUtils.getLocalRevisions(site, post);
+
+        if (localRevisions.isEmpty()) {
+            return null;
+        }
+
+        // we currently only support one local revision per post or page
+        LocalRevisionModel localRevision = localRevisions.get(0);
+        List<LocalDiffModel> localDiffs =
+                mPostSqlUtils.getLocalRevisionDiffs(localRevision);
+
+        return RevisionModel.fromLocalRevisionAndDiffs(localRevision, localDiffs);
+    }
+
+    @Nullable
+    public RevisionModel getRevisionById(final long revisionId, final long postId, final long siteId) {
+        final String revisionIdString = String.valueOf(revisionId);
+        final LocalRevisionModel localRevision = mPostSqlUtils.getRevisionById(revisionIdString, postId, siteId);
+
+        if (localRevision == null) {
+            return null;
+        }
+
+        List<LocalDiffModel> localDiffs = mPostSqlUtils.getLocalRevisionDiffs(localRevision);
+
+        return RevisionModel.fromLocalRevisionAndDiffs(localRevision, localDiffs);
+    }
+
+    public void deleteLocalRevision(RevisionModel revisionModel, SiteModel site, PostModel post) {
+        mPostSqlUtils.deleteLocalRevisionAndDiffs(
+                LocalRevisionModel.fromRevisionModel(revisionModel, site, post));
+    }
+
+    public void deleteLocalRevisionOfAPostOrPage(PostModel post) {
+        mPostSqlUtils.deleteLocalRevisionAndDiffsOfAPostOrPage(post);
+    }
+
+    public void deleteAllLocalRevisionAndDiffs() {
+        mPostSqlUtils.deleteAllLocalRevisionsAndDiffs();
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ProductsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ProductsStore.kt
new file mode 100644
index 00000000000..b7de5a3f4d9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ProductsStore.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.ProductAction
+import org.wordpress.android.fluxc.action.ProductAction.FETCH_PRODUCTS
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.products.Product
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.products.ProductsRestClient
+import org.wordpress.android.fluxc.store.ProductsStore.FetchProductsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProductsStore @Inject constructor(
+    private val productsRestClient: ProductsRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        when (action.type as? ProductAction ?: return) {
+            FETCH_PRODUCTS -> {
+                coroutineEngine.launch(T.API, this, "FETCH_PRODUCTS") {
+                    emitChange(fetchProducts())
+                }
+            }
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(T.API, ProductsStore::class.java.simpleName + " onRegister")
+    }
+
+    suspend fun fetchProducts(type: String? = null): OnProductsFetched =
+        coroutineEngine.withDefaultContext(T.API, this, "Fetch products") {
+            return@withDefaultContext when (val response = productsRestClient.fetchProducts(type)) {
+                is Success -> {
+                    OnProductsFetched(response.data.products)
+                }
+                is Error -> {
+                    OnProductsFetched(FetchProductsError(GENERIC_ERROR, response.error.message))
+                }
+            }
+        }
+
+    data class OnProductsFetched(val products: List<Product>? = null) : OnChanged<FetchProductsError>() {
+        constructor(error: FetchProductsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class FetchProductsError(
+        val type: FetchProductsErrorType,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class FetchProductsErrorType {
+        GENERIC_ERROR
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt
new file mode 100644
index 00000000000..1fc2d7e5216
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.QuickStartTaskModel
+import org.wordpress.android.fluxc.persistence.QuickStartSqlUtils
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.UNKNOWN
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GET_TO_KNOW_APP
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class QuickStartStore @Inject constructor(
+    private val quickStartSqlUtils: QuickStartSqlUtils,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    interface QuickStartTask {
+        val string: String
+        val taskType: QuickStartTaskType
+        val order: Int
+
+        companion object {
+            fun getAllTasks(): List<QuickStartTask> =
+                    QuickStartNewSiteTask.values().toList() +
+                            QuickStartExistingSiteTask.values().toList()
+
+            fun getTaskFromModel(model: QuickStartTaskModel) =
+                    getAllTasks().find {
+                        it.taskType.toString().equals(model.taskType, true) &&
+                            it.string.equals(model.taskName.toString(), true)
+                    } ?: UNKNOWN
+
+            fun getTasksByTaskType(taskType: QuickStartTaskType) =
+                    getAllTasks().filter { it.taskType == taskType }
+        }
+    }
+
+    enum class QuickStartNewSiteTask constructor(
+        override val string: String,
+        override val taskType: QuickStartTaskType,
+        override val order: Int
+    ) : QuickStartTask {
+        UNKNOWN(QUICK_START_UNKNOWN_LABEL, QuickStartTaskType.UNKNOWN, 0),
+        CREATE_SITE(QUICK_START_CREATE_SITE_LABEL, CUSTOMIZE, 0),
+        UPDATE_SITE_TITLE(QUICK_START_UPDATE_SITE_TITLE_LABEL, CUSTOMIZE, 1),
+        UPLOAD_SITE_ICON(QUICK_START_UPLOAD_SITE_ICON_LABEL, CUSTOMIZE, 2),
+        REVIEW_PAGES(QUICK_START_REVIEW_PAGES_LABEL, CUSTOMIZE, 3),
+        VIEW_SITE(QUICK_START_VIEW_SITE_LABEL, CUSTOMIZE, 4),
+        ENABLE_POST_SHARING(QUICK_START_ENABLE_POST_SHARING_LABEL, GROW, 6),
+        PUBLISH_POST(QUICK_START_PUBLISH_POST_LABEL, GROW, 7),
+        FOLLOW_SITE(QUICK_START_FOLLOW_SITE_LABEL, GROW, 8),
+        CHECK_STATS(QUICK_START_CHECK_STATS_LABEL, GROW, 9);
+
+        override fun toString(): String {
+            return string
+        }
+
+        companion object {
+            fun fromString(string: String?): QuickStartNewSiteTask {
+                for (value in values()) {
+                    if (string.equals(value.toString(), true)) {
+                        return value
+                    }
+                }
+
+                return UNKNOWN
+            }
+        }
+    }
+
+    enum class QuickStartExistingSiteTask constructor(
+        override val string: String,
+        override val taskType: QuickStartTaskType,
+        override val order: Int
+    ) : QuickStartTask {
+        UNKNOWN(QUICK_START_UNKNOWN_LABEL, QuickStartTaskType.UNKNOWN, 0),
+        CHECK_STATS(QUICK_START_CHECK_STATS_LABEL, GET_TO_KNOW_APP, 1),
+        CHECK_NOTIFICATIONS(QUICK_START_CHECK_NOTIFIATIONS_LABEL, GET_TO_KNOW_APP, 2),
+        VIEW_SITE(QUICK_START_VIEW_SITE_LABEL, GET_TO_KNOW_APP, 3),
+        UPLOAD_MEDIA(QUICK_START_UPLOAD_MEDIA_LABEL, GET_TO_KNOW_APP, 4),
+        FOLLOW_SITE(QUICK_START_FOLLOW_SITE_LABEL, GET_TO_KNOW_APP, 5);
+
+        override fun toString(): String {
+            return string
+        }
+
+        companion object {
+            fun fromString(string: String?): QuickStartExistingSiteTask {
+                for (value in values()) {
+                    if (string.equals(value.toString(), true)) {
+                        return value
+                    }
+                }
+
+                return UNKNOWN
+            }
+        }
+    }
+
+    enum class QuickStartTaskType(private val string: String) {
+        CUSTOMIZE("customize"),
+        GROW("grow"),
+        GET_TO_KNOW_APP("get_to_know_app"),
+        UNKNOWN("unknown");
+
+        override fun toString(): String {
+            return string
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) = Unit // Do nothing (ignore)
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, QuickStartStore::class.java.simpleName + " onRegister")
+    }
+
+    fun getDoneCount(siteId: Long): Int {
+        return quickStartSqlUtils.getDoneCount(siteId)
+    }
+
+    fun hasDoneTask(siteId: Long, task: QuickStartTask): Boolean {
+        return quickStartSqlUtils.hasDoneTask(siteId, task)
+    }
+
+    fun setDoneTask(siteId: Long, task: QuickStartTask, isDone: Boolean) {
+        quickStartSqlUtils.setDoneTask(siteId, task, isDone)
+    }
+
+    fun getCompletedTasksByType(siteId: Long, taskType: QuickStartTaskType): List<QuickStartTask> {
+        return QuickStartTask.getTasksByTaskType(taskType)
+                .filter { quickStartSqlUtils.hasDoneTask(siteId, it) }
+                .sortedBy { it.order }
+    }
+
+    fun getUncompletedTasksByType(
+        siteId: Long,
+        taskType: QuickStartTaskType
+    ): List<QuickStartTask> {
+        return QuickStartTask.getTasksByTaskType(taskType)
+                .filter { !quickStartSqlUtils.hasDoneTask(siteId, it) }
+                .sortedBy { it.order }
+    }
+
+    fun isQuickStartStatusSet(siteId: Long): Boolean {
+        return quickStartSqlUtils.getQuickStartStatus(siteId) != null
+    }
+
+    fun setQuickStartCompleted(siteId: Long, isCompleted: Boolean) {
+        quickStartSqlUtils.setQuickStartCompleted(siteId, isCompleted)
+    }
+
+    fun getQuickStartCompleted(siteId: Long): Boolean {
+        return quickStartSqlUtils.getQuickStartCompleted(siteId)
+    }
+
+    fun setQuickStartNotificationReceived(siteId: Long, isReceived: Boolean) {
+        quickStartSqlUtils.setQuickStartNotificationReceived(siteId, isReceived)
+    }
+
+    fun getQuickStartNotificationReceived(siteId: Long): Boolean {
+        return quickStartSqlUtils.getQuickStartNotificationReceived(siteId)
+    }
+
+    companion object {
+        const val QUICK_START_UNKNOWN_LABEL = "unknown"
+        const val QUICK_START_CREATE_SITE_LABEL = "create_site"
+        const val QUICK_START_UPDATE_SITE_TITLE_LABEL = "update_site_title"
+        const val QUICK_START_UPLOAD_SITE_ICON_LABEL = "upload_site_icon"
+        const val QUICK_START_REVIEW_PAGES_LABEL = "review_pages"
+        const val QUICK_START_VIEW_SITE_LABEL = "view_site"
+        const val QUICK_START_ENABLE_POST_SHARING_LABEL = "enable_post_sharing"
+        const val QUICK_START_PUBLISH_POST_LABEL = "publish_post"
+        const val QUICK_START_FOLLOW_SITE_LABEL = "follow_site"
+        const val QUICK_START_CHECK_STATS_LABEL = "check_stats"
+        const val QUICK_START_CHECK_NOTIFIATIONS_LABEL = "check_notifications"
+        const val QUICK_START_UPLOAD_MEDIA_LABEL = "upload_media"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReactNativeStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReactNativeStore.kt
new file mode 100644
index 00000000000..d185bc93029
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReactNativeStore.kt
@@ -0,0 +1,320 @@
+package org.wordpress.android.fluxc.store
+
+import android.net.Uri
+import androidx.annotation.VisibleForTesting
+import com.google.gson.JsonElement
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.discovery.DiscoveryWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Available
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.FailedRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.Nonce.Unknown
+import org.wordpress.android.fluxc.network.rest.wpapi.NonceRestClient
+import org.wordpress.android.fluxc.network.rest.wpapi.reactnative.ReactNativeWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.reactnative.ReactNativeWPComRestClient
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils.DuplicateSiteException
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Error
+import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Success
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.net.HttpURLConnection
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val WPCOM_ENDPOINT = "https://public-api.wordpress.com"
+
+/**
+ * This store is for use making calls that originate from React Native. It does not use
+ * a higher-level api for the requests and responses because of the unique requirements
+ * around React Native. Calls originating from native code should not use this class.
+ */
+@Singleton
+class ReactNativeStore @VisibleForTesting constructor(
+    private val wpComRestClient: ReactNativeWPComRestClient,
+    private val wpAPIRestClient: ReactNativeWPAPIRestClient,
+    private val nonceRestClient: NonceRestClient,
+    private val discoveryWPAPIRestClient: DiscoveryWPAPIRestClient,
+    private val siteSqlUtils: SiteSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    private val currentTimeMillis: () -> Long = System::currentTimeMillis,
+    private val sitePersistanceFunction: (site: SiteModel) -> Int = siteSqlUtils::insertOrUpdateSite,
+    private val uriParser: (string: String) -> Uri = Uri::parse
+) {
+    @Inject constructor(
+        wpComRestClient: ReactNativeWPComRestClient,
+        wpAPIRestClient: ReactNativeWPAPIRestClient,
+        nonceRestClient: NonceRestClient,
+        discoveryWPAPIRestClient: DiscoveryWPAPIRestClient,
+        siteSqlUtils: SiteSqlUtils,
+        coroutineEngine: CoroutineEngine
+    ) : this(
+            wpComRestClient,
+            wpAPIRestClient,
+            nonceRestClient,
+            discoveryWPAPIRestClient,
+            siteSqlUtils,
+            coroutineEngine,
+            System::currentTimeMillis,
+            siteSqlUtils::insertOrUpdateSite,
+            Uri::parse
+    )
+
+    private enum class RequestMethod {
+        GET,
+        POST
+    }
+
+    suspend fun executeGetRequest(
+        site: SiteModel,
+        pathWithParams: String,
+        enableCaching: Boolean = true
+    ): ReactNativeFetchResponse =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "executeGetRequest") {
+                return@withDefaultContext if (site.isUsingWpComRestApi) {
+                    executeWPComGetRequest(site, pathWithParams, enableCaching)
+                } else {
+                    executeWPAPIGetRequest(site, pathWithParams, enableCaching)
+                }
+            }
+
+    suspend fun executePostRequest(
+        site: SiteModel,
+        pathWithParams: String,
+        body: Map<String, Any> = emptyMap(),
+    ): ReactNativeFetchResponse =
+        coroutineEngine.withDefaultContext(AppLog.T.API, this, "executePostRequest") {
+            return@withDefaultContext if (site.isUsingWpComRestApi) {
+                executeWPComPostRequest(site, pathWithParams, body)
+            } else {
+                executeWPAPIPostRequest(site, pathWithParams, body)
+            }
+        }
+
+    /**
+     * WPCOM REST API
+     */
+    private suspend fun executeWPComGetRequest(
+        site: SiteModel,
+        path: String,
+        enableCaching: Boolean
+    ): ReactNativeFetchResponse {
+        val (url, params) = parseUrlAndParamsForWPCom(path, site.siteId)
+        return if (url != null) {
+            wpComRestClient.getRequest(url, params, ::Success, ::Error, enableCaching)
+        } else {
+            urlParseError(path)
+        }
+    }
+
+    private suspend fun executeWPComPostRequest(
+        site: SiteModel,
+        path: String,
+        body: Map<String, Any>,
+    ): ReactNativeFetchResponse {
+        val (url, params) = parseUrlAndParamsForWPCom(path, site.siteId)
+        return if (url != null) {
+            wpComRestClient.postRequest(url, params, body, ::Success, ::Error)
+        } else {
+            urlParseError(path)
+        }
+    }
+
+    /**
+     * WP REST PI
+     */
+    private suspend fun executeWPAPIGetRequest(
+        site: SiteModel,
+        pathWithParams: String,
+        enableCaching: Boolean
+    ): ReactNativeFetchResponse {
+        val (path, params) = parsePathAndParams(pathWithParams)
+        return if (path != null) {
+            // Omit `body` parameters as it's only supported in POST requests
+            executeWPAPIRequest(site, path, RequestMethod.GET, params, emptyMap(), enableCaching)
+        } else {
+            urlParseError(pathWithParams)
+        }
+    }
+
+    private suspend fun executeWPAPIPostRequest(
+        site: SiteModel,
+        pathWithParams: String,
+        body: Map<String, Any>,
+    ): ReactNativeFetchResponse {
+        val (path, params) = parsePathAndParams(pathWithParams)
+        return if (path != null) {
+            // Omit `params` and `enableCaching` parameters as they are only supported in GET requests
+            executeWPAPIRequest(site, path, RequestMethod.POST, emptyMap(), body, false)
+        } else {
+            urlParseError(pathWithParams)
+        }
+    }
+
+    private fun urlParseError(path: String): Error {
+        val error = BaseNetworkError(GenericErrorType.UNKNOWN).apply {
+            message = "Failed to parse URI from $path"
+        }
+        return Error(error)
+    }
+
+    @Suppress("ComplexMethod", "NestedBlockDepth", "LongParameterList")
+    private suspend fun executeWPAPIRequest(
+        site: SiteModel,
+        path: String,
+        method: RequestMethod,
+        params: Map<String, String>,
+        body: Map<String, Any>,
+        enableCaching: Boolean
+    ): ReactNativeFetchResponse {
+        // Storing this in a variable to avoid a NPE that can occur if the site object is mutated
+        // from another thread: https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/1579
+        var wpApiRestUrl = site.wpApiRestUrl
+
+        val usingSavedRestUrl = wpApiRestUrl != null
+        if (!usingSavedRestUrl) {
+            wpApiRestUrl = discoveryWPAPIRestClient.discoverWPAPIBaseURL(site.url) // discover rest api endpoint
+                    ?: slashJoin(site.url, "wp-json/") // fallback to ".../wp-json/" default if discovery fails
+            site.wpApiRestUrl = wpApiRestUrl
+            persistSiteSafely(site)
+        }
+        val fullRestUrl = slashJoin(wpApiRestUrl, path)
+
+        var nonce = nonceRestClient.getNonce(site)
+        val usingSavedNonce = nonce is Available
+        val failedRecently = true == (nonce as? FailedRequest)?.timeOfResponse?.let {
+            it + FIVE_MIN_MILLIS > currentTimeMillis()
+        }
+        if (nonce is Unknown || !(usingSavedNonce || failedRecently)) {
+            nonce = nonceRestClient.requestNonce(site)
+        }
+
+        val response = when (method) {
+            RequestMethod.GET -> executeGet(fullRestUrl, params, nonce?.value, enableCaching)
+            RequestMethod.POST -> executePost(fullRestUrl, body, nonce?.value)
+        }
+        return when (response) {
+            is Success -> response
+
+            is Error -> when (response.statusCode()) {
+                HttpURLConnection.HTTP_UNAUTHORIZED -> {
+                    if (usingSavedNonce) {
+                        // Call with saved nonce failed, so try getting a new one
+                        val previousNonce = nonce?.value
+                        val newNonce = nonceRestClient.requestNonce(site)?.value
+
+                        // Try original call again if we have a new nonce
+                        val nonceIsUpdated = newNonce != null && newNonce != previousNonce
+                        if (nonceIsUpdated) {
+                            return when (method) {
+                                RequestMethod.GET -> executeGet(fullRestUrl, params, newNonce, enableCaching)
+                                RequestMethod.POST -> executePost(fullRestUrl, body, newNonce)
+                            }
+                        }
+                    }
+                    response
+                }
+
+                HttpURLConnection.HTTP_NOT_FOUND -> {
+                    // call failed with 'not found' so clear the (failing) rest url
+                    site.wpApiRestUrl = null
+                    persistSiteSafely(site)
+
+                    if (usingSavedRestUrl) {
+                        // If we did the previous call with a saved rest url, try again by making
+                        // recursive call. This time there is no saved rest url to use
+                        // so the rest url will be retrieved using discovery
+                        executeWPAPIRequest(site, path, method, params, body, enableCaching)
+                    } else {
+                        // Already used discovery to fetch the rest base url and still got 'not found', so
+                        // just return the error response
+                        response
+                    }
+
+                    // For all other failures just return the error response
+                }
+
+                else -> response
+            }
+        }
+    }
+
+    private suspend fun executeGet(
+        fullRestApiUrl: String,
+        params: Map<String, String>,
+        nonce: String?,
+        enableCaching: Boolean
+    ): ReactNativeFetchResponse =
+            wpAPIRestClient.getRequest(fullRestApiUrl, params, ::Success, ::Error, nonce, enableCaching)
+
+    private suspend fun executePost(
+        fullRestApiUrl: String,
+        body: Map<String, Any>,
+        nonce: String?
+    ): ReactNativeFetchResponse =
+        wpAPIRestClient.postRequest(fullRestApiUrl, body, ::Success, ::Error, nonce)
+
+    private fun parseUrlAndParamsForWPCom(
+        pathWithParams: String,
+        wpComSiteId: Long
+    ): Pair<String?, Map<String, String>> =
+            parsePathAndParams(pathWithParams).let { (path, params) ->
+                val url = path?.let {
+                    val newPath = it
+                            .replace("wp/v2".toRegex(), "wp/v2/sites/$wpComSiteId")
+                            .replace("wpcom/v2".toRegex(), "wpcom/v2/sites/$wpComSiteId")
+                            .replace("wp-block-editor/v1".toRegex(), "wp-block-editor/v1/sites/$wpComSiteId")
+                            .replace("oembed/1.0".toRegex(), "oembed/1.0/sites/$wpComSiteId")
+                    slashJoin(WPCOM_ENDPOINT, newPath)
+                }
+                Pair(url, params)
+            }
+
+    private fun parsePathAndParams(pathWithParams: String): Pair<String?, Map<String, String>> {
+        val uri = uriParser(pathWithParams)
+        val paramMap = uri.queryParameterNames.mapNotNull { key ->
+            uri.getQueryParameter(key)?.let { value ->
+                key to value
+            }
+        }.toMap()
+        return Pair(uri.path, paramMap)
+    }
+
+    private fun persistSiteSafely(site: SiteModel) {
+        try {
+            sitePersistanceFunction.invoke(site)
+        } catch (e: DuplicateSiteException) {
+            // persistance failed, which is not a big deal because it just means we may need to re-discover the
+            // rest url later.
+            AppLog.d(AppLog.T.DB, "Error when persisting site: $e")
+        }
+    }
+
+    private fun getNonce(site: SiteModel) = nonceRestClient.getNonce(site)
+
+    companion object {
+        private const val FIVE_MIN_MILLIS: Long = 5 * 60 * 1000
+
+        /**
+         * @param begin beginning which may end with a /
+         * @param end ending which may begin with a /
+         * @return a string with only a single slash "between" [begin] and [end],
+         *          i.e. slashJoin("begin/", "/end") and slashJoin("begin", "end") both
+         *          return "begin/end".
+         *
+         */
+        fun slashJoin(begin: String, end: String): String {
+            val noSlashBegin = begin.replace("/$".toRegex(), "")
+            val noSlashEnd = end.replace("^/".toRegex(), "")
+            return "$noSlashBegin/$noSlashEnd"
+        }
+    }
+}
+
+private fun Error.statusCode() = error.volleyError?.networkResponse?.statusCode
+
+sealed class ReactNativeFetchResponse {
+    class Success(val result: JsonElement?) : ReactNativeFetchResponse()
+    class Error(val error: BaseNetworkError) : ReactNativeFetchResponse()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReaderStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReaderStore.java
new file mode 100644
index 00000000000..c5c9d732e35
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ReaderStore.java
@@ -0,0 +1,154 @@
+package org.wordpress.android.fluxc.store;
+
+import androidx.annotation.NonNull;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.ReaderAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.ReaderSiteModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.reader.ReaderRestClient;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class ReaderStore extends Store {
+    private ReaderRestClient mReaderRestClient;
+
+    @Inject public ReaderStore(Dispatcher dispatcher, ReaderRestClient readerRestClient) {
+        super(dispatcher);
+        mReaderRestClient = readerRestClient;
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(T.API, "ReaderStore onRegister");
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof ReaderAction)) {
+            return;
+        }
+        switch ((ReaderAction) actionType) {
+            case READER_SEARCH_SITES:
+                performReaderSearchSites((ReaderSearchSitesPayload) action.getPayload());
+                break;
+            case READER_SEARCHED_SITES:
+                handleReaderSearchedSites((ReaderSearchSitesResponsePayload) action.getPayload());
+                break;
+        }
+    }
+
+    public static class ReaderSearchSitesPayload extends Payload<BaseNetworkError> {
+        public @NonNull String searchTerm;
+        public int count;
+        public int offset;
+        public boolean excludeFollowed;
+
+        public ReaderSearchSitesPayload(@NonNull String searchTerm, int count, int offset, boolean excludeFollowed) {
+            this.searchTerm = searchTerm;
+            this.count = count;
+            this.offset = offset;
+            this.excludeFollowed = excludeFollowed;
+        }
+    }
+
+    public static class ReaderSearchSitesResponsePayload extends Payload<ReaderError> {
+        public @NonNull List<ReaderSiteModel> sites;
+        public @NonNull String searchTerm;
+        public int offset;
+        public boolean canLoadMore;
+
+        public ReaderSearchSitesResponsePayload(@NonNull List<ReaderSiteModel> sites,
+                                                @NonNull String searchTerm,
+                                                int offset,
+                                                boolean canLoadMore) {
+            this.sites = sites;
+            this.searchTerm = searchTerm;
+            this.offset = offset;
+            this.canLoadMore = canLoadMore;
+        }
+
+        public ReaderSearchSitesResponsePayload(@NonNull ReaderError error, @NonNull String searchTerm, int offset) {
+            this.searchTerm = searchTerm;
+            this.offset = offset;
+            this.error = error;
+            this.sites = new ArrayList<>();
+        }
+    }
+
+    public enum ReaderErrorType {
+        GENERIC_ERROR;
+
+        public static ReaderErrorType fromBaseNetworkError(BaseNetworkError baseError) {
+            return ReaderErrorType.GENERIC_ERROR;
+        }
+    }
+
+    public static class ReaderError implements OnChangedError {
+        public ReaderErrorType type;
+        public String message;
+
+        public ReaderError(ReaderErrorType type, String message) {
+            this.type = type;
+            this.message = message;
+        }
+    }
+
+    public static class OnReaderSitesSearched extends OnChanged<ReaderError> {
+        @NonNull public String searchTerm;
+        @NonNull public List<ReaderSiteModel> sites;
+        public boolean canLoadMore;
+        public int offset;
+
+        public OnReaderSitesSearched(@NonNull List<ReaderSiteModel> sites,
+                                     @NonNull String searchTerm,
+                                     int offset,
+                                     boolean canLoadMore) {
+            this.sites = sites;
+            this.searchTerm = searchTerm;
+            this.canLoadMore = canLoadMore;
+            this.offset = offset;
+        }
+
+        public OnReaderSitesSearched(@NonNull ReaderError error, @NonNull String searchTerm, int offset) {
+            this.error = error;
+            this.searchTerm = searchTerm;
+            this.offset = offset;
+            this.sites = new ArrayList<>();
+        }
+    }
+
+    private void performReaderSearchSites(ReaderSearchSitesPayload payload) {
+        mReaderRestClient.searchReaderSites(payload.searchTerm, payload.count, payload.offset, payload.excludeFollowed);
+    }
+
+    private void handleReaderSearchedSites(@NonNull ReaderSearchSitesResponsePayload payload) {
+        OnReaderSitesSearched onReaderSitesSearched;
+
+        if (payload.isError()) {
+            onReaderSitesSearched = new OnReaderSitesSearched(payload.error, payload.searchTerm, payload.offset);
+        } else {
+            onReaderSitesSearched = new OnReaderSitesSearched(
+                    payload.sites,
+                    payload.searchTerm,
+                    payload.offset,
+                    payload.canLoadMore);
+        }
+
+        emitChange(onReaderSitesSearched);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ScanStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ScanStore.kt
new file mode 100644
index 00000000000..a10a2ae021f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ScanStore.kt
@@ -0,0 +1,407 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.ScanAction
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_FIX_THREATS_STATUS
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_SCAN_HISTORY
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_SCAN_STATE
+import org.wordpress.android.fluxc.action.ScanAction.FIX_THREATS
+import org.wordpress.android.fluxc.action.ScanAction.IGNORE_THREAT
+import org.wordpress.android.fluxc.action.ScanAction.START_SCAN
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.CURRENT
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.IGNORED
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.scan.ScanRestClient
+import org.wordpress.android.fluxc.persistence.ScanSqlUtils
+import org.wordpress.android.fluxc.persistence.ThreatSqlUtils
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.fluxc.utils.BuildConfigWrapper
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private val SCAN_THREAT_STATUSES = listOf(CURRENT)
+private val SCAN_HISTORY_THREAT_STATUSES = listOf(IGNORED, FIXED)
+
+@Singleton
+class ScanStore @Inject constructor(
+    private val scanRestClient: ScanRestClient,
+    private val scanSqlUtils: ScanSqlUtils,
+    private val threatSqlUtils: ThreatSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    private val appLogWrapper: AppLogWrapper,
+    private val buildConfigWrapper: BuildConfigWrapper,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? ScanAction ?: return
+        when (actionType) {
+            FETCH_SCAN_STATE -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On FETCH_SCAN_STATE") {
+                    emitChange(fetchScanState(action.payload as FetchScanStatePayload))
+                }
+            }
+            START_SCAN -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On START_SCAN") {
+                    emitChange(startScan(action.payload as ScanStartPayload))
+                }
+            }
+            FIX_THREATS -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On FIX_THREATS") {
+                    emitChange(fixThreats(action.payload as FixThreatsPayload))
+                }
+            }
+            IGNORE_THREAT -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On IGNORE_THREAT") {
+                    emitChange(ignoreThreat(action.payload as IgnoreThreatPayload))
+                }
+            }
+            FETCH_FIX_THREATS_STATUS -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On FETCH_FIX_THREATS_STATUS") {
+                    emitChange(fetchFixThreatsStatus(action.payload as FetchFixThreatsStatusPayload))
+                }
+            }
+            FETCH_SCAN_HISTORY -> {
+                coroutineEngine.launch(AppLog.T.API, this, "Scan: On FETCH_SCAN_HISTORY") {
+                    emitChange(fetchScanHistory(action.payload as FetchScanHistoryPayload))
+                }
+            }
+        }
+    }
+
+    suspend fun getScanStateForSite(site: SiteModel) =
+        coroutineEngine.withDefaultContext(AppLog.T.JETPACK_SCAN, this, "getScanStateForSite") {
+            val scanStateModel = scanSqlUtils.getScanStateForSite(site)
+            val threats = scanStateModel?.let { threatSqlUtils.getThreats(site, SCAN_THREAT_STATUSES) }
+            scanStateModel?.copy(threats = threats)
+        }
+
+    suspend fun getScanHistoryForSite(site: SiteModel) =
+        coroutineEngine.withDefaultContext(AppLog.T.JETPACK_SCAN, this, "getScanHistoryForSite") {
+            threatSqlUtils.getThreats(site, SCAN_HISTORY_THREAT_STATUSES)
+        }
+
+    suspend fun getThreatModelByThreatId(threatId: Long) =
+        coroutineEngine.withDefaultContext(AppLog.T.JETPACK_SCAN, this, "getThreatModelByThreatId") {
+            threatSqlUtils.getThreatByThreatId(threatId)
+        }
+
+    suspend fun hasValidCredentials(site: SiteModel) =
+        coroutineEngine.withDefaultContext(AppLog.T.JETPACK_SCAN, this, "hasValidCredentials") {
+            val scanStateModel = scanSqlUtils.getScanStateForSite(site)
+            scanStateModel?.hasValidCredentials ?: false
+        }
+
+    suspend fun addOrUpdateScanStateModelForSite(action: ScanAction, site: SiteModel, scanStateModel: ScanStateModel) {
+        coroutineEngine.withDefaultContext(AppLog.T.JETPACK_SCAN, this, "addOrUpdateScanStateModelForSite") {
+            scanSqlUtils.replaceScanState(site, scanStateModel)
+            storeThreatsWithStatuses(action, site, scanStateModel.threats, SCAN_THREAT_STATUSES)
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, this.javaClass.name + ": onRegister")
+    }
+
+    suspend fun fetchScanState(fetchScanStatePayload: FetchScanStatePayload): OnScanStateFetched {
+        val payload = scanRestClient.fetchScanState(fetchScanStatePayload.site)
+        return storeScanState(payload)
+    }
+
+    private suspend fun storeScanState(payload: FetchedScanStatePayload): OnScanStateFetched {
+        return if (payload.error != null) {
+            OnScanStateFetched(payload.error, FETCH_SCAN_STATE)
+        } else {
+            payload.scanStateModel?.let {
+                addOrUpdateScanStateModelForSite(FETCH_SCAN_STATE, payload.site, payload.scanStateModel)
+            }
+            OnScanStateFetched(FETCH_SCAN_STATE)
+        }
+    }
+
+    suspend fun startScan(scanStartPayload: ScanStartPayload): OnScanStarted {
+        val payload = scanRestClient.startScan(scanStartPayload.site)
+        return emitScanStartResult(payload)
+    }
+
+    private fun emitScanStartResult(payload: ScanStartResultPayload): OnScanStarted {
+        return if (payload.error != null) {
+            OnScanStarted(payload.error, START_SCAN)
+        } else {
+            OnScanStarted(START_SCAN)
+        }
+    }
+
+    suspend fun fixThreats(fixThreatsPayload: FixThreatsPayload): OnFixThreatsStarted {
+        val payload = scanRestClient.fixThreats(fixThreatsPayload.remoteSiteId, fixThreatsPayload.threatIds)
+        return emitFixThreatsResult(payload)
+    }
+
+    private fun emitFixThreatsResult(payload: FixThreatsResultPayload): OnFixThreatsStarted {
+        return if (payload.error != null) {
+            OnFixThreatsStarted(payload.error, FIX_THREATS)
+        } else {
+            OnFixThreatsStarted(FIX_THREATS)
+        }
+    }
+
+    suspend fun ignoreThreat(ignoreThreatPayload: IgnoreThreatPayload): OnIgnoreThreatStarted {
+        val payload = scanRestClient.ignoreThreat(ignoreThreatPayload.remoteSiteId, ignoreThreatPayload.threatId)
+        return emitIgnoreThreatResult(payload)
+    }
+
+    private fun emitIgnoreThreatResult(payload: IgnoreThreatResultPayload): OnIgnoreThreatStarted {
+        return if (payload.error != null) {
+            OnIgnoreThreatStarted(payload.error, IGNORE_THREAT)
+        } else {
+            OnIgnoreThreatStarted(IGNORE_THREAT)
+        }
+    }
+
+    suspend fun fetchFixThreatsStatus(payload: FetchFixThreatsStatusPayload): OnFixThreatsStatusFetched {
+        val resultPayload = scanRestClient.fetchFixThreatsStatus(payload.remoteSiteId, payload.threatIds)
+        return emitFixThreatsStatus(resultPayload)
+    }
+
+    private fun emitFixThreatsStatus(payload: FetchFixThreatsStatusResultPayload) = if (payload.error != null) {
+        OnFixThreatsStatusFetched(payload.remoteSiteId, payload.error, FETCH_FIX_THREATS_STATUS)
+    } else {
+        OnFixThreatsStatusFetched(
+            remoteSiteId = payload.remoteSiteId,
+            fixThreatStatusModels = payload.fixThreatStatusModels,
+            causeOfChange = FETCH_FIX_THREATS_STATUS
+        )
+    }
+
+    suspend fun fetchScanHistory(payload: FetchScanHistoryPayload): OnScanHistoryFetched {
+        val resultPayload = scanRestClient.fetchScanHistory(payload.site.siteId)
+        if (!resultPayload.isError && resultPayload.threats != null) {
+            storeThreatsWithStatuses(
+                    FETCH_SCAN_HISTORY,
+                    payload.site,
+                    resultPayload.threats,
+                    SCAN_HISTORY_THREAT_STATUSES
+            )
+        }
+        return emitFetchScanHistoryResult(resultPayload)
+    }
+
+    @Suppress("TooGenericExceptionThrown")
+    private fun storeThreatsWithStatuses(
+        action: ScanAction,
+        site: SiteModel,
+        threats: List<ThreatModel>?,
+        statuses: List<ThreatStatus>
+    ) {
+        threatSqlUtils.removeThreatsWithStatus(site, statuses)
+        threats?.filter { statuses.contains(it.baseThreatModel.status) }
+                ?.also {
+                    if (it.size != threats.size) {
+                        val msg = "$action action returned a Threat with ThreatState not in ${statuses.joinToString()}"
+                        appLogWrapper.e(AppLog.T.API, msg)
+                        if (buildConfigWrapper.isDebug()) throw RuntimeException(msg)
+                    }
+                }
+                ?.run { threatSqlUtils.insertThreats(site, this) }
+    }
+
+    private fun emitFetchScanHistoryResult(payload: FetchScanHistoryResultPayload) =
+            OnScanHistoryFetched(payload.remoteSiteId, payload.error, FETCH_SCAN_HISTORY)
+
+    // Actions
+    data class OnScanStateFetched(
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<ScanStateError>() {
+        constructor(error: ScanStateError, causeOfChange: ScanAction) : this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnScanStarted(
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<ScanStartError>() {
+        constructor(error: ScanStartError, causeOfChange: ScanAction) : this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnFixThreatsStarted(
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<FixThreatsError>() {
+        constructor(error: FixThreatsError, causeOfChange: ScanAction) : this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnIgnoreThreatStarted(
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<IgnoreThreatError>() {
+        constructor(error: IgnoreThreatError, causeOfChange: ScanAction) : this(causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnFixThreatsStatusFetched(
+        val remoteSiteId: Long,
+        val fixThreatStatusModels: List<FixThreatStatusModel>,
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<FixThreatsStatusError>() {
+        constructor(
+            remoteSiteId: Long,
+            error: FixThreatsStatusError,
+            causeOfChange: ScanAction
+        ) : this(remoteSiteId = remoteSiteId, fixThreatStatusModels = emptyList(), causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    data class OnScanHistoryFetched(
+        val remoteSiteId: Long,
+        val causeOfChange: ScanAction
+    ) : Store.OnChanged<FetchScanHistoryError>() {
+        constructor(
+            remoteSiteId: Long,
+            error: FetchScanHistoryError?,
+            causeOfChange: ScanAction
+        ) : this(remoteSiteId = remoteSiteId, causeOfChange = causeOfChange) {
+            this.error = error
+        }
+    }
+
+    // Payloads
+    class FetchScanStatePayload(
+        val site: SiteModel
+    ) : Payload<BaseNetworkError>()
+
+    class FetchedScanStatePayload(
+        val scanStateModel: ScanStateModel? = null,
+        val site: SiteModel
+    ) : Payload<ScanStateError>() {
+        constructor(
+            error: ScanStateError,
+            site: SiteModel
+        ) : this(site = site) {
+            this.error = error
+        }
+    }
+
+    class ScanStartPayload(val site: SiteModel) : Payload<BaseNetworkError>()
+
+    class ScanStartResultPayload(val site: SiteModel) : Payload<ScanStartError>() {
+        constructor(error: ScanStartError, site: SiteModel) : this(site = site) {
+            this.error = error
+        }
+    }
+
+    class FixThreatsPayload(val remoteSiteId: Long, val threatIds: List<Long>) : Payload<BaseNetworkError>()
+
+    class FixThreatsResultPayload(val remoteSiteId: Long) : Payload<FixThreatsError>() {
+        constructor(error: FixThreatsError, remoteSiteId: Long) : this(remoteSiteId = remoteSiteId) {
+            this.error = error
+        }
+    }
+
+    class IgnoreThreatPayload(val remoteSiteId: Long, val threatId: Long) : Payload<BaseNetworkError>()
+
+    class IgnoreThreatResultPayload(
+        val remoteSiteId: Long
+    ) : Payload<IgnoreThreatError>() {
+        constructor(error: IgnoreThreatError, remoteSiteId: Long) : this(remoteSiteId = remoteSiteId) {
+            this.error = error
+        }
+    }
+
+    class FetchFixThreatsStatusPayload(val remoteSiteId: Long, val threatIds: List<Long>) : Payload<BaseNetworkError>()
+
+    class FetchFixThreatsStatusResultPayload(
+        val remoteSiteId: Long,
+        val fixThreatStatusModels: List<FixThreatStatusModel>
+    ) : Payload<FixThreatsStatusError>() {
+        constructor(
+            remoteSiteId: Long,
+            fixThreatStatusModels: List<FixThreatStatusModel> = emptyList(),
+            error: FixThreatsStatusError
+        ) : this(remoteSiteId = remoteSiteId, fixThreatStatusModels = fixThreatStatusModels) {
+            this.error = error
+        }
+    }
+
+    class FetchScanHistoryPayload(val site: SiteModel) : Payload<BaseNetworkError>()
+
+    class FetchScanHistoryResultPayload(
+        val remoteSiteId: Long,
+        val threats: List<ThreatModel>?
+    ) : Payload<FetchScanHistoryError>() {
+        constructor(
+            remoteSiteId: Long,
+            error: FetchScanHistoryError
+        ) : this(remoteSiteId = remoteSiteId, threats = listOf()) {
+            this.error = error
+        }
+    }
+
+    // Errors
+    enum class ScanStateErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class ScanStateError(var type: ScanStateErrorType, var message: String? = null) : OnChangedError
+
+    enum class ScanStartErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        API_ERROR
+    }
+
+    class ScanStartError(var type: ScanStartErrorType, var message: String? = null) : OnChangedError
+
+    enum class FixThreatsErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        API_ERROR
+    }
+
+    class FixThreatsError(var type: FixThreatsErrorType, var message: String? = null) : OnChangedError
+
+    enum class IgnoreThreatErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class IgnoreThreatError(var type: IgnoreThreatErrorType, var message: String? = null) : OnChangedError
+
+    enum class FixThreatsStatusErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        MISSING_THREAT_ID,
+        API_ERROR
+    }
+
+    class FixThreatsStatusError(var type: FixThreatsStatusErrorType, var message: String? = null) : OnChangedError
+
+    enum class FetchScanHistoryErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE
+    }
+
+    class FetchScanHistoryError(var type: FetchScanHistoryErrorType, var message: String? = null) : OnChangedError
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteOptionsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteOptionsStore.kt
new file mode 100644
index 00000000000..4de57386c91
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteOptionsStore.kt
@@ -0,0 +1,171 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.SiteHomepageSettings
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
+import org.wordpress.android.fluxc.model.SiteHomepageSettingsMapper
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.CENSORED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.HTTP_AUTH_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_SSL_CERTIFICATE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_AUTHENTICATED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NO_CONNECTION
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteHomepageRestClient
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsError
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsErrorType
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsErrorType.INVALID_PARAMETERS
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+
+class SiteOptionsStore
+@Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val dispatcher: Dispatcher,
+    private val siteHomepageSettingsMapper: SiteHomepageSettingsMapper,
+    private val siteHomepageRestClient: SiteHomepageRestClient
+) {
+    suspend fun updatePageForPosts(site: SiteModel, pageForPostsId: Long): HomepageUpdatedPayload =
+            coroutineEngine.withDefaultContext(T.API, this, "Update page for posts") {
+                if (site.pageForPosts == pageForPostsId) {
+                    return@withDefaultContext HomepageUpdatedPayload(
+                            SiteOptionsError(
+                                    GENERIC_ERROR,
+                                    "Trying to set pageForPosts with an already set value"
+                            )
+                    )
+                }
+                val updatedPageOnFrontId = if (pageForPostsId == site.pageOnFront) {
+                    0
+                } else {
+                    site.pageOnFront
+                }
+                val updatedHomepageSettings = StaticPage(
+                        pageForPostsId = pageForPostsId,
+                        pageOnFrontId = updatedPageOnFrontId
+                )
+                return@withDefaultContext updateHomepage(site, updatedHomepageSettings)
+            }
+
+    suspend fun updatePageOnFront(site: SiteModel, pageOnFrontId: Long): HomepageUpdatedPayload =
+            coroutineEngine.withDefaultContext(T.API, this, "Update page on front") {
+                if (site.pageOnFront == pageOnFrontId) {
+                    return@withDefaultContext HomepageUpdatedPayload(
+                            SiteOptionsError(
+                                    GENERIC_ERROR,
+                                    "Trying to set pageOnFront with an already set value"
+                            )
+                    )
+                }
+                val updatedPageForPostsId = if (pageOnFrontId == site.pageForPosts) {
+                    0
+                } else {
+                    site.pageForPosts
+                }
+                val updatedHomepageSettings = StaticPage(
+                        pageForPostsId = updatedPageForPostsId,
+                        pageOnFrontId = pageOnFrontId
+                )
+                return@withDefaultContext updateHomepage(site, updatedHomepageSettings)
+            }
+
+    suspend fun updateHomepage(site: SiteModel, homepageSettings: SiteHomepageSettings): HomepageUpdatedPayload =
+            coroutineEngine.withDefaultContext(T.API, this, "Update homepage settings") {
+                if (!site.isUsingWpComRestApi) {
+                    return@withDefaultContext HomepageUpdatedPayload(
+                            SiteOptionsError(
+                                    GENERIC_ERROR,
+                                    "You cannot update homepage for a self-hosted site"
+                            )
+                    )
+                }
+                if (homepageSettings is StaticPage &&
+                        homepageSettings.pageForPostsId == homepageSettings.pageOnFrontId) {
+                    return@withDefaultContext HomepageUpdatedPayload(
+                            SiteOptionsError(
+                                    INVALID_PARAMETERS,
+                                    "Page for posts and page on front cannot be the same"
+                            )
+                    )
+                }
+                return@withDefaultContext when (val response = siteHomepageRestClient.updateHomepage(
+                        site,
+                        homepageSettings
+                )) {
+                    is Success -> {
+                        val updatedHomepageSettings = siteHomepageSettingsMapper.map(response.data)
+                        if (updatedHomepageSettings is StaticPage) {
+                            site.pageForPosts = updatedHomepageSettings.pageForPostsId
+                            site.pageOnFront = updatedHomepageSettings.pageOnFrontId
+                        }
+                        site.showOnFront = updatedHomepageSettings.showOnFront.value
+                        dispatcher.dispatch(SiteActionBuilder.newUpdateSiteAction(site))
+                        HomepageUpdatedPayload(updatedHomepageSettings)
+                    }
+                    is Error -> {
+                        HomepageUpdatedPayload(response.error)
+                    }
+                }
+            }
+
+    data class HomepageUpdatedPayload(
+        val homepageSettings: SiteHomepageSettings? = null
+    ) : Payload<SiteOptionsError>() {
+        constructor(error: BaseNetworkError) : this() {
+            this.error = error.toSiteOptionsError()
+        }
+
+        constructor(errorType: SiteOptionsError) : this() {
+            this.error = errorType
+        }
+    }
+
+    data class SiteOptionsError(
+        val type: SiteOptionsErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class SiteOptionsErrorType {
+        INVALID_PARAMETERS,
+        TIMEOUT,
+        API_ERROR,
+        INVALID_RESPONSE,
+        AUTHORIZATION_REQUIRED,
+        GENERIC_ERROR;
+    }
+}
+
+fun BaseNetworkError.toSiteOptionsError(): SiteOptionsError {
+    val type = when (type) {
+        TIMEOUT -> SiteOptionsErrorType.TIMEOUT
+        NO_CONNECTION,
+        SERVER_ERROR,
+        INVALID_SSL_CERTIFICATE,
+        NETWORK_ERROR -> SiteOptionsErrorType.API_ERROR
+        PARSE_ERROR,
+        NOT_FOUND,
+        CENSORED,
+        INVALID_RESPONSE -> SiteOptionsErrorType.INVALID_RESPONSE
+        HTTP_AUTH_ERROR,
+        AUTHORIZATION_REQUIRED,
+        NOT_AUTHENTICATED -> SiteOptionsErrorType.AUTHORIZATION_REQUIRED
+        UNKNOWN,
+        null -> SiteOptionsErrorType.GENERIC_ERROR
+    }
+    return SiteOptionsError(type, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt
new file mode 100644
index 00000000000..a60545f3b71
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt
@@ -0,0 +1,2245 @@
+package org.wordpress.android.fluxc.store
+
+import android.text.TextUtils
+import androidx.annotation.VisibleForTesting
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode.ASYNC
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.SiteAction
+import org.wordpress.android.fluxc.action.SiteAction.CHECKED_AUTOMATED_TRANSFER_ELIGIBILITY
+import org.wordpress.android.fluxc.action.SiteAction.CHECKED_AUTOMATED_TRANSFER_STATUS
+import org.wordpress.android.fluxc.action.SiteAction.CHECKED_DOMAIN_AVAILABILITY
+import org.wordpress.android.fluxc.action.SiteAction.CHECKED_IS_WPCOM_URL
+import org.wordpress.android.fluxc.action.SiteAction.CHECK_AUTOMATED_TRANSFER_ELIGIBILITY
+import org.wordpress.android.fluxc.action.SiteAction.CHECK_AUTOMATED_TRANSFER_STATUS
+import org.wordpress.android.fluxc.action.SiteAction.CHECK_DOMAIN_AVAILABILITY
+import org.wordpress.android.fluxc.action.SiteAction.COMPLETED_QUICK_START
+import org.wordpress.android.fluxc.action.SiteAction.COMPLETE_QUICK_START
+import org.wordpress.android.fluxc.action.SiteAction.CREATE_NEW_SITE
+import org.wordpress.android.fluxc.action.SiteAction.DELETED_SITE
+import org.wordpress.android.fluxc.action.SiteAction.DELETE_SITE
+import org.wordpress.android.fluxc.action.SiteAction.DESIGNATED_MOBILE_EDITOR_FOR_ALL_SITES
+import org.wordpress.android.fluxc.action.SiteAction.DESIGNATED_PRIMARY_DOMAIN
+import org.wordpress.android.fluxc.action.SiteAction.DESIGNATE_MOBILE_EDITOR
+import org.wordpress.android.fluxc.action.SiteAction.DESIGNATE_MOBILE_EDITOR_FOR_ALL_SITES
+import org.wordpress.android.fluxc.action.SiteAction.DESIGNATE_PRIMARY_DOMAIN
+import org.wordpress.android.fluxc.action.SiteAction.EXPORTED_SITE
+import org.wordpress.android.fluxc.action.SiteAction.EXPORT_SITE
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_BLOCK_LAYOUTS
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_CONNECT_SITE_INFO
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_DOMAIN_SUPPORTED_COUNTRIES
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_DOMAIN_SUPPORTED_STATES
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_JETPACK_CAPABILITIES
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_PLANS
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_PRIVATE_ATOMIC_COOKIE
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_PROFILE_XML_RPC
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_SITE_EDITORS
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_USER_ROLES
+import org.wordpress.android.fluxc.action.SiteAction.FETCHED_WPCOM_SITE_BY_URL
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_BLOCK_LAYOUTS
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_CONNECT_SITE_INFO
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_DOMAIN_SUPPORTED_COUNTRIES
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_DOMAIN_SUPPORTED_STATES
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_JETPACK_CAPABILITIES
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_PLANS
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_POST_FORMATS
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_PRIVATE_ATOMIC_COOKIE
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_PROFILE_XML_RPC
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_SITE
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_SITES
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_SITES_XML_RPC
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_SITE_EDITORS
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_SITE_WP_API
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_USER_ROLES
+import org.wordpress.android.fluxc.action.SiteAction.FETCH_WPCOM_SITE_BY_URL
+import org.wordpress.android.fluxc.action.SiteAction.HIDE_SITES
+import org.wordpress.android.fluxc.action.SiteAction.INITIATED_AUTOMATED_TRANSFER
+import org.wordpress.android.fluxc.action.SiteAction.INITIATE_AUTOMATED_TRANSFER
+import org.wordpress.android.fluxc.action.SiteAction.IS_WPCOM_URL
+import org.wordpress.android.fluxc.action.SiteAction.REMOVE_ALL_SITES
+import org.wordpress.android.fluxc.action.SiteAction.REMOVE_SITE
+import org.wordpress.android.fluxc.action.SiteAction.REMOVE_WPCOM_AND_JETPACK_SITES
+import org.wordpress.android.fluxc.action.SiteAction.SHOW_SITES
+import org.wordpress.android.fluxc.action.SiteAction.SUGGESTED_DOMAINS
+import org.wordpress.android.fluxc.action.SiteAction.SUGGEST_DOMAINS
+import org.wordpress.android.fluxc.action.SiteAction.UPDATE_SITE
+import org.wordpress.android.fluxc.action.SiteAction.UPDATE_SITES
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.DomainModel
+import org.wordpress.android.fluxc.model.JetpackCapability
+import org.wordpress.android.fluxc.model.PlanModel
+import org.wordpress.android.fluxc.model.PostFormatModel
+import org.wordpress.android.fluxc.model.RoleModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.SitesModel
+import org.wordpress.android.fluxc.model.asDomainModel
+import org.wordpress.android.fluxc.model.jetpacksocial.JetpackSocial
+import org.wordpress.android.fluxc.model.jetpacksocial.JetpackSocialMapper
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordDeletionResult
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsManager
+import org.wordpress.android.fluxc.network.rest.wpapi.site.SiteWPAPIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.site.AllDomainsDomain
+import org.wordpress.android.fluxc.network.rest.wpcom.site.Domain
+import org.wordpress.android.fluxc.network.rest.wpcom.site.DomainPriceResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.DomainSuggestionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie
+import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookieResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.DeleteSiteResponsePayload
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.ExportSiteResponsePayload
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.FetchWPComSiteResponsePayload
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.IsWPComResponsePayload
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SiteRestClient.NewSiteResponsePayload
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SupportedCountryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.site.SupportedStateResponse
+import org.wordpress.android.fluxc.network.xmlrpc.site.SiteXMLRPCClient
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSiteModel
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao
+import org.wordpress.android.fluxc.persistence.JetpackCPConnectedSitesDao.JetpackCPConnectedSiteEntity
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils
+import org.wordpress.android.fluxc.persistence.SiteSqlUtils.DuplicateSiteException
+import org.wordpress.android.fluxc.persistence.domains.DomainDao
+import org.wordpress.android.fluxc.persistence.jetpacksocial.JetpackSocialDao
+import org.wordpress.android.fluxc.store.SiteStore.AccessCookieErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.SiteStore.AccessCookieErrorType.NON_PRIVATE_AT_SITE
+import org.wordpress.android.fluxc.store.SiteStore.AccessCookieErrorType.SITE_MISSING_FROM_STORE
+import org.wordpress.android.fluxc.store.SiteStore.DeleteSiteErrorType.INVALID_SITE
+import org.wordpress.android.fluxc.store.SiteStore.DomainAvailabilityErrorType.INVALID_DOMAIN_NAME
+import org.wordpress.android.fluxc.store.SiteStore.DomainSupportedStatesErrorType.INVALID_COUNTRY_CODE
+import org.wordpress.android.fluxc.store.SiteStore.ExportSiteErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteStore.LaunchSiteErrorType.ALREADY_LAUNCHED
+import org.wordpress.android.fluxc.store.SiteStore.PlansErrorType.NOT_AVAILABLE
+import org.wordpress.android.fluxc.store.SiteStore.SelfHostedErrorType.NOT_SET
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.DUPLICATE_SITE
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.UNAUTHORIZED
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.UNKNOWN_SITE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.SiteErrorUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
+
+/**
+ * SQLite based only. There is no in memory copy of mapped data, everything is queried from the DB.
+ *
+ * NOTE: This class needs to be open because it's mocked in android tests in the WPAndroid project.
+ *       TODO: consider adding https://kotlinlang.org/docs/all-open-plugin.html
+ */
+@Suppress("LargeClass", "ForbiddenComment")
+@Singleton
+open class SiteStore @Inject constructor(
+    dispatcher: Dispatcher?,
+    private val postSqlUtils: PostSqlUtils,
+    private val siteRestClient: SiteRestClient,
+    private val siteXMLRPCClient: SiteXMLRPCClient,
+    private val siteWPAPIRestClient: SiteWPAPIRestClient,
+    private val privateAtomicCookie: PrivateAtomicCookie,
+    private val siteSqlUtils: SiteSqlUtils,
+    private val jetpackCPConnectedSitesDao: JetpackCPConnectedSitesDao,
+    private val domainDao: DomainDao,
+    private val jetpackSocialDao: JetpackSocialDao,
+    private val jetpackSocialMapper: JetpackSocialMapper,
+    private val coroutineEngine: CoroutineEngine
+) : Store(dispatcher) {
+    @Inject internal lateinit var applicationPasswordsManagerProvider: Provider<ApplicationPasswordsManager>
+
+    // Payloads
+    data class CompleteQuickStartPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val variant: String
+    ) : Payload<BaseNetworkError>()
+
+    data class RefreshSitesXMLRPCPayload(
+        @JvmField val username: String = "",
+        @JvmField val password: String = "",
+        @JvmField val url: String = ""
+    ) : Payload<BaseNetworkError>()
+
+    data class FetchWPAPISitePayload(
+        val url: String,
+        val username: String? = null,
+        val password: String? = null,
+    ) : Payload<BaseNetworkError>()
+
+    data class FetchSitesPayload @JvmOverloads constructor(
+        @JvmField val filters: List<SiteFilter> = ArrayList(),
+        @JvmField val filterJetpackConnectedPackageSite: Boolean = false
+    ) : Payload<BaseNetworkError>()
+
+    /**
+     * Holds the new site parameters for site creation
+     *
+     * @param siteName The domain of the site
+     * @param siteTitle The title of the site
+     * @param language The language of the site
+     * @param timeZoneId The timezone of the site
+     * @param visibility The visibility of the site (public or private)
+     * @param segmentId The segment that the site belongs to
+     * @param siteDesign The design template of the site
+     * @param dryRun If set to true the call only validates the parameters passed
+     */
+    data class NewSitePayload(
+        @JvmField val siteName: String?,
+        @JvmField val siteTitle: String?,
+        @JvmField val language: String,
+        @JvmField val timeZoneId: String?,
+        @JvmField val visibility: SiteVisibility,
+        @JvmField val segmentId: Long? = null,
+        @JvmField val siteDesign: String? = null,
+        @JvmField val dryRun: Boolean,
+        @JvmField val findAvailableUrl: Boolean? = null,
+        @JvmField val siteCreationFlow: String? = null
+    ) : Payload<BaseNetworkError>() {
+        constructor(
+            siteName: String?,
+            language: String,
+            visibility: SiteVisibility,
+            dryRun: Boolean
+        ) : this(siteName, null, language, null, visibility, null, null, dryRun)
+
+        constructor(
+            siteName: String?,
+            language: String,
+            visibility: SiteVisibility,
+            segmentId: Long?,
+            dryRun: Boolean
+        ) : this(siteName, null, language, null, visibility, segmentId, null, dryRun)
+
+        constructor(
+            siteName: String?,
+            language: String,
+            timeZoneId: String,
+            visibility: SiteVisibility,
+            dryRun: Boolean
+        ) : this(siteName, null, language, timeZoneId, visibility, null, null, dryRun)
+
+        constructor(
+            siteName: String?,
+            siteTitle: String?,
+            language: String,
+            timeZoneId: String,
+            visibility: SiteVisibility,
+            findAvailableUrl: Boolean?,
+            dryRun: Boolean
+        ) : this(siteName, siteTitle, language, timeZoneId, visibility, null, null, dryRun, findAvailableUrl)
+    }
+
+    data class FetchedPostFormatsPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val postFormats: List<PostFormatModel>
+    ) : Payload<PostFormatsError>()
+
+    data class DesignateMobileEditorForAllSitesPayload
+    @JvmOverloads constructor(
+        @JvmField val editor: String,
+        @JvmField val setOnlyIfEmpty: Boolean = true
+    ) : Payload<SiteEditorsError>()
+
+    data class DesignateMobileEditorPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val editor: String
+    ) : Payload<SiteEditorsError>()
+
+    data class FetchedEditorsPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val webEditor: String,
+        @JvmField val mobileEditor: String
+    ) : Payload<SiteEditorsError>()
+
+    data class FetchBlockLayoutsPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val supportedBlocks: List<String>?,
+        @JvmField val previewWidth: Float?,
+        @JvmField val previewHeight: Float?,
+        @JvmField val scale: Float?,
+        @JvmField val isBeta: Boolean?,
+        @JvmField val preferCache: Boolean?
+    ) : Payload<BaseNetworkError>()
+
+    data class FetchedBlockLayoutsResponsePayload(
+        @JvmField val site: SiteModel,
+        @JvmField val layouts: List<GutenbergLayout>? = null,
+        @JvmField val categories: List<GutenbergLayoutCategory>? = null
+    ) : Payload<SiteError>() {
+        constructor(site: SiteModel, error: SiteError?) : this(site) {
+            this.error = error
+        }
+    }
+
+    sealed class FetchedJetpackSocialResult {
+        data class Success(
+            @JvmField val jetpackSocial: JetpackSocial,
+        ) : FetchedJetpackSocialResult()
+
+        data class Error(val error: SiteError): FetchedJetpackSocialResult()
+    }
+
+    data class DesignateMobileEditorForAllSitesResponsePayload(
+        @JvmField val editors: Map<String, String>? = null
+    ) : Payload<SiteEditorsError>()
+
+    data class FetchedUserRolesPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val roles: List<RoleModel>
+    ) : Payload<UserRolesError>()
+
+    data class FetchedPlansPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val plans: List<PlanModel>? = null
+    ) : Payload<PlansError>() {
+        constructor(site: SiteModel, error: PlansError) : this(site) {
+            this.error = error
+        }
+    }
+
+    data class FetchedPrivateAtomicCookiePayload(
+        @JvmField val site: SiteModel,
+        @JvmField val cookie: PrivateAtomicCookieResponse?
+    ) : Payload<PrivateAtomicCookieError>()
+
+    data class FetchPrivateAtomicCookiePayload(@JvmField val siteId: Long)
+    data class FetchJetpackCapabilitiesPayload(@JvmField val remoteSiteId: Long)
+    data class FetchedJetpackCapabilitiesPayload(
+        @JvmField val remoteSiteId: Long,
+        @JvmField val capabilities: List<JetpackCapability> = listOf()
+    ) : Payload<JetpackCapabilitiesError>() {
+        constructor(remoteSiteId: Long, error: JetpackCapabilitiesError) : this(remoteSiteId) {
+            this.error = error
+        }
+    }
+
+    data class OnJetpackCapabilitiesFetched(
+        @JvmField val remoteSiteId: Long,
+        @JvmField val capabilities: List<JetpackCapability> = listOf(),
+        @JvmField val error: JetpackCapabilitiesError? = null
+    ) : OnChanged<JetpackCapabilitiesError>()
+
+    data class SuggestDomainsPayload(
+        @JvmField val query: String,
+        @JvmField val quantity: Int,
+        @JvmField val vendor: String? = null,
+        @JvmField val onlyWordpressCom: Boolean? = null,
+        @JvmField val includeWordpressCom: Boolean? = null,
+        @JvmField val includeDotBlogSubdomain: Boolean? = null,
+        @JvmField val tlds: String? = null,
+        @JvmField val segmentId: Long? = null
+    ) : Payload<BaseNetworkError>() {
+        @Deprecated(
+            "Replace with primary constructor " +
+                "which accepts 'vendor = \"dot\"' instead of 'includeVendorDot = true' " +
+                "or 'vendor = null' instead of 'includeVendorDot = false'.",
+            replaceWith = ReplaceWith(
+                expression = "SiteStore.SuggestDomainsPayload(" +
+                    "query = query, " +
+                    "onlyWordpressCom = onlyWordpressCom, " +
+                    "includeWordpressCom = includeWordpressCom, " +
+                    "includeDotBlogSubdomain = includeDotBlogSubdomain, " +
+                    "quantity = quantity, " +
+                    "vendor = null)"
+            )
+        )
+        constructor(
+            query: String,
+            onlyWordpressCom: Boolean,
+            includeWordpressCom: Boolean,
+            includeDotBlogSubdomain: Boolean,
+            quantity: Int,
+            includeVendorDot: Boolean
+        ) : this(
+            query = query,
+            quantity = quantity,
+            vendor = if (includeVendorDot) "dot" else null,
+            onlyWordpressCom = onlyWordpressCom,
+            includeWordpressCom = includeWordpressCom,
+            includeDotBlogSubdomain = includeDotBlogSubdomain
+        )
+
+        constructor(
+            query: String,
+            onlyWordpressCom: Boolean,
+            includeWordpressCom: Boolean,
+            includeDotBlogSubdomain: Boolean,
+            quantity: Int,
+            vendor: String? = null,
+        ) : this(
+            query,
+            quantity,
+            vendor,
+            onlyWordpressCom,
+            includeWordpressCom,
+            includeDotBlogSubdomain
+        )
+
+        constructor(query: String, quantity: Int, tlds: String?) : this(
+            query,
+            quantity,
+            vendor = null, // Avoids error: "There's a cycle in the delegation calls chain"
+            tlds = tlds
+        )
+    }
+
+    data class SuggestDomainsResponsePayload(
+        @JvmField val query: String,
+        @JvmField val suggestions: List<DomainSuggestionResponse> = listOf()
+    ) : Payload<SuggestDomainError>() {
+        constructor(query: String, error: SuggestDomainError?) : this(query) {
+            this.error = error
+        }
+    }
+
+    data class ConnectSiteInfoPayload @JvmOverloads constructor(
+        @JvmField val url: String,
+        @JvmField val exists: Boolean = false,
+        @JvmField val isWordPress: Boolean = false,
+        @JvmField val hasJetpack: Boolean = false,
+        @JvmField val isJetpackActive: Boolean = false,
+        @JvmField val isJetpackConnected: Boolean = false,
+        @JvmField val isWPCom: Boolean = false,
+        @JvmField val urlAfterRedirects: String? = null
+    ) : Payload<SiteError>() {
+        constructor(url: String, error: SiteError?) : this(url) {
+            this.error = error
+        }
+
+        fun description(): String {
+            return String.format(
+                Locale.US,
+                "url: %s, e: %b, wp: %b, jp: %b, wpcom: %b, urlAfterRedirects: %s",
+                url, exists, isWordPress, hasJetpack, isWPCom, urlAfterRedirects
+            )
+        }
+    }
+
+    data class DesignatePrimaryDomainPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val domain: String
+    ) : Payload<DesignatePrimaryDomainError>()
+
+    data class InitiateAutomatedTransferPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val pluginSlugToInstall: String
+    ) : Payload<AutomatedTransferError>()
+
+    data class AutomatedTransferEligibilityResponsePayload
+    @JvmOverloads constructor(
+        @JvmField val site: SiteModel,
+        @JvmField val isEligible: Boolean = false,
+        @JvmField val errorCodes: List<String> = listOf()
+    ) : Payload<AutomatedTransferError>() {
+        constructor(site: SiteModel, error: AutomatedTransferError) : this(site) {
+            this.error = error
+        }
+    }
+
+    data class InitiateAutomatedTransferResponsePayload
+    @JvmOverloads constructor(
+        @JvmField val site: SiteModel,
+        @JvmField val pluginSlugToInstall: String,
+        @JvmField val success: Boolean = false
+    ) : Payload<AutomatedTransferError>()
+
+    data class AutomatedTransferStatusResponsePayload(
+        @JvmField val site: SiteModel,
+        @JvmField val status: String? = null,
+        @JvmField val currentStep: Int = 0,
+        @JvmField val totalSteps: Int = 0
+    ) : Payload<AutomatedTransferError>() {
+        constructor(site: SiteModel, error: AutomatedTransferError?) : this(site) {
+            this.error = error
+        }
+    }
+
+    data class DomainAvailabilityResponsePayload(
+        @JvmField val status: DomainAvailabilityStatus? = null,
+        @JvmField val mappable: DomainMappabilityStatus? = null,
+        @JvmField val supportsPrivacy: Boolean = false
+    ) : Payload<DomainAvailabilityError>() {
+        constructor(error: DomainAvailabilityError) : this() {
+            this.error = error
+        }
+    }
+
+    data class DomainSupportedStatesResponsePayload(
+        @JvmField val supportedStates: List<SupportedStateResponse>? = null
+    ) : Payload<DomainSupportedStatesError>() {
+        constructor(error: DomainSupportedStatesError) : this() {
+            this.error = error
+        }
+    }
+
+    data class DomainSupportedCountriesResponsePayload(
+        @JvmField val supportedCountries: List<SupportedCountryResponse>? = null
+    ) : Payload<DomainSupportedCountriesError>() {
+        constructor(error: DomainSupportedCountriesError) : this() {
+            this.error = error
+        }
+    }
+
+    data class AllDomainsError @JvmOverloads constructor(
+        @JvmField val type: AllDomainsErrorType,
+        @JvmField val message: String? = null,
+    ) : OnChangedError
+
+    data class SiteError @JvmOverloads constructor(
+        @JvmField val type: SiteErrorType,
+        @JvmField val message: String? = null,
+        @JvmField val selfHostedErrorType: SelfHostedErrorType = NOT_SET
+    ) : OnChangedError
+
+    data class SiteEditorsError internal constructor(
+        @JvmField val type: SiteEditorsErrorType?,
+        @JvmField val message: String
+    ) : OnChangedError {
+        constructor(type: SiteEditorsErrorType?) : this(type, "")
+    }
+
+    data class PostFormatsError @JvmOverloads constructor(
+        @JvmField val type: PostFormatsErrorType,
+        @JvmField val message: String? = ""
+    ) : OnChangedError
+
+    data class UserRolesError internal constructor(
+        @JvmField val type: UserRolesErrorType?,
+        @JvmField val message: String
+    ) : OnChangedError {
+        constructor(type: UserRolesErrorType?) : this(type, "")
+    }
+
+    data class NewSiteError(@JvmField val type: NewSiteErrorType, @JvmField val message: String) : OnChangedError
+    data class DeleteSiteError(
+        @JvmField val type: DeleteSiteErrorType,
+        @JvmField val message: String = ""
+    ) : OnChangedError {
+        constructor(errorType: String, message: String) : this(DeleteSiteErrorType.fromString(errorType), message)
+    }
+
+    data class ExportSiteError(@JvmField val type: ExportSiteErrorType) : OnChangedError
+    data class AutomatedTransferError(@JvmField val type: AutomatedTransferErrorType?, @JvmField val message: String?) :
+            OnChangedError {
+        constructor(type: String, message: String) : this(AutomatedTransferErrorType.fromString(type), message)
+    }
+
+    data class DomainAvailabilityError
+    @JvmOverloads
+    constructor(
+        @JvmField val type: DomainAvailabilityErrorType,
+        @JvmField val message: String? = null
+    ) : OnChangedError
+
+    data class DomainSupportedStatesError
+    @JvmOverloads
+    constructor(
+        @JvmField val type: DomainSupportedStatesErrorType,
+        @JvmField val message: String? = null
+    ) : OnChangedError
+
+    data class DomainSupportedCountriesError(
+        @JvmField val type: DomainSupportedCountriesErrorType,
+        @JvmField val message: String?
+    ) : OnChangedError
+
+    data class QuickStartError(@JvmField val type: QuickStartErrorType, @JvmField val message: String?) : OnChangedError
+    data class DesignatePrimaryDomainError(
+        @JvmField val type: DesignatePrimaryDomainErrorType,
+        @JvmField val message: String?
+    ) : OnChangedError
+
+    // OnChanged Events
+    data class OnProfileFetched(@JvmField val site: SiteModel) : OnChanged<SiteError>()
+    data class OnSiteChanged(
+        @JvmField val rowsAffected: Int = 0,
+        @JvmField val updatedSites: List<SiteModel> = emptyList()
+    ) : OnChanged<SiteError>() {
+        constructor(rowsAffected: Int = 0, siteError: SiteError?) : this(rowsAffected) {
+            this.error = siteError
+        }
+
+        constructor(siteError: SiteError) : this(0, siteError)
+    }
+
+    data class OnSiteRemoved(@JvmField val mRowsAffected: Int) : OnChanged<SiteError>()
+    data class OnAllSitesRemoved(@JvmField val mRowsAffected: Int) : OnChanged<SiteError>()
+    data class OnBlockLayoutsFetched(
+        @JvmField val layouts: List<GutenbergLayout>?,
+        @JvmField val categories: List<GutenbergLayoutCategory>?
+    ) : OnChanged<SiteError>() {
+        constructor(
+            layouts: List<GutenbergLayout>?,
+            categories: List<GutenbergLayoutCategory>?,
+            error: SiteError?
+        ) : this(layouts, categories) {
+            this.error = error
+        }
+    }
+
+    data class OnNewSiteCreated(
+        @JvmField val dryRun: Boolean = false,
+        @JvmField val url: String? = null,
+        @JvmField val newSiteRemoteId: Long = 0
+    ) : OnChanged<NewSiteError>() {
+        constructor(dryRun: Boolean, url: String?, newSiteRemoteId: Long, error: NewSiteError?) : this(
+                dryRun,
+                url,
+                newSiteRemoteId
+        ) {
+            this.error = error
+        }
+    }
+
+    data class OnSiteDeleted(@JvmField val error: DeleteSiteError?) : OnChanged<DeleteSiteError>() {
+        init {
+            this.error = error
+        }
+    }
+
+    class OnSiteExported() : OnChanged<ExportSiteError>() {
+        constructor(error: ExportSiteError?) : this() {
+            this.error = error
+        }
+    }
+
+    data class OnPostFormatsChanged(@JvmField val site: SiteModel) : OnChanged<PostFormatsError>()
+    data class OnSiteEditorsChanged(
+        @JvmField val site: SiteModel,
+        @JvmField val rowsAffected: Int = 0
+    ) : OnChanged<SiteEditorsError>() {
+        constructor(site: SiteModel, error: SiteEditorsError?) : this(site) {
+            this.error = error
+        }
+    }
+
+    data class OnAllSitesMobileEditorChanged(
+        @JvmField val rowsAffected: Int = 0,
+            // True when all sites are self-hosted or wpcom backend response
+        @JvmField val isNetworkResponse: Boolean = false,
+        @JvmField val siteEditorsError: SiteEditorsError? = null
+    ) : OnChanged<SiteEditorsError>() {
+        init {
+            this.error = siteEditorsError
+        }
+    }
+
+    data class OnUserRolesChanged(@JvmField val site: SiteModel) : OnChanged<UserRolesError>()
+    data class OnPlansFetched(
+        @JvmField val site: SiteModel,
+        @JvmField val plans: List<PlanModel>?
+    ) : OnChanged<PlansError>() {
+        constructor(
+            site: SiteModel,
+            plans: List<PlanModel>?,
+            error: PlansError?
+        ) : this(site, plans) {
+            this.error = error
+        }
+    }
+
+    data class OnPrivateAtomicCookieFetched(
+        @JvmField val site: SiteModel?,
+        @JvmField val success: Boolean,
+        @JvmField val privateAtomicCookieError: PrivateAtomicCookieError? = null
+    ) : OnChanged<PrivateAtomicCookieError>() {
+        init {
+            this.error = privateAtomicCookieError
+        }
+    }
+
+    data class OnURLChecked(
+        @JvmField val url: String,
+        @JvmField val isWPCom: Boolean = false,
+        val siteError: SiteError? = null
+    ) : OnChanged<SiteError>() {
+        init {
+            this.error = siteError
+        }
+    }
+
+    data class OnConnectSiteInfoChecked(@JvmField val info: ConnectSiteInfoPayload) : OnChanged<SiteError>()
+    data class OnWPComSiteFetched(
+        @JvmField val checkedUrl: String? = null,
+        @JvmField val site: SiteModel? = null
+    ) : OnChanged<SiteError>()
+
+    data class SuggestDomainError(@JvmField val type: SuggestDomainErrorType, @JvmField val message: String) :
+            OnChangedError {
+        constructor(apiErrorType: String, message: String) : this(
+                SuggestDomainErrorType.fromString(apiErrorType),
+                message
+        )
+    }
+
+    data class OnSuggestedDomains(
+        val query: String,
+        @JvmField val suggestions: List<DomainSuggestionResponse>
+    ) : OnChanged<SuggestDomainError>()
+
+    data class OnDomainAvailabilityChecked(
+        @JvmField val status: DomainAvailabilityStatus?,
+        @JvmField val mappable: DomainMappabilityStatus?,
+        @JvmField val supportsPrivacy: Boolean
+    ) : OnChanged<DomainAvailabilityError>() {
+        constructor(
+            status: DomainAvailabilityStatus?,
+            mappable: DomainMappabilityStatus?,
+            supportsPrivacy: Boolean,
+            error: DomainAvailabilityError?
+        ) : this(status, mappable, supportsPrivacy) {
+            this.error = error
+        }
+    }
+
+    enum class DomainAvailabilityStatus {
+        BLACKLISTED_DOMAIN,
+        INVALID_TLD,
+        INVALID_DOMAIN,
+        TLD_NOT_SUPPORTED,
+        TRANSFERRABLE_DOMAIN,
+        AVAILABLE,
+        UNKNOWN_STATUS;
+
+        companion object {
+            @JvmStatic fun fromString(string: String): DomainAvailabilityStatus {
+                if (!TextUtils.isEmpty(string)) {
+                    for (v in values()) {
+                        if (string.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return UNKNOWN_STATUS
+            }
+        }
+    }
+
+    enum class DomainMappabilityStatus {
+        BLACKLISTED_DOMAIN, INVALID_TLD, INVALID_DOMAIN, MAPPABLE_DOMAIN, UNKNOWN_STATUS;
+
+        companion object {
+            @JvmStatic fun fromString(string: String): DomainMappabilityStatus {
+                if (!TextUtils.isEmpty(string)) {
+                    for (v in values()) {
+                        if (string.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return UNKNOWN_STATUS
+            }
+        }
+    }
+
+    data class OnDomainSupportedStatesFetched(
+        @JvmField val supportedStates: List<SupportedStateResponse>?
+    ) : OnChanged<DomainSupportedStatesError>() {
+        constructor(
+            supportedStates: List<SupportedStateResponse>?,
+            error: DomainSupportedStatesError?
+        ) : this(supportedStates) {
+            this.error = error
+        }
+    }
+
+    class OnDomainSupportedCountriesFetched(
+        @JvmField val supportedCountries: List<SupportedCountryResponse>?,
+        error: DomainSupportedCountriesError?
+    ) : OnChanged<DomainSupportedCountriesError>() {
+        init {
+            this.error = error
+        }
+    }
+
+    data class FetchedAllDomainsPayload(
+        @JvmField val domains: List<AllDomainsDomain>? = null
+    ) : Payload<AllDomainsError>() {
+        constructor(error: AllDomainsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class FetchedDomainsPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val domains: List<Domain>? = null
+    ) : Payload<SiteError>() {
+        constructor(site: SiteModel, error: SiteError) : this(site) {
+            this.error = error
+        }
+    }
+
+    data class OnApplicationPasswordDeleted(val site: SiteModel) : OnChanged<OnApplicationPasswordDeleteError>() {
+        constructor(site: SiteModel, error: BaseNetworkError): this(site) {
+            this.error = OnApplicationPasswordDeleteError(error)
+        }
+    }
+
+    class OnSiteLaunched() : OnChanged<LaunchSiteError>() {
+        constructor(error: LaunchSiteError) : this() {
+            this.error = error
+        }
+    }
+
+    data class LaunchSiteError internal constructor(
+        @JvmField val type: LaunchSiteErrorType?,
+        @JvmField val message: String
+    ) : OnChangedError
+
+    enum class LaunchSiteErrorType {
+        GENERIC_ERROR,
+        ALREADY_LAUNCHED,
+        UNAUTHORIZED
+    }
+
+    class OnApplicationPasswordDeleteError(error: BaseNetworkError) : OnChangedError {
+        var errorCode: String? = null
+        var message: String
+
+        init {
+            if (error is WPAPINetworkError) {
+                errorCode = error.errorCode
+            } else if (error is WPComGsonNetworkError) {
+                errorCode = error.apiError
+            }
+            message = error.message
+        }
+    }
+
+    class PlansError
+    @JvmOverloads constructor(
+        @JvmField val type: PlansErrorType,
+        @JvmField val message: String? = null
+    ) : OnChangedError {
+        constructor(type: String?, message: String?) : this(PlansErrorType.fromString(type), message)
+    }
+
+    class PrivateAtomicCookieError(@JvmField val type: AccessCookieErrorType, @JvmField val message: String) :
+            OnChangedError
+
+    class JetpackCapabilitiesError(@JvmField val type: JetpackCapabilitiesErrorType, @JvmField val message: String?) :
+            OnChangedError
+
+    class OnAutomatedTransferEligibilityChecked(
+        @JvmField val site: SiteModel,
+        @JvmField val isEligible: Boolean,
+        @JvmField val eligibilityErrorCodes: List<String>
+    ) : OnChanged<AutomatedTransferError>() {
+        constructor(
+            site: SiteModel,
+            isEligible: Boolean,
+            eligibilityErrorCodes: List<String>,
+            error: AutomatedTransferError?
+        ) : this(site, isEligible, eligibilityErrorCodes) {
+            this.error = error
+        }
+    }
+
+    class OnAutomatedTransferInitiated(
+        @JvmField val site: SiteModel,
+        @JvmField val pluginSlugToInstall: String
+    ) : OnChanged<AutomatedTransferError>() {
+        constructor(
+            site: SiteModel,
+            pluginSlugToInstall: String,
+            error: AutomatedTransferError?
+        ) : this(site, pluginSlugToInstall) {
+            this.error = error
+        }
+    }
+
+    class OnAutomatedTransferStatusChecked(
+        @JvmField val site: SiteModel,
+        @JvmField val isCompleted: Boolean = false,
+        @JvmField val currentStep: Int = 0,
+        @JvmField val totalSteps: Int = 0
+    ) : OnChanged<AutomatedTransferError>() {
+        constructor(site: SiteModel, error: AutomatedTransferError?) : this(site) {
+            this.error = error
+        }
+    }
+
+    class QuickStartCompletedResponsePayload(
+        @JvmField val site: SiteModel,
+        @JvmField val success: Boolean
+    ) : OnChanged<QuickStartError>()
+
+    class OnQuickStartCompleted internal constructor(
+        @JvmField val site: SiteModel,
+        @JvmField val success: Boolean
+    ) : OnChanged<QuickStartError>()
+
+    class DesignatedPrimaryDomainPayload(
+        @JvmField val site: SiteModel,
+        @JvmField val success: Boolean
+    ) : OnChanged<DesignatePrimaryDomainError>()
+
+    class OnPrimaryDomainDesignated(
+        @JvmField val site: SiteModel,
+        @JvmField val success: Boolean
+    ) : OnChanged<DesignatePrimaryDomainError>()
+
+    data class UpdateSitesResult(
+        @JvmField val rowsAffected: Int = 0,
+        @JvmField val updatedSites: List<SiteModel> = emptyList(),
+        @JvmField val duplicateSiteFound: Boolean = false
+    )
+
+    enum class SiteErrorType {
+        INVALID_SITE,
+        UNKNOWN_SITE,
+        DUPLICATE_SITE,
+        INVALID_RESPONSE,
+        UNAUTHORIZED,
+        NOT_AUTHENTICATED,
+        GENERIC_ERROR,
+        WPCOM_SITE_SUSPENDED
+    }
+
+    enum class AllDomainsErrorType {
+        UNAUTHORIZED, GENERIC_ERROR
+    }
+
+    enum class SuggestDomainErrorType {
+        EMPTY_RESULTS, EMPTY_QUERY, INVALID_MINIMUM_QUANTITY, INVALID_MAXIMUM_QUANTITY, INVALID_QUERY, GENERIC_ERROR;
+
+        companion object {
+            fun fromString(string: String): SuggestDomainErrorType {
+                if (!TextUtils.isEmpty(string)) {
+                    for (v in values()) {
+                        if (string.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class PostFormatsErrorType {
+        INVALID_SITE, INVALID_RESPONSE, GENERIC_ERROR
+    }
+
+    enum class PlansErrorType {
+        NOT_AVAILABLE, AUTHORIZATION_REQUIRED, UNAUTHORIZED, UNKNOWN_BLOG, GENERIC_ERROR;
+
+        companion object {
+            fun fromString(type: String?): PlansErrorType {
+                if (!TextUtils.isEmpty(type)) {
+                    for (v in values()) {
+                        if (type.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class AccessCookieErrorType {
+        GENERIC_ERROR, INVALID_RESPONSE, SITE_MISSING_FROM_STORE, NON_PRIVATE_AT_SITE
+    }
+
+    enum class UserRolesErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class SiteEditorsErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class JetpackCapabilitiesErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class SelfHostedErrorType {
+        NOT_SET,
+        XML_RPC_SERVICES_DISABLED,
+        UNABLE_TO_READ_SITE
+    }
+
+    enum class DeleteSiteErrorType {
+        INVALID_SITE, UNAUTHORIZED, // user don't have permission to delete
+        AUTHORIZATION_REQUIRED, // missing access token
+        GENERIC_ERROR;
+
+        companion object {
+            @Suppress("ReturnCount")
+            fun fromString(string: String): DeleteSiteErrorType {
+                if (!TextUtils.isEmpty(string)) {
+                    if (string == "unauthorized") {
+                        return UNAUTHORIZED
+                    } else if (string == "authorization_required") {
+                        return AUTHORIZATION_REQUIRED
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class ExportSiteErrorType {
+        INVALID_SITE, GENERIC_ERROR
+    }
+
+    // Enums
+    enum class NewSiteErrorType {
+        SITE_NAME_REQUIRED,
+        SITE_NAME_NOT_ALLOWED,
+        SITE_NAME_MUST_BE_AT_LEAST_FOUR_CHARACTERS,
+        SITE_NAME_MUST_BE_LESS_THAN_SIXTY_FOUR_CHARACTERS,
+        SITE_NAME_CONTAINS_INVALID_CHARACTERS,
+        SITE_NAME_CANT_BE_USED,
+        SITE_NAME_ONLY_LOWERCASE_LETTERS_AND_NUMBERS,
+        SITE_NAME_MUST_INCLUDE_LETTERS,
+        SITE_NAME_EXISTS,
+        SITE_NAME_RESERVED,
+        SITE_NAME_RESERVED_BUT_MAY_BE_AVAILABLE,
+        SITE_NAME_INVALID,
+        SITE_TITLE_INVALID,
+        GENERIC_ERROR;
+
+        companion object {
+            // SiteStore semantics prefers SITE over BLOG but errors reported from the API use BLOG
+            // these are used to convert API errors to the appropriate enum value in fromString
+            private const val BLOG = "BLOG"
+            private const val SITE = "SITE"
+            @JvmStatic fun fromString(string: String): NewSiteErrorType {
+                if (!TextUtils.isEmpty(string)) {
+                    val siteString = string.toUpperCase(Locale.US).replace(BLOG, SITE)
+                    for (v in values()) {
+                        if (siteString.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class AutomatedTransferErrorType {
+        AT_NOT_ELIGIBLE, // occurs if AT is initiated when the site is not eligible
+        NOT_FOUND, // occurs if transfer status of a site with no active transfer is checked
+        GENERIC_ERROR;
+
+        companion object {
+            fun fromString(type: String?): AutomatedTransferErrorType {
+                if (!TextUtils.isEmpty(type)) {
+                    for (v in values()) {
+                        if (type.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class DomainAvailabilityErrorType {
+        INVALID_DOMAIN_NAME, GENERIC_ERROR
+    }
+
+    enum class DomainSupportedStatesErrorType {
+        INVALID_COUNTRY_CODE, INVALID_QUERY, GENERIC_ERROR;
+
+        companion object {
+            @JvmStatic fun fromString(type: String): DomainSupportedStatesErrorType {
+                if (!TextUtils.isEmpty(type)) {
+                    for (v in values()) {
+                        if (type.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return GENERIC_ERROR
+            }
+        }
+    }
+
+    enum class DomainSupportedCountriesErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class QuickStartErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class DesignatePrimaryDomainErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class SiteVisibility(private val mValue: Int) {
+        PRIVATE(-1),
+        BLOCK_SEARCH_ENGINE(0),
+        PUBLIC(1),
+        COMING_SOON(999);
+
+        fun value(): Int {
+            return mValue
+        }
+    }
+
+    enum class CompleteQuickStartVariant(private val mString: String) {
+        NEXT_STEPS("next-steps");
+
+        override fun toString(): String {
+            return mString
+        }
+    }
+
+    enum class SiteFilter(private val mString: String) {
+        ATOMIC("atomic"), JETPACK("jetpack"), WPCOM("wpcom");
+
+        override fun toString(): String {
+            return mString
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(T.API, "SiteStore onRegister")
+    }
+
+    /**
+     * Returns all sites in the store as a [SiteModel] list.
+     */
+    val sites: List<SiteModel>
+        get() = siteSqlUtils.getSites()
+
+    /**
+     * Returns the number of sites of any kind in the store.
+     */
+    val sitesCount: Int
+        get() = siteSqlUtils.getSites().count()
+
+    /**
+     * Checks whether the store contains any sites of any kind.
+     */
+    fun hasSite(): Boolean {
+        return sitesCount != 0
+    }
+
+    /**
+     * Obtains the site with the given (local) id and returns it as a [SiteModel].
+     *
+     * NOTE: This method needs to be open because it's mocked in android tests in the WPAndroid project.
+     *       TODO: consider adding https://kotlinlang.org/docs/all-open-plugin.html
+     */
+    @Suppress("ForbiddenComment")
+    open fun getSiteByLocalId(id: Int): SiteModel? {
+        val result = siteSqlUtils.getSitesWithLocalId(id)
+        return if (result.isNotEmpty()) {
+            result[0]
+        } else null
+    }
+
+    /**
+     * Checks whether the store contains a site matching the given (local) id.
+     */
+    fun hasSiteWithLocalId(id: Int): Boolean {
+        return siteSqlUtils.getSitesWithLocalId(id).isNotEmpty()
+    }
+
+    /**
+     * Returns all .COM sites in the store.
+     */
+    val wPComSites: List<SiteModel>
+        get() = siteSqlUtils.getWpComSites()
+
+    /**
+     * Returns sites accessed via WPCom REST API (WPCom sites or Jetpack sites connected via WPCom REST API).
+     */
+    val sitesAccessedViaWPComRest: List<SiteModel>
+        get() = siteSqlUtils.sitesAccessedViaWPComRest.asModel
+
+    /**
+     * Returns the number of sites accessed via WPCom REST API (WPCom sites or Jetpack sites connected
+     * via WPCom REST API).
+     */
+    val sitesAccessedViaWPComRestCount: Int
+        get() = siteSqlUtils.sitesAccessedViaWPComRest.count().toInt()
+
+    /**
+     * Checks whether the store contains at least one site accessed via WPCom REST API (WPCom sites or Jetpack
+     * sites connected via WPCom REST API).
+     */
+    fun hasSitesAccessedViaWPComRest(): Boolean {
+        return sitesAccessedViaWPComRestCount != 0
+    }
+
+    /**
+     * Returns the number of .COM sites in the store.
+     */
+    val wPComSitesCount: Int
+        get() = siteSqlUtils.getWpComSites().size
+
+    /**
+     * Returns the number of .COM Atomic sites in the store.
+     */
+    val wPComAtomicSitesCount: Int
+        get() = siteSqlUtils.getWpComAtomicSites().size
+
+    /**
+     * Returns sites with a name or url matching the search string.
+     */
+    fun getSitesByNameOrUrlMatching(searchString: String): List<SiteModel> {
+        return siteSqlUtils.getSitesByNameOrUrlMatching(searchString)
+    }
+
+    /**
+     * Returns sites accessed via WPCom REST API (WPCom sites or Jetpack sites connected via WPCom REST API) with a
+     * name or url matching the search string.
+     */
+    fun getSitesAccessedViaWPComRestByNameOrUrlMatching(searchString: String): List<SiteModel> {
+        return siteSqlUtils.getSitesAccessedViaWPComRestByNameOrUrlMatching(searchString)
+    }
+
+    /**
+     * Checks whether the store contains at least one .COM site.
+     */
+    fun hasWPComSite(): Boolean {
+        return wPComSitesCount != 0
+    }
+
+    /**
+     * Checks whether the store contains at least one .COM Atomic site.
+     */
+    fun hasWPComAtomicSite(): Boolean {
+        return wPComAtomicSitesCount != 0
+    }
+
+    /**
+     * Returns sites accessed via XMLRPC (self-hosted sites or Jetpack sites accessed via XMLRPC).
+     */
+    val sitesAccessedViaXMLRPC: List<SiteModel>
+        get() = siteSqlUtils.sitesAccessedViaXMLRPC.asModel
+
+    /**
+     * Returns the number of sites accessed via XMLRPC (self-hosted sites or Jetpack sites accessed via XMLRPC).
+     */
+    val sitesAccessedViaXMLRPCCount: Int
+        get() = siteSqlUtils.sitesAccessedViaXMLRPC.count().toInt()
+
+    /**
+     * Checks whether the store contains at least one site accessed via XMLRPC (self-hosted sites or
+     * Jetpack sites accessed via XMLRPC).
+     */
+    fun hasSiteAccessedViaXMLRPC(): Boolean {
+        return sitesAccessedViaXMLRPCCount != 0
+    }
+
+    /**
+     * Returns all visible sites as [SiteModel]s. All self-hosted sites over XML-RPC are visible by default.
+     */
+    val visibleSites: List<SiteModel>
+        get() = siteSqlUtils.getVisibleSites()
+
+    /**
+     * Returns the number of visible sites. All self-hosted sites over XML-RPC are visible by default.
+     */
+    val visibleSitesCount: Int
+        get() = siteSqlUtils.getVisibleSites().size
+
+    /**
+     * Returns all visible .COM sites as [SiteModel]s.
+     */
+    val visibleSitesAccessedViaWPCom: List<SiteModel>
+        get() = siteSqlUtils.visibleSitesAccessedViaWPCom.asModel
+
+    /**
+     * Returns the number of visible .COM sites.
+     */
+    val visibleSitesAccessedViaWPComCount: Int
+        get() = siteSqlUtils.visibleSitesAccessedViaWPCom.count().toInt()
+
+    /**
+     * Checks whether the .COM site with the given (local) id is visible.
+     */
+    fun isWPComSiteVisibleByLocalId(id: Int): Boolean {
+        return siteSqlUtils.isWPComSiteVisibleByLocalId(id)
+    }
+
+    /**
+     * Given a (remote) site id, returns the corresponding (local) id.
+     */
+    fun getLocalIdForRemoteSiteId(siteId: Long): Int {
+        return siteSqlUtils.getLocalIdForRemoteSiteId(siteId)
+    }
+
+    /**
+     * Given a (remote) self-hosted site id and XML-RPC url, returns the corresponding (local) id.
+     */
+    fun getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(selfHostedSiteId: Long, xmlRpcUrl: String?): Int {
+        return siteSqlUtils.getLocalIdForSelfHostedSiteIdAndXmlRpcUrl(selfHostedSiteId, xmlRpcUrl)
+    }
+
+    /**
+     * Given a (local) id, returns the (remote) site id. Searches first for .COM and Jetpack, then looks for self-hosted
+     * sites.
+     */
+    fun getSiteIdForLocalId(id: Int): Long {
+        return siteSqlUtils.getSiteIdForLocalId(id)
+    }
+
+    /**
+     * Given a .COM site ID (either a .COM site id, or the .COM id of a Jetpack site), returns the site as a
+     * [SiteModel].
+     */
+    fun getSiteBySiteId(siteId: Long): SiteModel? {
+        if (siteId == 0L) {
+            return null
+        }
+        val sites = siteSqlUtils.getSitesWithRemoteId(siteId)
+        return if (sites.isEmpty()) {
+            null
+        } else {
+            sites[0]
+        }
+    }
+
+    /**
+     * Gets the cached content of a page layout
+     *
+     * @param site the current site
+     * @param slug the slug of the layout
+     * @return the content or null if the content is not cached
+     */
+    fun getBlockLayoutContent(site: SiteModel, slug: String): String? {
+        return siteSqlUtils.getBlockLayoutContent(site, slug)
+    }
+
+    /**
+     * Gets the cached page layout
+     *
+     * @param site the current site
+     * @param slug the slug of the layout
+     * @return the layout or null if the layout is not cached
+     */
+    fun getBlockLayout(site: SiteModel, slug: String): GutenbergLayout? {
+        return siteSqlUtils.getBlockLayout(site, slug)
+    }
+
+    fun getPostFormats(site: SiteModel?): List<PostFormatModel> {
+        return siteSqlUtils.getPostFormats(site!!)
+    }
+
+    fun getUserRoles(site: SiteModel?): List<RoleModel> {
+        return siteSqlUtils.getUserRoles(site!!)
+    }
+
+    suspend fun getJetpackCPConnectedSites(): List<JetpackCPConnectedSiteModel> {
+        return jetpackCPConnectedSitesDao.getAll().map { it.toJetpackCPConnectedSite() }
+    }
+
+    suspend fun hasJetpackCPConnectedSites(): Boolean {
+        return jetpackCPConnectedSitesDao.getCount() > 0
+    }
+
+    @Subscribe(threadMode = ASYNC)
+    @Suppress("LongMethod", "ComplexMethod")
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? SiteAction ?: return
+        when (actionType) {
+            FETCH_PROFILE_XML_RPC -> fetchProfileXmlRpc(action.payload as SiteModel)
+            FETCHED_PROFILE_XML_RPC -> updateSiteProfile(action.payload as SiteModel)
+            FETCH_SITE -> coroutineEngine.launch(T.MAIN, this, "Fetch site") {
+                emitChange(fetchSite(action.payload as SiteModel))
+            }
+            FETCH_SITES -> coroutineEngine.launch(T.MAIN, this, "Fetch sites") {
+                emitChange(fetchSites(action.payload as FetchSitesPayload))
+            }
+            FETCH_SITES_XML_RPC -> coroutineEngine.launch(T.MAIN, this, "Fetch XMLRPC sites") {
+                emitChange(fetchSitesXmlRpc(action.payload as RefreshSitesXMLRPCPayload))
+            }
+            FETCH_SITE_WP_API -> coroutineEngine.launch(T.MAIN, this, "Fetch WPAPI Site") {
+                emitChange(fetchWPAPISite(action.payload as FetchWPAPISitePayload))
+            }
+            UPDATE_SITE -> {
+                emitChange(updateSite(action.payload as SiteModel))
+            }
+            UPDATE_SITES -> updateSites(action.payload as SitesModel)
+            DELETE_SITE -> deleteSite(action.payload as SiteModel)
+            DELETED_SITE -> handleDeletedSite(action.payload as DeleteSiteResponsePayload)
+            EXPORT_SITE -> exportSite(action.payload as SiteModel)
+            EXPORTED_SITE -> handleExportedSite(action.payload as ExportSiteResponsePayload)
+            REMOVE_SITE -> removeSite(action.payload as SiteModel)
+            REMOVE_ALL_SITES -> coroutineEngine.launch(T.MAIN, this, "Remove all sites") {
+                removeAllSites()
+            }
+            REMOVE_WPCOM_AND_JETPACK_SITES -> coroutineEngine.launch(T.MAIN, this, "Remove WPCom and Jetpack sites") {
+                removeWPComAndJetpackSites()
+            }
+            SHOW_SITES -> toggleSitesVisibility(action.payload as SitesModel, true)
+            HIDE_SITES -> toggleSitesVisibility(action.payload as SitesModel, false)
+            CREATE_NEW_SITE -> coroutineEngine.launch(T.MAIN, this, "Create a new site") {
+                emitChange(createNewSite(action.payload as NewSitePayload))
+            }
+            FETCH_POST_FORMATS -> coroutineEngine.launch(T.MAIN, this, "Fetch post formats") {
+                emitChange(fetchPostFormats(action.payload as SiteModel))
+            }
+            FETCH_SITE_EDITORS -> fetchSiteEditors(action.payload as SiteModel)
+            FETCH_BLOCK_LAYOUTS -> fetchBlockLayouts(action.payload as FetchBlockLayoutsPayload)
+            FETCHED_BLOCK_LAYOUTS -> handleFetchedBlockLayouts(action.payload as FetchedBlockLayoutsResponsePayload)
+            DESIGNATE_MOBILE_EDITOR -> designateMobileEditor(action.payload as DesignateMobileEditorPayload)
+            DESIGNATE_MOBILE_EDITOR_FOR_ALL_SITES -> designateMobileEditorForAllSites(
+                    action.payload as DesignateMobileEditorForAllSitesPayload
+            )
+            FETCHED_SITE_EDITORS -> updateSiteEditors(action.payload as FetchedEditorsPayload)
+            DESIGNATED_MOBILE_EDITOR_FOR_ALL_SITES -> handleDesignatedMobileEditorForAllSites(
+                    action.payload as DesignateMobileEditorForAllSitesResponsePayload
+            )
+            FETCH_USER_ROLES -> fetchUserRoles(action.payload as SiteModel)
+            FETCHED_USER_ROLES -> updateUserRoles(action.payload as FetchedUserRolesPayload)
+            FETCH_CONNECT_SITE_INFO -> fetchConnectSiteInfo(action.payload as String)
+            FETCHED_CONNECT_SITE_INFO -> handleFetchedConnectSiteInfo(action.payload as ConnectSiteInfoPayload)
+            FETCH_WPCOM_SITE_BY_URL -> fetchWPComSiteByUrl(action.payload as String)
+            FETCHED_WPCOM_SITE_BY_URL -> handleFetchedWPComSiteByUrl(action.payload as FetchWPComSiteResponsePayload)
+            IS_WPCOM_URL -> checkUrlIsWPCom(action.payload as String)
+            CHECKED_IS_WPCOM_URL -> handleCheckedIsWPComUrl(action.payload as IsWPComResponsePayload)
+            SUGGEST_DOMAINS -> suggestDomains(action.payload as SuggestDomainsPayload)
+            SUGGESTED_DOMAINS -> handleSuggestedDomains(action.payload as SuggestDomainsResponsePayload)
+            FETCH_PLANS -> fetchPlans(action.payload as SiteModel)
+            FETCHED_PLANS -> handleFetchedPlans(action.payload as FetchedPlansPayload)
+            CHECK_DOMAIN_AVAILABILITY -> checkDomainAvailability(action.payload as String)
+            CHECKED_DOMAIN_AVAILABILITY -> handleCheckedDomainAvailability(
+                    action.payload as DomainAvailabilityResponsePayload
+            )
+            FETCH_DOMAIN_SUPPORTED_STATES -> fetchSupportedStates(action.payload as String)
+            FETCHED_DOMAIN_SUPPORTED_STATES -> handleFetchedSupportedStates(
+                    action.payload as DomainSupportedStatesResponsePayload
+            )
+            FETCH_DOMAIN_SUPPORTED_COUNTRIES -> siteRestClient.fetchSupportedCountries()
+            FETCHED_DOMAIN_SUPPORTED_COUNTRIES -> handleFetchedSupportedCountries(
+                    action.payload as DomainSupportedCountriesResponsePayload
+            )
+            CHECK_AUTOMATED_TRANSFER_ELIGIBILITY -> checkAutomatedTransferEligibility(action.payload as SiteModel)
+            INITIATE_AUTOMATED_TRANSFER -> initiateAutomatedTransfer(action.payload as InitiateAutomatedTransferPayload)
+            CHECK_AUTOMATED_TRANSFER_STATUS -> checkAutomatedTransferStatus(action.payload as SiteModel)
+            CHECKED_AUTOMATED_TRANSFER_ELIGIBILITY -> handleCheckedAutomatedTransferEligibility(
+                    action.payload as AutomatedTransferEligibilityResponsePayload
+            )
+            INITIATED_AUTOMATED_TRANSFER -> handleInitiatedAutomatedTransfer(
+                    action.payload as InitiateAutomatedTransferResponsePayload
+            )
+            CHECKED_AUTOMATED_TRANSFER_STATUS -> handleCheckedAutomatedTransferStatus(
+                    action.payload as AutomatedTransferStatusResponsePayload
+            )
+            COMPLETE_QUICK_START -> completeQuickStart(action.payload as CompleteQuickStartPayload)
+            COMPLETED_QUICK_START -> handleQuickStartCompleted(action.payload as QuickStartCompletedResponsePayload)
+            DESIGNATE_PRIMARY_DOMAIN -> designatePrimaryDomain(action.payload as DesignatePrimaryDomainPayload)
+            DESIGNATED_PRIMARY_DOMAIN -> handleDesignatedPrimaryDomain(action.payload as DesignatedPrimaryDomainPayload)
+            FETCH_PRIVATE_ATOMIC_COOKIE -> fetchPrivateAtomicCookie(action.payload as FetchPrivateAtomicCookiePayload)
+            FETCHED_PRIVATE_ATOMIC_COOKIE -> handleFetchedPrivateAtomicCookie(
+                    action.payload as FetchedPrivateAtomicCookiePayload
+            )
+            FETCH_JETPACK_CAPABILITIES -> fetchJetpackCapabilities(action.payload as FetchJetpackCapabilitiesPayload)
+            FETCHED_JETPACK_CAPABILITIES -> handleFetchedJetpackCapabilities(
+                    action.payload as FetchedJetpackCapabilitiesPayload
+            )
+        }
+    }
+
+    private fun fetchProfileXmlRpc(site: SiteModel) {
+        siteXMLRPCClient.fetchProfile(site)
+    }
+
+    suspend fun fetchSite(site: SiteModel): OnSiteChanged {
+        return coroutineEngine.withDefaultContext(T.API, this, "Fetch site") {
+            val updatedSite = when (site.origin) {
+                SiteModel.ORIGIN_WPCOM_REST -> siteRestClient.fetchSite(site)
+                SiteModel.ORIGIN_WPAPI -> siteWPAPIRestClient.fetchWPAPISite(site)
+                else -> siteXMLRPCClient.fetchSite(site)
+            }
+
+            updateSite(updatedSite)
+        }
+    }
+
+    suspend fun fetchSites(payload: FetchSitesPayload): OnSiteChanged {
+        return coroutineEngine.withDefaultContext(T.API, this, "Fetch sites") {
+            val result = siteRestClient.fetchSites(payload.filters, payload.filterJetpackConnectedPackageSite)
+            handleFetchedSitesWPComRest(result)
+        }
+    }
+
+    suspend fun fetchSitesXmlRpc(payload: RefreshSitesXMLRPCPayload): OnSiteChanged {
+        return coroutineEngine.withDefaultContext(T.API, this, "Fetch sites") {
+            updateSites(siteXMLRPCClient.fetchSites(payload.url, payload.username, payload.password))
+        }
+    }
+
+    suspend fun fetchWPAPISite(payload: FetchWPAPISitePayload): OnSiteChanged {
+        return coroutineEngine.withDefaultContext(T.MAIN, this, "Fetch WPAPI Site") {
+            updateSite(siteWPAPIRestClient.fetchWPAPISite(payload))
+        }
+    }
+
+    @Suppress("ForbiddenComment", "SwallowedException")
+    private fun updateSiteProfile(siteModel: SiteModel) {
+        val event = OnProfileFetched(siteModel)
+        if (siteModel.isError) {
+            // TODO: what kind of error could we get here?
+            event.error = SiteErrorUtils.genericToSiteError(siteModel.error)
+        } else {
+            try {
+                siteSqlUtils.insertOrUpdateSite(siteModel)
+            } catch (e: DuplicateSiteException) {
+                event.error = SiteError(DUPLICATE_SITE)
+            }
+        }
+        emitChange(event)
+    }
+
+    @Suppress("ForbiddenComment", "SwallowedException")
+    private fun updateSite(siteModel: SiteModel): OnSiteChanged {
+        return if (siteModel.isError) {
+            // TODO: what kind of error could we get here?
+            OnSiteChanged(SiteErrorUtils.genericToSiteError(siteModel.error))
+        } else {
+            try {
+                // The REST API doesn't return info about the editor(s). Make sure to copy current values
+                // available on the DB. Otherwise the apps will receive an update site without editor prefs set.
+                // The apps will dispatch the action to update editor(s) when necessary.
+                val freshSiteFromDB = getSiteByLocalId(siteModel.id)
+                if (freshSiteFromDB != null) {
+                    siteModel.mobileEditor = freshSiteFromDB.mobileEditor
+                    siteModel.webEditor = freshSiteFromDB.webEditor
+                }
+                OnSiteChanged(siteSqlUtils.insertOrUpdateSite(siteModel))
+            } catch (e: DuplicateSiteException) {
+                OnSiteChanged(SiteError(DUPLICATE_SITE))
+            }
+        }
+    }
+
+    @Suppress("ForbiddenComment")
+    private fun updateSites(sitesModel: SitesModel): OnSiteChanged {
+        val event = if (sitesModel.isError) {
+            // TODO: what kind of error could we get here?
+            OnSiteChanged(SiteErrorUtils.genericToSiteError(sitesModel.error))
+        } else {
+            val res = createOrUpdateSites(sitesModel)
+            if (res.duplicateSiteFound) {
+                OnSiteChanged(res.rowsAffected, SiteError(DUPLICATE_SITE))
+            } else {
+                OnSiteChanged(res.rowsAffected)
+            }
+        }
+        return event
+    }
+
+    @Suppress("ForbiddenComment")
+    private suspend fun handleFetchedSitesWPComRest(fetchedSites: SitesModel): OnSiteChanged {
+        return if (fetchedSites.isError) {
+            // TODO: what kind of error could we get here?
+            OnSiteChanged(SiteErrorUtils.genericToSiteError(fetchedSites.error))
+        } else {
+            val res = createOrUpdateSites(fetchedSites)
+            val result = if (res.duplicateSiteFound) {
+                OnSiteChanged(res.rowsAffected, SiteError(DUPLICATE_SITE))
+            } else {
+                OnSiteChanged(res.rowsAffected, res.updatedSites)
+            }
+            siteSqlUtils.removeWPComRestSitesAbsentFromList(postSqlUtils, fetchedSites.sites)
+
+            createOrUpdateJetpackCPConnectedSites(fetchedSites, res.updatedSites)
+
+            result
+        }
+    }
+
+    @Suppress("SwallowedException")
+    private fun createOrUpdateSites(sites: SitesModel): UpdateSitesResult {
+        var rowsAffected = 0
+        var duplicateSiteFound = false
+        val updatedSites = mutableListOf<SiteModel>()
+        for (site in sites.sites) {
+            try {
+                // The REST API doesn't return info about the editor(s). Make sure to copy current values
+                // available on the DB. Otherwise the apps will receive an update site without editor prefs set.
+                // The apps will dispatch the action to update editor(s) when necessary.
+                val siteFromDB = getSiteBySiteId(site.siteId)
+                if (siteFromDB != null) {
+                    site.mobileEditor = siteFromDB.mobileEditor
+                    site.webEditor = siteFromDB.webEditor
+                }
+                val isUpdated = (siteSqlUtils.insertOrUpdateSite(site) == 1)
+                if (isUpdated) {
+                    rowsAffected++
+                    updatedSites.add(site)
+                }
+            } catch (caughtException: DuplicateSiteException) {
+                duplicateSiteFound = true
+            }
+        }
+        return UpdateSitesResult(rowsAffected, updatedSites, duplicateSiteFound)
+    }
+
+    // Insert Jetpack CP connected sites, with updated local id info if they are also in the fetched sites list
+    private suspend fun createOrUpdateJetpackCPConnectedSites(fetchedSites: SitesModel, updatedSites: List<SiteModel>) {
+        if (fetchedSites.jetpackCPSites.isNotEmpty()) {
+            for (i in fetchedSites.jetpackCPSites.indices) {
+                val site = fetchedSites.jetpackCPSites[i]
+                val siteInList = updatedSites.find { it.siteId == site.siteId }
+                siteInList?.let { fetchedSites.jetpackCPSites[i] = it }
+            }
+
+            // clear all Jetpack CP connected sites and insert the new ones (to remove old stale sites)
+            jetpackCPConnectedSitesDao.deleteAll()
+            jetpackCPConnectedSitesDao.insert(
+                fetchedSites.jetpackCPSites.mapNotNull(JetpackCPConnectedSiteEntity::from)
+            )
+        }
+    }
+
+    private fun deleteSite(site: SiteModel) {
+        // Not available for Jetpack sites
+        if (!site.isWPCom) {
+            val event = OnSiteDeleted(DeleteSiteError(INVALID_SITE))
+            emitChange(event)
+            return
+        }
+        siteRestClient.deleteSite(site)
+    }
+
+    private fun handleDeletedSite(payload: DeleteSiteResponsePayload) {
+        val event = OnSiteDeleted(payload.error)
+        if (!payload.isError) {
+            siteSqlUtils.deleteSite(payload.site)
+        }
+        emitChange(event)
+    }
+
+    private fun exportSite(site: SiteModel) {
+        // Not available for Jetpack sites
+        if (!site.isWPCom) {
+            emitChange(OnSiteExported(ExportSiteError(ExportSiteErrorType.INVALID_SITE)))
+            return
+        }
+        siteRestClient.exportSite(site)
+    }
+
+    @Suppress("ForbiddenComment")
+    private fun handleExportedSite(payload: ExportSiteResponsePayload) {
+        val event = if (payload.isError) {
+            // TODO: what kind of error could we get here?
+            OnSiteExported(ExportSiteError(GENERIC_ERROR))
+        } else {
+            OnSiteExported()
+        }
+        emitChange(event)
+    }
+
+    private fun removeSite(site: SiteModel) {
+        val rowsAffected = siteSqlUtils.deleteSite(site)
+        emitChange(OnSiteRemoved(rowsAffected))
+    }
+
+    private suspend fun removeAllSites() {
+        val rowsAffected = siteSqlUtils.deleteAllSites()
+        val event = OnAllSitesRemoved(rowsAffected)
+
+        // also drop everything from the Jetpack CP connected sites table, no change needs to be emitted for this
+        jetpackCPConnectedSitesDao.deleteAll()
+
+        emitChange(event)
+    }
+
+    private suspend fun removeWPComAndJetpackSites() {
+        // Logging out of WP.com. Drop all WP.com sites, and all Jetpack sites that were fetched over the WP.com
+        // REST API only (they don't have a .org site id)
+        val wpcomAndJetpackSites = siteSqlUtils.sitesAccessedViaWPComRest.asModel
+        val rowsAffected = removeSites(wpcomAndJetpackSites)
+
+        // also drop everything from the Jetpack CP connected sites table, no change needs to be emitted for this
+        jetpackCPConnectedSitesDao.deleteAll()
+
+        emitChange(OnSiteRemoved(rowsAffected))
+    }
+
+    private fun toggleSitesVisibility(sites: SitesModel, visible: Boolean): Int {
+        var rowsAffected = 0
+        for (site in sites.sites) {
+            rowsAffected += siteSqlUtils.setSiteVisibility(site, visible)
+        }
+        return rowsAffected
+    }
+
+    @VisibleForTesting
+    suspend fun createNewSite(payload: NewSitePayload): OnNewSiteCreated {
+        val result = siteRestClient.newSite(
+                payload.siteName,
+                payload.siteTitle,
+                payload.language,
+                payload.timeZoneId,
+                payload.visibility,
+                payload.segmentId,
+                payload.siteDesign,
+                payload.findAvailableUrl,
+                payload.dryRun,
+                payload.siteCreationFlow
+        )
+        return handleCreateNewSiteCompleted(
+                payload = result
+        )
+    }
+
+    private fun handleCreateNewSiteCompleted(payload: NewSiteResponsePayload): OnNewSiteCreated {
+        return OnNewSiteCreated(payload.dryRun, payload.siteUrl, payload.newSiteRemoteId, payload.error)
+    }
+
+    suspend fun fetchPostFormats(site: SiteModel): OnPostFormatsChanged {
+        val payload = if (site.isUsingWpComRestApi) {
+            siteRestClient.fetchPostFormats(site)
+        } else {
+            siteXMLRPCClient.fetchPostFormats(site)
+        }
+        val event = OnPostFormatsChanged(payload.site)
+        if (payload.isError) {
+            event.error = payload.error
+        } else {
+            siteSqlUtils.insertOrReplacePostFormats(payload.site, payload.postFormats)
+        }
+        return event
+    }
+
+    private fun fetchSiteEditors(site: SiteModel) {
+        if (site.isUsingWpComRestApi) {
+            siteRestClient.fetchSiteEditors(site)
+        }
+    }
+
+    private fun fetchBlockLayouts(payload: FetchBlockLayoutsPayload) {
+        if (payload.preferCache == true && cachedLayoutsRetrieved(payload.site)) return
+        if (payload.site.isUsingWpComRestApi) {
+            siteRestClient
+                    .fetchWpComBlockLayouts(
+                            payload.site, payload.supportedBlocks,
+                            payload.previewWidth, payload.previewHeight, payload.scale, payload.isBeta
+                    )
+        } else {
+            siteRestClient.fetchSelfHostedBlockLayouts(
+                    payload.site, payload.supportedBlocks,
+                    payload.previewWidth, payload.previewHeight, payload.scale, payload.isBeta
+            )
+        }
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun designateMobileEditor(payload: DesignateMobileEditorPayload) {
+        // wpcom sites sync the new value with the backend
+        if (payload.site.isUsingWpComRestApi) {
+            siteRestClient.designateMobileEditor(payload.site, payload.editor)
+        }
+
+        // Update the editor pref on the DB, and emit the change immediately
+        val site = payload.site
+        site.mobileEditor = payload.editor
+        val event = try {
+            OnSiteEditorsChanged(site, siteSqlUtils.insertOrUpdateSite(site))
+        } catch (e: Exception) {
+            OnSiteEditorsChanged(site, SiteEditorsError(SiteEditorsErrorType.GENERIC_ERROR))
+        }
+        emitChange(event)
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun designateMobileEditorForAllSites(payload: DesignateMobileEditorForAllSitesPayload) {
+        var rowsAffected = 0
+        var wpcomPostRequestRequired = false
+        var error: SiteEditorsError? = null
+        for (site in sites) {
+            site.mobileEditor = payload.editor
+            if (!wpcomPostRequestRequired && site.isUsingWpComRestApi) {
+                wpcomPostRequestRequired = true
+            }
+            try {
+                rowsAffected += siteSqlUtils.insertOrUpdateSite(site)
+            } catch (e: Exception) {
+                error = SiteEditorsError(SiteEditorsErrorType.GENERIC_ERROR)
+            }
+        }
+        val isNetworkResponse = if (wpcomPostRequestRequired) {
+            siteRestClient.designateMobileEditorForAllSites(payload.editor, payload.setOnlyIfEmpty)
+            false
+        } else {
+            true
+        }
+
+        emitChange(OnAllSitesMobileEditorChanged(rowsAffected, isNetworkResponse, error))
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun updateSiteEditors(payload: FetchedEditorsPayload) {
+        val site = payload.site
+        val event = if (payload.isError) {
+            OnSiteEditorsChanged(site, payload.error ?: SiteEditorsError(SiteEditorsErrorType.GENERIC_ERROR))
+        } else {
+            site.mobileEditor = payload.mobileEditor
+            site.webEditor = payload.webEditor
+            try {
+                OnSiteEditorsChanged(site, siteSqlUtils.insertOrUpdateSite(site))
+            } catch (e: Exception) {
+                OnSiteEditorsChanged(site, SiteEditorsError(SiteEditorsErrorType.GENERIC_ERROR))
+            }
+        }
+        emitChange(event)
+    }
+
+    private fun handleDesignatedMobileEditorForAllSites(payload: DesignateMobileEditorForAllSitesResponsePayload) {
+        val event = if (payload.isError) {
+            OnAllSitesMobileEditorChanged(siteEditorsError = payload.error)
+        } else {
+            onAllSitesMobileEditorChanged(payload)
+        }
+        emitChange(event)
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private fun onAllSitesMobileEditorChanged(
+        payload: DesignateMobileEditorForAllSitesResponsePayload
+    ): OnAllSitesMobileEditorChanged {
+        var rowsAffected = 0
+        var error: SiteEditorsError? = null
+        // Loop over the returned sites and make sure we've the fresh values for editor prop stored locally
+        for ((key, value) in payload.editors ?: mapOf()) {
+            val currentModel = getSiteBySiteId(key.toLong())
+            if (currentModel == null) {
+                // this could happen when a site was added to the current account with another app, or on the web
+                AppLog.e(
+                    T.API,
+                    "handleDesignatedMobileEditorForAllSites - The backend returned info for the " +
+                        "following siteID $key but there is no site with that remote ID in SiteStore."
+                )
+                continue
+            }
+            if (currentModel.mobileEditor == null || currentModel.mobileEditor != value) {
+                // the current editor is either null or != from the value on the server. Update it
+                currentModel.mobileEditor = value
+                try {
+                    rowsAffected += siteSqlUtils.insertOrUpdateSite(currentModel)
+                } catch (e: Exception) {
+                    error = SiteEditorsError(SiteEditorsErrorType.GENERIC_ERROR)
+                }
+            }
+        }
+        return OnAllSitesMobileEditorChanged(rowsAffected, true, error)
+    }
+
+    private fun fetchUserRoles(site: SiteModel) {
+        if (site.isUsingWpComRestApi) {
+            siteRestClient.fetchUserRoles(site)
+        }
+    }
+
+    private fun updateUserRoles(payload: FetchedUserRolesPayload) {
+        val event = OnUserRolesChanged(payload.site)
+        if (payload.isError) {
+            event.error = payload.error
+        } else {
+            siteSqlUtils.insertOrReplaceUserRoles(payload.site, payload.roles)
+        }
+        emitChange(event)
+    }
+
+    private fun removeSites(sites: List<SiteModel>): Int {
+        var rowsAffected = 0
+        for (site in sites) {
+            rowsAffected += siteSqlUtils.deleteSite(site)
+        }
+        return rowsAffected
+    }
+
+    private fun fetchConnectSiteInfo(payload: String) {
+        siteRestClient.fetchConnectSiteInfo(payload)
+    }
+
+    suspend fun fetchConnectSiteInfoSync(siteUrl: String): ConnectSiteInfoPayload {
+        return coroutineEngine.withDefaultContext(T.API, this, "Fetch Connect Site Info") {
+            siteRestClient.fetchConnectSiteInfoSync(siteUrl)
+        }
+    }
+
+    private fun handleFetchedConnectSiteInfo(payload: ConnectSiteInfoPayload) {
+        val event = OnConnectSiteInfoChecked(payload)
+        event.error = payload.error
+        emitChange(event)
+    }
+
+    private fun fetchWPComSiteByUrl(payload: String) {
+        siteRestClient.fetchWPComSiteByUrl(payload)
+    }
+
+    private fun handleFetchedWPComSiteByUrl(payload: FetchWPComSiteResponsePayload) {
+        val event = OnWPComSiteFetched(payload.checkedUrl, payload.site)
+        event.error = payload.error
+        emitChange(event)
+    }
+
+    private fun checkUrlIsWPCom(payload: String) {
+        siteRestClient.checkUrlIsWPCom(payload)
+    }
+
+    private fun handleCheckedIsWPComUrl(payload: IsWPComResponsePayload) {
+        val error = if (payload.isError) {
+            // Return invalid site for all errors (this endpoint seems a bit drunk).
+            // Client likely needs to know if there was an error or not.
+            SiteError(SiteErrorType.INVALID_SITE)
+        } else {
+            null
+        }
+        emitChange(OnURLChecked(payload.url ?: "", payload.isWPCom, error))
+    }
+
+    private fun suggestDomains(payload: SuggestDomainsPayload) {
+        siteRestClient.suggestDomains(
+            payload.query,
+            payload.quantity,
+            payload.vendor,
+            payload.onlyWordpressCom,
+            payload.includeWordpressCom,
+            payload.includeDotBlogSubdomain,
+            payload.segmentId,
+            payload.tlds
+        )
+    }
+
+    private fun handleSuggestedDomains(payload: SuggestDomainsResponsePayload) {
+        val event = OnSuggestedDomains(payload.query, payload.suggestions)
+        if (payload.isError) {
+            event.error = payload.error
+        }
+        emitChange(event)
+    }
+
+    private fun fetchPrivateAtomicCookie(payload: FetchPrivateAtomicCookiePayload) {
+        val site = getSiteBySiteId(payload.siteId)
+        if (site == null) {
+            val cookieError = PrivateAtomicCookieError(
+                    SITE_MISSING_FROM_STORE,
+                    "Requested site is missing from the store."
+            )
+            emitChange(OnPrivateAtomicCookieFetched(null, false, cookieError))
+            return
+        }
+        if (!site.isPrivateWPComAtomic) {
+            val cookieError = PrivateAtomicCookieError(
+                    NON_PRIVATE_AT_SITE,
+                    "Cookie can only be requested for private atomic site."
+            )
+            emitChange(OnPrivateAtomicCookieFetched(site, false, cookieError))
+            return
+        }
+        siteRestClient.fetchAccessCookie(site)
+    }
+
+    private fun handleFetchedPrivateAtomicCookie(payload: FetchedPrivateAtomicCookiePayload) {
+        if (payload.cookie == null || payload.cookie.cookies.isEmpty()) {
+            emitChange(
+                    OnPrivateAtomicCookieFetched(
+                            payload.site, false,
+                            PrivateAtomicCookieError(
+                                    INVALID_RESPONSE,
+                                    "Cookie is missing from response."
+                            )
+                    )
+            )
+            privateAtomicCookie.set(null)
+            return
+        }
+        privateAtomicCookie.set(payload.cookie.cookies[0])
+        emitChange(OnPrivateAtomicCookieFetched(payload.site, true, payload.error))
+    }
+
+    private fun fetchJetpackCapabilities(payload: FetchJetpackCapabilitiesPayload) {
+        siteRestClient.fetchJetpackCapabilities(payload.remoteSiteId)
+    }
+
+    private fun handleFetchedJetpackCapabilities(payload: FetchedJetpackCapabilitiesPayload) {
+        emitChange(OnJetpackCapabilitiesFetched(payload.remoteSiteId, payload.capabilities, payload.error))
+    }
+
+    private fun fetchPlans(siteModel: SiteModel) {
+        if (siteModel.isUsingWpComRestApi) {
+            siteRestClient.fetchPlans(siteModel)
+        } else {
+            val plansError = PlansError(NOT_AVAILABLE)
+            handleFetchedPlans(FetchedPlansPayload(siteModel, plansError))
+        }
+    }
+
+    private fun handleFetchedPlans(payload: FetchedPlansPayload) {
+        emitChange(OnPlansFetched(payload.site, payload.plans, payload.error))
+    }
+
+    private fun checkDomainAvailability(domainName: String) {
+        if (TextUtils.isEmpty(domainName)) {
+            val error = DomainAvailabilityError(INVALID_DOMAIN_NAME)
+            handleCheckedDomainAvailability(DomainAvailabilityResponsePayload(error))
+        } else {
+            siteRestClient.checkDomainAvailability(domainName)
+        }
+    }
+
+    private fun handleCheckedDomainAvailability(payload: DomainAvailabilityResponsePayload) {
+        emitChange(
+                OnDomainAvailabilityChecked(
+                        payload.status,
+                        payload.mappable,
+                        payload.supportsPrivacy,
+                        payload.error
+                )
+        )
+    }
+
+    private fun fetchSupportedStates(countryCode: String) {
+        if (TextUtils.isEmpty(countryCode)) {
+            val error = DomainSupportedStatesError(INVALID_COUNTRY_CODE)
+            handleFetchedSupportedStates(DomainSupportedStatesResponsePayload(error))
+        } else {
+            siteRestClient.fetchSupportedStates(countryCode)
+        }
+    }
+
+    private fun handleFetchedSupportedStates(payload: DomainSupportedStatesResponsePayload) {
+        emitChange(OnDomainSupportedStatesFetched(payload.supportedStates, payload.error))
+    }
+
+    private fun handleFetchedSupportedCountries(payload: DomainSupportedCountriesResponsePayload) {
+        emitChange(OnDomainSupportedCountriesFetched(payload.supportedCountries, payload.error))
+    }
+
+    private fun handleFetchedBlockLayouts(payload: FetchedBlockLayoutsResponsePayload) {
+        if (payload.isError) {
+            // Return cached layouts on error
+            if (!cachedLayoutsRetrieved(payload.site)) {
+                emitChange(OnBlockLayoutsFetched(payload.layouts, payload.categories, payload.error))
+            }
+        } else {
+            siteSqlUtils.insertOrReplaceBlockLayouts(payload.site, payload.categories!!, payload.layouts!!)
+            emitChange(OnBlockLayoutsFetched(payload.layouts, payload.categories, payload.error))
+        }
+    }
+
+    /**
+     * Emits a new [OnBlockLayoutsFetched] event with cached layouts for a given site
+     *
+     * @param site the site for which the cached layouts should be retrieved
+     * @return true if cached layouts were retrieved successfully
+     */
+    private fun cachedLayoutsRetrieved(site: SiteModel): Boolean {
+        val layouts = siteSqlUtils.getBlockLayouts(site)
+        val categories = siteSqlUtils.getBlockLayoutCategories(site)
+        if (layouts.isNotEmpty() && categories.isNotEmpty()) {
+            emitChange(OnBlockLayoutsFetched(layouts, categories, null))
+            return true
+        }
+        return false
+    }
+
+    // Automated Transfers
+    private fun checkAutomatedTransferEligibility(site: SiteModel) {
+        siteRestClient.checkAutomatedTransferEligibility(site)
+    }
+
+    private fun handleCheckedAutomatedTransferEligibility(payload: AutomatedTransferEligibilityResponsePayload) {
+        emitChange(
+                OnAutomatedTransferEligibilityChecked(
+                        payload.site, payload.isEligible, payload.errorCodes,
+                        payload.error
+                )
+        )
+    }
+
+    private fun initiateAutomatedTransfer(payload: InitiateAutomatedTransferPayload) {
+        siteRestClient.initiateAutomatedTransfer(payload.site, payload.pluginSlugToInstall)
+    }
+
+    private fun handleInitiatedAutomatedTransfer(payload: InitiateAutomatedTransferResponsePayload) {
+        emitChange(OnAutomatedTransferInitiated(payload.site, payload.pluginSlugToInstall, payload.error))
+    }
+
+    private fun checkAutomatedTransferStatus(site: SiteModel) {
+        siteRestClient.checkAutomatedTransferStatus(site)
+    }
+
+    private fun handleCheckedAutomatedTransferStatus(payload: AutomatedTransferStatusResponsePayload) {
+        val event: OnAutomatedTransferStatusChecked = if (!payload.isError) {
+            // We can't rely on the currentStep and totalSteps as it may not be equal when the transfer is complete
+            val isTransferCompleted = payload.status.equals("complete", ignoreCase = true)
+            OnAutomatedTransferStatusChecked(
+                    payload.site, isTransferCompleted, payload.currentStep,
+                    payload.totalSteps
+            )
+        } else {
+            OnAutomatedTransferStatusChecked(payload.site, payload.error)
+        }
+        emitChange(event)
+    }
+
+    private fun completeQuickStart(payload: CompleteQuickStartPayload) {
+        siteRestClient.completeQuickStart(payload.site, payload.variant)
+    }
+
+    private fun handleQuickStartCompleted(payload: QuickStartCompletedResponsePayload) {
+        val event = OnQuickStartCompleted(payload.site, payload.success)
+        event.error = payload.error
+        emitChange(event)
+    }
+
+    private fun designatePrimaryDomain(payload: DesignatePrimaryDomainPayload) {
+        siteRestClient.designatePrimaryDomain(payload.site, payload.domain)
+    }
+
+    private fun handleDesignatedPrimaryDomain(payload: DesignatedPrimaryDomainPayload) {
+        val event = OnPrimaryDomainDesignated(payload.site, payload.success)
+        event.error = payload.error
+        emitChange(event)
+    }
+
+    suspend fun fetchAllDomains(
+        noWpCom: Boolean = true,
+        resolveStatus: Boolean = true
+    ): FetchedAllDomainsPayload =
+        coroutineEngine.withDefaultContext(T.API, this, "Fetch all domains") {
+            return@withDefaultContext when (val response =
+                siteRestClient.fetchAllDomains(noWpCom, resolveStatus)) {
+                is Success -> {
+                    val domains = response.data.domains
+                    FetchedAllDomainsPayload(domains)
+                }
+                is Error -> {
+                    val errorType = when (response.error.apiError) {
+                        "authorization_required" -> AllDomainsErrorType.UNAUTHORIZED
+                        else -> AllDomainsErrorType.GENERIC_ERROR
+                    }
+                    val domainsError = AllDomainsError(errorType, response.error.message)
+                    FetchedAllDomainsPayload(domainsError)
+                }
+            }
+        }
+    suspend fun fetchSiteDomains(siteModel: SiteModel): FetchedDomainsPayload =
+            coroutineEngine.withDefaultContext(T.API, this, "Fetch site domains") {
+                return@withDefaultContext when (val response =
+                        siteRestClient.fetchSiteDomains(siteModel)) {
+                            is Success -> {
+                                val domains = response.data.domains
+                                insertDomainModels(siteModel, domains)
+                                FetchedDomainsPayload(siteModel, domains)
+                            }
+                            is Error -> {
+                                val siteErrorType = when (response.error.apiError) {
+                                    "unauthorized" -> UNAUTHORIZED
+                                    "unknown_blog" -> UNKNOWN_SITE
+                                    else -> SiteErrorType.GENERIC_ERROR
+                                }
+                                val domainsError = SiteError(siteErrorType, response.error.message)
+                                FetchedDomainsPayload(siteModel, domainsError)
+                            }
+                }
+            }
+
+    private suspend fun insertDomainModels(siteModel: SiteModel, domains: List<Domain>) {
+        val domainModels = domains.map { it.asDomainModel() }
+        domainDao.insert(siteModel.id, domainModels)
+    }
+
+    fun getSiteDomains(siteLocalId: Int): Flow<List<DomainModel>> {
+        return domainDao.getDomains(siteLocalId).map { result ->
+            result.map { it.toDomainModel() }
+        }
+    }
+
+    suspend fun fetchJetpackSocial(siteModel: SiteModel): FetchedJetpackSocialResult =
+        coroutineEngine.withDefaultContext(T.API, this, "Fetch Jetpack Social") {
+            when (val response = siteRestClient.fetchJetpackSocial(siteModel.siteId)) {
+                is Success -> {
+                    val entity = jetpackSocialMapper.mapEntity(response.data, siteModel.id)
+                    jetpackSocialDao.insert(entity)
+                    val domain = jetpackSocialMapper.mapDomain(entity)
+                    FetchedJetpackSocialResult.Success(domain)
+                }
+                is Error -> {
+                    val error = SiteError(SiteErrorType.GENERIC_ERROR, response.error.message)
+                    FetchedJetpackSocialResult.Error(error)
+                }
+            }
+        }
+
+    suspend fun deleteApplicationPassword(site: SiteModel): OnApplicationPasswordDeleted =
+        coroutineEngine.withDefaultContext(T.API, this, "Delete Application Password") {
+            when (val result = applicationPasswordsManagerProvider.get().deleteApplicationCredentials(site)) {
+                is ApplicationPasswordDeletionResult.Success -> OnApplicationPasswordDeleted(site)
+                is ApplicationPasswordDeletionResult.Failure -> OnApplicationPasswordDeleted(site, result.error)
+            }
+        }
+
+    suspend fun fetchSitePlans(siteModel: SiteModel): FetchedPlansPayload {
+        return if (siteModel.isUsingWpComRestApi) {
+            coroutineEngine.withDefaultContext(T.API, this, "Fetch site plans") {
+                return@withDefaultContext when (val response =
+                    siteRestClient.fetchSitePlans(siteModel)) {
+                    is Success -> {
+                        FetchedPlansPayload(siteModel, response.data.plansList)
+                    }
+                    is Error -> {
+                        val siteErrorType = when (response.error.apiError) {
+                            "unauthorized" -> PlansErrorType.UNAUTHORIZED
+                            "unknown_blog" -> PlansErrorType.UNKNOWN_BLOG
+                            else -> PlansErrorType.GENERIC_ERROR
+                        }
+                        val plansError = PlansError(siteErrorType, response.error.message)
+                        FetchedPlansPayload(siteModel, plansError)
+                    }
+                }
+            }
+        } else {
+            FetchedPlansPayload(siteModel, PlansError(NOT_AVAILABLE))
+        }
+    }
+
+    suspend fun fetchDomainPrice(domainName: String): WPAPIResponse<DomainPriceResponse> {
+        return coroutineEngine.withDefaultContext(T.API, this, "Fetch domain price") {
+            when (val response =
+                siteRestClient.fetchDomainPrice(domainName)) {
+                is Success -> {
+                    WPAPIResponse.Success(response.data)
+                }
+                is Error -> {
+                    WPAPIResponse.Error(WPAPINetworkError(response.error))
+                }
+            }
+        }
+    }
+
+    suspend fun launchSite(site: SiteModel): OnSiteLaunched {
+        return coroutineEngine.withDefaultContext(T.API, this, "Launch site") {
+            when (val response =
+                siteRestClient.launchSite(site)) {
+                is Success -> OnSiteLaunched()
+                is Error -> {
+                    val errorType = when (response.error.apiError) {
+                        "unauthorized" -> LaunchSiteErrorType.UNAUTHORIZED
+                        "already-launched" -> ALREADY_LAUNCHED
+                        else -> LaunchSiteErrorType.GENERIC_ERROR
+                    }
+                    val error = LaunchSiteError(errorType, response.error.message)
+                    OnSiteLaunched(error)
+                }
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StatsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StatsStore.kt
new file mode 100644
index 00000000000..eb41a25e3f1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StatsStore.kt
@@ -0,0 +1,344 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.CENSORED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.HTTP_AUTH_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.INVALID_SSL_CERTIFICATE
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NETWORK_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_AUTHENTICATED
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NOT_FOUND
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.NO_CONNECTION
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.PARSE_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.SERVER_ERROR
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.TIMEOUT
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType.UNKNOWN
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.persistence.InsightTypeSqlUtils
+import org.wordpress.android.fluxc.persistence.StatsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ACTION_GROW
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ACTION_REMINDER
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ACTION_SCHEDULE
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.ALL_TIME_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.FOLLOWERS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.LATEST_POST_SUMMARY
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.MOST_POPULAR_DAY_AND_HOUR
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TODAY_STATS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TOTAL_COMMENTS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TOTAL_FOLLOWERS
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.TOTAL_LIKES
+import org.wordpress.android.fluxc.store.StatsStore.InsightType.VIEWS_AND_VISITORS
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.FILE_DOWNLOADS
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
+import org.wordpress.android.util.AppLog
+import java.util.Collections
+import javax.inject.Inject
+import javax.inject.Singleton
+
+val DEFAULT_INSIGHTS = listOf(
+        MOST_POPULAR_DAY_AND_HOUR,
+        ALL_TIME_STATS,
+        TODAY_STATS,
+        FOLLOWERS
+)
+
+val JETPACK_DEFAULT_INSIGHTS = listOf(
+        VIEWS_AND_VISITORS,
+        TOTAL_LIKES,
+        TOTAL_COMMENTS,
+        TOTAL_FOLLOWERS,
+        MOST_POPULAR_DAY_AND_HOUR,
+        LATEST_POST_SUMMARY
+)
+
+val STATS_UNAVAILABLE_WITH_JETPACK = listOf(FILE_DOWNLOADS)
+const val INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN = "INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN"
+
+@Singleton
+class StatsStore
+@Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val insightTypeSqlUtils: InsightTypeSqlUtils,
+    private val preferenceUtils: PreferenceUtilsWrapper,
+    private val statsSqlUtils: StatsSqlUtils
+) {
+    fun deleteAllData() {
+        statsSqlUtils.deleteAllStats()
+    }
+
+    fun deleteSiteData(site: SiteModel) {
+        statsSqlUtils.deleteSiteStats(site)
+    }
+
+    suspend fun getInsightTypes(site: SiteModel): List<StatsType> =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "getInsightTypes") {
+                val types = mutableListOf<StatsType>()
+/**
+ * Customize Insights Management card is being hidden for now.
+ * It will be updated to new design in the next iteration.
+ * Also, make sure to remove @Ignore annotation on tests in StatsStoreTest when this is undone.
+ **/
+//                if (!preferenceUtils.getFluxCPreferences().getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, false)) {
+//                    types.add(ManagementType.NEWS_CARD)
+//                }
+                types.addAll(getAddedInsights(site))
+                types.add(ManagementType.CONTROL)
+                return@withDefaultContext types
+            }
+
+    fun hideInsightsManagementNewsCard() = coroutineEngine.run(AppLog.T.STATS, this, "hideInsightsManagementNewsCard") {
+        preferenceUtils.getFluxCPreferences().edit().putBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, true).apply()
+    }
+
+    fun isInsightsManagementNewsCardShowing() =
+            coroutineEngine.run(AppLog.T.STATS, this, "isInsightsManagementNewsCardShowing") {
+                preferenceUtils.getFluxCPreferences().getBoolean(INSIGHTS_MANAGEMENT_NEWS_CARD_SHOWN, true)
+            }
+
+    suspend fun getAddedInsights(site: SiteModel) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "getAddedInsights") {
+                val addedInsights = insightTypeSqlUtils.selectAddedItemsOrderedByStatus(site)
+                val removedInsights = insightTypeSqlUtils.selectRemovedItemsOrderedByStatus(site)
+
+                return@withDefaultContext if (addedInsights.isEmpty() && removedInsights.isEmpty()) {
+                    DEFAULT_INSIGHTS
+                } else {
+                    addedInsights
+                }
+            }
+
+    fun getRemovedInsights(addedInsights: List<InsightType>) =
+            coroutineEngine.run(AppLog.T.STATS, this, "getRemovedInsights") {
+                InsightType.values().asList() - addedInsights
+            }
+
+    suspend fun updateTypes(site: SiteModel, addedInsights: List<InsightType>) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "updateTypes") {
+                insertOrReplaceItems(site, addedInsights, getRemovedInsights(addedInsights))
+            }
+
+    suspend fun moveTypeUp(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "moveTypeUp") {
+                val insights = getAddedInsights(site)
+                val index = insights.indexOf(type)
+
+                if (index > 0) {
+                    Collections.swap(insights, index, index - 1)
+                    insightTypeSqlUtils.insertOrReplaceAddedItems(site, insights)
+                }
+            }
+
+    suspend fun moveTypeDown(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "moveTypeDown") {
+                val insights = getAddedInsights(site)
+                val index = insights.indexOf(type)
+
+                if (index < insights.size - 1) {
+                    Collections.swap(insights, index, index + 1)
+                    insightTypeSqlUtils.insertOrReplaceAddedItems(site, insights)
+                }
+            }
+
+    suspend fun removeType(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "removeType") {
+                val addedItems = getAddedInsights(site) - type
+                updateTypes(site, addedItems)
+            }
+
+    suspend fun addType(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "addType") {
+                val addedItems = getAddedInsights(site) + type
+                updateTypes(site, addedItems)
+            }
+
+    suspend fun addActionType(site: SiteModel, type: InsightType) =
+        coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "addActionType($type)") {
+            val addedInsights = getAddedInsights(site).toMutableList()
+
+            when (type) {
+                ACTION_REMINDER -> {
+                    if (!addedInsights.contains(ACTION_REMINDER)) {
+                        addedInsights.add(addedInsights.indexOf(MOST_POPULAR_DAY_AND_HOUR) + 1, ACTION_REMINDER)
+                    }
+                }
+                ACTION_GROW -> {
+                    if (!addedInsights.contains(ACTION_GROW)) {
+                        addedInsights.add(addedInsights.indexOf(TOTAL_FOLLOWERS) + 1, ACTION_GROW)
+                    }
+                }
+                ACTION_SCHEDULE -> {
+                    if (!addedInsights.contains(ACTION_SCHEDULE) && !addedInsights.contains(ACTION_REMINDER)) {
+                        addedInsights.add(addedInsights.indexOf(MOST_POPULAR_DAY_AND_HOUR) + 1, ACTION_SCHEDULE)
+                    }
+                }
+                else -> {
+                    // just to make when exhaustive
+                }
+            }
+
+            insightTypeSqlUtils.insertOrReplaceAddedItems(site, addedInsights)
+        }
+
+    suspend fun removeActionType(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "removeActionType($type)") {
+                val addedInsights = insightTypeSqlUtils.selectAddedItemsOrderedByStatus(site)
+                val removedInsights = insightTypeSqlUtils.selectRemovedItemsOrderedByStatus(site)
+                insertOrReplaceItems(site, addedInsights - type, removedInsights + type)
+            }
+
+    suspend fun isActionTypeShown(site: SiteModel, type: InsightType) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "isActionTypeShown(${site.id} $type") {
+                val addedInsights = insightTypeSqlUtils.selectAddedItemsOrderedByStatus(site)
+                val removedInsights = insightTypeSqlUtils.selectRemovedItemsOrderedByStatus(site)
+
+                return@withDefaultContext (addedInsights.contains(type) || removedInsights.contains(type))
+            }
+
+    private fun insertOrReplaceItems(
+        site: SiteModel,
+        addedItems: List<InsightType>,
+        removedItems: List<InsightType>
+    ) {
+        insightTypeSqlUtils.insertOrReplaceAddedItems(site, addedItems)
+        insightTypeSqlUtils.insertOrReplaceRemovedItems(site, removedItems)
+    }
+
+    suspend fun getTimeStatsTypes(site: SiteModel): List<TimeStatsType> =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "getTimeStatsTypes") {
+                return@withDefaultContext if (site.isJetpackConnected) {
+                    TimeStatsType.values().toList().filter { !STATS_UNAVAILABLE_WITH_JETPACK.contains(it) }
+                } else {
+                    TimeStatsType.values().toList()
+                }
+            }
+
+    suspend fun getSubscriberTypes() = coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "getSubscriberTypes") {
+        return@withDefaultContext SubscriberType.values().toList()
+    }
+
+    suspend fun getPostDetailTypes(): List<PostDetailType> =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "getPostDetailTypes") {
+                return@withDefaultContext PostDetailType.values().toList()
+            }
+
+    interface StatsType
+
+    enum class InsightType : StatsType {
+        VIEWS_AND_VISITORS,
+        TOTAL_LIKES,
+        TOTAL_COMMENTS,
+        TOTAL_FOLLOWERS,
+        LATEST_POST_SUMMARY,
+        MOST_POPULAR_DAY_AND_HOUR,
+        ALL_TIME_STATS,
+        FOLLOWER_TYPES,
+        FOLLOWER_TOTALS,
+        TAGS_AND_CATEGORIES,
+        ANNUAL_SITE_STATS,
+        COMMENTS,
+        AUTHORS_COMMENTS,
+        POSTS_COMMENTS,
+        FOLLOWERS,
+        TODAY_STATS,
+        POSTING_ACTIVITY,
+        PUBLICIZE,
+        ACTION_GROW,
+        ACTION_REMINDER,
+        ACTION_SCHEDULE
+    }
+
+    enum class ManagementType : StatsType {
+        NEWS_CARD,
+        CONTROL
+    }
+
+    enum class TimeStatsType : StatsType {
+        OVERVIEW,
+        POSTS_AND_PAGES,
+        REFERRERS,
+        CLICKS,
+        AUTHORS,
+        COUNTRIES,
+        SEARCH_TERMS,
+        PUBLISHED,
+        VIDEOS,
+        FILE_DOWNLOADS
+    }
+
+
+    enum class SubscriberType : StatsType { TOTAL_SUBSCRIBERS, SUBSCRIBERS_CHART, SUBSCRIBERS, EMAILS }
+
+    enum class PostDetailType : StatsType {
+        POST_HEADER,
+        POST_OVERVIEW,
+        MONTHS_AND_YEARS,
+        AVERAGE_VIEWS_PER_DAY,
+        CLICKS_BY_WEEKS
+    }
+
+    data class OnStatsFetched<T>(val model: T? = null, val cached: Boolean = false) : Store.OnChanged<StatsError>() {
+        constructor(error: StatsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class FetchStatsPayload<T>(
+        val response: T? = null
+    ) : Payload<StatsError>() {
+        constructor(error: StatsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class OnReportReferrerAsSpam<T>(val model: T? = null) : Store.OnChanged<StatsError>() {
+        constructor(error: StatsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class ReportReferrerAsSpamPayload<T>(
+        val response: T? = null
+    ) : Payload<StatsError>() {
+        constructor(error: StatsError) : this() {
+            this.error = error
+        }
+    }
+
+    enum class StatsErrorType {
+        GENERIC_ERROR,
+        TIMEOUT,
+        API_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        ALREADY_SPAMMED
+    }
+
+    class StatsError(var type: StatsErrorType, var message: String? = null) : OnChangedError
+}
+
+fun WPComGsonNetworkError.toStatsError(): StatsError {
+    val type = when (type) {
+        TIMEOUT -> StatsErrorType.TIMEOUT
+        NO_CONNECTION,
+        SERVER_ERROR,
+        INVALID_SSL_CERTIFICATE,
+        NETWORK_ERROR -> StatsErrorType.API_ERROR
+        PARSE_ERROR,
+        NOT_FOUND,
+        CENSORED,
+        INVALID_RESPONSE -> StatsErrorType.INVALID_RESPONSE
+        HTTP_AUTH_ERROR,
+        AUTHORIZATION_REQUIRED,
+        NOT_AUTHENTICATED -> StatsErrorType.AUTHORIZATION_REQUIRED
+        UNKNOWN -> if (message == "Already spammed.") StatsErrorType.ALREADY_SPAMMED else GENERIC_ERROR
+        null -> GENERIC_ERROR
+    }
+    return StatsError(type, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaItem.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaItem.kt
new file mode 100644
index 00000000000..fe50d4570ed
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaItem.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.store
+
+data class StockMediaItem(
+    val id: String? = null,
+    val name: String? = null,
+    val title: String? = null,
+    val url: String? = null,
+    val date: String? = null,
+    val thumbnail: String? = null
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaStore.kt
new file mode 100644
index 00000000000..5597bb6e5d2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaStore.kt
@@ -0,0 +1,160 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode.ASYNC
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.StockMediaAction
+import org.wordpress.android.fluxc.action.StockMediaAction.FETCH_STOCK_MEDIA
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.StockMediaModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.stockmedia.StockMediaRestClient
+import org.wordpress.android.fluxc.persistence.StockMediaSqlUtils
+import org.wordpress.android.fluxc.store.MediaStore.OnStockMediaUploaded
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MEDIA
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StockMediaStore
+@Inject constructor(
+    dispatcher: Dispatcher?,
+    private val restClient: StockMediaRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    private val sqlUtils: StockMediaSqlUtils,
+    private val mediaStore: MediaStore
+) : Store(dispatcher) {
+    /**
+     * Actions: FETCH_MEDIA_LIST
+     */
+    data class FetchStockMediaListPayload(val searchTerm: String, val page: Int) : Payload<BaseNetworkError?>()
+
+    /**
+     * Actions: FETCHED_MEDIA_LIST
+     */
+    class FetchedStockMediaListPayload(
+        @JvmField val mediaList: List<StockMediaModel>,
+        @JvmField val searchTerm: String,
+        @JvmField val nextPage: Int,
+        @JvmField val canLoadMore: Boolean
+    ) : Payload<StockMediaError?>() {
+        constructor(error: StockMediaError, searchTerm: String) : this(listOf(), searchTerm, 0, false) {
+            this.error = error
+        }
+    }
+
+    class OnStockMediaListFetched(
+        @JvmField val mediaList: List<StockMediaModel>,
+        @JvmField val searchTerm: String,
+        @JvmField val nextPage: Int,
+        @JvmField val canLoadMore: Boolean
+    ) : OnChanged<StockMediaError?>() {
+        constructor(error: StockMediaError, searchTerm: String) : this(listOf(), searchTerm, 0, false) {
+            this.error = error
+        }
+    }
+
+    enum class StockMediaErrorType {
+        GENERIC_ERROR;
+
+        companion object {
+            // endpoint returns an empty media list for any type of error, including timeouts, server error, etc.
+            fun fromBaseNetworkError() = GENERIC_ERROR
+        }
+    }
+
+    data class StockMediaError(val type: StockMediaErrorType, val message: String) : OnChangedError
+
+    @Subscribe(threadMode = ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? StockMediaAction ?: return
+        when (actionType) {
+            FETCH_STOCK_MEDIA -> performFetchStockMediaList(action.payload as FetchStockMediaListPayload)
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(MEDIA, "StockMediaStore onRegister")
+    }
+
+    private fun performFetchStockMediaList(payload: FetchStockMediaListPayload) {
+        coroutineEngine.launch(MEDIA, this, "Fetching stock media") {
+            val mediaListPayload = restClient.searchStockMedia(
+                    payload.searchTerm,
+                    payload.page,
+                    PAGE_SIZE
+            )
+            handleStockMediaListFetched(mediaListPayload)
+        }
+    }
+
+    suspend fun fetchStockMedia(filter: String, loadMore: Boolean): OnStockMediaListFetched {
+        return coroutineEngine.withDefaultContext(MEDIA, this, "Fetching stock media") {
+            val loadedPage = if (loadMore) {
+                sqlUtils.getNextPage() ?: 0
+            } else {
+                0
+            }
+            if (loadedPage == 0) {
+                sqlUtils.clear()
+            }
+
+            val payload = restClient.searchStockMedia(filter, loadedPage, PAGE_SIZE)
+            if (payload.isError) {
+                OnStockMediaListFetched(requireNotNull(payload.error), filter)
+            } else {
+                sqlUtils.insert(
+                        loadedPage,
+                        if (payload.canLoadMore) payload.nextPage else null,
+                        payload.mediaList.map {
+                            StockMediaItem(it.id, it.name, it.title, it.url, it.date, it.thumbnail)
+                        })
+                OnStockMediaListFetched(payload.mediaList, filter, payload.nextPage, payload.canLoadMore)
+            }
+        }
+    }
+
+    suspend fun getStockMedia(): List<StockMediaItem> {
+        return coroutineEngine.withDefaultContext(MEDIA, this, "Getting stock media") {
+            sqlUtils.selectAll()
+        }
+    }
+
+    private fun handleStockMediaListFetched(payload: FetchedStockMediaListPayload) {
+        val onStockMediaListFetched: OnStockMediaListFetched = if (payload.isError) {
+            OnStockMediaListFetched(payload.error!!, payload.searchTerm)
+        } else {
+            OnStockMediaListFetched(
+                    payload.mediaList,
+                    payload.searchTerm,
+                    payload.nextPage,
+                    payload.canLoadMore
+            )
+        }
+        emitChange(onStockMediaListFetched)
+    }
+
+    suspend fun performUploadStockMedia(site: SiteModel, stockMedia: List<StockMediaUploadItem>): OnStockMediaUploaded {
+        return coroutineEngine.withDefaultContext(MEDIA, this, "Upload stock media") {
+            val payload = restClient.uploadStockMedia(site, stockMedia)
+            if (payload.isError) {
+                OnStockMediaUploaded(payload.site, payload.error!!)
+            } else {
+                // add uploaded media to the store
+                for (media in payload.mediaList) {
+                    mediaStore.updateMedia(media, false)
+                }
+                OnStockMediaUploaded(payload.site, payload.mediaList)
+            }
+        }
+    }
+
+    companion object {
+        // this should be a multiple of both 3 and 4 since WPAndroid shows either 3 or 4 pics per row
+        const val PAGE_SIZE = 36
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaUploadItem.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaUploadItem.kt
new file mode 100644
index 00000000000..259b7fbcbde
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/StockMediaUploadItem.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.fluxc.store
+
+data class StockMediaUploadItem(
+    val name: String? = null,
+    val title: String? = null,
+    val url: String? = null
+)
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/Store.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/Store.java
new file mode 100644
index 00000000000..945324a0ec2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/Store.java
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.store;
+
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.FluxCError;
+import org.wordpress.android.fluxc.annotations.action.Action;
+
+public abstract class Store {
+    protected final Dispatcher mDispatcher;
+
+    Store(Dispatcher dispatcher) {
+        mDispatcher = dispatcher;
+        mDispatcher.register(this);
+    }
+
+    public interface OnChangedError extends FluxCError {}
+
+    public static class OnChanged<T extends OnChangedError> {
+        public T error = null;
+
+        public boolean isError() {
+            return error != null;
+        }
+    }
+
+    /**
+     * onAction should {@link org.greenrobot.eventbus.Subscribe} with ASYNC {@link org.greenrobot.eventbus.ThreadMode}.
+     */
+    public abstract void onAction(Action action);
+    public abstract void onRegister();
+
+    protected void emitChange(OnChanged onChangedEvent) {
+        mDispatcher.emitChange(onChangedEvent);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TaxonomyStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TaxonomyStore.java
new file mode 100644
index 00000000000..a59a03ed537
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TaxonomyStore.java
@@ -0,0 +1,467 @@
+package org.wordpress.android.fluxc.store;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.TaxonomyAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.PostImmutableModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.TaxonomyModel;
+import org.wordpress.android.fluxc.model.TermModel;
+import org.wordpress.android.fluxc.model.TermsModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.taxonomy.TaxonomyRestClient;
+import org.wordpress.android.fluxc.network.xmlrpc.taxonomy.TaxonomyXMLRPCClient;
+import org.wordpress.android.fluxc.persistence.TaxonomySqlUtils;
+import org.wordpress.android.util.AppLog;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class TaxonomyStore extends Store {
+    public static final String DEFAULT_TAXONOMY_CATEGORY = "category";
+    public static final String DEFAULT_TAXONOMY_TAG = "post_tag";
+
+    public static class FetchTermsPayload extends Payload<BaseNetworkError> {
+        @NonNull public SiteModel site;
+        @NonNull public TaxonomyModel taxonomy;
+
+        public FetchTermsPayload(@NonNull SiteModel site, @NonNull TaxonomyModel taxonomy) {
+            this.site = site;
+            this.taxonomy = taxonomy;
+        }
+    }
+
+    @SuppressWarnings("NotNullFieldNotInitialized")
+    public static class FetchTermsResponsePayload extends Payload<TaxonomyError> {
+        @NonNull public TermsModel terms;
+        @NonNull public SiteModel site;
+        @NonNull public String taxonomy; // This field is also included in error payload.
+
+        public FetchTermsResponsePayload(@NonNull TermsModel terms, @NonNull SiteModel site, @NonNull String taxonomy) {
+            this.terms = terms;
+            this.site = site;
+            this.taxonomy = taxonomy;
+        }
+
+        public FetchTermsResponsePayload(@NonNull TaxonomyError error, @NonNull String taxonomy) {
+            this.error = error;
+            this.taxonomy = taxonomy;
+        }
+    }
+
+    public static class RemoteTermPayload extends Payload<TaxonomyError> {
+        @NonNull public TermModel term;
+        @NonNull public SiteModel site;
+
+        public RemoteTermPayload(@NonNull TermModel term, @NonNull SiteModel site) {
+            this.term = term;
+            this.site = site;
+        }
+    }
+
+    public static class FetchTermResponsePayload extends RemoteTermPayload {
+        // Used to track fetching newly uploaded XML-RPC terms
+        @NonNull public TaxonomyAction origin = TaxonomyAction.FETCH_TERM;
+
+        public FetchTermResponsePayload(@NonNull TermModel term, @NonNull SiteModel site) {
+            super(term, site);
+        }
+    }
+
+    // OnChanged events
+    public static class OnTaxonomyChanged extends OnChanged<TaxonomyError> {
+        public int rowsAffected;
+        @NonNull public TaxonomyAction causeOfChange;
+
+        public OnTaxonomyChanged(int rowsAffected, @NonNull String taxonomyName) {
+            this.rowsAffected = rowsAffected;
+            this.causeOfChange = taxonomyActionFromName(taxonomyName);
+        }
+
+        public OnTaxonomyChanged(int rowsAffected, @NonNull TaxonomyAction causeOfChange) {
+            this.rowsAffected = rowsAffected;
+            this.causeOfChange = causeOfChange;
+        }
+
+        @NonNull
+        private TaxonomyAction taxonomyActionFromName(@NonNull String taxonomy) {
+            switch (taxonomy) {
+                case DEFAULT_TAXONOMY_CATEGORY:
+                    return TaxonomyAction.FETCH_CATEGORIES;
+                case DEFAULT_TAXONOMY_TAG:
+                    return TaxonomyAction.FETCH_TAGS;
+                default:
+                    return TaxonomyAction.FETCH_TERMS;
+            }
+        }
+    }
+
+    public static class OnTermUploaded extends OnChanged<TaxonomyError> {
+        @NonNull public TermModel term;
+
+        public OnTermUploaded(@NonNull TermModel term) {
+            this.term = term;
+        }
+    }
+
+    public static class TaxonomyError implements OnChangedError {
+        @NonNull public TaxonomyErrorType type;
+        @NonNull public String message;
+
+        public TaxonomyError(@NonNull TaxonomyErrorType type, @NonNull String message) {
+            this.type = type;
+            this.message = message;
+        }
+
+        public TaxonomyError(@NonNull String type, @NonNull String message) {
+            this.type = TaxonomyErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public TaxonomyError(@NonNull TaxonomyErrorType type) {
+            this(type, "");
+        }
+    }
+
+    public enum TaxonomyErrorType {
+        INVALID_TAXONOMY,
+        DUPLICATE,
+        UNAUTHORIZED,
+        INVALID_RESPONSE,
+        GENERIC_ERROR;
+
+        @NonNull
+        public static TaxonomyErrorType fromString(@NonNull String string) {
+            for (TaxonomyErrorType v : TaxonomyErrorType.values()) {
+                if (string.equalsIgnoreCase(v.name())) {
+                    return v;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    private final TaxonomyRestClient mTaxonomyRestClient;
+    private final TaxonomyXMLRPCClient mTaxonomyXMLRPCClient;
+
+    @Inject public TaxonomyStore(Dispatcher dispatcher, TaxonomyRestClient taxonomyRestClient,
+                         TaxonomyXMLRPCClient taxonomyXMLRPCClient) {
+        super(dispatcher);
+        mTaxonomyRestClient = taxonomyRestClient;
+        mTaxonomyXMLRPCClient = taxonomyXMLRPCClient;
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(AppLog.T.API, "TaxonomyStore onRegister");
+    }
+
+    /**
+     * Returns all categories for the given site as a {@link TermModel} list.
+     */
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<TermModel> getCategoriesForSite(@NonNull SiteModel site) {
+        return TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_CATEGORY);
+    }
+
+    /**
+     * Returns all tags for the given site as a {@link TermModel} list.
+     */
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<TermModel> getTagsForSite(@NonNull SiteModel site) {
+        return TaxonomySqlUtils.getTermsForSite(site, DEFAULT_TAXONOMY_TAG);
+    }
+
+    /**
+     * Returns all the terms of a taxonomy for the given site as a {@link TermModel} list.
+     */
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<TermModel> getTermsForSite(@NonNull SiteModel site, @NonNull String taxonomyName) {
+        return TaxonomySqlUtils.getTermsForSite(site, taxonomyName);
+    }
+
+    /**
+     * Returns a category as a {@link TermModel} given its remote id.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getCategoryByRemoteId(@NonNull SiteModel site, long remoteId) {
+        return TaxonomySqlUtils.getTermByRemoteId(site, remoteId, DEFAULT_TAXONOMY_CATEGORY);
+    }
+
+    /**
+     * Returns a tag as a {@link TermModel} given its remote id.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getTagByRemoteId(@NonNull SiteModel site, long remoteId) {
+        return TaxonomySqlUtils.getTermByRemoteId(site, remoteId, DEFAULT_TAXONOMY_TAG);
+    }
+
+    /**
+     * Returns a term as a {@link TermModel} given its remote id.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getTermByRemoteId(@NonNull SiteModel site, long remoteId, @NonNull String taxonomyName) {
+        return TaxonomySqlUtils.getTermByRemoteId(site, remoteId, taxonomyName);
+    }
+
+    /**
+     * Returns a category as a {@link TermModel} given its name.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getCategoryByName(@NonNull SiteModel site, @NonNull String categoryName) {
+        return TaxonomySqlUtils.getTermByName(site, categoryName, DEFAULT_TAXONOMY_CATEGORY);
+    }
+
+    /**
+     * Returns a tag as a {@link TermModel} given its name.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getTagByName(@NonNull SiteModel site, @NonNull String tagName) {
+        return TaxonomySqlUtils.getTermByName(site, tagName, DEFAULT_TAXONOMY_TAG);
+    }
+
+    /**
+     * Returns a term as a {@link TermModel} given its name.
+     */
+    @Nullable
+    @SuppressWarnings("unused")
+    public TermModel getTermByName(@NonNull SiteModel site, @NonNull String termName, @NonNull String taxonomyName) {
+        return TaxonomySqlUtils.getTermByName(site, termName, taxonomyName);
+    }
+
+    /**
+     * Returns all the categories for the given post as a {@link TermModel} list.
+     */
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<TermModel> getCategoriesForPost(@NonNull PostImmutableModel post, @NonNull SiteModel site) {
+        return TaxonomySqlUtils.getTermsFromRemoteIdList(post.getCategoryIdList(), site, DEFAULT_TAXONOMY_CATEGORY);
+    }
+
+    /**
+     * Returns all the tags for the given post as a {@link TermModel} list.
+     */
+    @NonNull
+    @SuppressWarnings("unused")
+    public List<TermModel> getTagsForPost(@NonNull PostImmutableModel post, @NonNull SiteModel site) {
+        return TaxonomySqlUtils.getTermsFromRemoteNameList(post.getTagNameList(), site, DEFAULT_TAXONOMY_TAG);
+    }
+
+    @Override
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @SuppressWarnings("rawtypes")
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof TaxonomyAction)) {
+            return;
+        }
+
+        switch ((TaxonomyAction) actionType) {
+            case FETCH_CATEGORIES:
+                fetchTerms(((SiteModel) action.getPayload()), DEFAULT_TAXONOMY_CATEGORY);
+                break;
+            case FETCH_TAGS:
+                fetchTerms(((SiteModel) action.getPayload()), DEFAULT_TAXONOMY_TAG);
+                break;
+            case FETCH_TERMS:
+                fetchTerms((FetchTermsPayload) action.getPayload());
+                break;
+            case FETCHED_TERMS:
+                handleFetchTermsCompleted((FetchTermsResponsePayload) action.getPayload());
+                break;
+            case FETCH_TERM:
+                fetchTerm((RemoteTermPayload) action.getPayload());
+                break;
+            case FETCHED_TERM:
+                handleFetchSingleTermCompleted((FetchTermResponsePayload) action.getPayload());
+                break;
+            case PUSH_TERM:
+                pushTerm((RemoteTermPayload) action.getPayload());
+                break;
+            case PUSHED_TERM:
+                handlePushTermCompleted((RemoteTermPayload) action.getPayload());
+                break;
+            case DELETE_TERM:
+                deleteTerm((RemoteTermPayload) action.getPayload());
+                break;
+            case DELETED_TERM:
+                handleDeleteTermCompleted((RemoteTermPayload) action.getPayload());
+                break;
+            case REMOVE_ALL_TERMS:
+                removeAllTerms();
+                break;
+            case UPDATE_TERM:
+            case REMOVE_TERM:
+                break;
+        }
+    }
+
+    private void fetchTerm(@NonNull RemoteTermPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mTaxonomyRestClient.fetchTerm(payload.term, payload.site);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mTaxonomyXMLRPCClient.fetchTerm(payload.term, payload.site);
+        }
+    }
+
+    private void fetchTerms(@NonNull SiteModel site, @NonNull String taxonomyName) {
+        // TODO: Support large number of terms (currently pulling 100 from REST, and ? from XML-RPC) - pagination?
+        if (site.isUsingWpComRestApi()) {
+            mTaxonomyRestClient.fetchTerms(site, taxonomyName);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+             mTaxonomyXMLRPCClient.fetchTerms(site, taxonomyName);
+        }
+    }
+
+    private void fetchTerms(@NonNull FetchTermsPayload payload) {
+        fetchTerms(payload.site, payload.taxonomy.getName());
+    }
+
+    private void handleFetchTermsCompleted(@NonNull FetchTermsResponsePayload payload) {
+        OnTaxonomyChanged onTaxonomyChanged;
+
+        if (payload.isError()) {
+            onTaxonomyChanged = new OnTaxonomyChanged(0, payload.taxonomy);
+            onTaxonomyChanged.error = payload.error;
+        } else {
+            // Clear existing terms for this taxonomy
+            // This is the simplest way of keeping our local terms in sync with their remote versions
+            // (in case of deletions,or if the user manually changed some term IDs)
+            // TODO: This may have to change when we support large numbers of terms and require multiple requests
+            TaxonomySqlUtils.clearTaxonomyForSite(payload.site, payload.taxonomy);
+
+            int rowsAffected = 0;
+            for (TermModel term : payload.terms.getTerms()) {
+                rowsAffected += TaxonomySqlUtils.insertOrUpdateTerm(term);
+            }
+
+            onTaxonomyChanged = new OnTaxonomyChanged(rowsAffected, payload.taxonomy);
+        }
+
+        emitChange(onTaxonomyChanged);
+    }
+
+    private void handleFetchSingleTermCompleted(@NonNull FetchTermResponsePayload payload) {
+        if (payload.origin == TaxonomyAction.PUSH_TERM) {
+            OnTermUploaded onTermUploaded = new OnTermUploaded(payload.term);
+            if (payload.isError()) {
+                onTermUploaded.error = payload.error;
+            } else {
+                updateTerm(payload.term);
+            }
+            emitChange(onTermUploaded);
+            return;
+        }
+
+        if (payload.isError()) {
+            OnTaxonomyChanged event = new OnTaxonomyChanged(
+                    0,
+                    TaxonomyAction.UPDATE_TERM
+            );
+            event.error = payload.error;
+            emitChange(event);
+        } else {
+            updateTerm(payload.term);
+        }
+    }
+
+    private void handleDeleteTermCompleted(@NonNull RemoteTermPayload payload) {
+        if (payload.isError()) {
+            OnTaxonomyChanged event = new OnTaxonomyChanged(
+                    0,
+                    TaxonomyAction.DELETE_TERM
+            );
+            event.error = payload.error;
+            emitChange(event);
+        } else {
+            removeTerm(payload.term);
+        }
+    }
+
+    private void handlePushTermCompleted(@NonNull RemoteTermPayload payload) {
+        if (payload.isError()) {
+            OnTermUploaded onTermUploaded = new OnTermUploaded(payload.term);
+            onTermUploaded.error = payload.error;
+            emitChange(onTermUploaded);
+        } else {
+            if (payload.site.isUsingWpComRestApi()) {
+                // The WP.COM REST API response contains the modified term, so we're already in sync with the server
+                // All we need to do is store it and emit OnTaxonomyChanged
+                updateTerm(payload.term);
+                emitChange(new OnTermUploaded(payload.term));
+            } else {
+                // XML-RPC does not respond to new/edit term calls with the resulting term - request it from the server
+                // This needs to complete for us to obtain the slug for a newly created term
+                TaxonomySqlUtils.insertOrUpdateTerm(payload.term);
+                mTaxonomyXMLRPCClient.fetchTerm(payload.term, payload.site, TaxonomyAction.PUSH_TERM);
+            }
+        }
+    }
+
+    private void pushTerm(@NonNull RemoteTermPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mTaxonomyRestClient.pushTerm(payload.term, payload.site);
+        } else {
+            // TODO: check for WP-REST-API plugin and use it here
+            mTaxonomyXMLRPCClient.pushTerm(payload.term, payload.site);
+        }
+    }
+
+    private void deleteTerm(@NonNull RemoteTermPayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mTaxonomyRestClient.deleteTerm(payload.term, payload.site);
+        } else {
+            mTaxonomyXMLRPCClient.deleteTerm(payload.term, payload.site);
+        }
+    }
+
+    private void updateTerm(@NonNull TermModel term) {
+        int rowsAffected = TaxonomySqlUtils.insertOrUpdateTerm(term);
+
+        OnTaxonomyChanged onTaxonomyChanged = new OnTaxonomyChanged(
+                rowsAffected,
+                TaxonomyAction.UPDATE_TERM
+        );
+        emitChange(onTaxonomyChanged);
+    }
+
+    private void removeTerm(@NonNull TermModel term) {
+        int rowsAffected = TaxonomySqlUtils.removeTerm(term);
+
+        OnTaxonomyChanged onTaxonomyChanged = new OnTaxonomyChanged(
+                rowsAffected,
+                TaxonomyAction.REMOVE_TERM
+        );
+        emitChange(onTaxonomyChanged);
+    }
+
+    private void removeAllTerms() {
+        int rowsAffected = TaxonomySqlUtils.deleteAllTerms();
+
+        OnTaxonomyChanged onTaxonomyChanged = new OnTaxonomyChanged(
+                rowsAffected,
+                TaxonomyAction.REMOVE_ALL_TERMS
+        );
+        emitChange(onTaxonomyChanged);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeCoroutineStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeCoroutineStore.kt
new file mode 100644
index 00000000000..de8909dd971
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeCoroutineStore.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.ThemeCoroutineRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ThemeCoroutineStore @Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val themeRestClient: ThemeCoroutineRestClient,
+) {
+    suspend fun fetchDemoThemePages(demoThemeUrl: String): List<DemoPage> =
+        coroutineEngine.withDefaultContext(
+            T.API,
+            this,
+            "Fetching demo pages for theme $demoThemeUrl"
+        ) {
+            val response = themeRestClient.fetchThemeDemoPages(demoThemeUrl)
+            when {
+                response.isError || response.result == null -> emptyList()
+                else -> response.result
+                    .toList()
+                    .map {
+                        DemoPage(
+                            link = it.link,
+                            title = it.title.rendered,
+                            slug = it.slug
+                        )
+                    }
+            }
+        }
+
+    data class DemoPage(
+        val link: String,
+        val title: String,
+        val slug: String
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeStore.java
new file mode 100644
index 00000000000..70b80b37b09
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/ThemeStore.java
@@ -0,0 +1,525 @@
+package org.wordpress.android.fluxc.store;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.ThemeAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.model.ThemeModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory;
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.ThemeRestClient;
+import org.wordpress.android.fluxc.persistence.ThemeSqlUtils;
+import org.wordpress.android.util.AppLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class ThemeStore extends Store {
+    public static final String MOBILE_FRIENDLY_CATEGORY_BLOG = "starting-blog";
+    public static final String MOBILE_FRIENDLY_CATEGORY_WEBSITE = "starting-website";
+    public static final String MOBILE_FRIENDLY_CATEGORY_PORTFOLIO = "starting-portfolio";
+
+    // A high number to ensure we get all themes in one request
+    private static final int DEFAULT_LIMIT_OF_THEME_RESULTS = 500;
+
+    // Payloads
+    public static class FetchWPComThemesPayload extends Payload<BaseNetworkError> {
+        @Nullable public String filter;
+        public int resultsLimit = DEFAULT_LIMIT_OF_THEME_RESULTS;
+
+        public FetchWPComThemesPayload() {}
+
+        public FetchWPComThemesPayload(@Nullable String filter) {
+            this.filter = filter;
+        }
+
+        public FetchWPComThemesPayload(@Nullable String filter, int resultsLimit) {
+            this.filter = filter;
+            this.resultsLimit = resultsLimit;
+        }
+    }
+
+    public static class FetchedCurrentThemePayload extends Payload<ThemesError> {
+        @NonNull public SiteModel site;
+        @Nullable public ThemeModel theme;
+
+        public FetchedCurrentThemePayload(@NonNull SiteModel site, @NonNull ThemesError error) {
+            this.site = site;
+            this.error = error;
+        }
+
+        public FetchedCurrentThemePayload(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    public static class FetchedSiteThemesPayload extends Payload<ThemesError> {
+        @NonNull public SiteModel site;
+        @Nullable public List<ThemeModel> themes;
+
+        public FetchedSiteThemesPayload(@NonNull SiteModel site, @NonNull ThemesError error) {
+            this.site = site;
+            this.error = error;
+        }
+
+        public FetchedSiteThemesPayload(@NonNull SiteModel site, @NonNull List<ThemeModel> themes) {
+            this.site = site;
+            this.themes = themes;
+        }
+    }
+
+    public static class FetchedWpComThemesPayload extends Payload<ThemesError> {
+        @NonNull public List<ThemeModel> themes;
+
+        public FetchedWpComThemesPayload(@NonNull ThemesError error) {
+            this.error = error;
+            this.themes = new ArrayList<>();
+        }
+
+        public FetchedWpComThemesPayload(@NonNull List<ThemeModel> themes) {
+            this.themes = themes;
+        }
+    }
+
+    public static class SiteThemePayload extends Payload<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeModel theme;
+
+        public SiteThemePayload(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    public static class FetchStarterDesignsPayload extends Payload<BaseNetworkError> {
+        @Nullable public Float previewWidth;
+        @Nullable public Float previewHeight;
+        @Nullable public Float scale;
+        @Nullable public String[] groups;
+
+        public FetchStarterDesignsPayload(
+                @Nullable Float previewWidth,
+                @Nullable Float previewHeight,
+                @Nullable Float scale,
+                @Nullable String... groups) {
+            this.previewWidth = previewWidth;
+            this.previewHeight = previewHeight;
+            this.scale = scale;
+            this.groups = groups;
+        }
+    }
+
+    public static class FetchedStarterDesignsPayload extends Payload<ThemesError> {
+        @NonNull public List<StarterDesign> designs;
+        @NonNull public List<StarterDesignCategory> categories;
+
+        public FetchedStarterDesignsPayload(@NonNull ThemesError error) {
+            this.error = error;
+            this.designs = new ArrayList<>();
+            this.categories = new ArrayList<>();
+        }
+
+        public FetchedStarterDesignsPayload(
+                @NonNull List<StarterDesign> designs,
+                @NonNull List<StarterDesignCategory> categories) {
+            this.designs = designs;
+            this.categories = categories;
+        }
+    }
+
+    public enum ThemeErrorType {
+        GENERIC_ERROR,
+        UNAUTHORIZED,
+        NOT_AVAILABLE,
+        THEME_NOT_FOUND,
+        THEME_ALREADY_INSTALLED,
+        UNKNOWN_THEME,
+        MISSING_THEME;
+
+        @NonNull
+        public static ThemeErrorType fromString(@NonNull String type) {
+            for (ThemeErrorType v : ThemeErrorType.values()) {
+                if (type.equalsIgnoreCase(v.name())) {
+                    return v;
+                }
+            }
+            return GENERIC_ERROR;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class ThemesError implements OnChangedError {
+        @NonNull public ThemeErrorType type;
+        @Nullable public String message;
+
+        public ThemesError(@NonNull String type, @Nullable String message) {
+            this.type = ThemeErrorType.fromString(type);
+            this.message = message;
+        }
+
+        public ThemesError(@NonNull ThemeErrorType type) {
+            this.type = type;
+        }
+    }
+
+    // OnChanged events
+    @SuppressWarnings("WeakerAccess")
+    public static class OnSiteThemesChanged extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeAction origin;
+
+        public OnSiteThemesChanged(@NonNull SiteModel site, @NonNull ThemeAction origin) {
+            this.site = site;
+            this.origin = origin;
+        }
+    }
+
+    public static class OnWpComThemesChanged extends OnChanged<ThemesError> {
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnCurrentThemeFetched extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @Nullable public ThemeModel theme;
+
+        public OnCurrentThemeFetched(@NonNull SiteModel site, @Nullable ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnThemeActivated extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeModel theme;
+
+        public OnThemeActivated(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnThemeRemoved extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeModel theme;
+
+        public OnThemeRemoved(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnThemeDeleted extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeModel theme;
+
+        public OnThemeDeleted(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static class OnThemeInstalled extends OnChanged<ThemesError> {
+        @NonNull public SiteModel site;
+        @NonNull public ThemeModel theme;
+
+        public OnThemeInstalled(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+            this.site = site;
+            this.theme = theme;
+        }
+    }
+
+    public static class OnStarterDesignsFetched extends OnChanged<ThemesError> {
+        @NonNull public List<StarterDesign> designs;
+        @NonNull public List<StarterDesignCategory> categories;
+
+        public OnStarterDesignsFetched(
+                @NonNull List<StarterDesign> designs,
+                @NonNull List<StarterDesignCategory> categories,
+                @Nullable ThemesError error) {
+            this.designs = designs;
+            this.categories = categories;
+            this.error = error;
+        }
+    }
+
+    private final ThemeRestClient mThemeRestClient;
+
+    @Inject public ThemeStore(Dispatcher dispatcher, ThemeRestClient themeRestClient) {
+        super(dispatcher);
+        mThemeRestClient = themeRestClient;
+    }
+
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (!(actionType instanceof ThemeAction)) {
+            return;
+        }
+        switch ((ThemeAction) actionType) {
+            case FETCH_WP_COM_THEMES:
+                fetchWpComThemes((FetchWPComThemesPayload) action.getPayload());
+                break;
+            case FETCHED_WP_COM_THEMES:
+                handleWpComThemesFetched((FetchedWpComThemesPayload) action.getPayload());
+                break;
+            case FETCH_INSTALLED_THEMES:
+                fetchInstalledThemes((SiteModel) action.getPayload());
+                break;
+            case FETCHED_INSTALLED_THEMES:
+                handleInstalledThemesFetched((FetchedSiteThemesPayload) action.getPayload());
+                break;
+            case FETCH_CURRENT_THEME:
+                fetchCurrentTheme((SiteModel) action.getPayload());
+                break;
+            case FETCHED_CURRENT_THEME:
+                handleCurrentThemeFetched((FetchedCurrentThemePayload) action.getPayload());
+                break;
+            case ACTIVATE_THEME:
+                activateTheme((SiteThemePayload) action.getPayload());
+                break;
+            case ACTIVATED_THEME:
+                handleThemeActivated((SiteThemePayload) action.getPayload());
+                break;
+            case INSTALL_THEME:
+                installTheme((SiteThemePayload) action.getPayload());
+                break;
+            case INSTALLED_THEME:
+                handleThemeInstalled((SiteThemePayload) action.getPayload());
+                break;
+            case DELETE_THEME:
+                deleteTheme((SiteThemePayload) action.getPayload());
+                break;
+            case DELETED_THEME:
+                handleThemeDeleted((SiteThemePayload) action.getPayload());
+                break;
+            case REMOVE_SITE_THEMES:
+                removeSiteThemes((SiteModel) action.getPayload());
+                break;
+            case FETCH_STARTER_DESIGNS:
+                fetchStarterDesigns((FetchStarterDesignsPayload) action.getPayload());
+                break;
+            case FETCHED_STARTER_DESIGNS:
+                handleStarterDesignsFetched((FetchedStarterDesignsPayload) action.getPayload());
+                break;
+        }
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(AppLog.T.API, "ThemeStore onRegister");
+    }
+
+    @NonNull
+    public List<ThemeModel> getWpComThemes() {
+        return ThemeSqlUtils.getWpComThemes();
+    }
+
+    @NonNull
+    public List<ThemeModel> getWpComThemes(@NonNull List<String> themeIds) {
+        return ThemeSqlUtils.getWpComThemes(themeIds);
+    }
+
+    @NonNull
+    public List<ThemeModel> getWpComMobileFriendlyThemes(@NonNull String categorySlug) {
+        return ThemeSqlUtils.getWpComMobileFriendlyThemes(categorySlug);
+    }
+
+    @NonNull
+    public List<ThemeModel> getThemesForSite(@NonNull SiteModel site) {
+        return ThemeSqlUtils.getThemesForSite(site);
+    }
+
+    @Nullable
+    public ThemeModel getInstalledThemeByThemeId(@NonNull SiteModel siteModel, @NonNull String themeId) {
+        if (TextUtils.isEmpty(themeId)) {
+            return null;
+        }
+        return ThemeSqlUtils.getSiteThemeByThemeId(siteModel, themeId);
+    }
+
+    @Nullable
+    @SuppressWarnings("WeakerAccess")
+    public ThemeModel getWpComThemeByThemeId(@NonNull String themeId) {
+        if (TextUtils.isEmpty(themeId)) {
+            return null;
+        }
+        return ThemeSqlUtils.getWpComThemeByThemeId(themeId);
+    }
+
+    @Nullable
+    public ThemeModel getActiveThemeForSite(@NonNull SiteModel site) {
+        List<ThemeModel> activeTheme = ThemeSqlUtils.getActiveThemeForSite(site);
+        return activeTheme.isEmpty() ? null : activeTheme.get(0);
+    }
+
+    public void setActiveThemeForSite(@NonNull SiteModel site, @NonNull ThemeModel theme) {
+        ThemeSqlUtils.insertOrReplaceActiveThemeForSite(site, theme);
+    }
+
+    private void fetchWpComThemes(@NonNull FetchWPComThemesPayload payload) {
+        mThemeRestClient.fetchWpComThemes(payload.filter, payload.resultsLimit);
+    }
+
+    private void fetchStarterDesigns(@NonNull FetchStarterDesignsPayload payload) {
+        mThemeRestClient.fetchStarterDesigns(
+                payload.previewWidth,
+                payload.previewHeight,
+                payload.scale,
+                payload.groups);
+    }
+
+    private void handleWpComThemesFetched(@NonNull FetchedWpComThemesPayload payload) {
+        OnWpComThemesChanged event = new OnWpComThemesChanged();
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            ThemeSqlUtils.insertOrReplaceWpComThemes(payload.themes);
+        }
+        emitChange(event);
+    }
+
+    private void fetchInstalledThemes(@NonNull SiteModel site) {
+        if (site.isJetpackConnected() && site.isUsingWpComRestApi()) {
+            mThemeRestClient.fetchJetpackInstalledThemes(site);
+        } else {
+            ThemesError error = new ThemesError(ThemeErrorType.NOT_AVAILABLE);
+            FetchedSiteThemesPayload payload = new FetchedSiteThemesPayload(site, error);
+            handleInstalledThemesFetched(payload);
+        }
+    }
+
+    private void handleInstalledThemesFetched(@NonNull FetchedSiteThemesPayload payload) {
+        OnSiteThemesChanged event = new OnSiteThemesChanged(payload.site, ThemeAction.FETCH_INSTALLED_THEMES);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            if (payload.themes != null) {
+                ThemeSqlUtils.insertOrReplaceInstalledThemes(payload.site, payload.themes);
+            } else {
+                AppLog.w(AppLog.T.THEMES, "Fetched site themes payload themes is null.");
+            }
+        }
+        emitChange(event);
+    }
+
+    private void fetchCurrentTheme(@NonNull SiteModel site) {
+        if (site.isUsingWpComRestApi()) {
+            mThemeRestClient.fetchCurrentTheme(site);
+        } else {
+            ThemesError error = new ThemesError(ThemeErrorType.NOT_AVAILABLE);
+            FetchedCurrentThemePayload payload = new FetchedCurrentThemePayload(site, error);
+            handleCurrentThemeFetched(payload);
+        }
+    }
+
+    private void handleCurrentThemeFetched(@NonNull FetchedCurrentThemePayload payload) {
+        OnCurrentThemeFetched event = new OnCurrentThemeFetched(payload.site, payload.theme);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            if (payload.theme != null) {
+                ThemeSqlUtils.insertOrReplaceActiveThemeForSite(payload.site, payload.theme);
+            } else {
+                AppLog.w(AppLog.T.THEMES, "Fetched current theme payload theme is null.");
+            }
+        }
+        emitChange(event);
+    }
+
+    private void installTheme(@NonNull SiteThemePayload payload) {
+        if (payload.site.isJetpackConnected() && payload.site.isUsingWpComRestApi()) {
+            mThemeRestClient.installTheme(payload.site, payload.theme);
+        } else {
+            payload.error = new ThemesError(ThemeErrorType.NOT_AVAILABLE);
+            handleThemeInstalled(payload);
+        }
+    }
+
+    private void handleThemeInstalled(@NonNull SiteThemePayload payload) {
+        OnThemeInstalled event = new OnThemeInstalled(payload.site, payload.theme);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            ThemeSqlUtils.insertOrUpdateSiteTheme(payload.site, payload.theme);
+        }
+        emitChange(event);
+    }
+
+    private void activateTheme(@NonNull SiteThemePayload payload) {
+        if (payload.site.isUsingWpComRestApi()) {
+            mThemeRestClient.activateTheme(payload.site, payload.theme);
+        } else {
+            payload.error = new ThemesError(ThemeErrorType.NOT_AVAILABLE);
+            handleThemeActivated(payload);
+        }
+    }
+
+    private void handleThemeActivated(@NonNull SiteThemePayload payload) {
+        OnThemeActivated event = new OnThemeActivated(payload.site, payload.theme);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            ThemeModel activatedTheme;
+            // payload theme doesn't have all the data so we grab a copy of the database theme and update active flag
+            if (payload.site.isJetpackConnected()) {
+                activatedTheme = getInstalledThemeByThemeId(payload.site, payload.theme.getThemeId());
+            } else {
+                activatedTheme = getWpComThemeByThemeId(payload.theme.getThemeId());
+            }
+            if (activatedTheme != null) {
+                setActiveThemeForSite(payload.site, activatedTheme);
+            }
+        }
+        emitChange(event);
+    }
+
+    private void deleteTheme(@NonNull SiteThemePayload payload) {
+        if (payload.site.isJetpackConnected() && payload.site.isUsingWpComRestApi()) {
+            mThemeRestClient.deleteTheme(payload.site, payload.theme);
+        } else {
+            payload.error = new ThemesError(ThemeErrorType.NOT_AVAILABLE);
+            handleThemeDeleted(payload);
+        }
+    }
+
+    private void handleThemeDeleted(@NonNull SiteThemePayload payload) {
+        OnThemeDeleted event = new OnThemeDeleted(payload.site, payload.theme);
+        if (payload.isError()) {
+            event.error = payload.error;
+        } else {
+            ThemeSqlUtils.removeSiteTheme(payload.site, payload.theme);
+        }
+        emitChange(event);
+    }
+
+    private void removeSiteThemes(@NonNull SiteModel site) {
+        ThemeSqlUtils.removeSiteThemes(site);
+        emitChange(new OnSiteThemesChanged(site, ThemeAction.REMOVE_SITE_THEMES));
+    }
+
+    private void handleStarterDesignsFetched(@NonNull FetchedStarterDesignsPayload payload) {
+        OnStarterDesignsFetched event = new OnStarterDesignsFetched(payload.designs, payload.categories, payload.error);
+        emitChange(event);
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TransactionsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TransactionsStore.kt
new file mode 100644
index 00000000000..a67b2338423
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/TransactionsStore.kt
@@ -0,0 +1,249 @@
+package org.wordpress.android.fluxc.store
+
+import android.text.TextUtils
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.TransactionAction
+import org.wordpress.android.fluxc.action.TransactionAction.CREATE_SHOPPING_CART
+import org.wordpress.android.fluxc.action.TransactionAction.CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN
+import org.wordpress.android.fluxc.action.TransactionAction.FETCH_SUPPORTED_COUNTRIES
+import org.wordpress.android.fluxc.action.TransactionAction.REDEEM_CART_WITH_CREDITS
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.DomainContactModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.SupportedDomainCountry
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.transactions.TransactionsRestClient.CreateShoppingCartResponse
+import org.wordpress.android.fluxc.store.TransactionsStore.FetchSupportedCountriesErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TransactionsStore @Inject constructor(
+    private val transactionsRestClient: TransactionsRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        when (action.type as? TransactionAction ?: return) {
+            FETCH_SUPPORTED_COUNTRIES -> {
+                coroutineEngine.launch(AppLog.T.API, this, "FETCH_SUPPORTED_COUNTRIES") {
+                    emitChange(fetchSupportedCountries())
+                }
+            }
+
+            CREATE_SHOPPING_CART -> {
+                coroutineEngine.launch(AppLog.T.API, this, "CREATE_SHOPPING_CART") {
+                    val payload = action.payload as CreateShoppingCartPayload
+                    emitChange(createShoppingCart(payload.toCreateShoppingCartWithDomainAndPlanPayload()))
+                }
+            }
+
+            CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN -> {
+                coroutineEngine.launch(
+                        AppLog.T.API,
+                        this,
+                        "CREATE_SHOPPING_CART_WITH_DOMAIN_AND_PLAN"
+                ) {
+                    emitChange(createShoppingCart(action.payload as CreateShoppingCartWithDomainAndPlanPayload))
+                }
+            }
+
+            REDEEM_CART_WITH_CREDITS -> {
+                coroutineEngine.launch(AppLog.T.API, this, "REDEEM_CART_WITH_CREDITS") {
+                    emitChange(redeemCartUsingCredits(action.payload as RedeemShoppingCartPayload))
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchSupportedCountries(): OnSupportedCountriesFetched {
+        val supportedCountriesPayload = transactionsRestClient.fetchSupportedCountries()
+
+        return if (!supportedCountriesPayload.isError) {
+            // api returns couple of objects with empty names and codes so we need to filter them out
+            val filteredCountries: Array<SupportedDomainCountry>? = supportedCountriesPayload.countries?.filter {
+                !TextUtils.isEmpty(it.code) && !TextUtils.isEmpty(it.name)
+            }?.toTypedArray()
+
+            OnSupportedCountriesFetched(filteredCountries?.toMutableList())
+        } else {
+            OnSupportedCountriesFetched(
+                    FetchSupportedCountriesError(
+                            GENERIC_ERROR,
+                            supportedCountriesPayload.error.message
+                    )
+            )
+        }
+    }
+
+    private suspend fun createShoppingCart(payload: CreateShoppingCartWithDomainAndPlanPayload): OnShoppingCartCreated {
+        val createdShoppingCartWithDomainAndPlanPayload = transactionsRestClient.createShoppingCart(
+                payload.site,
+                payload.domainProductId,
+                payload.domainName,
+                payload.isDomainPrivacyEnabled,
+                payload.isTemporary,
+                payload.planProductId
+        )
+
+        return if (!createdShoppingCartWithDomainAndPlanPayload.isError) {
+            OnShoppingCartCreated(createdShoppingCartWithDomainAndPlanPayload.cartDetails)
+        } else {
+            OnShoppingCartCreated(
+                    CreateShoppingCartError(
+                            CreateCartErrorType.GENERIC_ERROR,
+                            createdShoppingCartWithDomainAndPlanPayload.error.message
+                    )
+            )
+        }
+    }
+
+    private suspend fun redeemCartUsingCredits(payload: RedeemShoppingCartPayload): OnShoppingCartRedeemed {
+        val cartRedeemedPayload = transactionsRestClient.redeemCartUsingCredits(
+                payload.cartDetails,
+                payload.domainContactModel
+        )
+
+        return if (!cartRedeemedPayload.isError) {
+            OnShoppingCartRedeemed(cartRedeemedPayload.success)
+        } else {
+            OnShoppingCartRedeemed(cartRedeemedPayload.error)
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, TransactionsStore::class.java.simpleName + " onRegister")
+    }
+
+    // Actions
+
+    data class OnSupportedCountriesFetched(
+        val countries: List<SupportedDomainCountry>? = null
+    ) : Store.OnChanged<FetchSupportedCountriesError>() {
+        constructor(error: FetchSupportedCountriesError) : this() {
+            this.error = error
+        }
+    }
+
+    data class OnShoppingCartCreated(
+        val cartDetails: CreateShoppingCartResponse? = null
+    ) : Store.OnChanged<CreateShoppingCartError>() {
+        constructor(error: CreateShoppingCartError) : this() {
+            this.error = error
+        }
+    }
+
+    data class OnShoppingCartRedeemed(val success: Boolean = false) : Store.OnChanged<RedeemShoppingCartError>() {
+        constructor(error: RedeemShoppingCartError) : this() {
+            this.error = error
+        }
+    }
+
+    // Payloads
+
+    // Shopping cart with only domain
+    @Deprecated("Use CreateShoppingCartWithDomainAndPlanPayload with null 'planProductId' instead")
+    class CreateShoppingCartPayload(
+        val site: SiteModel,
+        val productId: Int,
+        val domainName: String,
+        val isPrivacyEnabled: Boolean,
+        val isTemporary: Boolean = true
+    ) : Payload<BaseRequest.BaseNetworkError>() {
+        fun toCreateShoppingCartWithDomainAndPlanPayload() =
+                CreateShoppingCartWithDomainAndPlanPayload(
+                        site = site,
+                        domainProductId = productId,
+                        domainName = domainName,
+                        isDomainPrivacyEnabled = isPrivacyEnabled,
+                        planProductId = null,
+                        isTemporary = isTemporary
+                ).apply { error = this@CreateShoppingCartPayload.error }
+    }
+
+    class CreateShoppingCartWithDomainAndPlanPayload(
+        val site: SiteModel?,
+        val domainProductId: Int,
+        val domainName: String,
+        val isDomainPrivacyEnabled: Boolean,
+        val planProductId: Int? = null,
+        val isTemporary: Boolean = true
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class RedeemShoppingCartPayload(
+        val cartDetails: CreateShoppingCartResponse,
+        val domainContactModel: DomainContactModel
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class FetchedSupportedCountriesPayload(
+        val countries: Array<SupportedDomainCountry>? = null
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class CreatedShoppingCartPayload(
+        val cartDetails: CreateShoppingCartResponse? = null
+    ) : Payload<BaseRequest.BaseNetworkError>()
+
+    class RedeemedShoppingCartPayload(
+        val success: Boolean
+    ) : Payload<RedeemShoppingCartError>()
+
+    // Errors
+
+    data class FetchSupportedCountriesError(val type: FetchSupportedCountriesErrorType, val message: String = "") :
+            OnChangedError
+
+    data class CreateShoppingCartError(
+        val type: CreateCartErrorType,
+        val message: String = ""
+    ) : OnChangedError
+
+    data class RedeemShoppingCartError(
+        val type: TransactionErrorType,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class FetchSupportedCountriesErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class CreateCartErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class TransactionErrorType {
+        FIRST_NAME,
+        LAST_NAME,
+        ORGANIZATION,
+        ADDRESS_1,
+        ADDRESS_2,
+        POSTAL_CODE,
+        CITY,
+        STATE,
+        COUNTRY_CODE,
+        EMAIL,
+        PHONE,
+        FAX,
+        INSUFFICIENT_FUNDS,
+        OTHER;
+
+        companion object {
+            fun fromString(string: String?): TransactionErrorType {
+                if (string != null) {
+                    for (v in values()) {
+                        if (string.equals(v.name, ignoreCase = true)) {
+                            return v
+                        }
+                    }
+                }
+                return OTHER
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/UploadStore.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/UploadStore.java
new file mode 100644
index 00000000000..1f63b8ccc4d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/UploadStore.java
@@ -0,0 +1,499 @@
+package org.wordpress.android.fluxc.store;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.wordpress.android.fluxc.Dispatcher;
+import org.wordpress.android.fluxc.Payload;
+import org.wordpress.android.fluxc.action.MediaAction;
+import org.wordpress.android.fluxc.action.UploadAction;
+import org.wordpress.android.fluxc.annotations.action.Action;
+import org.wordpress.android.fluxc.annotations.action.IAction;
+import org.wordpress.android.fluxc.generated.MediaActionBuilder;
+import org.wordpress.android.fluxc.generated.PostActionBuilder;
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState;
+import org.wordpress.android.fluxc.model.MediaUploadModel;
+import org.wordpress.android.fluxc.model.PostImmutableModel;
+import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.PostUploadModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.persistence.MediaSqlUtils;
+import org.wordpress.android.fluxc.persistence.UploadSqlUtils;
+import org.wordpress.android.fluxc.store.MediaStore.CancelMediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.MediaError;
+import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType;
+import org.wordpress.android.fluxc.store.MediaStore.MediaPayload;
+import org.wordpress.android.fluxc.store.MediaStore.ProgressPayload;
+import org.wordpress.android.fluxc.store.PostStore.PostError;
+import org.wordpress.android.fluxc.store.PostStore.PostErrorType;
+import org.wordpress.android.fluxc.store.PostStore.RemoteAutoSavePostPayload;
+import org.wordpress.android.fluxc.store.PostStore.RemotePostPayload;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type;
+import org.wordpress.android.fluxc.utils.MediaUtils;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class UploadStore extends Store {
+    public static class ClearMediaPayload extends Payload<BaseNetworkError> {
+        public PostImmutableModel post;
+        public Set<MediaModel> media;
+        public ClearMediaPayload(PostImmutableModel post, Set<MediaModel> media) {
+            this.post = post;
+            this.media = media;
+        }
+    }
+
+    public static class OnUploadChanged extends OnChanged<UploadError> {
+        public UploadAction cause;
+
+        public OnUploadChanged(UploadAction cause) {
+            this(cause, null);
+        }
+
+        public OnUploadChanged(UploadAction cause, UploadError error) {
+            this.cause = cause;
+            this.error = error;
+        }
+    }
+
+    public static class UploadError implements OnChangedError {
+        public PostError postError;
+        public MediaError mediaError;
+
+        public UploadError(PostError postError) {
+            this.postError = postError;
+        }
+
+        public UploadError(MediaError mediaError) {
+            this.mediaError = mediaError;
+        }
+    }
+
+    @Inject public UploadStore(Dispatcher dispatcher) {
+        super(dispatcher);
+    }
+
+    @Override
+    public void onRegister() {
+        AppLog.d(T.API, "UploadStore onRegister");
+    }
+
+    // Ensure that events reach the UploadStore before their main stores (MediaStore, PostStore)
+    @Subscribe(threadMode = ThreadMode.ASYNC, priority = 1)
+    @Override
+    public void onAction(Action action) {
+        IAction actionType = action.getType();
+        if (actionType instanceof UploadAction) {
+            onUploadAction((UploadAction) actionType, action.getPayload());
+        } else if (actionType instanceof MediaAction) {
+            onMediaAction((MediaAction) actionType, action.getPayload());
+        }
+    }
+
+    private void onUploadAction(UploadAction actionType, Object payload) {
+        switch (actionType) {
+            case UPLOADED_MEDIA:
+                handleMediaUploaded((ProgressPayload) payload);
+                mDispatcher.dispatch(MediaActionBuilder.newUploadedMediaAction((ProgressPayload) payload));
+                break;
+            case PUSHED_POST:
+                handlePostUploaded((RemotePostPayload) payload);
+                mDispatcher.dispatch(PostActionBuilder.newPushedPostAction((RemotePostPayload) payload));
+                break;
+            case REMOTE_AUTO_SAVED_POST:
+                handleRemoteAutoSavedPost((RemoteAutoSavePostPayload) payload);
+                mDispatcher
+                        .dispatch(PostActionBuilder.newRemoteAutoSavedPostAction((RemoteAutoSavePostPayload) payload));
+                break;
+            case INCREMENT_NUMBER_OF_AUTO_UPLOAD_ATTEMPTS:
+                handleIncrementNumberOfAutoUploadAttempts((PostImmutableModel) payload);
+                break;
+            case CANCEL_POST:
+                handleCancelPost((PostImmutableModel) payload);
+                break;
+            case CLEAR_MEDIA_FOR_POST:
+                handleClearMediaForPost((ClearMediaPayload) payload);
+                break;
+        }
+    }
+
+    @SuppressWarnings("EnumSwitchStatementWhichMissesCases")
+    private void onMediaAction(MediaAction actionType, @NonNull Object payload) {
+        switch (actionType) {
+            case UPLOAD_MEDIA:
+                handleUploadMedia((MediaPayload) payload);
+                break;
+            case CANCEL_MEDIA_UPLOAD:
+                handleCancelMedia((CancelMediaPayload) payload);
+                break;
+            case UPDATE_MEDIA:
+                handleUpdateMedia((MediaModel) payload);
+                break;
+        }
+    }
+
+    public void registerPostModel(PostImmutableModel postModel, List<MediaModel> mediaModelList) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId());
+        Set<Integer> mediaIdSet = new HashSet<>();
+
+        if (postUploadModel != null) {
+            // Keep any existing media associated with this post
+            mediaIdSet.addAll(postUploadModel.getAssociatedMediaIdSet());
+        } else {
+            postUploadModel = new PostUploadModel(postModel.getId());
+        }
+
+        for (MediaModel mediaModel : mediaModelList) {
+            mediaIdSet.add(mediaModel.getId());
+        }
+
+        postUploadModel.setAssociatedMediaIdSet(mediaIdSet);
+        postUploadModel.setUploadState(PostUploadModel.PENDING);
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+    }
+
+    public @NonNull Set<MediaModel> getUploadingMediaForPost(PostImmutableModel post) {
+        return getMediaForPostWithState(post, MediaUploadModel.UPLOADING);
+    }
+
+    public @NonNull Set<MediaModel> getCompletedMediaForPost(PostImmutableModel post) {
+        return getMediaForPostWithState(post, MediaUploadModel.COMPLETED);
+    }
+
+    public @NonNull Set<MediaModel> getFailedMediaForPost(PostImmutableModel post) {
+        return getMediaForPostWithState(post, MediaUploadModel.FAILED);
+    }
+
+    public @NonNull List<PostModel> getPendingPosts() {
+        List<PostUploadModel> postUploadModels = UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.PENDING);
+        return UploadSqlUtils.getPostModelsForPostUploadModels(postUploadModels);
+    }
+
+    public @NonNull List<PostModel> getFailedPosts() {
+        List<PostUploadModel> postUploadModels = UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.FAILED);
+        return UploadSqlUtils.getPostModelsForPostUploadModels(postUploadModels);
+    }
+
+    public @NonNull List<PostModel> getCancelledPosts() {
+        List<PostUploadModel> postUploadModels = UploadSqlUtils.getPostUploadModelsWithState(PostUploadModel.CANCELLED);
+        return UploadSqlUtils.getPostModelsForPostUploadModels(postUploadModels);
+    }
+
+    public @NonNull List<PostModel> getAllRegisteredPosts() {
+        List<PostUploadModel> postUploadModels = UploadSqlUtils.getAllPostUploadModels();
+        return UploadSqlUtils.getPostModelsForPostUploadModels(postUploadModels);
+    }
+
+    public boolean isPendingPost(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        return postUploadModel != null && postUploadModel.getUploadState() == PostUploadModel.PENDING;
+    }
+
+    public boolean isFailedPost(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        return postUploadModel != null && postUploadModel.getUploadState() == PostUploadModel.FAILED;
+    }
+
+    public boolean isCancelledPost(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        return postUploadModel != null && postUploadModel.getUploadState() == PostUploadModel.CANCELLED;
+    }
+
+    public boolean isRegisteredPostModel(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        return postUploadModel != null;
+    }
+
+    public int getNumberOfPostAutoUploadAttempts(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        if (postUploadModel == null) {
+            return 0;
+        }
+        return postUploadModel.getNumberOfAutoUploadAttempts();
+    }
+
+    /**
+     * If the {@code postModel} has been registered as uploading with the UploadStore, this will return the associated
+     * {@link PostError}, if any.
+     * Otherwise, whether or not the {@code postModel} has been registered as uploading with the UploadStore, this
+     * will check all media attached to the {@code postModel} and will return the first error it finds.
+     */
+    public @Nullable UploadError getUploadErrorForPost(PostImmutableModel postModel) {
+        if (postModel == null) return null;
+
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId());
+        if (postUploadModel == null) {
+            // If there's no matching PostUploadModel, we might still have associated MediaUploadModels that have errors
+            Set<MediaUploadModel> mediaUploadModels = UploadSqlUtils.getMediaUploadModelsForPostId(postModel.getId());
+            for (MediaUploadModel mediaUploadModel : mediaUploadModels) {
+                if (mediaUploadModel.getMediaError() != null) {
+                    return new UploadError(mediaUploadModel.getMediaError());
+                }
+            }
+            return null;
+        }
+
+        if (postUploadModel.getPostError() != null) {
+            return new UploadError(postUploadModel.getPostError());
+        } else {
+            for (int localMediaId : postUploadModel.getAssociatedMediaIdSet()) {
+                MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(localMediaId);
+                if (mediaUploadModel != null && mediaUploadModel.getMediaError() != null) {
+                    return new UploadError(mediaUploadModel.getMediaError());
+                }
+            }
+        }
+        return null;
+    }
+
+    public void clearUploadErrorForPost(PostImmutableModel postModel) {
+        if (postModel == null) return;
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(postModel.getId());
+        if (postUploadModel != null) {
+            postUploadModel.setPostError(null);
+            UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+        }
+    }
+
+    public float getUploadProgressForMedia(MediaModel mediaModel) {
+        MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(mediaModel.getId());
+        if (mediaUploadModel != null) {
+            return mediaUploadModel.getProgress();
+        }
+        return 0;
+    }
+
+    private void handleUploadMedia(@NonNull MediaPayload payload) {
+        if (payload.media == null) {
+            return;
+        }
+        MediaUploadModel mediaUploadModel = new MediaUploadModel(payload.media.getId());
+        MalformedMediaArgSubType argError = MediaUtils.getMediaValidationErrorType(payload.media);
+
+        if (argError.getType() != Type.NO_ERROR) {
+            mediaUploadModel.setUploadState(MediaUploadModel.FAILED);
+            mediaUploadModel.setMediaError(
+                    new MediaError(
+                            MediaErrorType.MALFORMED_MEDIA_ARG,
+                            argError.getType().getErrorLogDescription(),
+                            argError
+                    )
+            );
+        }
+        UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+    }
+
+    private void handleMediaUploaded(@NonNull ProgressPayload payload) {
+        if (payload.media == null) {
+            return;
+        }
+
+        MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(payload.media.getId());
+        if (mediaUploadModel == null) {
+            if (!payload.isError() && !payload.canceled && !payload.completed) {
+                // This is a progress event, and the upload seems to have already been cancelled
+                // We don't want to store a new MediaUploadModel in this case, just move on
+                return;
+            }
+            mediaUploadModel = new MediaUploadModel(payload.media.getId());
+        }
+
+        if (payload.isError() || payload.canceled) {
+            mediaUploadModel.setUploadState(MediaUploadModel.FAILED);
+            if (payload.isError()) {
+                mediaUploadModel.setMediaError(payload.error);
+            }
+            UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+            if (payload.media.getLocalPostId() > 0) {
+                cancelPost(payload.media.getLocalPostId());
+            }
+            return;
+        }
+
+        if (payload.completed) {
+            mediaUploadModel.setUploadState(MediaUploadModel.COMPLETED);
+            mediaUploadModel.setProgress(1F);
+            UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+        } else {
+            if (mediaUploadModel.getProgress() < payload.progress) {
+                mediaUploadModel.setProgress(payload.progress);
+                // To avoid conflicts with another action handler updating the state of the MediaUploadModel,
+                // update the progress value only, since that's all the new information this event gives us
+                UploadSqlUtils.updateMediaProgressOnly(mediaUploadModel);
+            }
+        }
+    }
+
+    private void handleCancelMedia(@NonNull CancelMediaPayload payload) {
+        // If the cancel action has the delete flag, the corresponding MediaModel will be deleted once this action
+        // reaches the MediaStore, along with the MediaUploadModel (because of the FOREIGN KEY association)
+        // Otherwise, we should mark the MediaUploadModel as FAILED
+        if (!payload.delete) {
+            MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(payload.media.getId());
+            if (mediaUploadModel == null) {
+                mediaUploadModel = new MediaUploadModel(payload.media.getId());
+            }
+
+            mediaUploadModel.setUploadState(MediaUploadModel.FAILED);
+            UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+        }
+
+        if (payload.media.getLocalPostId() > 0) {
+            cancelPost(payload.media.getLocalPostId());
+        }
+    }
+
+    private void handleUpdateMedia(@NonNull MediaModel payload) {
+        MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(payload.getId());
+        if (mediaUploadModel == null) {
+            return;
+        }
+
+        // If the new MediaModel state is different from ours, update the MediaUploadModel to reflect it
+        MediaUploadState newUploadState = MediaUploadState.fromString(payload.getUploadState());
+        switch (mediaUploadModel.getUploadState()) {
+            case MediaUploadModel.UPLOADING:
+                if (newUploadState == MediaUploadState.FAILED) {
+                    mediaUploadModel.setUploadState(MediaUploadModel.FAILED);
+                    mediaUploadModel.setMediaError(new MediaError(MediaErrorType.GENERIC_ERROR));
+                    mediaUploadModel.setProgress(0);
+                    UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+                    // Also cancel the associated post
+                    if (payload.getLocalPostId() > 0) {
+                        cancelPost(payload.getLocalPostId());
+                    }
+                }
+                break;
+            case MediaUploadModel.COMPLETED:
+                // We never care about changes to MediaModels that are already COMPLETED
+                break;
+            case MediaUploadModel.FAILED:
+                if (newUploadState == MediaUploadState.UPLOADING || newUploadState == MediaUploadState.QUEUED) {
+                    mediaUploadModel.setUploadState(MediaUploadModel.UPLOADING);
+                    mediaUploadModel.setMediaError(null); // clear any previous errors
+                    UploadSqlUtils.insertOrUpdateMedia(mediaUploadModel);
+                }
+                break;
+        }
+    }
+
+    private void handleRemoteAutoSavedPost(@NonNull RemoteAutoSavePostPayload payload) {
+        if (payload.error != null && payload.error.type == PostErrorType.UNSUPPORTED_ACTION) {
+            // The remote-auto-save is not supported -> lets just delete the post from the queue
+            UploadSqlUtils.deletePostUploadModelWithLocalId(payload.localPostId);
+        } else {
+            handlePostUploadedOrAutoSaved(payload.localPostId, payload.error);
+        }
+    }
+
+    private void handlePostUploaded(@NonNull RemotePostPayload payload) {
+        if (payload.post == null) {
+            return;
+        }
+
+        handlePostUploadedOrAutoSaved(payload.post.getId(), payload.error);
+    }
+
+    private void handlePostUploadedOrAutoSaved(int localPostId, PostError error) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(localPostId);
+
+        if (error != null) {
+            if (postUploadModel == null) {
+                postUploadModel = new PostUploadModel(localPostId);
+            }
+            if (postUploadModel.getUploadState() != PostUploadModel.FAILED) {
+                postUploadModel.setUploadState(PostUploadModel.FAILED);
+            }
+            postUploadModel.setPostError(error);
+            UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+            return;
+        }
+
+        if (postUploadModel != null) {
+            // Delete all MediaUploadModels associated with this post since we're finished with it
+            UploadSqlUtils.deleteMediaUploadModelsWithLocalIds(postUploadModel.getAssociatedMediaIdSet());
+
+            // Delete the PostUploadModel itself
+            UploadSqlUtils.deletePostUploadModelWithLocalId(localPostId);
+        }
+    }
+
+    private void handleIncrementNumberOfAutoUploadAttempts(PostImmutableModel post) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        if (postUploadModel != null) {
+            postUploadModel.incNumberOfAutoUploadAttempts();
+            UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+        }
+    }
+
+    private void handleCancelPost(PostImmutableModel payload) {
+        if (payload != null) {
+            cancelPost(payload.getId());
+        }
+        emitChange(new OnUploadChanged(UploadAction.CANCEL_POST));
+    }
+
+    private void handleClearMediaForPost(ClearMediaPayload payload) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(payload.post.getId());
+        if (postUploadModel == null) {
+            return;
+        }
+
+        // Remove media from the list of associated media for the post
+        Set<Integer> associatedMediaIdList = postUploadModel.getAssociatedMediaIdSet();
+        for (MediaModel mediaModel : payload.media) {
+            associatedMediaIdList.remove(mediaModel.getId());
+        }
+        postUploadModel.setAssociatedMediaIdSet(associatedMediaIdList);
+        UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+
+        // Clear the MediaUploadModels
+        Set<Integer> localMediaIds = new HashSet<>();
+        for (MediaModel mediaModel : payload.media) {
+            localMediaIds.add(mediaModel.getId());
+        }
+        UploadSqlUtils.deleteMediaUploadModelsWithLocalIds(localMediaIds);
+
+        emitChange(new OnUploadChanged(UploadAction.CLEAR_MEDIA_FOR_POST));
+    }
+
+    @NonNull
+    private Set<MediaModel> getMediaForPostWithState(
+            PostImmutableModel post,
+            @MediaUploadModel.UploadState int state) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(post.getId());
+        if (postUploadModel == null) {
+            return Collections.emptySet();
+        }
+
+        Set<MediaModel> mediaModels = new HashSet<>();
+        for (int localMediaId : postUploadModel.getAssociatedMediaIdSet()) {
+            MediaUploadModel mediaUploadModel = UploadSqlUtils.getMediaUploadModelForLocalId(localMediaId);
+            if (mediaUploadModel != null && mediaUploadModel.getUploadState() == state) {
+                mediaModels.add(MediaSqlUtils.getMediaWithLocalId(localMediaId));
+            }
+        }
+        return mediaModels;
+    }
+
+    private void cancelPost(int localPostId) {
+        PostUploadModel postUploadModel = UploadSqlUtils.getPostUploadModelForLocalId(localPostId);
+        if (postUploadModel != null && postUploadModel.getUploadState() != PostUploadModel.CANCELLED) {
+            postUploadModel.setUploadState(PostUploadModel.CANCELLED);
+            UploadSqlUtils.insertOrUpdatePost(postUploadModel);
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/VerticalStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/VerticalStore.kt
new file mode 100644
index 00000000000..26f1bedce35
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/VerticalStore.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.VerticalAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.vertical.VerticalSegmentModel
+import org.wordpress.android.fluxc.network.rest.wpcom.vertical.VerticalRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class VerticalStore @Inject constructor(
+    private val verticalRestClient: VerticalRestClient,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? VerticalAction ?: return
+
+        when (actionType) {
+            VerticalAction.FETCH_SEGMENTS -> {
+                coroutineEngine.launch(AppLog.T.API, this, "FETCH_SEGMENTS") {
+                    emitChange(fetchSegments())
+                }
+            }
+        }
+    }
+
+    override fun onRegister() {
+        AppLog.d(AppLog.T.API, VerticalStore::class.java.simpleName + " onRegister")
+    }
+
+    private suspend fun fetchSegments(): OnSegmentsFetched {
+        val fetchedSegmentsPayload = verticalRestClient.fetchSegments()
+        return OnSegmentsFetched(fetchedSegmentsPayload.segmentList, fetchedSegmentsPayload.error)
+    }
+
+    class OnSegmentsFetched(
+        val segmentList: List<VerticalSegmentModel>,
+        error: FetchSegmentsError? = null
+    ) : Store.OnChanged<FetchSegmentsError>() {
+        init {
+            this.error = error
+        }
+    }
+
+    class FetchSegmentPromptPayload(val segmentId: Long)
+
+    class FetchedSegmentsPayload(val segmentList: List<VerticalSegmentModel>) : Payload<FetchSegmentsError>() {
+        constructor(error: FetchSegmentsError) : this(emptyList()) {
+            this.error = error
+        }
+    }
+
+    class FetchSegmentsError(val type: VerticalErrorType, val message: String? = null) : Store.OnChangedError
+    enum class VerticalErrorType {
+        GENERIC_ERROR
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/WhatsNewStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/WhatsNewStore.kt
new file mode 100644
index 00000000000..2c1bd04c8b0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/WhatsNewStore.kt
@@ -0,0 +1,108 @@
+package org.wordpress.android.fluxc.store
+
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.action.WhatsNewAction
+import org.wordpress.android.fluxc.action.WhatsNewAction.FETCH_CACHED_ANNOUNCEMENT
+import org.wordpress.android.fluxc.action.WhatsNewAction.FETCH_REMOTE_ANNOUNCEMENT
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.whatsnew.WhatsNewAnnouncementModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.whatsnew.WhatsNewRestClient
+import org.wordpress.android.fluxc.persistence.WhatsNewSqlUtils
+import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.AppLog.T.API
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WhatsNewStore @Inject constructor(
+    private val whatsNewRestClient: WhatsNewRestClient,
+    private val whatsNewSqlUtils: WhatsNewSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    dispatcher: Dispatcher
+) : Store(dispatcher) {
+    @Subscribe(threadMode = ThreadMode.ASYNC)
+    override fun onAction(action: Action<*>) {
+        val actionType = action.type as? WhatsNewAction ?: return
+        when (actionType) {
+            FETCH_REMOTE_ANNOUNCEMENT -> {
+                val versionName = (action.payload as WhatsNewFetchPayload).versionName
+                val appId = (action.payload as WhatsNewFetchPayload).appId
+                coroutineEngine.launch(AppLog.T.API, this, "FETCH_REMOTE_ANNOUNCEMENT") {
+                    emitChange(fetchRemoteAnnouncements(versionName, appId))
+                }
+            }
+            FETCH_CACHED_ANNOUNCEMENT -> {
+                coroutineEngine.launch(AppLog.T.API, this, "FETCH_CACHED_ANNOUNCEMENT") {
+                    emitChange(fetchCachedAnnouncements())
+                }
+            }
+        }
+    }
+
+    suspend fun fetchCachedAnnouncements() =
+            coroutineEngine.withDefaultContext(T.API, this, "fetchWhatsNew") {
+                return@withDefaultContext OnWhatsNewFetched(whatsNewSqlUtils.getAnnouncements(), true)
+            }
+
+    suspend fun fetchRemoteAnnouncements(versionName: String, appId: WhatsNewAppId) =
+            coroutineEngine.withDefaultContext(T.API, this, "fetchWhatsNew") {
+                val fetchedWhatsNewPayload = whatsNewRestClient.fetchWhatsNew(versionName, appId)
+
+                return@withDefaultContext if (!fetchedWhatsNewPayload.isError) {
+                    val fetchedAnnouncements = fetchedWhatsNewPayload.whatsNewItems
+                    whatsNewSqlUtils.updateAnnouncementCache(fetchedAnnouncements)
+                    OnWhatsNewFetched(fetchedAnnouncements)
+                } else {
+                    OnWhatsNewFetched(
+                            fetchError = WhatsNewFetchError(GENERIC_ERROR, fetchedWhatsNewPayload.error.message)
+                    )
+                }
+            }
+
+    override fun onRegister() {
+        AppLog.d(API, WhatsNewStore::class.java.simpleName + " onRegister")
+    }
+
+    class WhatsNewFetchPayload(
+        val versionName: String,
+        val appId: WhatsNewAppId
+    ) : Payload<BaseNetworkError>()
+
+    class WhatsNewFetchedPayload(
+        val whatsNewItems: List<WhatsNewAnnouncementModel>? = null
+    ) : Payload<BaseNetworkError>()
+
+    data class OnWhatsNewFetched(
+        val whatsNewItems: List<WhatsNewAnnouncementModel>? = null,
+        val isFromCache: Boolean = false,
+        val fetchError: WhatsNewFetchError? = null
+    ) : Store.OnChanged<WhatsNewFetchError>() {
+        init {
+            // we allow setting error from constructor, so it will be a part of data class
+            // and used during comparison, so we can test error events
+            this.error = fetchError
+        }
+    }
+
+    data class WhatsNewFetchError(
+        val type: WhatsNewErrorType,
+        val message: String = ""
+    ) : OnChangedError
+
+    enum class WhatsNewErrorType {
+        GENERIC_ERROR
+    }
+
+    enum class WhatsNewAppId(val id: Int) {
+        WP_ANDROID(1),
+        WOO_ANDROID(3),
+        JP_ANDROID(5)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/XPostsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/XPostsStore.kt
new file mode 100644
index 00000000000..d7fdbd39c0c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/XPostsStore.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.fluxc.store
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequestBuilder.Response
+import org.wordpress.android.fluxc.network.rest.wpcom.site.XPostsRestClient
+import org.wordpress.android.fluxc.persistence.XPostsSqlUtils
+import org.wordpress.android.fluxc.store.XPostsSource.DB
+import org.wordpress.android.fluxc.store.XPostsSource.REST_API
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+
+class XPostsStore
+@Inject constructor(
+    private val coroutineEngine: CoroutineEngine,
+    private val xPostsRestClient: XPostsRestClient,
+    private val xPostsSqlUtils: XPostsSqlUtils
+) {
+    suspend fun fetchXPosts(site: SiteModel): XPostsResult =
+            coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchXPosts") {
+                return@withDefaultContext when (val response = xPostsRestClient.fetch(site)) {
+                    is Response.Success -> {
+                        val xPosts = response.data.toList()
+                        xPostsSqlUtils.setXPostsForSite(xPosts, site)
+                        XPostsResult.apiResult(xPosts)
+                    }
+                    is Response.Error -> when (response.error.apiError) {
+                        "unauthorized",
+                        "xposts_require_o2_enabled" -> {
+                            // These errors mean the site does not support xposts for this user
+                            xPostsSqlUtils.persistNoXpostsForSite(site)
+                            XPostsResult.apiResult(emptyList())
+                        }
+                        else -> {
+                            // Call failed for unknown reason, leave db unchanged and return saved data
+                            savedXPosts(site)
+                        }
+                    }
+                }
+            }
+
+    suspend fun getXPostsFromDb(site: SiteModel): XPostsResult =
+        coroutineEngine.withDefaultContext(AppLog.T.DB, this, "getXPostsFromDb") {
+            return@withDefaultContext savedXPosts(site)
+        }
+
+    /**
+     * Returns either (a) a list of XPosts from the db wrapped in an [XPostsResult.Result], or
+     * (b) [XPostsResult.Unknown] if we have never gotten a response from the backend indicating
+     * whether this site has any XPosts.
+     */
+    private fun savedXPosts(site: SiteModel) =
+        xPostsSqlUtils.selectXPostsForSite(site)?.let {
+            XPostsResult.dbResult(it)
+        } ?: XPostsResult.Unknown
+}
+
+enum class XPostsSource { REST_API, DB }
+
+sealed class XPostsResult {
+    data class Result(val xPosts: List<XPostSiteModel>, val source: XPostsSource) : XPostsResult()
+    object Unknown : XPostsResult()
+    companion object {
+        fun dbResult(xPosts: List<XPostSiteModel>) = Result(xPosts, DB)
+        fun apiResult(xPosts: List<XPostSiteModel>) = Result(xPosts, REST_API)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/CloseAccountStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/CloseAccountStore.kt
new file mode 100644
index 00000000000..bb3437b3be6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/CloseAccountStore.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.fluxc.store.account
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.network.rest.wpcom.account.close.CloseAccountRestClient
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.store.account.CloseAccountStore.CloseAccountErrorType.EXISTING_ATOMIC_SITES
+import org.wordpress.android.fluxc.store.account.CloseAccountStore.CloseAccountErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CloseAccountStore @Inject constructor(
+    private val restClient: CloseAccountRestClient,
+    private val coroutineEngine: CoroutineEngine,
+) {
+    suspend fun closeAccount(): CloseAccountResult {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "closeAccount") {
+            val result = restClient.closeAccount()
+            when {
+                result.isError -> {
+                    val errorType = when (result.error?.apiError) {
+                        EXISTING_ATOMIC_SITES.errorKey -> EXISTING_ATOMIC_SITES
+                        else -> GENERIC_ERROR
+                    }
+                    CloseAccountResult(
+                        CloseAccountError(
+                            type = errorType,
+                            message = result.error?.message
+                        )
+                    )
+                }
+
+                else -> CloseAccountResult()
+            }
+        }
+    }
+
+    class CloseAccountResult() : Payload<CloseAccountError>() {
+        constructor(error: CloseAccountError) : this() {
+            this.error = error
+        }
+    }
+
+    class CloseAccountError(
+        val type: CloseAccountErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+
+    enum class CloseAccountErrorType(val errorKey: String) {
+        EXISTING_ATOMIC_SITES("atomic-site"),
+        GENERIC_ERROR("generic-error")
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/SignUpStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/SignUpStore.kt
new file mode 100644
index 00000000000..0ae79e38d6a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/account/SignUpStore.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.store.account
+
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.network.rest.wpcom.account.signup.SignUpRestClient
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SignUpStore @Inject constructor(
+    private val signUpRestClient: SignUpRestClient,
+    private val coroutineEngine: CoroutineEngine,
+) {
+    companion object {
+        const val EMPTY_SUCCESSFUL_RESPONSE = "Empty successful response"
+    }
+
+    suspend fun fetchUserNameSuggestions(username: String): UsernameSuggestionsResult {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchUserNameSuggestions") {
+            val result = signUpRestClient.fetchUsernameSuggestions(username)
+            when {
+                result.isError -> UsernameSuggestionsResult(UsernameSuggestionsError(result.error?.message))
+                result.result.isNullOrEmpty() -> UsernameSuggestionsResult(UsernameSuggestionsError("Empty result"))
+                else -> UsernameSuggestionsResult(result.result)
+            }
+        }
+    }
+
+    data class UsernameSuggestionsResult(
+        val suggestions: List<String>
+    ) : Payload<UsernameSuggestionsError>() {
+        constructor(error: UsernameSuggestionsError) : this(emptyList()) {
+            this.error = error
+        }
+    }
+
+    class UsernameSuggestionsError(
+        val message: String? = null
+    ) : OnChangedError
+
+    suspend fun createWpAccount(email: String, password: String, username: String): CreateWpAccountResult {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "createWpAccount") {
+            val result = signUpRestClient.createWPAccount(email, password, username)
+            when {
+                result.isError -> CreateWpAccountResult(
+                    CreateWpAccountError(result.error?.apiError)
+                )
+                result.result == null -> CreateWpAccountResult(
+                    CreateWpAccountError(EMPTY_SUCCESSFUL_RESPONSE)
+                )
+                else -> CreateWpAccountResult(result.result.success, result.result.token)
+            }
+        }
+    }
+
+    data class CreateWpAccountResult(
+        val success: Boolean,
+        val token: String
+    ) : Payload<CreateWpAccountError>() {
+        constructor(error: CreateWpAccountError) : this(false, "") {
+            this.error = error
+        }
+    }
+
+    class CreateWpAccountError(
+        val apiError: String?
+    ) : OnChangedError
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStore.kt
new file mode 100644
index 00000000000..5e05d8fb0f4
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStore.kt
@@ -0,0 +1,367 @@
+package org.wordpress.android.fluxc.store.blaze
+
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignCreationRequest
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignModel
+import org.wordpress.android.fluxc.model.blaze.BlazeCampaignsModel
+import org.wordpress.android.fluxc.model.blaze.BlazeTargetingParameters
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignListResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsError
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsFetchedPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCampaignsRestClient.Companion.DEFAULT_PER_PAGE
+import org.wordpress.android.fluxc.network.rest.wpcom.blaze.BlazeCreationRestClient
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao.BlazeCampaignEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao.BlazeCampaignObjectiveEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDao
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDeviceEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingLanguageEntity
+import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingTopicEntity
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BlazeCampaignsStore @Inject constructor(
+    private val creationRestClient: BlazeCreationRestClient,
+    private val campaignsRestClient: BlazeCampaignsRestClient,
+    private val campaignsDao: BlazeCampaignsDao,
+    private val targetingDao: BlazeTargetingDao,
+    private val coroutineEngine: CoroutineEngine,
+    private val blazeObjectivesDao: BlazeObjectivesDao
+) {
+    suspend fun fetchBlazeCampaigns(
+        site: SiteModel,
+        offset: Int = 0,
+        perPage: Int = DEFAULT_PER_PAGE,
+        locale: String = Locale.getDefault().language,
+        status: String? = null,
+    ): BlazeCampaignsResult<BlazeCampaignsModel> {
+        fun handlePayloadError(
+            site: SiteModel,
+            error: BlazeCampaignsError
+        ): BlazeCampaignsResult<BlazeCampaignsModel> = when (error.type) {
+            AUTHORIZATION_REQUIRED -> {
+                campaignsDao.clearBlazeCampaigns(site.siteId)
+                BlazeCampaignsResult()
+            }
+
+            else -> BlazeCampaignsResult(error)
+        }
+
+        @Suppress("TooGenericExceptionCaught", "SwallowedException")
+        suspend fun handlePayloadResponse(
+            site: SiteModel,
+            response: BlazeCampaignListResponse
+        ): BlazeCampaignsResult<BlazeCampaignsModel> = try {
+            val blazeCampaignsModel = response.toCampaignsModel()
+            campaignsDao.insertCampaigns(site.siteId, blazeCampaignsModel)
+            BlazeCampaignsResult(blazeCampaignsModel)
+        } catch (e: Exception) {
+            AppLog.e(AppLog.T.API, "Error storing blaze campaigns", e)
+            BlazeCampaignsResult(BlazeCampaignsError(INVALID_RESPONSE))
+        }
+
+        suspend fun storeBlazeCampaigns(
+            site: SiteModel,
+            payload: BlazeCampaignsFetchedPayload<BlazeCampaignListResponse>
+        ): BlazeCampaignsResult<BlazeCampaignsModel> = when {
+            payload.isError -> handlePayloadError(site, payload.error)
+            payload.response != null -> handlePayloadResponse(site, payload.response)
+            else -> BlazeCampaignsResult(BlazeCampaignsError(INVALID_RESPONSE))
+        }
+
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetch blaze campaigns") {
+            val payload = campaignsRestClient.fetchBlazeCampaigns(
+                site.siteId,
+                offset,
+                perPage,
+                locale,
+                status
+            )
+            storeBlazeCampaigns(site, payload)
+        }
+    }
+
+    suspend fun getBlazeCampaigns(site: SiteModel): List<BlazeCampaignModel> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "get blaze campaigns") {
+            campaignsDao.getCachedCampaigns(site.siteId)
+        }
+    }
+
+    fun observeBlazeCampaigns(site: SiteModel) = campaignsDao
+        .observeCampaigns(site.siteId)
+        .map { campaigns -> campaigns.map { it.toDomainModel() } }
+
+    suspend fun getMostRecentBlazeCampaign(site: SiteModel): BlazeCampaignModel? {
+        return coroutineEngine.withDefaultContext(
+            AppLog.T.API,
+            this,
+            "get most recent blaze campaign"
+        ) {
+            campaignsDao.getMostRecentCampaignForSite(site.siteId)?.toDomainModel()
+        }
+    }
+
+    fun observeMostRecentBlazeCampaign(site: SiteModel) =
+        campaignsDao.observeMostRecentCampaignForSite(site.siteId)
+            .map { it?.toDomainModel() }
+
+    suspend fun fetchBlazeCampaignObjectives(
+        site: SiteModel,
+        locale: String = Locale.getDefault().language
+    ) = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch blaze objectives"
+    ) {
+        creationRestClient.fetchCampaignObjectives(site, locale).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    blazeObjectivesDao.replaceObjectives(payload.data?.map {
+                        BlazeCampaignObjectiveEntity(
+                            id = it.id,
+                            title = it.title,
+                            description = it.description,
+                            suitableForDescription = it.suitableForDescription,
+                            locale = locale
+                        )
+                    }.orEmpty())
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    fun observeBlazeCampaignObjectives(
+        locale: String = Locale.getDefault().language
+    ) = blazeObjectivesDao.observeObjectives(locale).map { objectives -> objectives.map { it.toDomainModel() } }
+
+    suspend fun fetchBlazeTargetingLocations(
+        site: SiteModel,
+        query: String,
+        locale: String = Locale.getDefault().language
+    ) = coroutineEngine.withDefaultContext(
+        AppLog.T.API,
+        this,
+        "fetch blaze locations"
+    ) {
+        creationRestClient.fetchTargetingLocations(site, query, locale).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> BlazeResult(payload.data)
+            }
+        }
+    }
+
+    suspend fun fetchBlazeTargetingTopics(
+        site: SiteModel,
+        locale: String = Locale.getDefault().language
+    ) = coroutineEngine.withDefaultContext(
+        AppLog.T.API,
+        this,
+        "fetch blaze topics"
+    ) {
+        creationRestClient.fetchTargetingTopics(site, locale).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    targetingDao.replaceTopics(payload.data?.map {
+                        BlazeTargetingTopicEntity(
+                            id = it.id,
+                            description = it.description,
+                            locale = locale
+                        )
+                    }.orEmpty())
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    fun observeBlazeTargetingTopics(
+        locale: String = Locale.getDefault().language
+    ) = targetingDao.observeTopics(locale).map { topics -> topics.map { it.toDomainModel() } }
+
+    suspend fun fetchBlazeTargetingLanguages(
+        site: SiteModel,
+        locale: String = Locale.getDefault().language
+    ) = coroutineEngine.withDefaultContext(
+        AppLog.T.API,
+        this,
+        "fetch blaze languages"
+    ) {
+        creationRestClient.fetchTargetingLanguages(site, locale).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    targetingDao.replaceLanguages(payload.data?.map {
+                        BlazeTargetingLanguageEntity(
+                            id = it.id,
+                            name = it.name,
+                            locale = locale
+                        )
+                    }.orEmpty())
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    fun observeBlazeTargetingLanguages(
+        locale: String = Locale.getDefault().language
+    ) = targetingDao.observeLanguages(locale)
+        .map { languages -> languages.map { it.toDomainModel() } }
+
+    suspend fun fetchBlazeTargetingDevices(
+        site: SiteModel,
+        locale: String = Locale.getDefault().language
+    ) = coroutineEngine.withDefaultContext(
+        AppLog.T.API,
+        this,
+        "fetch blaze devices"
+    ) {
+        creationRestClient.fetchTargetingDevices(site, locale).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    targetingDao.replaceDevices(payload.data?.map { device ->
+                        BlazeTargetingDeviceEntity(
+                            id = device.id,
+                            name = device.name,
+                            locale = locale
+                        )
+                    }.orEmpty())
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    fun observeBlazeTargetingDevices(
+        locale: String = Locale.getDefault().language
+    ) = targetingDao.observeDevices(locale).map { devices -> devices.map { it.toDomainModel() } }
+
+    suspend fun fetchBlazeAdSuggestions(
+        siteModel: SiteModel,
+        productId: Long
+    ) = coroutineEngine.withDefaultContext(
+        AppLog.T.API,
+        this,
+        "fetch blaze ad suggestions"
+    ) {
+        creationRestClient.fetchAdSuggestions(siteModel, productId)
+            .let { payload ->
+                when {
+                    payload.isError -> BlazeResult(BlazeError(payload.error))
+                    else -> {
+                        BlazeResult(payload.data)
+                    }
+                }
+            }
+    }
+
+    suspend fun fetchBlazeAdForecast(
+        siteModel: SiteModel,
+        startDate: Date,
+        endDate: Date,
+        totalBudget: Double,
+        timeZoneId: String = TimeZone.getDefault().id,
+        targetingParameters: BlazeTargetingParameters? = null
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetch blaze ad forecast") {
+        creationRestClient.fetchAdForecast(
+            site = siteModel,
+            startDate = startDate,
+            endDate = endDate,
+            totalBudget = totalBudget,
+            timeZoneId = timeZoneId,
+            targetingParameters = targetingParameters
+        ).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    suspend fun fetchBlazePaymentMethods(
+        site: SiteModel
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetch blaze payment methods") {
+        creationRestClient.fetchPaymentMethods(site).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                else -> {
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    suspend fun createCampaign(
+        site: SiteModel,
+        request: BlazeCampaignCreationRequest
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "create blaze campaign") {
+        creationRestClient.createCampaign(site, request).let { payload ->
+            when {
+                payload.isError -> BlazeResult(BlazeError(payload.error))
+                payload.data == null -> BlazeResult(BlazeError(type = GenericErrorType.UNKNOWN))
+                else -> {
+                    campaignsDao.insert(
+                        listOf(
+                            BlazeCampaignEntity.fromDomainModel(
+                                site.siteId,
+                                payload.data
+                            )
+                        )
+                    )
+                    BlazeResult(payload.data)
+                }
+            }
+        }
+    }
+
+    data class BlazeCampaignsResult<T>(
+        val model: T? = null,
+        val cached: Boolean = false
+    ) : Store.OnChanged<BlazeCampaignsError>() {
+        constructor(error: BlazeCampaignsError) : this() {
+            this.error = error
+        }
+    }
+
+    data class BlazeResult<T>(
+        val model: T? = null,
+    ) : Store.OnChanged<BlazeError>() {
+        constructor(error: BlazeError) : this() {
+            this.error = error
+        }
+    }
+
+    data class BlazeError(
+        val type: GenericErrorType,
+        val apiError: String? = null,
+        val message: String? = null
+    ) : OnChangedError {
+        constructor(wpComGsonNetworkError: WPComGsonNetworkError) : this(
+            wpComGsonNetworkError.type,
+            wpComGsonNetworkError.apiError,
+            wpComGsonNetworkError.message
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStore.kt
new file mode 100644
index 00000000000..fca34231413
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/bloggingprompts/BloggingPromptsStore.kt
@@ -0,0 +1,103 @@
+package org.wordpress.android.fluxc.store.bloggingprompts
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.bloggingprompts.BloggingPromptModel
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsError
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.AUTHORIZATION_REQUIRED
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsListResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsPayload
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.BloggingPromptsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.bloggingprompts.toBloggingPrompts
+import org.wordpress.android.fluxc.persistence.bloggingprompts.BloggingPromptsDao
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BloggingPromptsStore @Inject constructor(
+    private val restClient: BloggingPromptsRestClient,
+    private val promptsDao: BloggingPromptsDao,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchPrompts(
+        site: SiteModel,
+        number: Int,
+        from: Date
+    ): BloggingPromptsResult<List<BloggingPromptModel>> {
+        return coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchPrompts") {
+            val payload = restClient.fetchPrompts(site, number, from)
+            storePrompts(site, payload)
+        }
+    }
+
+    private suspend fun storePrompts(
+        site: SiteModel,
+        payload: BloggingPromptsPayload<BloggingPromptsListResponse>
+    ): BloggingPromptsResult<List<BloggingPromptModel>> = when {
+        payload.isError -> handlePayloadError(payload.error)
+        payload.response != null -> handlePayloadResponse(site, payload.response)
+        else -> BloggingPromptsResult(BloggingPromptsError(INVALID_RESPONSE))
+    }
+
+    private fun handlePayloadError(
+        error: BloggingPromptsError
+    ): BloggingPromptsResult<List<BloggingPromptModel>> = when (error.type) {
+        AUTHORIZATION_REQUIRED -> {
+            promptsDao.clear()
+            BloggingPromptsResult()
+        }
+        else -> BloggingPromptsResult(error)
+    }
+
+    fun getPromptForDate(
+        site: SiteModel,
+        date: Date
+    ): Flow<BloggingPromptsResult<BloggingPromptModel>> {
+        return promptsDao.getPromptForDate(site.id, date).map { prompts ->
+            BloggingPromptsResult(prompts.firstOrNull()?.toBloggingPrompt())
+        }
+    }
+
+    fun getPromptById(
+        site: SiteModel,
+        promptId: Int
+    ): Flow<BloggingPromptsResult<BloggingPromptModel>> {
+        return promptsDao.getPrompt(site.id, promptId).map { prompts ->
+            BloggingPromptsResult(prompts.firstOrNull()?.toBloggingPrompt())
+        }
+    }
+
+    fun getPrompts(site: SiteModel): Flow<BloggingPromptsResult<List<BloggingPromptModel>>> {
+        return promptsDao.getAllPrompts(site.id).map { prompts ->
+            BloggingPromptsResult(prompts.map { it.toBloggingPrompt() })
+        }
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private suspend fun handlePayloadResponse(
+        site: SiteModel,
+        response: BloggingPromptsListResponse
+    ): BloggingPromptsResult<List<BloggingPromptModel>> = try {
+        val prompts = response.toBloggingPrompts()
+        promptsDao.insertForSite(site.id, prompts)
+        BloggingPromptsResult(prompts)
+    } catch (e: Exception) {
+        BloggingPromptsResult(BloggingPromptsError(GENERIC_ERROR))
+    }
+
+    data class BloggingPromptsResult<T>(
+        val model: T? = null,
+        val cached: Boolean = false
+    ) : Store.OnChanged<BloggingPromptsError>() {
+        constructor(error: BloggingPromptsError) : this() {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/dashboard/CardsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/dashboard/CardsStore.kt
new file mode 100644
index 00000000000..11b6c0a94a9
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/dashboard/CardsStore.kt
@@ -0,0 +1,133 @@
+package org.wordpress.android.fluxc.store.dashboard
+
+import kotlinx.coroutines.flow.map
+import org.wordpress.android.fluxc.Payload
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.dashboard.CardModel
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.CardsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.dashboard.CardsRestClient.FetchCardsPayload
+import org.wordpress.android.fluxc.persistence.dashboard.CardsDao
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.store.Store.OnChangedError
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CardsStore @Inject constructor(
+    private val restClient: CardsRestClient,
+    private val cardsDao: CardsDao,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchCards(
+        fetchCardsPayload: FetchCardsPayload
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetchCards") {
+        val payload = restClient.fetchCards(fetchCardsPayload)
+        return@withDefaultContext storeCards(fetchCardsPayload.site, payload)
+    }
+
+    private suspend fun storeCards(
+        site: SiteModel,
+        payload: CardsPayload<CardsResponse>
+    ): CardsResult<List<CardModel>> = when {
+        payload.isError -> handlePayloadError(payload.error)
+        payload.response != null -> handlePayloadResponse(site, payload.response)
+        else -> CardsResult(CardsError(CardsErrorType.INVALID_RESPONSE))
+    }
+
+    private fun handlePayloadError(
+        error: CardsError
+    ): CardsResult<List<CardModel>> = when (error.type) {
+        CardsErrorType.AUTHORIZATION_REQUIRED -> {
+            cardsDao.clear()
+            CardsResult()
+        }
+        else -> CardsResult(error)
+    }
+
+    @Suppress("TooGenericExceptionCaught", "SwallowedException")
+    private suspend fun handlePayloadResponse(
+        site: SiteModel,
+        response: CardsResponse
+    ): CardsResult<List<CardModel>> = try {
+        cardsDao.insertWithDate(site.id, response.toCards())
+        CardsResult()
+    } catch (e: Exception) {
+        CardsResult(CardsError(CardsErrorType.GENERIC_ERROR))
+    }
+
+    fun getCards(
+        site: SiteModel,
+    ) = cardsDao.get(site.id).map { cards ->
+            cards.map { it.toCard() }}
+        .map { CardsResult(it) }
+
+    /* PAYLOADS */
+
+    data class CardsPayload<T>(
+        val response: T? = null
+    ) : Payload<CardsError>() {
+        constructor(error: CardsError) : this() {
+            this.error = error
+        }
+    }
+
+    /* ACTIONS */
+
+    data class CardsResult<T>(
+        val model: T? = null,
+        val cached: Boolean = false
+    ) : Store.OnChanged<CardsError>() {
+        constructor(error: CardsError) : this() {
+            this.error = error
+        }
+    }
+
+    /* ERRORS */
+
+    enum class TodaysStatsCardErrorType {
+        JETPACK_DISCONNECTED,
+        JETPACK_DISABLED,
+        UNAUTHORIZED,
+        GENERIC_ERROR
+    }
+
+    class TodaysStatsCardError(
+        val type: TodaysStatsCardErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class PostCardErrorType {
+        UNAUTHORIZED,
+        GENERIC_ERROR
+    }
+
+    class PostCardError(
+        val type: PostCardErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class ActivityCardErrorType {
+        UNAUTHORIZED,
+        GENERIC_ERROR
+    }
+    class ActivityCardError(
+        val type: ActivityCardErrorType,
+        val message: String? = null
+    ) : OnChangedError
+
+    enum class CardsErrorType {
+        GENERIC_ERROR,
+        AUTHORIZATION_REQUIRED,
+        INVALID_RESPONSE,
+        API_ERROR,
+        TIMEOUT
+    }
+
+    class CardsError(
+        val type: CardsErrorType,
+        val message: String? = null
+    ) : OnChangedError
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/jetpackai/JetpackAIStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/jetpackai/JetpackAIStore.kt
new file mode 100644
index 00000000000..47febe0e51d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/jetpackai/JetpackAIStore.kt
@@ -0,0 +1,365 @@
+package org.wordpress.android.fluxc.store.jetpackai
+
+import org.wordpress.android.fluxc.model.JWTToken
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIAssistantFeatureResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIQueryErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIQueryResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.JetpackAICompletionsErrorType.AUTH_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.JetpackAICompletionsResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.JetpackAIJWTTokenResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.JetpackAIJWTTokenResponse.Error
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.JetpackAIJWTTokenResponse.Success
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAIRestClient.ResponseFormat
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAITranscriptionErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAITranscriptionResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.jetpackai.JetpackAITranscriptionRestClient
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class JetpackAIStore @Inject constructor(
+    private val jetpackAIRestClient: JetpackAIRestClient,
+    private val jetpackAITranscriptionRestClient: JetpackAITranscriptionRestClient,
+    private val coroutineEngine: CoroutineEngine
+) {
+    companion object {
+        private const val OPENAI_GPT4_MODEL_NAME = "gpt-4o"
+    }
+
+    private var token: JWTToken? = null
+
+    /**
+     * Fetches Jetpack AI completions for a given prompt to be used on a particular post.
+     *
+     * @param site      The site for which completions are fetched.
+     * @param prompt    The prompt used to generate completions.
+     * @param skipCache If true, bypasses the default 30-second throttle and fetches fresh data.
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param postId    Used to mark the post as having content generated by Jetpack AI.
+     */
+    suspend fun fetchJetpackAICompletionsForPost(
+        site: SiteModel,
+        prompt: String,
+        postId: Long,
+        feature: String,
+        skipCache: Boolean = false
+    ) = fetchJetpackAICompletions(site, prompt, feature, skipCache, postId)
+
+    /**
+     * Fetches Jetpack AI completions for a given prompt used globally by a site.
+     *
+     * @param site      The site for which completions are fetched.
+     * @param prompt    The prompt used to generate completions.
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param skipCache If true, bypasses the default 30-second throttle and fetches fresh data.
+     */
+    suspend fun fetchJetpackAICompletionsForSite(
+        site: SiteModel,
+        prompt: String,
+        feature: String? = null,
+        skipCache: Boolean = false
+    ) = fetchJetpackAICompletions(site, prompt, feature, skipCache)
+
+    private suspend fun fetchJetpackAICompletions(
+        site: SiteModel,
+        prompt: String,
+        feature: String? = null,
+        skipCache: Boolean,
+        postId: Long? = null
+    ) = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI completions"
+    ) {
+        jetpackAIRestClient.fetchJetpackAICompletions(site, prompt, feature, skipCache, postId)
+    }
+
+    suspend fun fetchJetpackAICompletions(
+        site: SiteModel,
+        prompt: String,
+        feature: String,
+        responseFormat: ResponseFormat? = null,
+        model: String? = null
+    ): JetpackAICompletionsResponse = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI completions"
+    ) {
+        val token = token?.validateExpiryDate()?.validateBlogId(site.siteId)
+            ?: fetchJetpackAIJWTToken(site).let { tokenResponse ->
+                when (tokenResponse) {
+                    is Error -> {
+                        return@withDefaultContext JetpackAICompletionsResponse.Error(
+                            type = AUTH_ERROR,
+                            message = tokenResponse.message,
+                        )
+                    }
+
+                    is Success -> {
+                        token = tokenResponse.token
+                        tokenResponse.token
+                    }
+                }
+            }
+
+        val result = jetpackAIRestClient.fetchJetpackAITextCompletion(
+            token,
+            prompt,
+            feature,
+            responseFormat,
+            model
+        )
+
+        return@withDefaultContext when {
+            // Fetch token anew if using existing token returns AUTH_ERROR
+            result is JetpackAICompletionsResponse.Error && result.type == AUTH_ERROR -> {
+                // Remove cached token
+                this@JetpackAIStore.token = null
+                fetchJetpackAICompletions(site, prompt, feature, responseFormat, model)
+            }
+
+            else -> result
+        }
+    }
+
+    private suspend fun fetchJetpackAIJWTToken(site: SiteModel): JetpackAIJWTTokenResponse =
+        coroutineEngine.withDefaultContext(
+            tag = AppLog.T.API,
+            caller = this,
+            loggedMessage = "fetch Jetpack AI JWT token"
+        ) {
+            jetpackAIRestClient.fetchJetpackAIJWTToken(site)
+        }
+
+    private fun JWTToken.validateBlogId(blogId: Long): JWTToken? =
+        if (getPayloadItem("blog_id")?.toLong() == blogId) this else null
+
+    /**
+     * Fetches Jetpack AI Transcription for the specified audio file.
+     *
+     * @param site      The site used to create the JWT token
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param audioFile The audio File to be transcribed.
+     * @param retryCount The number of times the JWTToken request was called
+     * @param maxRetries The max number of times JWTToken can be requested
+     */
+    suspend fun fetchJetpackAITranscription(
+        site: SiteModel,
+        feature: String?,
+        audioFile: File,
+        retryCount: Int = 0,
+        maxRetries: Int = 1
+    ): JetpackAITranscriptionResponse = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI Transcription"
+    ) {
+        val token = token?.validateExpiryDate()?.validateBlogId(site.siteId)
+            ?: fetchJetpackAIJWTToken(site).let { tokenResponse ->
+                when (tokenResponse) {
+                    is Error -> {
+                        return@withDefaultContext JetpackAITranscriptionResponse.Error(
+                            type = JetpackAITranscriptionErrorType.AUTH_ERROR,
+                            message = tokenResponse.message,
+                        )
+                    }
+
+                    is Success -> {
+                        token = tokenResponse.token
+                        tokenResponse.token
+                    }
+                }
+            }
+
+        val result = jetpackAITranscriptionRestClient.fetchJetpackAITranscription(
+            jwtToken = token,
+            feature = feature,
+            audioFile = audioFile
+        )
+
+        return@withDefaultContext when {
+            // Fetch token anew if using existing token returns AUTH_ERROR
+            result is JetpackAITranscriptionResponse.Error &&
+                    result.type == JetpackAITranscriptionErrorType.AUTH_ERROR -> {
+                // Remove cached token and retry getting the token another time
+                this@JetpackAIStore.token = null
+                if (retryCount <= maxRetries) {
+                    fetchJetpackAITranscription(
+                        site,
+                        feature,
+                        audioFile,
+                        retryCount + 1,
+                        maxRetries
+                    )
+                } else {
+                    result // Return the error after max retries
+                }
+            }
+
+            else -> result
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI Query for the specified audio file.
+     *
+     * @param site      The site used to create the JWT token
+     * @param feature   Used by backend to track AI-generation usage and measure costs. Optional.
+     * @param role      A special marker to indicate that the message needs to be expanded by the Jetpack AI BE.
+     * @param message   The message to be expanded by the Jetpack AI BE.
+     * @param type      An indication of which kind of post-processing action will be executed over the content.
+     * @param stream    When true, the response is a set of EventSource events, otherwise a single response
+     * @param retryCount The number of times the JWTToken request was called
+     * @param maxRetries The max number of times JWTToken can be requested
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAIQuery(
+        site: SiteModel,
+        feature: String?,
+        role: String,
+        message: String,
+        type: String,
+        stream: Boolean,
+        retryCount: Int = 0,
+        maxRetries: Int = 1
+    ): JetpackAIQueryResponse = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI Query"
+    ) {
+        val token = token?.validateExpiryDate()?.validateBlogId(site.siteId)
+            ?: fetchJetpackAIJWTToken(site).let { tokenResponse ->
+                when (tokenResponse) {
+                    is Error -> {
+                        return@withDefaultContext JetpackAIQueryResponse.Error(
+                            type = JetpackAIQueryErrorType.AUTH_ERROR,
+                            message = tokenResponse.message,
+                        )
+                    }
+
+                    is Success -> {
+                        token = tokenResponse.token
+                        tokenResponse.token
+                    }
+                }
+            }
+
+        val result = jetpackAIRestClient.fetchJetpackAiMessageQuery(
+            jwtToken = token,
+            message = message,
+            feature = feature,
+            role = role,
+            type = type,
+            stream = stream
+        )
+
+        return@withDefaultContext when {
+            // Fetch token anew if using existing token returns AUTH_ERROR
+            result is JetpackAIQueryResponse.Error &&
+                    result.type == JetpackAIQueryErrorType.AUTH_ERROR -> {
+                // Remove cached token and retry getting the token another time
+                this@JetpackAIStore.token = null
+                if (retryCount <= maxRetries) {
+                    fetchJetpackAIQuery(
+                        site = site,
+                        feature = feature,
+                        role = role,
+                        message = message,
+                        type = type,
+                        stream = stream,
+                        retryCount = retryCount + 1,
+                        maxRetries = maxRetries
+                    )
+                } else {
+                    result // Return the error after max retries
+                }
+            }
+
+            else -> result
+        }
+    }
+
+    /**
+     * Fetches Jetpack AI Query for the specific prompt/question
+     *
+     * @param site      The site used to create the JWT token.
+     * @param question  The question to be expanded by the Jetpack AI BE.
+     * @param feature   Used by backend to track AI-generation usage and measure costs.
+     * @param stream    When true, the response is a set of EventSource events, otherwise a single response
+     * @param format    The format of the response: 'text' or 'json_object'. Default "text"
+     * @param model     The model to be used for the query: 'gpt-4o' or 'gpt-3.5-turbo-1106'. Optional
+     * @param maxTokens The maximum number of tokens to generate, leave null for default
+     * @param fields    The fields to be requested in the response
+     */
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAIQuery(
+        site: SiteModel,
+        question: String,
+        feature: String,
+        stream: Boolean,
+        model: String = OPENAI_GPT4_MODEL_NAME,
+        format: ResponseFormat = ResponseFormat.TEXT,
+        maxTokens: Int? = null,
+        fields: String? = null
+    ): JetpackAIQueryResponse = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI Query"
+    ) {
+        val token = token?.validateExpiryDate()?.validateBlogId(site.siteId)
+            ?: fetchJetpackAIJWTToken(site).let { tokenResponse ->
+                when (tokenResponse) {
+                    is Error -> {
+                        return@withDefaultContext JetpackAIQueryResponse.Error(
+                            type = JetpackAIQueryErrorType.AUTH_ERROR,
+                            message = tokenResponse.message,
+                        )
+                    }
+
+                    is Success -> {
+                        token = tokenResponse.token
+                        tokenResponse.token
+                    }
+                }
+            }
+
+        val result = jetpackAIRestClient.fetchJetpackAiQuestionQuery(
+            jwtToken = token,
+            question = question,
+            feature = feature,
+            format = format,
+            model = model,
+            stream = stream,
+            maxTokens = maxTokens,
+            fields = fields
+        )
+
+        return@withDefaultContext when {
+            // Fetch token anew if using existing token returns AUTH_ERROR
+            result is JetpackAIQueryResponse.Error &&
+                    result.type == JetpackAIQueryErrorType.AUTH_ERROR -> {
+                // Remove cached token and retry getting the token another time
+                this@JetpackAIStore.token = null
+                result
+            }
+
+            else -> result
+        }
+    }
+
+    @Suppress("LongParameterList")
+    suspend fun fetchJetpackAIAssistantFeature(
+        site: SiteModel,
+    ): JetpackAIAssistantFeatureResponse = coroutineEngine.withDefaultContext(
+        tag = AppLog.T.API,
+        caller = this,
+        loggedMessage = "fetch Jetpack AI Assistant Feature"
+    ) {
+        jetpackAIRestClient.fetchJetpackAiAssistantFeature(site)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/media/MediaErrorSubType.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/media/MediaErrorSubType.kt
new file mode 100644
index 00000000000..2ee98198dbf
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/media/MediaErrorSubType.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.store.media
+
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType.Type
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MediaErrorSubtypeCategory.MALFORMED_MEDIA_ARG_SUBTYPE
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MediaErrorSubtypeCategory.UNDEFINED_SUBTYPE
+
+sealed class MediaErrorSubType(val category: MediaErrorSubtypeCategory, val subTypeName: String) {
+    // This enum lists the categories of MediaErrorType that are mapped into one or multiple
+    // MediaErrorSubType in the companion object categories field.
+    // UNDEFINED_SUBTYPE category collects all MediaErrorType(s) that are not mapped yet.
+    // To map another MediaErrorType, add an item to the enum and define a MediaErrorSubType element
+    enum class MediaErrorSubtypeCategory {
+        UNDEFINED_SUBTYPE,
+        MALFORMED_MEDIA_ARG_SUBTYPE
+    }
+
+    fun serialize(): String {
+        return "${category.name}:$subTypeName"
+    }
+
+    companion object {
+        private val categories = MediaErrorSubtypeCategory.values().flatMap { value ->
+            when (value) {
+                UNDEFINED_SUBTYPE -> listOf(UndefinedSubType)
+                MALFORMED_MEDIA_ARG_SUBTYPE -> Type.values().map { MalformedMediaArgSubType(it) }
+            }
+        }
+
+        @JvmStatic
+        @Suppress("ReturnCount")
+        fun deserialize(name: String?): MediaErrorSubType {
+            if (name == null) return UndefinedSubType
+
+            categories.forEach { subType ->
+                if (subType.serialize() == name) {
+                    return subType
+                }
+            }
+
+            return UndefinedSubType
+        }
+    }
+
+    object UndefinedSubType : MediaErrorSubType(UNDEFINED_SUBTYPE, "")
+
+    data class MalformedMediaArgSubType(
+        val type: Type
+    ) : MediaErrorSubType(MALFORMED_MEDIA_ARG_SUBTYPE, type.name) {
+        enum class Type(val errorLogDescription: String?) {
+            MEDIA_WAS_NULL("media cannot be null"),
+            UNSUPPORTED_MIME_TYPE("media must define a valid MIME type"),
+            NOT_VALID_LOCAL_FILE_PATH("media must define a local file path"),
+            MEDIA_FILE_NOT_FOUND_LOCALLY("local file path for media does not exist"),
+            DIRECTORY_PATH_SUPPLIED_FILE_NEEDED("supplied file path is a directory, a file is required"),
+            NO_ERROR(null)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStore.kt
new file mode 100644
index 00000000000..28c9706af5f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/FeatureFlagsStore.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsError
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.FeatureFlagsRestClient.FeatureFlagsPayload
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao.FeatureFlag
+import org.wordpress.android.fluxc.persistence.FeatureFlagConfigDao.FeatureFlagValueSource
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FeatureFlagsStore @Inject constructor(
+    private val featureFlagsRestClient: FeatureFlagsRestClient,
+    private val featureFlagConfigDao: FeatureFlagConfigDao,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchFeatureFlags(
+        buildNumber: String,
+        deviceId: String,
+        identifier: String,
+        marketingVersion: String,
+        platform: String
+    ) = fetchFeatureFlags(FeatureFlagsPayload(
+        buildNumber = buildNumber,
+        deviceId = deviceId,
+        identifier = identifier,
+        marketingVersion = marketingVersion,
+        platform = platform
+    ))
+
+    suspend fun fetchFeatureFlags(payload: FeatureFlagsPayload) =
+        coroutineEngine.withDefaultContext(AppLog.T.API, this, "fetch feature-flags") {
+            val payload = featureFlagsRestClient.fetchFeatureFlags(payload)
+            return@withDefaultContext when {
+                payload.isError -> FeatureFlagsResult(payload.error)
+                payload.featureFlags != null -> {
+                    featureFlagConfigDao.insert(payload.featureFlags)
+                    FeatureFlagsResult(payload.featureFlags)
+                }
+
+                else -> FeatureFlagsResult(FeatureFlagsError(GENERIC_ERROR))
+            }
+        }
+
+    fun getFeatureFlags(): List<FeatureFlag> {
+        return featureFlagConfigDao.getFeatureFlagList()
+    }
+
+    // This returns a list because there can be multiple values for a single key.
+    // It will be the client's responsibility to decide which value to use.
+    fun getFeatureFlagsByKey(key: String): List<FeatureFlag> {
+        return featureFlagConfigDao.getFeatureFlag(key)
+    }
+
+    fun insertFeatureFlagValue(key: String, value: Boolean) {
+        featureFlagConfigDao.insert(
+                FeatureFlag(
+                        key = key,
+                        value = value,
+                        createdAt = System.currentTimeMillis(),
+                        modifiedAt = System.currentTimeMillis(),
+                        source = FeatureFlagValueSource.BUILD_CONFIG
+                )
+        )
+    }
+
+    fun clearAllValues() {
+        featureFlagConfigDao.clear()
+    }
+
+    data class FeatureFlagsResult(
+        val featureFlags: Map<String, Boolean>? = null
+    ) : Store.OnChanged<FeatureFlagsError>() {
+        constructor(error: FeatureFlagsError) : this() {
+            this.error = error
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStore.kt
new file mode 100644
index 00000000000..ef053ea62d6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/JetpackMigrationStore.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.JetpackMigrationRestClient
+import org.wordpress.android.fluxc.store.mobile.MigrationCompleteFetchedPayload.Error
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class JetpackMigrationStore @Inject constructor(
+    private val jetpackMigrationClient: JetpackMigrationRestClient,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun migrationComplete(
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "post migration-complete") {
+        return@withDefaultContext jetpackMigrationClient.migrationComplete(::Error)
+    }
+}
+
+sealed class MigrationCompleteFetchedPayload {
+    object Success : MigrationCompleteFetchedPayload()
+    class Error(val error: BaseNetworkError?) : MigrationCompleteFetchedPayload()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStore.kt
new file mode 100644
index 00000000000..aa7e3a921d6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/mobile/RemoteConfigStore.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.store.mobile
+
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.mobile.RemoteConfigError
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao.RemoteConfig
+import org.wordpress.android.fluxc.persistence.RemoteConfigDao.RemoteConfigValueSource.BUILD_CONFIG
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigStore @Inject constructor(
+    private val remoteConfigRestClient: RemoteConfigRestClient,
+    private val remoteConfigDao: RemoteConfigDao,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchRemoteConfig() = coroutineEngine.withDefaultContext(
+            AppLog.T.API, this,
+            "fetch remote-field-config"
+    ) {
+        val payload = remoteConfigRestClient.fetchRemoteConfig()
+        return@withDefaultContext when {
+            payload.isError -> RemoteConfigResult(payload.error)
+            payload.remoteConfig != null -> {
+                remoteConfigDao.insert(payload.remoteConfig)
+                RemoteConfigResult(payload.remoteConfig)
+            }
+            else -> RemoteConfigResult(RemoteConfigError(GENERIC_ERROR))
+        }
+    }
+
+    data class RemoteConfigResult(
+        val remoteConfig: Map<String, String>? = null
+    ) : Store.OnChanged<RemoteConfigError>() {
+        constructor(error: RemoteConfigError) : this() {
+            this.error = error
+        }
+    }
+
+    fun getRemoteConfigs(): List<RemoteConfig> {
+        return remoteConfigDao.getRemoteConfigList()
+    }
+
+    fun insertRemoteConfig(key: String, value: String) {
+        remoteConfigDao.insert(
+                RemoteConfig(
+                        key = key,
+                        value = value,
+                        createdAt = System.currentTimeMillis(),
+                        modifiedAt = System.currentTimeMillis(),
+                        source = BUILD_CONFIG
+                )
+        )
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStore.kt
new file mode 100644
index 00000000000..82a131b77a2
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/qrcodeauth/QRCodeAuthStore.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.fluxc.store.qrcodeauth
+
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthError
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthAuthenticateResponse
+import org.wordpress.android.fluxc.network.rest.wpcom.qrcodeauth.QRCodeAuthRestClient.QRCodeAuthValidateResponse
+import org.wordpress.android.fluxc.store.Store
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class QRCodeAuthStore
+@Inject constructor(
+    private val qrcodeAuthRestClient: QRCodeAuthRestClient,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun validate(
+        data: String,
+        token: String
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "validate") {
+        val payload = qrcodeAuthRestClient.validate(data, token)
+        return@withDefaultContext when {
+            payload.isError -> QRCodeAuthResult(payload.error)
+            payload.response != null -> QRCodeAuthResult(payload.response.toResult())
+            else -> QRCodeAuthResult(QRCodeAuthError(QRCodeAuthErrorType.INVALID_RESPONSE))
+        }
+    }
+
+    fun QRCodeAuthValidateResponse.toResult() =
+        QRCodeAuthValidateResult(browser = this.browser,
+            location = this.location,
+            success = this.success ?: false
+        )
+
+    suspend fun authenticate(
+        data: String,
+        token: String
+    ) = coroutineEngine.withDefaultContext(AppLog.T.API, this, "authenticate") {
+        val payload = qrcodeAuthRestClient.authenticate(data, token)
+        return@withDefaultContext when {
+            payload.isError -> QRCodeAuthResult(payload.error)
+            payload.response != null -> QRCodeAuthResult(payload.response.toResult())
+            else -> QRCodeAuthResult(QRCodeAuthError(QRCodeAuthErrorType.INVALID_RESPONSE))
+        }
+    }
+
+    fun QRCodeAuthAuthenticateResponse.toResult() =
+        QRCodeAuthAuthenticateResult(authenticated = this.authenticated ?: false)
+
+    data class QRCodeAuthResult<T>(
+        val model: T? = null
+    ) : Store.OnChanged<QRCodeAuthError>() {
+        constructor(error: QRCodeAuthError) : this() {
+            this.error = error
+        }
+    }
+
+    data class QRCodeAuthValidateResult(
+        val browser: String? = null,
+        val location: String? = null,
+        val success: Boolean = false
+    )
+
+    data class QRCodeAuthAuthenticateResult(
+        val authenticated: Boolean = false
+    )
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/PostDetailStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/PostDetailStore.kt
new file mode 100644
index 00000000000..75dfa62e905
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/PostDetailStore.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.store.stats
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.PostDetailStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.DetailedPostStatsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PostDetailStore
+@Inject constructor(
+    private val restClient: LatestPostInsightsRestClient,
+    private val sqlUtils: DetailedPostStatsSqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: PostDetailStatsMapper
+) {
+    suspend fun fetchPostDetail(
+        site: SiteModel,
+        postId: Long,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "fetchPostDetail") {
+        if (!forced && sqlUtils.hasFreshRequest(site, postId = postId)) {
+            return@withDefaultContext OnStatsFetched(getPostDetail(site, postId), cached = true)
+        }
+        val payload = restClient.fetchPostStats(site, postId, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, postId = postId)
+                OnStatsFetched(mapper.map(payload.response))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getPostDetail(site: SiteModel, postId: Long) = coroutineEngine.run(AppLog.T.STATS, this, "getPostDetail") {
+        sqlUtils.select(site, postId)?.let { mapper.map(it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/AllTimeInsightsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/AllTimeInsightsStore.kt
new file mode 100644
index 00000000000..920811f03b6
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/AllTimeInsightsStore.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsAllTimeModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.AllTimeInsightsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.AllTimeSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AllTimeInsightsStore @Inject constructor(
+    private val restClient: AllTimeInsightsRestClient,
+    private val sqlUtils: AllTimeSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchAllTimeInsights(site: SiteModel, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "fetchAllTimeInsights") {
+                if (!forced && sqlUtils.hasFreshRequest(site)) {
+                    return@withDefaultContext OnStatsFetched(getAllTimeInsights(site), cached = true)
+                }
+                val payload = restClient.fetchAllTimeInsights(site, forced)
+                return@withDefaultContext when {
+                    payload.isError -> OnStatsFetched(payload.error)
+                    payload.response != null -> {
+                        sqlUtils.insert(site, payload.response)
+                        OnStatsFetched(insightsMapper.map(payload.response, site))
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getAllTimeInsights(site: SiteModel): InsightsAllTimeModel? =
+            coroutineEngine.run(AppLog.T.STATS, this, "getAllTimeInsights") {
+                sqlUtils.select(site)?.let { insightsMapper.map(it, site) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/CommentsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/CommentsStore.kt
new file mode 100644
index 00000000000..48b3e522806
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/CommentsStore.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.CommentsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.CommentsInsightsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CommentsStore @Inject constructor(
+    private val restClient: CommentsRestClient,
+    private val sqlUtils: CommentsInsightsSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchComments(siteModel: SiteModel, limitMode: LimitMode, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchComments") {
+                val requestedItems = if (limitMode is Top) limitMode.limit else Int.MAX_VALUE
+                if (!forced && sqlUtils.hasFreshRequest(siteModel, requestedItems)) {
+                    return@withDefaultContext OnStatsFetched(getComments(siteModel, limitMode), cached = true)
+                }
+                val responsePayload = restClient.fetchTopComments(siteModel, forced = forced)
+                return@withDefaultContext when {
+                    responsePayload.isError -> {
+                        OnStatsFetched(responsePayload.error)
+                    }
+                    responsePayload.response != null -> {
+                        sqlUtils.insert(
+                                siteModel,
+                                responsePayload.response,
+                                requestedItems
+                        )
+                        OnStatsFetched(insightsMapper.map(responsePayload.response, limitMode))
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getComments(site: SiteModel, cacheMode: LimitMode) = coroutineEngine.run(STATS, this, "getComments") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it, cacheMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/FollowersStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/FollowersStore.kt
new file mode 100644
index 00000000000..53b18b55bc1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/FollowersStore.kt
@@ -0,0 +1,135 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.FollowersModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.All
+import org.wordpress.android.fluxc.model.stats.PagedMode
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.ALL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.EMAIL
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowerType.WP_COM
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.FollowersRestClient.FollowersResponse
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.EmailFollowersSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.FollowersSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.WpComFollowersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FollowersStore
+@Inject constructor(
+    private val restClient: FollowersRestClient,
+    private val followersSqlUtils: FollowersSqlUtils,
+    private val wpComFollowersSqlUtils: WpComFollowersSqlUtils,
+    private val emailFollowersSqlUtils: EmailFollowersSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchFollowers(
+        siteModel: SiteModel,
+        fetchMode: PagedMode,
+        forced: Boolean = false
+    ) = fetchFollowers(siteModel, forced, ALL, fetchMode, followersSqlUtils)
+
+    suspend fun fetchWpComFollowers(
+        siteModel: SiteModel,
+        fetchMode: PagedMode,
+        forced: Boolean = false
+    ): OnStatsFetched<FollowersModel> {
+        return fetchFollowers(siteModel, forced, WP_COM, fetchMode, wpComFollowersSqlUtils)
+    }
+
+    suspend fun fetchEmailFollowers(
+        siteModel: SiteModel,
+        fetchMode: PagedMode,
+        forced: Boolean = false
+    ): OnStatsFetched<FollowersModel> {
+        return fetchFollowers(siteModel, forced, EMAIL, fetchMode, emailFollowersSqlUtils)
+    }
+
+    private suspend fun fetchFollowers(
+        siteModel: SiteModel,
+        forced: Boolean = false,
+        followerType: FollowerType,
+        fetchMode: PagedMode,
+        sqlUtils: InsightsSqlUtils<FollowersResponse>
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchFollowers") {
+        if (!forced && !fetchMode.loadMore && sqlUtils.hasFreshRequest(
+                        siteModel,
+                        fetchMode.pageSize
+                )) {
+            return@withDefaultContext OnStatsFetched(
+                    getFollowers(
+                            siteModel,
+                            followerType,
+                            cacheMode = LimitMode.Top(fetchMode.pageSize),
+                            sqlUtils = sqlUtils
+                    ),
+                    cached = true
+            )
+        }
+        val nextPage = if (fetchMode.loadMore) {
+            val savedFollowers = sqlUtils.selectAll(siteModel).sumBy { it.subscribers.size }
+            savedFollowers / fetchMode.pageSize + 1
+        } else {
+            1
+        }
+
+        val responsePayload = restClient.fetchFollowers(siteModel, followerType, nextPage, fetchMode.pageSize, forced)
+        return@withDefaultContext when {
+            responsePayload.isError -> {
+                OnStatsFetched(responsePayload.error)
+            }
+            responsePayload.response != null -> {
+                val replace = !fetchMode.loadMore
+                sqlUtils.insert(
+                        siteModel,
+                        responsePayload.response,
+                        replaceExistingData = replace,
+                        requestedItems = fetchMode.pageSize
+                )
+                val followerResponses = sqlUtils.selectAll(siteModel)
+                val allFollowers = insightsMapper.mapAndMergeFollowersModels(
+                        followerResponses,
+                        followerType,
+                        All
+                )
+                OnStatsFetched(allFollowers)
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getFollowers(site: SiteModel, cacheMode: LimitMode) = getFollowers(site, ALL, cacheMode, followersSqlUtils)
+
+    fun getWpComFollowers(site: SiteModel, cacheMode: LimitMode): FollowersModel? {
+        return getFollowers(site, WP_COM, cacheMode, wpComFollowersSqlUtils)
+    }
+
+    fun getEmailFollowers(site: SiteModel, cacheMode: LimitMode): FollowersModel? {
+        return getFollowers(site, EMAIL, cacheMode, emailFollowersSqlUtils)
+    }
+
+    private fun getFollowers(
+        site: SiteModel,
+        followerType: FollowerType,
+        cacheMode: LimitMode,
+        sqlUtils: InsightsSqlUtils<FollowersResponse>
+    ) = coroutineEngine.run(STATS, this, "getFollowers") {
+        val followerResponses = sqlUtils.selectAll(site)
+        if (followerResponses.isEmpty()) {
+            null
+        } else {
+            insightsMapper.mapAndMergeFollowersModels(followerResponses, followerType, cacheMode)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/LatestPostInsightsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/LatestPostInsightsStore.kt
new file mode 100644
index 00000000000..fabc3203f80
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/LatestPostInsightsStore.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.LatestPostInsightsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.DetailedPostStatsSqlUtils
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.LatestPostDetailSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LatestPostInsightsStore @Inject constructor(
+    private val restClient: LatestPostInsightsRestClient,
+    private val latestPostDetailSqlUtils: LatestPostDetailSqlUtils,
+    private val detailedPostStats: DetailedPostStatsSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchLatestPostInsights(site: SiteModel, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchLatestPostInsights") {
+                if (!forced && latestPostDetailSqlUtils.hasFreshRequest(site)) {
+                    return@withDefaultContext OnStatsFetched(getLatestPostInsights(site), cached = true)
+                }
+                val latestPostPayload = restClient.fetchLatestPostForInsights(site, forced)
+                val postsFound = latestPostPayload.response?.postsFound
+
+                val posts = latestPostPayload.response?.posts
+                return@withDefaultContext if (
+                    (postsFound != null && postsFound > 0) &&
+                    !posts.isNullOrEmpty()
+                ) {
+                    val latestPost = posts[0]
+                    val postStats = restClient.fetchPostStats(site, latestPost.id, forced)
+                    when {
+                        postStats.response != null -> {
+                            latestPostDetailSqlUtils.insert(site, latestPost)
+                            detailedPostStats.insert(site, postStats.response, postId = latestPost.id)
+                            OnStatsFetched(insightsMapper.map(latestPost, postStats.response, site))
+                        }
+                        postStats.isError -> OnStatsFetched(postStats.error)
+                        else -> OnStatsFetched()
+                    }
+                } else if (latestPostPayload.isError) {
+                    OnStatsFetched(latestPostPayload.error)
+                } else {
+                    OnStatsFetched()
+                }
+            }
+
+    fun getLatestPostInsights(site: SiteModel) = coroutineEngine.run(
+            STATS, this, "getLatestPostInsights"
+    ) {
+        latestPostDetailSqlUtils.select(site)?.let { latestPostDetailResponse ->
+            detailedPostStats.select(site, latestPostDetailResponse.id)?.let { latestPostViewsResponse ->
+                insightsMapper.map(latestPostDetailResponse, latestPostViewsResponse, site)
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStore.kt
new file mode 100644
index 00000000000..c62715602e5
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/MostPopularInsightsStore.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.MostPopularRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.MostPopularSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MostPopularInsightsStore @Inject constructor(
+    private val restClient: MostPopularRestClient,
+    private val sqlUtils: MostPopularSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchMostPopularInsights(site: SiteModel, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchMostPopularInsights") {
+                if (!forced && sqlUtils.hasFreshRequest(site)) {
+                    return@withDefaultContext OnStatsFetched(getMostPopularInsights(site), cached = true)
+                }
+                val payload = restClient.fetchMostPopularInsights(site, forced)
+                return@withDefaultContext when {
+                    payload.isError -> OnStatsFetched(payload.error)
+                    payload.response != null -> {
+                        val data = payload.response
+                        sqlUtils.insert(site, data)
+                        OnStatsFetched(
+                                insightsMapper.map(data, site)
+                        )
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    suspend fun fetchYearsInsights(site: SiteModel, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchYearsInsights") {
+                if (!forced && sqlUtils.hasFreshRequest(site)) {
+                    return@withDefaultContext OnStatsFetched(getYearsInsights(site), cached = true)
+                }
+                val payload = restClient.fetchMostPopularInsights(site, forced)
+                return@withDefaultContext when {
+                    payload.isError -> OnStatsFetched(payload.error)
+                    payload.response != null -> {
+                        val data = payload.response
+                        sqlUtils.insert(site, data)
+                        OnStatsFetched(
+                                insightsMapper.map(data)
+                        )
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getMostPopularInsights(site: SiteModel) = coroutineEngine.run(STATS, this, "getMostPopularInsights") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it, site) }
+    }
+
+    fun getYearsInsights(site: SiteModel) = coroutineEngine.run(STATS, this, "getYearsInsights") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStore.kt
new file mode 100644
index 00000000000..58423730ada
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PostingActivityStore.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.insights.PostingActivityModel.Day
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PostingActivityRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.PostingActivitySqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PostingActivityStore
+@Inject constructor(
+    private val restClient: PostingActivityRestClient,
+    private val sqlUtils: PostingActivitySqlUtils,
+    private val coroutineEngine: CoroutineEngine,
+    private val mapper: InsightsMapper
+) {
+    suspend fun fetchPostingActivity(
+        site: SiteModel,
+        startDay: Day,
+        endDay: Day,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchPostingActivity") {
+        if (!forced && sqlUtils.hasFreshRequest(site)) {
+            return@withDefaultContext OnStatsFetched(getPostingActivity(site, startDay, endDay), cached = true)
+        }
+        val payload = restClient.fetchPostingActivity(site, startDay, endDay, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response)
+                OnStatsFetched(mapper.map(payload.response, startDay, endDay))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getPostingActivity(site: SiteModel, startDay: Day, endDay: Day) =
+            coroutineEngine.run(STATS, this, "getPostingActivity") {
+                sqlUtils.select(site)?.let { mapper.map(it, startDay, endDay) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PublicizeStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PublicizeStore.kt
new file mode 100644
index 00000000000..aefe559f09d
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/PublicizeStore.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.PublicizeRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.PublicizeSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PublicizeStore
+@Inject constructor(
+    private val restClient: PublicizeRestClient,
+    private val sqlUtils: PublicizeSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchPublicizeData(siteModel: SiteModel, limitMode: LimitMode, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchPublicizeData") {
+                if (!forced && sqlUtils.hasFreshRequest(siteModel)) {
+                    return@withDefaultContext OnStatsFetched(getPublicizeData(siteModel, limitMode), cached = true)
+                }
+                val response = restClient.fetchPublicizeData(siteModel, forced = forced)
+                return@withDefaultContext when {
+                    response.isError -> {
+                        OnStatsFetched(response.error)
+                    }
+                    response.response != null -> {
+                        sqlUtils.insert(siteModel, response.response)
+                        OnStatsFetched(insightsMapper.map(response.response, limitMode))
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getPublicizeData(site: SiteModel, limitMode: LimitMode) = coroutineEngine.run(STATS, this, "getPublicizeData") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it, limitMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStore.kt
new file mode 100644
index 00000000000..3d28eec6d87
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/SummaryStore.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.SummaryRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.SummarySqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SummaryStore @Inject constructor(
+    private val restClient: SummaryRestClient,
+    private val sqlUtils: SummarySqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchSummary(site: SiteModel, forced: Boolean = false) =
+        coroutineEngine.withDefaultContext(AppLog.T.STATS, this, "fetchSummary") {
+            if (!forced && sqlUtils.hasFreshRequest(site)) {
+                return@withDefaultContext OnStatsFetched(getSummary(site), cached = true)
+            }
+            val payload = restClient.fetchSummary(site, forced)
+            return@withDefaultContext when {
+                payload.isError -> OnStatsFetched(payload.error)
+                payload.response != null -> {
+                    sqlUtils.insert(site, payload.response)
+                    OnStatsFetched(insightsMapper.map(payload.response))
+                }
+                else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+            }
+        }
+
+    fun getSummary(site: SiteModel) = coroutineEngine.run(AppLog.T.STATS, this, "getSummary") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TagsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TagsStore.kt
new file mode 100644
index 00000000000..78c7ff5cab7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TagsStore.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TagsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.TagsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TagsStore @Inject constructor(
+    private val restClient: TagsRestClient,
+    private val sqlUtils: TagsSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchTags(siteModel: SiteModel, limitMode: Top, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchTags") {
+                if (!forced && sqlUtils.hasFreshRequest(siteModel, limitMode.limit)) {
+                    return@withDefaultContext OnStatsFetched(getTags(siteModel, limitMode), cached = true)
+                }
+                val response = restClient.fetchTags(siteModel, max = limitMode.limit + 1, forced = forced)
+                return@withDefaultContext when {
+                    response.isError -> {
+                        OnStatsFetched(response.error)
+                    }
+                    response.response != null -> {
+                        sqlUtils.insert(siteModel, response.response, requestedItems = limitMode.limit)
+                        OnStatsFetched(
+                                insightsMapper.map(response.response, limitMode)
+                        )
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getTags(site: SiteModel, cacheMode: LimitMode) = coroutineEngine.run(STATS, this, "getTags") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it, cacheMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TodayInsightsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TodayInsightsStore.kt
new file mode 100644
index 00000000000..0b6dbe8cc94
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/insights/TodayInsightsStore.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.store.stats.insights
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.insights.TodayInsightsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity.DAYS
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.TodayInsightsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TodayInsightsStore @Inject constructor(
+    private val restClient: TodayInsightsRestClient,
+    private val sqlUtils: TodayInsightsSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchTodayInsights(siteModel: SiteModel, forced: Boolean = false) =
+            coroutineEngine.withDefaultContext(STATS, this, "fetchTodayInsights") {
+                if (!forced && sqlUtils.hasFreshRequest(siteModel)) {
+                    return@withDefaultContext OnStatsFetched(getTodayInsights(siteModel), cached = true)
+                }
+                val response = restClient.fetchTimePeriodStats(siteModel, DAYS, forced)
+                return@withDefaultContext when {
+                    response.isError -> {
+                        OnStatsFetched(response.error)
+                    }
+                    response.response != null -> {
+                        sqlUtils.insert(siteModel, response.response)
+                        OnStatsFetched(insightsMapper.map(response.response))
+                    }
+                    else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+                }
+            }
+
+    fun getTodayInsights(site: SiteModel) = coroutineEngine.run(STATS, this, "getTodayInsights") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/EmailsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/EmailsStore.kt
new file mode 100644
index 00000000000..118b080ad87
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/EmailsStore.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.store.stats.subscribers
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.InsightsMapper
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.EmailsRestClient
+import org.wordpress.android.fluxc.persistence.InsightsSqlUtils.EmailsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EmailsStore @Inject constructor(
+    private val restClient: EmailsRestClient,
+    private val sqlUtils: EmailsSqlUtils,
+    private val insightsMapper: InsightsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchEmails(
+        siteModel: SiteModel,
+        limitMode: LimitMode.Top,
+        sortField: EmailsRestClient.SortField,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchEmails") {
+        if (!forced && sqlUtils.hasFreshRequest(siteModel, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getEmails(siteModel, limitMode, sortField), cached = true)
+        }
+
+        val response = restClient.fetchEmailsSummary(siteModel, limitMode.limit, sortField, forced)
+        return@withDefaultContext when {
+            response.isError -> OnStatsFetched(response.error)
+            response.response != null -> {
+                sqlUtils.insert(siteModel, response.response, requestedItems = limitMode.limit)
+                OnStatsFetched(insightsMapper.map(response.response, limitMode, sortField))
+            }
+
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getEmails(
+        site: SiteModel,
+        cacheMode: LimitMode,
+        sortField: EmailsRestClient.SortField
+    ) = coroutineEngine.run(STATS, this, "getEmails") {
+        sqlUtils.select(site)?.let { insightsMapper.map(it, cacheMode, sortField) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStore.kt
new file mode 100644
index 00000000000..e3901dda483
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/subscribers/SubscribersStore.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.store.stats.subscribers
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersMapper
+import org.wordpress.android.fluxc.model.stats.subscribers.SubscribersModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.subscribers.SubscribersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SubscribersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import org.wordpress.android.fluxc.utils.SiteUtils
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SubscribersStore @Inject constructor(
+    private val restClient: SubscribersRestClient,
+    private val sqlUtils: SubscribersSqlUtils,
+    private val subscribersMapper: SubscribersMapper,
+    private val statsUtils: StatsUtils,
+    private val currentTimeProvider: CurrentTimeProvider,
+    private val coroutineEngine: CoroutineEngine,
+    private val appLogWrapper: AppLogWrapper
+) {
+    suspend fun fetchSubscribers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchSubscribers") {
+        val dateWithTimeZone = statsUtils.getFormattedDate(
+            currentTimeProvider.currentDate(),
+            SiteUtils.getNormalizedTimezone(site.timezone)
+        )
+        logProgress(granularity, "Site timezone: ${site.timezone}")
+        logProgress(granularity, "Fetching for date with applied timezone: $dateWithTimeZone")
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, dateWithTimeZone, limitMode.limit)) {
+            logProgress(granularity, "Loading cached data")
+            return@withDefaultContext OnStatsFetched(
+                getSubscribers(site, granularity, limitMode, dateWithTimeZone),
+                cached = true
+            )
+        }
+        val payload = restClient.fetchSubscribers(site, granularity, limitMode.limit, dateWithTimeZone, forced)
+        return@withDefaultContext when {
+            payload.isError -> {
+                logProgress(granularity, "Error fetching data: ${payload.error}")
+                OnStatsFetched(payload.error)
+            }
+
+            payload.response != null -> {
+                logProgress(granularity, "Data fetched correctly")
+                sqlUtils.insert(site, payload.response, granularity, dateWithTimeZone, limitMode.limit)
+                val subscribersResponse = subscribersMapper.map(payload.response, limitMode)
+                if (subscribersResponse.period.isBlank() || subscribersResponse.dates.isEmpty()) {
+                    logProgress(granularity, "Invalid response")
+                    OnStatsFetched(
+                        StatsError(INVALID_RESPONSE, "Subscribers: Required data 'period' or 'dates' missing")
+                    )
+                } else {
+                    logProgress(granularity, "Valid response returned for period: ${subscribersResponse.period}")
+                    logProgress(granularity, "Last data item for: ${subscribersResponse.dates.lastOrNull()?.period}")
+                    OnStatsFetched(subscribersResponse)
+                }
+            }
+
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    private fun logProgress(granularity: StatsGranularity, message: String) {
+        appLogWrapper.d(STATS, "fetchSubscribers for $granularity: $message")
+    }
+
+    fun getSubscribers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode
+    ): SubscribersModel? {
+        val dateWithTimeZone = statsUtils.getFormattedDate(
+            currentTimeProvider.currentDate(),
+            SiteUtils.getNormalizedTimezone(site.timezone)
+        )
+        return getSubscribers(site, granularity, limitMode, dateWithTimeZone)
+    }
+
+    fun getSubscribers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date
+    ): SubscribersModel? {
+        val dateWithTimeZone = statsUtils.getFormattedDate(date, SiteUtils.getNormalizedTimezone(site.timezone))
+        return getSubscribers(site, granularity, limitMode, dateWithTimeZone)
+    }
+
+    private fun getSubscribers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode,
+        dateWithTimeZone: String
+    ) = coroutineEngine.run(STATS, this, "getSubscribers") {
+        sqlUtils.select(site, granularity, dateWithTimeZone)?.let { subscribersMapper.map(it, limitMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStore.kt
new file mode 100644
index 00000000000..abb9530e7ad
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/AuthorsStore.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.AuthorsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.AuthorsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AuthorsStore
+@Inject constructor(
+    private val restClient: AuthorsRestClient,
+    private val sqlUtils: AuthorsSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchAuthors(
+        site: SiteModel,
+        period: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchAuthors") {
+        if (!forced && sqlUtils.hasFreshRequest(site, period, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getAuthors(site, period, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchAuthors(site, period, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, period, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getAuthors(site: SiteModel, period: StatsGranularity, limitMode: LimitMode, date: Date) =
+            coroutineEngine.run(STATS, this, "getAuthors") {
+                sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ClicksStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ClicksStore.kt
new file mode 100644
index 00000000000..aa06fe53fb1
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ClicksStore.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ClicksRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ClicksSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ClicksStore
+@Inject constructor(
+    private val restClient: ClicksRestClient,
+    private val sqlUtils: ClicksSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchClicks(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchClicks") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getClicks(site, granularity, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchClicks(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getClicks(site: SiteModel, period: StatsGranularity, limitMode: Top, date: Date) =
+            coroutineEngine.run(STATS, this, "getClicks") {
+                sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStore.kt
new file mode 100644
index 00000000000..929df14ff24
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/CountryViewsStore.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.CountryViewsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.CountryViewsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CountryViewsStore
+@Inject constructor(
+    private val restClient: CountryViewsRestClient,
+    private val sqlUtils: CountryViewsSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchCountryViews(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode.Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchCountryViews") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getCountryViews(site, granularity, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchCountryViews(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getCountryViews(
+        site: SiteModel,
+        period: StatsGranularity,
+        limitMode: LimitMode,
+        date: Date
+    ) = coroutineEngine.run(STATS, this, "getCountryViews") {
+        sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStore.kt
new file mode 100644
index 00000000000..45cc4c31889
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/FileDownloadsStore.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.FileDownloadsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.FileDownloadsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FileDownloadsStore
+@Inject constructor(
+    private val restClient: FileDownloadsRestClient,
+    private val sqlUtils: FileDownloadsSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchFileDownloads(
+        site: SiteModel,
+        period: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchFileDownloads") {
+        if (!forced && sqlUtils.hasFreshRequest(site, period, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getFileDownloads(site, period, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchFileDownloads(site, period, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, period, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getFileDownloads(
+        site: SiteModel,
+        period: StatsGranularity,
+        limitMode: LimitMode,
+        date: Date
+    ) = coroutineEngine.run(STATS, this, "getFileDownloads") {
+        sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStore.kt
new file mode 100644
index 00000000000..931a4ad3f55
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/PostAndPageViewsStore.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.PostAndPageViewsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.PostsAndPagesSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PostAndPageViewsStore
+@Inject constructor(
+    private val restClient: PostAndPageViewsRestClient,
+    private val sqlUtils: PostsAndPagesSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchPostAndPageViews(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchPostAndPageViews") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(
+                    getPostAndPageViews(site, granularity, limitMode, date),
+                    cached = true
+            )
+        }
+        val payload = restClient.fetchPostAndPageViews(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getPostAndPageViews(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        cacheMode: LimitMode,
+        date: Date
+    ) = coroutineEngine.run(STATS, this, "getPostAndPageViews") {
+        sqlUtils.select(site, granularity, date)?.let { timeStatsMapper.map(it, cacheMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStore.kt
new file mode 100644
index 00000000000..bd17e22e818
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/ReferrersStore.kt
@@ -0,0 +1,131 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.ReferrersRestClient.ReferrersResponse
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.ReferrersSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnReportReferrerAsSpam
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReferrersStore @Inject constructor(
+    private val restClient: ReferrersRestClient,
+    private val sqlUtils: ReferrersSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchReferrers(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchReferrers") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getReferrers(site, granularity, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchReferrers(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getReferrers(site: SiteModel, granularity: StatsGranularity, limitMode: Top, date: Date) =
+            coroutineEngine.run(STATS, this, "getReferrers") {
+                sqlUtils.select(site, granularity, date)?.let { timeStatsMapper.map(it, limitMode) }
+            }
+
+    suspend fun reportReferrerAsSpam(
+        site: SiteModel,
+        domain: String,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date
+    ) = coroutineEngine.withDefaultContext(STATS, this, "reportReferrerAsSpam") {
+        val payload = restClient.reportReferrerAsSpam(site, domain)
+
+        if (payload.response != null || payload.error.type == StatsErrorType.ALREADY_SPAMMED) {
+            updateCacheWithMarkedSpam(site, granularity, date, domain, limitMode, true)
+        }
+        return@withDefaultContext when {
+            payload.isError -> OnReportReferrerAsSpam(payload.error)
+            payload.response != null -> OnReportReferrerAsSpam(payload.response)
+            else -> OnReportReferrerAsSpam(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    suspend fun unreportReferrerAsSpam(
+        site: SiteModel,
+        domain: String,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date
+    ) = coroutineEngine.withDefaultContext(STATS, this, "unreportReferrerAsSpam") {
+        val payload = restClient.unreportReferrerAsSpam(site, domain)
+
+        if (payload.response != null || payload.error.type == StatsErrorType.ALREADY_SPAMMED) {
+            updateCacheWithMarkedSpam(site, granularity, date, domain, limitMode, false)
+        }
+        return@withDefaultContext when {
+            payload.isError -> OnReportReferrerAsSpam(payload.error)
+            payload.response != null -> OnReportReferrerAsSpam(payload.response)
+            else -> OnReportReferrerAsSpam(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    @Suppress("LongParameterList")
+    private fun updateCacheWithMarkedSpam(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        date: Date,
+        domain: String,
+        limitMode: Top,
+        spam: Boolean
+    ) {
+        val currentModel = sqlUtils.select(site, granularity, date)
+        if (currentModel != null) {
+            val updatedModel = setSelectForSpam(currentModel, domain, spam)
+            if (currentModel != updatedModel) {
+                sqlUtils.insert(site, updatedModel, granularity, date, limitMode.limit)
+            }
+        }
+    }
+
+    fun setSelectForSpam(model: ReferrersResponse, domain: String, spam: Boolean): ReferrersResponse {
+        val updatedGroups = model.referrerGroups.map { group ->
+            // Many groups has url as null, but they can still be spammed using their names as url
+            val groupMarkedAsSpam = if (group.url == domain || group.name == domain) {
+                spam
+            } else {
+                group.markedAsSpam
+            }
+            val updatedReferrers = group.referrers?.map { referrer ->
+                val referrerMarkedAsSpam = if (referrer.url == domain ||
+                        referrer.children?.any { it.url == domain } == true) {
+                    spam
+                } else {
+                    referrer.markedAsSpam
+                }
+                referrer.copy(markedAsSpam = referrerMarkedAsSpam)
+            }
+            group.copy(markedAsSpam = groupMarkedAsSpam, referrers = updatedReferrers)
+        }
+        return model.copy(referrerGroups = updatedGroups)
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStore.kt
new file mode 100644
index 00000000000..cb13cfd4522
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/SearchTermsStore.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.SearchTermsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.SearchTermsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SearchTermsStore
+@Inject constructor(
+    private val restClient: SearchTermsRestClient,
+    private val sqlUtils: SearchTermsSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchSearchTerms(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode.Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchSearchTerms") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getSearchTerms(site, granularity, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchSearchTerms(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getSearchTerms(site: SiteModel, period: StatsGranularity, limitMode: LimitMode, date: Date) =
+            coroutineEngine.run(STATS, this, "getSearchTerms") {
+                sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStore.kt
new file mode 100644
index 00000000000..91a079c76fe
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VideoPlaysStore.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VideoPlaysRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VideoPlaysSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class VideoPlaysStore
+@Inject constructor(
+    private val restClient: VideoPlaysRestClient,
+    private val sqlUtils: VideoPlaysSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val coroutineEngine: CoroutineEngine
+) {
+    suspend fun fetchVideoPlays(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode.Top,
+        date: Date,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchVideoPlays") {
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, date, limitMode.limit)) {
+            return@withDefaultContext OnStatsFetched(getVideoPlays(site, granularity, limitMode, date), cached = true)
+        }
+        val payload = restClient.fetchVideoPlays(site, granularity, date, limitMode.limit + 1, forced)
+        return@withDefaultContext when {
+            payload.isError -> OnStatsFetched(payload.error)
+            payload.response != null -> {
+                sqlUtils.insert(site, payload.response, granularity, date, limitMode.limit)
+                OnStatsFetched(timeStatsMapper.map(payload.response, limitMode))
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    fun getVideoPlays(site: SiteModel, period: StatsGranularity, limitMode: LimitMode, date: Date) =
+            coroutineEngine.run(STATS, this, "getVideoPlays") {
+                sqlUtils.select(site, period, date)?.let { timeStatsMapper.map(it, limitMode) }
+            }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStore.kt
new file mode 100644
index 00000000000..7f60fc35aed
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/stats/time/VisitsAndViewsStore.kt
@@ -0,0 +1,167 @@
+package org.wordpress.android.fluxc.store.stats.time
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.stats.LimitMode
+import org.wordpress.android.fluxc.model.stats.LimitMode.Top
+import org.wordpress.android.fluxc.model.stats.time.TimeStatsMapper
+import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.StatsUtils
+import org.wordpress.android.fluxc.network.rest.wpcom.stats.time.VisitAndViewsRestClient
+import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.fluxc.persistence.TimeStatsSqlUtils.VisitsAndViewsSqlUtils
+import org.wordpress.android.fluxc.store.StatsStore.OnStatsFetched
+import org.wordpress.android.fluxc.store.StatsStore.StatsError
+import org.wordpress.android.fluxc.store.StatsStore.StatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.tools.CoroutineEngine
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.fluxc.utils.CurrentTimeProvider
+import org.wordpress.android.fluxc.utils.SiteUtils
+import org.wordpress.android.util.AppLog.T.STATS
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class VisitsAndViewsStore
+@Inject constructor(
+    private val restClient: VisitAndViewsRestClient,
+    private val sqlUtils: VisitsAndViewsSqlUtils,
+    private val timeStatsMapper: TimeStatsMapper,
+    private val statsUtils: StatsUtils,
+    private val currentTimeProvider: CurrentTimeProvider,
+    private val coroutineEngine: CoroutineEngine,
+    private val appLogWrapper: AppLogWrapper
+) {
+    suspend fun fetchVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        forced: Boolean = false
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchVisits") {
+        val dateWithTimeZone = statsUtils.getFormattedDate(
+            currentTimeProvider.currentDate(),
+            SiteUtils.getNormalizedTimezone(site.timezone)
+        )
+        logProgress(granularity, "Site timezone: ${site.timezone}")
+        try {
+            logProgress(granularity, "Current date: ${currentTimeProvider.currentDate()}")
+        } catch (e: AssertionError) {
+            // Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
+            logProgress(granularity, "Cannot print current date because of AssertionError: $e")
+        }
+        logProgress(granularity, "Fetching for date with applied timezone: $dateWithTimeZone")
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, dateWithTimeZone, limitMode.limit)) {
+            logProgress(granularity, "Loading cached data")
+            return@withDefaultContext OnStatsFetched(
+                    getVisits(site, granularity, limitMode, dateWithTimeZone),
+                    cached = true
+            )
+        }
+        val payload = restClient.fetchVisits(site, granularity, dateWithTimeZone, limitMode.limit, forced)
+        return@withDefaultContext when {
+            payload.isError -> {
+                logProgress(granularity, "Error fetching data: ${payload.error}")
+                OnStatsFetched(payload.error)
+            }
+            payload.response != null -> {
+                logProgress(granularity, "Data fetched correctly")
+                sqlUtils.insert(site, payload.response, granularity, dateWithTimeZone, limitMode.limit)
+                val overviewResponse = timeStatsMapper.map(payload.response, limitMode)
+                if (overviewResponse.period.isBlank() || overviewResponse.dates.isEmpty()) {
+                    logProgress(granularity, "Invalid response")
+                    OnStatsFetched(StatsError(INVALID_RESPONSE, "Overview: Required data 'period' or 'dates' missing"))
+                } else {
+                    logProgress(granularity, "Valid response returned for period: ${overviewResponse.period}")
+                    logProgress(granularity, "Last data item for: ${overviewResponse.dates.lastOrNull()?.period}")
+                    OnStatsFetched(overviewResponse)
+                }
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    suspend fun fetchVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        forced: Boolean = false,
+        applySiteTimezone: Boolean = true
+    ) = coroutineEngine.withDefaultContext(STATS, this, "fetchVisits") {
+        val timezone = if (applySiteTimezone) SiteUtils.getNormalizedTimezone(site.timezone) else null
+        val dateWithTimeZone = statsUtils.getFormattedDate(date, timezone)
+        logProgress(granularity, "Site timezone: ${site.timezone}")
+        try {
+            logProgress(granularity, "Current date: ${currentTimeProvider.currentDate()}")
+        } catch (e: AssertionError) {
+            // Workaround for a bug in Android that can cause crashes on Android 8.0 and 8.1
+            logProgress(granularity, "Cannot print current date because of AssertionError: $e")
+        }
+        logProgress(granularity, "Fetching for date with applied timezone: $dateWithTimeZone")
+        if (!forced && sqlUtils.hasFreshRequest(site, granularity, dateWithTimeZone, limitMode.limit)) {
+            logProgress(granularity, "Loading cached data")
+            return@withDefaultContext OnStatsFetched(
+                    getVisits(site, granularity, limitMode, dateWithTimeZone),
+                    cached = true
+            )
+        }
+        val payload = restClient.fetchVisits(site, granularity, dateWithTimeZone, limitMode.limit, forced)
+        return@withDefaultContext when {
+            payload.isError -> {
+                logProgress(granularity, "Error fetching data: ${payload.error}")
+                OnStatsFetched(payload.error)
+            }
+            payload.response != null -> {
+                logProgress(granularity, "Data fetched correctly")
+                sqlUtils.insert(site, payload.response, granularity, dateWithTimeZone, limitMode.limit)
+                val overviewResponse = timeStatsMapper.map(payload.response, limitMode)
+                if (overviewResponse.period.isBlank() || overviewResponse.dates.isEmpty()) {
+                    logProgress(granularity, "Invalid response")
+                    OnStatsFetched(StatsError(INVALID_RESPONSE, "Overview: Required data 'period' or 'dates' missing"))
+                } else {
+                    logProgress(granularity, "Valid response returned for period: ${overviewResponse.period}")
+                    logProgress(granularity, "Last data item for: ${overviewResponse.dates.lastOrNull()?.period}")
+                    OnStatsFetched(overviewResponse)
+                }
+            }
+            else -> OnStatsFetched(StatsError(INVALID_RESPONSE))
+        }
+    }
+
+    private fun logProgress(granularity: StatsGranularity, message: String) {
+        appLogWrapper.d(STATS, "fetchVisits for $granularity: $message")
+    }
+
+    fun getVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode
+    ): VisitsAndViewsModel? {
+        val dateWithTimeZone = statsUtils.getFormattedDate(
+            currentTimeProvider.currentDate(),
+            SiteUtils.getNormalizedTimezone(site.timezone)
+        )
+        return getVisits(site, granularity, limitMode, dateWithTimeZone)
+    }
+
+    fun getVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: Top,
+        date: Date,
+        applySiteTimezone: Boolean = true
+    ): VisitsAndViewsModel? {
+        val timezone = if (applySiteTimezone) SiteUtils.getNormalizedTimezone(site.timezone) else null
+        val dateWithTimeZone = statsUtils.getFormattedDate(date, timezone)
+        return getVisits(site, granularity, limitMode, dateWithTimeZone)
+    }
+
+    private fun getVisits(
+        site: SiteModel,
+        granularity: StatsGranularity,
+        limitMode: LimitMode,
+        dateWithTimeZone: String
+    ) = coroutineEngine.run(STATS, this, "getVisits") {
+        sqlUtils.select(site, granularity, dateWithTimeZone)?.let { timeStatsMapper.map(it, limitMode) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/CoroutineEngine.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/CoroutineEngine.kt
new file mode 100644
index 00000000000..48dc7c5a847
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/CoroutineEngine.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.fluxc.tools
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+// The class is open for testing
+open class CoroutineEngine
+@Inject constructor(
+    private val context: CoroutineContext,
+    private val appLog: AppLogWrapper
+) {
+    private val coroutineScope = CoroutineScope(context)
+
+    suspend fun <RESULT_TYPE> withDefaultContext(
+        tag: AppLog.T,
+        caller: Any,
+        loggedMessage: String,
+        block: suspend CoroutineScope.() -> RESULT_TYPE
+    ): RESULT_TYPE {
+        appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage")
+        return withContext(context, block)
+    }
+
+    fun <RESULT_TYPE> run(tag: AppLog.T, caller: Any, loggedMessage: String, block: () -> RESULT_TYPE): RESULT_TYPE {
+        appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage")
+        return block()
+    }
+
+    fun <RESULT_TYPE> flowWithDefaultContext(
+        tag: AppLog.T,
+        caller: Any,
+        loggedMessage: String,
+        block: suspend FlowCollector<RESULT_TYPE>.() -> Unit
+    ): Flow<RESULT_TYPE> {
+        return flow { block() }
+            .flowOn(context)
+            .onStart { appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage Started") }
+            .onEach { appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage OnEvent: $it") }
+            .onCompletion { appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage Completed") }
+    }
+
+    fun <RESULT_TYPE> launch(
+        tag: AppLog.T,
+        caller: Any,
+        loggedMessage: String,
+        block: suspend CoroutineScope.() -> RESULT_TYPE
+    ): Job {
+        appLog.d(tag, "${caller.javaClass.simpleName}: $loggedMessage")
+        return coroutineScope.launch {
+            block(this)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FluxCImageLoader.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FluxCImageLoader.java
new file mode 100644
index 00000000000..7785ddc6117
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FluxCImageLoader.java
@@ -0,0 +1,89 @@
+package org.wordpress.android.fluxc.tools;
+
+import android.graphics.Bitmap;
+import android.util.Base64;
+import android.widget.ImageView.ScaleType;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.ImageLoader;
+import com.android.volley.toolbox.ImageRequest;
+
+import org.wordpress.android.fluxc.network.HTTPAuthManager;
+import org.wordpress.android.fluxc.network.HTTPAuthModel;
+import org.wordpress.android.fluxc.network.UserAgent;
+import org.wordpress.android.fluxc.network.rest.wpcom.auth.AccessToken;
+import org.wordpress.android.fluxc.utils.WPUrlUtils;
+import org.wordpress.android.util.UrlUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * Image Loader that leverage the Volley queue, stored access token and stored HTTP Auth credentials
+ */
+public class FluxCImageLoader extends ImageLoader {
+    private AccessToken mAccessToken;
+    private HTTPAuthManager mHTTPAuthManager;
+    private UserAgent mUserAgent;
+
+    @Inject public FluxCImageLoader(@Named("custom-ssl") RequestQueue queue,
+                            ImageCache imageCache,
+                            AccessToken accessToken,
+                            HTTPAuthManager httpAuthManager,
+                            UserAgent userAgent) {
+        super(queue, imageCache);
+        mAccessToken = accessToken;
+        mHTTPAuthManager = httpAuthManager;
+        mUserAgent = userAgent;
+        // http://stackoverflow.com/a/17035814 - Responses from the ImageLoader are actually delayed / batched
+        // up before being delivered. So images that are ready are not being delivered as soon as they
+        // possible can be to achieve a sort of page load aesthetic.
+        setBatchedResponseDelay(0);
+    }
+
+    @Override
+    protected Request<Bitmap> makeImageRequest(String requestUrl, int maxWidth, int maxHeight,
+                                               ScaleType scaleType, final String cacheKey) {
+        if (WPUrlUtils.isWordPressCom(requestUrl) && !UrlUtils.isHttps(requestUrl)) {
+            requestUrl = UrlUtils.makeHttps(requestUrl);
+        }
+        final String url = requestUrl;
+        return new ImageRequest(url, new Response.Listener<Bitmap>() {
+            @Override
+            public void onResponse(Bitmap response) {
+                onGetImageSuccess(cacheKey, response);
+            }
+        }, maxWidth, maxHeight, scaleType, Bitmap.Config.RGB_565, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                onGetImageError(cacheKey, error);
+            }
+        }) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                HashMap<String, String> headers = new HashMap<>();
+                headers.put("User-Agent", mUserAgent.getUserAgent());
+                if (WPUrlUtils.safeToAddWordPressComAuthToken(url)) {
+                    headers.put("Authorization", "Bearer " + mAccessToken.get());
+                } else {
+                    // Check if we had HTTP Auth credentials for the root url
+                    HTTPAuthModel httpAuthModel = mHTTPAuthManager.getHTTPAuthModel(url);
+                    if (httpAuthModel != null) {
+                        String creds = String.format("%s:%s", httpAuthModel.getUsername(), httpAuthModel.getPassword());
+                        String auth = "Basic " + Base64.encodeToString(creds.getBytes(), Base64.NO_WRAP);
+                        headers.put("Authorization", auth);
+                    }
+                }
+                return headers;
+            }
+        };
+    }
+}
+
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FormattableContentMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FormattableContentMapper.kt
new file mode 100644
index 00000000000..103a368eb0f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/tools/FormattableContentMapper.kt
@@ -0,0 +1,141 @@
+package org.wordpress.android.fluxc.tools
+
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import javax.inject.Inject
+
+class FormattableContentMapper @Inject constructor(val gson: Gson) {
+    fun mapToFormattableContent(json: String): FormattableContent = gson.fromJson(json, FormattableContent::class.java)
+
+    fun mapToFormattableContentList(json: String): List<FormattableContent> =
+            gson.fromJson(json, object : TypeToken<List<FormattableContent>>() {}.type)
+
+    fun mapToFormattableMeta(json: String): FormattableMeta = gson.fromJson(json, FormattableMeta::class.java)
+
+    fun mapFormattableContentToJson(formattableContent: FormattableContent): String = gson.toJson(formattableContent)
+
+    fun mapFormattableContentListToJson(formattableList: List<FormattableContent>): String =
+            gson.toJson(formattableList)
+
+    fun mapFormattableMetaToJson(formattableMeta: FormattableMeta): String = gson.toJson(formattableMeta)
+}
+
+data class FormattableContent(
+    @SerializedName("actions") val actions: Map<String, Boolean>? = null,
+    @SerializedName("media") val media: List<FormattableMedia>? = null,
+    @SerializedName("meta") val meta: FormattableMeta? = null,
+    @SerializedName("text") val text: String? = null,
+    @SerializedName("type") val type: String? = null,
+    @SerializedName("nest_level") val nestLevel: Int? = null,
+    @SerializedName("ranges") val ranges: List<FormattableRange>? = null
+)
+
+data class FormattableMedia(
+    @SerializedName("height") val height: String? = null,
+    @SerializedName("width") val width: String? = null,
+    @SerializedName("type") val type: String? = null,
+    @SerializedName("url") val url: String? = null,
+    @SerializedName("indices") val indices: List<Int>? = null
+)
+
+data class FormattableMeta(
+    @SerializedName("ids") val ids: Ids? = null,
+    @SerializedName("links") val links: Links? = null,
+    @SerializedName("titles") val titles: Titles? = null,
+    @SerializedName("is_mobile_button") val isMobileButton: Boolean? = null
+) {
+    data class Ids(
+        @SerializedName("site") val site: Long? = null,
+        @SerializedName("user") val user: Long? = null,
+        @SerializedName("comment") val comment: Long? = null,
+        @SerializedName("post") val post: Long? = null,
+        @SerializedName("order") val order: Long? = null,
+        @SerializedName("campaign_id") val campaignId: Long? = null
+    )
+
+    data class Links(
+        @SerializedName("site") val site: String? = null,
+        @SerializedName("user") val user: String? = null,
+        @SerializedName("comment") val comment: String? = null,
+        @SerializedName("post") val post: String? = null,
+        @SerializedName("email") val email: String? = null,
+        @SerializedName("home") val home: String? = null,
+        @SerializedName("order") val order: String? = null
+    )
+
+    data class Titles(
+        @SerializedName("home") val home: String? = null,
+        @SerializedName("tagline") val tagline: String? = null
+    )
+}
+
+data class FormattableRange(
+    @SerializedName("id") private val stringId: String? = null,
+    @SerializedName("site_id") val siteId: Long? = null,
+    @SerializedName("post_id") val postId: Long? = null,
+    @SerializedName("root_id") val rootId: Long? = null,
+    @SerializedName("type") val type: String? = null,
+    @SerializedName("url") val url: String? = null,
+    @SerializedName("section") val section: String? = null,
+    @SerializedName("intent") val intent: String? = null,
+    @SerializedName("context") val context: String? = null,
+    @SerializedName("value") val value: String? = null,
+    @SerializedName("indices") val indices: List<Int>? = null
+) {
+    // ID in json response is string, and can be non numerical.
+    // we only use numerical ID at the moment, and can safely ignore non-numerical values
+    val id: Long?
+        get() = try {
+            stringId?.toLong()
+        } catch (e: NumberFormatException) {
+            null
+        }
+
+    fun rangeType(): FormattableRangeType {
+        return if (type != null) FormattableRangeType.fromString(type) else FormattableRangeType.fromString(section)
+    }
+}
+
+enum class FormattableRangeType {
+    POST,
+    SITE,
+    PAGE,
+    COMMENT,
+    USER,
+    STAT,
+    SCAN,
+    BLOCKQUOTE,
+    FOLLOW,
+    NOTICON,
+    LIKE,
+    MATCH,
+    MEDIA,
+    B,
+    REWIND_DOWNLOAD_READY,
+    UNKNOWN;
+
+    companion object {
+        @Suppress("ComplexMethod")
+        fun fromString(value: String?): FormattableRangeType {
+            return when (value) {
+                "post" -> POST
+                "site" -> SITE
+                "page" -> PAGE
+                "comment" -> COMMENT
+                "user" -> USER
+                "stat" -> STAT
+                "scan" -> SCAN
+                "blockquote" -> BLOCKQUOTE
+                "follow" -> FOLLOW
+                "noticon" -> NOTICON
+                "like" -> LIKE
+                "match" -> MATCH
+                "media" -> MEDIA
+                "b" -> B
+                "rewind_download_ready" -> REWIND_DOWNLOAD_READY
+                else -> UNKNOWN
+            }
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/AppLogWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/AppLogWrapper.kt
new file mode 100644
index 00000000000..36eff1a578f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/AppLogWrapper.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.util.AppLog
+import javax.inject.Inject
+
+class AppLogWrapper
+@Inject constructor() {
+    fun d(tag: AppLog.T, message: String) = AppLog.d(tag, message)
+    fun e(tag: AppLog.T, message: String) = AppLog.e(tag, message)
+    fun w(tag: AppLog.T, message: String) = AppLog.w(tag, message)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/BuildConfigWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/BuildConfigWrapper.kt
new file mode 100644
index 00000000000..a818167ba3b
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/BuildConfigWrapper.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.fluxc.utils
+
+import dagger.Reusable
+import org.wordpress.android.fluxc.BuildConfig
+import javax.inject.Inject
+
+@Reusable
+class BuildConfigWrapper @Inject constructor() {
+    fun isDebug() = BuildConfig.DEBUG
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtils.java
new file mode 100644
index 00000000000..14b15564c41
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtils.java
@@ -0,0 +1,114 @@
+package org.wordpress.android.fluxc.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.wordpress.android.fluxc.model.CommentModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType;
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError;
+import org.wordpress.android.fluxc.network.xmlrpc.XMLRPCFault;
+import org.wordpress.android.fluxc.store.CommentStore.CommentError;
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType;
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.FetchedCommentLikesResponsePayload;
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentResponsePayload;
+
+import java.util.ArrayList;
+
+public class CommentErrorUtils {
+    @NonNull
+    public static RemoteCommentResponsePayload commentErrorToFetchCommentPayload(
+            @NonNull BaseNetworkError error,
+            @Nullable CommentModel comment) {
+        RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+        payload.error = new CommentError(genericToCommentError(error), getErrorMessage(error));
+        return payload;
+    }
+
+    @NonNull
+    public static FetchCommentsResponsePayload commentErrorToFetchCommentsPayload(
+            @NonNull BaseNetworkError error,
+            @NonNull SiteModel site) {
+        FetchCommentsResponsePayload payload = new FetchCommentsResponsePayload(
+                new ArrayList<>(), site, 0, 0, null
+        );
+        payload.error = new CommentError(genericToCommentError(error), getErrorMessage(error));
+        return payload;
+    }
+
+    @NonNull
+    public static FetchedCommentLikesResponsePayload commentErrorToFetchedCommentLikesPayload(
+            @NonNull BaseNetworkError error,
+            long siteId,
+            long commentId,
+            boolean requestNextPage,
+            boolean hasMore
+    ) {
+        FetchedCommentLikesResponsePayload payload = new FetchedCommentLikesResponsePayload(
+                new ArrayList<>(),
+                siteId,
+                commentId,
+                requestNextPage,
+                hasMore
+        );
+        payload.error = new CommentError(genericToCommentError(error), getErrorMessage(error));
+        return payload;
+    }
+
+    @NonNull
+    public static RemoteCommentResponsePayload commentErrorToPushCommentPayload(
+            @NonNull BaseNetworkError error,
+            @NonNull CommentModel comment) {
+        RemoteCommentResponsePayload payload = new RemoteCommentResponsePayload(comment);
+        payload.error = new CommentError(genericToCommentError(error), getErrorMessage(error));
+        return payload;
+    }
+
+    @NonNull
+    public static CommentError networkToCommentError(@NonNull BaseNetworkError error) {
+        return new CommentError(genericToCommentError(error), getErrorMessage(error));
+    }
+
+    @NonNull
+    private static CommentErrorType genericToCommentError(@NonNull BaseNetworkError error) {
+        CommentErrorType errorType = CommentErrorType.GENERIC_ERROR;
+        if (error.isGeneric() && error.type == GenericErrorType.INVALID_RESPONSE) {
+            errorType = CommentErrorType.INVALID_RESPONSE;
+        }
+        if (error instanceof WPComGsonNetworkError) {
+            WPComGsonNetworkError wpComGsonNetworkError = (WPComGsonNetworkError) error;
+            // Duplicate comment on WPCom REST
+            if ("comment_duplicate".equals(wpComGsonNetworkError.apiError)
+                || "duplicate_comment".equals(wpComGsonNetworkError.apiError)) {
+                errorType = CommentErrorType.DUPLICATE_COMMENT;
+            }
+            if ("unauthorized".equals(wpComGsonNetworkError.apiError)) {
+                errorType = CommentErrorType.AUTHORIZATION_REQUIRED;
+            }
+            // Note: we also get this "unknown_comment" error we we try to comment on the post with id=0.
+            if ("unknown_comment".equals(wpComGsonNetworkError.apiError)) {
+                errorType = CommentErrorType.UNKNOWN_COMMENT;
+            }
+            if ("unknown_post".equals(wpComGsonNetworkError.apiError)) {
+                errorType = CommentErrorType.UNKNOWN_POST;
+            }
+        }
+        // Duplicate comment on XMLRPC
+        if (error.type == GenericErrorType.PARSE_ERROR && error.hasVolleyError()
+            && error.volleyError.getCause() instanceof XMLRPCFault
+            && ((XMLRPCFault) error.volleyError.getCause()).getFaultCode() == 409) {
+            errorType = CommentErrorType.DUPLICATE_COMMENT;
+        }
+        // Note: We get a 404 error reply via XMLRPC if the comment or post ids are invalid, there is no way to know
+        // the exact underlying error. It's described in the error message "Invalid post ID" for instance, but that
+        // error message is localized, so not great for parsing.
+        return errorType;
+    }
+
+    @NonNull
+    private static String getErrorMessage(@NonNull BaseNetworkError error) {
+        return error.message;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtilsWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtilsWrapper.kt
new file mode 100644
index 00000000000..6950fcd5e90
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CommentErrorUtilsWrapper.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.utils
+
+import dagger.Reusable
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import javax.inject.Inject
+
+@Reusable
+class CommentErrorUtilsWrapper @Inject constructor() {
+    fun networkToCommentError(error: BaseNetworkError): CommentError = CommentErrorUtils.networkToCommentError(error)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CurrentTimeProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CurrentTimeProvider.kt
new file mode 100644
index 00000000000..652d59abeb8
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/CurrentTimeProvider.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.fluxc.utils
+
+import java.util.Date
+import javax.inject.Inject
+
+class CurrentTimeProvider
+@Inject constructor() {
+    fun currentDate() = Date()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/DateTimeUtilsWrapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/DateTimeUtilsWrapper.kt
new file mode 100644
index 00000000000..aa8c20271eb
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/DateTimeUtilsWrapper.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.utils
+
+import dagger.Reusable
+import org.wordpress.android.util.DateTimeUtils
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class DateTimeUtilsWrapper @Inject constructor() {
+    fun timestampFromIso8601(strDate: String?) = DateTimeUtils.timestampFromIso8601(strDate)
+    fun iso8601UTCFromDate(date: Date?): String? = DateTimeUtils.iso8601UTCFromDate(date)
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ErrorUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ErrorUtils.java
new file mode 100644
index 00000000000..b51398f101f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ErrorUtils.java
@@ -0,0 +1,37 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ErrorUtils {
+    public static class OnUnexpectedError {
+        public static final String KEY_URL = "url";
+        public static final String KEY_RESPONSE = "response";
+
+        public Exception exception;
+        public String description;
+        public Map<String, String> extras = new HashMap<>();
+        public AppLog.T type;
+
+        public OnUnexpectedError(Exception exception) {
+            this(exception, "");
+        }
+
+        public OnUnexpectedError(Exception exception, String description) {
+            this(exception, description, T.API);
+        }
+
+        public OnUnexpectedError(Exception exception, String description, T type) {
+            this.exception = exception;
+            this.description = description;
+            this.type = type;
+        }
+
+        public void addExtra(String key, String value) {
+            extras.put(key, value);
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ExifUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ExifUtils.kt
new file mode 100644
index 00000000000..92beb05dc14
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ExifUtils.kt
@@ -0,0 +1,192 @@
+package org.wordpress.android.fluxc.utils
+
+import androidx.exifinterface.media.ExifInterface
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import java.io.IOException
+
+object ExifUtils {
+    @Suppress("LongMethod")
+    private fun getExifAttributes(): List<String> {
+        return listOf(
+            ExifInterface.TAG_IMAGE_WIDTH,
+            ExifInterface.TAG_IMAGE_LENGTH,
+            ExifInterface.TAG_BITS_PER_SAMPLE,
+            ExifInterface.TAG_COMPRESSION,
+            ExifInterface.TAG_PHOTOMETRIC_INTERPRETATION,
+            ExifInterface.TAG_ORIENTATION,
+            ExifInterface.TAG_SAMPLES_PER_PIXEL,
+            ExifInterface.TAG_PLANAR_CONFIGURATION,
+            ExifInterface.TAG_Y_CB_CR_SUB_SAMPLING,
+            ExifInterface.TAG_Y_CB_CR_POSITIONING,
+            ExifInterface.TAG_X_RESOLUTION,
+            ExifInterface.TAG_Y_RESOLUTION,
+            ExifInterface.TAG_RESOLUTION_UNIT,
+            ExifInterface.TAG_STRIP_OFFSETS,
+            ExifInterface.TAG_ROWS_PER_STRIP,
+            ExifInterface.TAG_STRIP_BYTE_COUNTS,
+            ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT,
+            ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+            ExifInterface.TAG_TRANSFER_FUNCTION,
+            ExifInterface.TAG_WHITE_POINT,
+            ExifInterface.TAG_PRIMARY_CHROMATICITIES,
+            ExifInterface.TAG_Y_CB_CR_COEFFICIENTS,
+            ExifInterface.TAG_REFERENCE_BLACK_WHITE,
+            ExifInterface.TAG_DATETIME,
+            ExifInterface.TAG_IMAGE_DESCRIPTION,
+            ExifInterface.TAG_MAKE,
+            ExifInterface.TAG_MODEL,
+            ExifInterface.TAG_SOFTWARE,
+            ExifInterface.TAG_ARTIST,
+            ExifInterface.TAG_COPYRIGHT,
+            ExifInterface.TAG_EXIF_VERSION,
+            ExifInterface.TAG_FLASHPIX_VERSION,
+            ExifInterface.TAG_COLOR_SPACE,
+            ExifInterface.TAG_GAMMA,
+            ExifInterface.TAG_PIXEL_X_DIMENSION,
+            ExifInterface.TAG_PIXEL_Y_DIMENSION,
+            ExifInterface.TAG_COMPONENTS_CONFIGURATION,
+            ExifInterface.TAG_COMPRESSED_BITS_PER_PIXEL,
+            ExifInterface.TAG_MAKER_NOTE,
+            ExifInterface.TAG_USER_COMMENT,
+            ExifInterface.TAG_RELATED_SOUND_FILE,
+            ExifInterface.TAG_DATETIME_ORIGINAL,
+            ExifInterface.TAG_DATETIME_DIGITIZED,
+            ExifInterface.TAG_SUBSEC_TIME,
+            ExifInterface.TAG_SUBSEC_TIME_ORIGINAL,
+            ExifInterface.TAG_SUBSEC_TIME_DIGITIZED,
+            ExifInterface.TAG_EXPOSURE_TIME,
+            ExifInterface.TAG_F_NUMBER,
+            ExifInterface.TAG_EXPOSURE_PROGRAM,
+            ExifInterface.TAG_SPECTRAL_SENSITIVITY,
+            ExifInterface.TAG_ISO_SPEED_RATINGS,
+            ExifInterface.TAG_PHOTOGRAPHIC_SENSITIVITY,
+            ExifInterface.TAG_OECF,
+            ExifInterface.TAG_SENSITIVITY_TYPE,
+            ExifInterface.TAG_STANDARD_OUTPUT_SENSITIVITY,
+            ExifInterface.TAG_RECOMMENDED_EXPOSURE_INDEX,
+            ExifInterface.TAG_ISO_SPEED,
+            ExifInterface.TAG_ISO_SPEED_LATITUDE_YYY,
+            ExifInterface.TAG_ISO_SPEED_LATITUDE_ZZZ,
+            ExifInterface.TAG_SHUTTER_SPEED_VALUE,
+            ExifInterface.TAG_APERTURE_VALUE,
+            ExifInterface.TAG_BRIGHTNESS_VALUE,
+            ExifInterface.TAG_EXPOSURE_BIAS_VALUE,
+            ExifInterface.TAG_MAX_APERTURE_VALUE,
+            ExifInterface.TAG_SUBJECT_DISTANCE,
+            ExifInterface.TAG_METERING_MODE,
+            ExifInterface.TAG_LIGHT_SOURCE,
+            ExifInterface.TAG_FLASH,
+            ExifInterface.TAG_SUBJECT_AREA,
+            ExifInterface.TAG_FOCAL_LENGTH,
+            ExifInterface.TAG_FLASH_ENERGY,
+            ExifInterface.TAG_SPATIAL_FREQUENCY_RESPONSE,
+            ExifInterface.TAG_FOCAL_PLANE_X_RESOLUTION,
+            ExifInterface.TAG_FOCAL_PLANE_Y_RESOLUTION,
+            ExifInterface.TAG_FOCAL_PLANE_RESOLUTION_UNIT,
+            ExifInterface.TAG_SUBJECT_LOCATION,
+            ExifInterface.TAG_EXPOSURE_INDEX,
+            ExifInterface.TAG_SENSING_METHOD,
+            ExifInterface.TAG_FILE_SOURCE,
+            ExifInterface.TAG_SCENE_TYPE,
+            ExifInterface.TAG_CFA_PATTERN,
+            ExifInterface.TAG_CUSTOM_RENDERED,
+            ExifInterface.TAG_EXPOSURE_MODE,
+            ExifInterface.TAG_WHITE_BALANCE,
+            ExifInterface.TAG_DIGITAL_ZOOM_RATIO,
+            ExifInterface.TAG_FOCAL_LENGTH_IN_35MM_FILM,
+            ExifInterface.TAG_SCENE_CAPTURE_TYPE,
+            ExifInterface.TAG_GAIN_CONTROL,
+            ExifInterface.TAG_CONTRAST,
+            ExifInterface.TAG_SATURATION,
+            ExifInterface.TAG_SHARPNESS,
+            ExifInterface.TAG_DEVICE_SETTING_DESCRIPTION,
+            ExifInterface.TAG_SUBJECT_DISTANCE_RANGE,
+            ExifInterface.TAG_IMAGE_UNIQUE_ID,
+            ExifInterface.TAG_BODY_SERIAL_NUMBER,
+            ExifInterface.TAG_LENS_SPECIFICATION,
+            ExifInterface.TAG_LENS_MAKE,
+            ExifInterface.TAG_LENS_MODEL,
+            ExifInterface.TAG_LENS_SERIAL_NUMBER,
+            ExifInterface.TAG_GPS_VERSION_ID,
+            ExifInterface.TAG_GPS_LATITUDE_REF,
+            ExifInterface.TAG_GPS_LATITUDE,
+            ExifInterface.TAG_GPS_LONGITUDE_REF,
+            ExifInterface.TAG_GPS_LONGITUDE,
+            ExifInterface.TAG_GPS_ALTITUDE_REF,
+            ExifInterface.TAG_GPS_ALTITUDE,
+            ExifInterface.TAG_GPS_TIMESTAMP,
+            ExifInterface.TAG_GPS_SATELLITES,
+            ExifInterface.TAG_GPS_STATUS,
+            ExifInterface.TAG_GPS_MEASURE_MODE,
+            ExifInterface.TAG_GPS_DOP,
+            ExifInterface.TAG_GPS_SPEED_REF,
+            ExifInterface.TAG_GPS_SPEED,
+            ExifInterface.TAG_GPS_TRACK_REF,
+            ExifInterface.TAG_GPS_TRACK,
+            ExifInterface.TAG_GPS_IMG_DIRECTION_REF,
+            ExifInterface.TAG_GPS_IMG_DIRECTION,
+            ExifInterface.TAG_GPS_MAP_DATUM,
+            ExifInterface.TAG_GPS_DEST_LATITUDE_REF,
+            ExifInterface.TAG_GPS_DEST_LATITUDE,
+            ExifInterface.TAG_GPS_DEST_LONGITUDE_REF,
+            ExifInterface.TAG_GPS_DEST_LONGITUDE,
+            ExifInterface.TAG_GPS_DEST_BEARING_REF,
+            ExifInterface.TAG_GPS_DEST_BEARING,
+            ExifInterface.TAG_GPS_DEST_DISTANCE_REF,
+            ExifInterface.TAG_GPS_DEST_DISTANCE,
+            ExifInterface.TAG_GPS_PROCESSING_METHOD,
+            ExifInterface.TAG_GPS_AREA_INFORMATION,
+            ExifInterface.TAG_GPS_DATESTAMP,
+            ExifInterface.TAG_GPS_DIFFERENTIAL,
+            ExifInterface.TAG_GPS_H_POSITIONING_ERROR,
+            ExifInterface.TAG_INTEROPERABILITY_INDEX,
+            ExifInterface.TAG_THUMBNAIL_IMAGE_LENGTH,
+            ExifInterface.TAG_THUMBNAIL_IMAGE_WIDTH,
+            ExifInterface.TAG_DNG_VERSION,
+            ExifInterface.TAG_DEFAULT_CROP_SIZE,
+            ExifInterface.TAG_ORF_THUMBNAIL_IMAGE,
+            ExifInterface.TAG_ORF_PREVIEW_IMAGE_START,
+            ExifInterface.TAG_ORF_PREVIEW_IMAGE_LENGTH,
+            ExifInterface.TAG_ORF_ASPECT_FRAME,
+            ExifInterface.TAG_RW2_SENSOR_BOTTOM_BORDER,
+            ExifInterface.TAG_RW2_SENSOR_LEFT_BORDER,
+            ExifInterface.TAG_RW2_SENSOR_RIGHT_BORDER,
+            ExifInterface.TAG_RW2_SENSOR_TOP_BORDER,
+            ExifInterface.TAG_RW2_ISO,
+            ExifInterface.TAG_RW2_JPG_FROM_RAW,
+            ExifInterface.TAG_NEW_SUBFILE_TYPE,
+            ExifInterface.TAG_SUBFILE_TYPE
+        )
+    }
+
+    @JvmStatic
+    @Suppress("SwallowedException")
+    fun readExifData(filePath: String): Map<String, String> {
+        val exifData = mutableMapOf<String, String>()
+        try {
+            val exifInterface = ExifInterface(filePath)
+            val tags = getExifAttributes()
+            for (tag in tags) {
+                exifInterface.getAttribute(tag)?.let { exifData[tag] = it }
+            }
+        } catch (e: IOException) {
+            AppLog.w(T.MEDIA, "Failed to read exif data to $filePath")
+        }
+        return exifData
+    }
+
+    @JvmStatic
+    @Suppress("SwallowedException")
+    fun writeExifData(exifData: Map<String, String>, filePath: String) {
+        try {
+            val exifInterface = ExifInterface(filePath)
+            for ((key, value) in exifData) {
+                exifInterface.setAttribute(key, value)
+            }
+            exifInterface.saveAttributes()
+        } catch (e: IOException) {
+            AppLog.w(T.MEDIA, "Failed to write exif data to $filePath")
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtils.kt
new file mode 100644
index 00000000000..55c7b80f392
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/JetpackAITranscriptionUtils.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.utils
+
+import java.io.File
+import javax.inject.Inject
+
+class JetpackAITranscriptionUtils @Inject constructor() {
+    fun isFileEligibleForTranscription(file: File, sizeLimit: Long): Boolean {
+        if (!fileExistsAndIsReadable(file)) {
+            return false
+        }
+        return fileMeetsSizeLimit(file.length(), sizeLimit)
+    }
+
+    private fun fileExistsAndIsReadable(file: File) = file.exists() && file.canRead()
+
+    private fun fileMeetsSizeLimit(fileSizeInBytes: Long, sizeLimit: Long): Boolean {
+        return fileSizeInBytes <= sizeLimit
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MediaUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MediaUtils.java
new file mode 100644
index 00000000000..fb18a5bb8bc
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MediaUtils.java
@@ -0,0 +1,144 @@
+package org.wordpress.android.fluxc.utils;
+
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.exifinterface.media.ExifInterface;
+
+import org.wordpress.android.fluxc.model.MediaModel;
+import org.wordpress.android.fluxc.network.BaseUploadRequestBody;
+import org.wordpress.android.fluxc.store.media.MediaErrorSubType.MalformedMediaArgSubType;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
+import java.io.File;
+import java.io.IOException;
+
+public class MediaUtils {
+    private static final MimeTypes MIME_TYPES = new MimeTypes();
+    public static final double MEMORY_LIMIT_FILESIZE_MULTIPLIER = 0.75D;
+
+    public static boolean isImageMimeType(@Nullable String type) {
+        return MIME_TYPES.isImageType(type);
+    }
+
+    public static boolean isVideoMimeType(@Nullable String type) {
+        return MIME_TYPES.isVideoType(type);
+    }
+
+    public static boolean isAudioMimeType(@Nullable String type) {
+        return MIME_TYPES.isAudioType(type);
+    }
+
+    public static boolean isApplicationMimeType(@Nullable String type) {
+        return MIME_TYPES.isApplicationType(type);
+    }
+
+    public static boolean isSupportedImageMimeType(@Nullable String type) {
+        return MIME_TYPES.isSupportedImageType(type);
+    }
+
+    public static boolean isSupportedVideoMimeType(@Nullable String type) {
+        return MIME_TYPES.isSupportedVideoType(type);
+    }
+
+    public static boolean isSupportedAudioMimeType(@Nullable String type) {
+        return MIME_TYPES.isSupportedAudioType(type);
+    }
+
+    public static boolean isSupportedApplicationMimeType(@Nullable String type) {
+        return MIME_TYPES.isSupportedApplicationType(type);
+    }
+
+    public static boolean isSupportedMimeType(@Nullable String type) {
+        return isSupportedImageMimeType(type)
+                || isSupportedVideoMimeType(type)
+                || isSupportedAudioMimeType(type)
+                || isSupportedApplicationMimeType(type);
+    }
+
+    @Nullable
+    public static String getMimeTypeForExtension(@Nullable String extension) {
+        return MIME_TYPES.getMimeTypeForExtension(extension);
+    }
+
+    //
+    // File operations
+    //
+
+    @NonNull
+    @SuppressWarnings("unused")
+    public static String getMediaValidationError(@NonNull MediaModel media) {
+        return BaseUploadRequestBody.hasRequiredData(media);
+    }
+
+    @NonNull
+    public static MalformedMediaArgSubType getMediaValidationErrorType(@NonNull MediaModel media) {
+        return BaseUploadRequestBody.checkMediaArg(media);
+    }
+
+    /**
+     * Queries filesystem to determine if a given file can be read.
+     */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    public static boolean canReadFile(@Nullable String filePath) {
+        if (filePath == null || TextUtils.isEmpty(filePath)) return false;
+        File file = new File(filePath);
+        return file.canRead();
+    }
+
+    /**
+     * Returns the substring of characters that follow the final '.' in the given string.
+     */
+    @Nullable
+    public static String getExtension(@Nullable String filePath) {
+        if (TextUtils.isEmpty(filePath) || !filePath.contains(".")) return null;
+        if (filePath.lastIndexOf(".") + 1 >= filePath.length()) return null;
+        return filePath.substring(filePath.lastIndexOf(".") + 1);
+    }
+
+    /**
+     * Returns the substring of characters that follow the final '/' in the given string.
+     */
+    @Nullable
+    public static String getFileName(@Nullable String filePath) {
+        if (TextUtils.isEmpty(filePath) || !filePath.contains("/")) return null;
+        if (filePath.lastIndexOf("/") + 1 >= filePath.length()) return null;
+        return filePath.substring(filePath.lastIndexOf("/") + 1);
+    }
+
+    /**
+     * Given the memory limit for media for a site, returns the maximum 'safe' file size we can upload to that site.
+     */
+    public static double getMaxFilesizeForMemoryLimit(double mediaMemoryLimit) {
+        return MEMORY_LIMIT_FILESIZE_MULTIPLIER * mediaMemoryLimit;
+    }
+
+    /**
+     * Removes location from the Exif information from an image
+     *
+     * @param imagePath image file path
+     */
+    public static void stripLocation(@Nullable String imagePath) {
+        if (imagePath != null) {
+            try {
+                ExifInterface exifInterface = new ExifInterface(imagePath);
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_ALTITUDE, "0/0");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_ALTITUDE_REF, "0");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_LATITUDE, "0/0,0/0000,00000000/00000");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_LATITUDE_REF, "0");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_LONGITUDE, "0/0,0/0,000000/00000 ");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF, "0");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_TIMESTAMP, "00:00:00");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD, "0");
+                exifInterface.setAttribute(ExifInterface.TAG_GPS_DATESTAMP, " ");
+                exifInterface.saveAttributes();
+            } catch (IOException e) {
+                AppLog.e(T.MEDIA, "Removing of GPS info from image failed [IO Exception]");
+            }
+        } else {
+            AppLog.e(T.MEDIA, "Removing of GPS info from image failed [Null Image Path]");
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeType.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeType.kt
new file mode 100644
index 00000000000..326acbae88a
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeType.kt
@@ -0,0 +1,58 @@
+package org.wordpress.android.fluxc.utils
+
+data class MimeType(val type: Type, val subtypes: List<Subtype>, val extensions: List<String> = listOf()) {
+    constructor(type: Type, subtype: Subtype, extensions: List<String>) : this(
+            type,
+            listOf<Subtype>(subtype),
+            extensions
+    )
+
+    enum class Type(val value: String) {
+        AUDIO("audio"),
+        VIDEO("video"),
+        IMAGE("image"),
+        APPLICATION("application")
+    }
+
+    enum class Subtype(val value: String) {
+        MPEG("mpeg"),
+        MP4("mp4"),
+        OGG("ogg"),
+        X_WAV("x-wav"),
+        QUICKTIME("quicktime"),
+        X_MS_WMV("x-ms-wmv"),
+        AVI("avi"),
+        MP2P("mp2p"),
+        THREE_GPP("3gpp"),
+        THREE_GPP_2("3gpp2"),
+        JPEG("jpeg"),
+        PNG("png"),
+        GIF("gif"),
+        WEBP("webp"),
+        HEIC("heic"),
+        HEIF("heif"),
+        PDF("pdf"),
+        DOC("doc"),
+        MSDOC("ms-doc"),
+        MSWORD("msword"),
+        DOCX("vnd.openxmlformats-officedocument.wordprocessingml.document"),
+        POWERPOINT("powerpoint"),
+        MSPOWERPOINT("mspowerpoint"),
+        VND_MSPOWERPOINT("vnd.ms-powerpoint"),
+        X_MSPOWERPOINT("x-mspowerpoint"),
+        PPTX("vnd.openxmlformats-officedocument.presentationml.presentation"),
+        PPSX("vnd.openxmlformats-officedocument.presentationml.slideshow"),
+        ODT("vnd.oasis.opendocument.text"),
+        EXCEL("excel"),
+        X_EXCEL("x-excel"),
+        X_MS_EXCEL("x-msexcel"),
+        VND_MS_EXCEL("vnd.ms-excel"),
+        XLSX("vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
+        KEYNOTE("keynote"),
+        ZIP("zip")
+    }
+
+    override fun toString(): String {
+        return "${type.value}/${subtypes.first().value}"
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeTypes.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeTypes.kt
new file mode 100644
index 00000000000..7f70219eed3
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/MimeTypes.kt
@@ -0,0 +1,251 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.utils.MimeType.Subtype
+import org.wordpress.android.fluxc.utils.MimeType.Type.APPLICATION
+import org.wordpress.android.fluxc.utils.MimeType.Type.AUDIO
+import org.wordpress.android.fluxc.utils.MimeType.Type.IMAGE
+import org.wordpress.android.fluxc.utils.MimeType.Type.VIDEO
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.NO_PLAN_SPECIFIED
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.SELF_HOSTED
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.WP_COM_FREE
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan.WP_COM_PAID
+
+class MimeTypes {
+    enum class Plan {
+        NO_PLAN_SPECIFIED,
+        SELF_HOSTED,
+        WP_COM_FREE,
+        WP_COM_PAID
+    }
+
+    /*
+     * The WordPress supported audio types based on https://wordpress.com/support/accepted-filetypes/ are:
+     * .mp3, .m4a, .ogg, .wav
+     * This translates (based on https://android.googlesource.com/platform/frameworks/base/+/cd92588/media/java/android/media/MediaFile.java) to:
+     * .mp3 - "audio/mpeg"
+     * .m4a - "audio/mp4"
+     * .ogg - "audio/ogg", "application/ogg"
+     * .wav - "audio/x-wav"
+     */
+    @Suppress("MaxLineLength")
+    private val audioTypes = listOf(
+            MimeType(AUDIO, Subtype.MPEG, listOf("mp3")),
+            MimeType(AUDIO, Subtype.MP4, listOf("m4a")),
+            MimeType(AUDIO, Subtype.OGG, listOf("ogg")),
+            MimeType(APPLICATION, Subtype.OGG, listOf("ogg")),
+            MimeType(AUDIO, Subtype.X_WAV, listOf("wav"))
+    )
+
+    /*
+     * The WordPress supported video types based on https://wordpress.com/support/accepted-filetypes/ are:
+     * .mp4, .m4v (MPEG-4), .mov (QuickTime), .wmv (Windows Media Video), .avi, .mpg, .ogv (Ogg), .3gp (3GPP), .3g2 (3GPP2)
+     * This translates (based on https://android.googlesource.com/platform/frameworks/base/+/cd92588/media/java/android/media/MediaFile.java) to:
+     * .mp4, .m4v (MPEG-4) - "video/mp4"
+     * .mov - missing - using "video/quicktime"
+     * .wmv - "video/x-ms-wmv"
+     * .avi - "video/avi"
+     * .mpg - "video/mpeg", "video/mp2p"
+     * .ogv (Ogg) - missing - using "video/ogg"
+     * .3gp (3GPP) - "video/3gpp"
+     * .3g2 (3GPP2) - "video/3gpp2"
+     */
+    @Suppress("MaxLineLength")
+    private val videoTypes = listOf(
+            MimeType(VIDEO, Subtype.MP4, listOf("mp4", "m4v")),
+            MimeType(VIDEO, Subtype.QUICKTIME, listOf("mov")),
+            MimeType(VIDEO, Subtype.X_MS_WMV, listOf("wmv")),
+            MimeType(VIDEO, Subtype.AVI, listOf("avi")),
+            MimeType(VIDEO, Subtype.MPEG, listOf("mpg")),
+            MimeType(VIDEO, Subtype.MP2P, listOf("mpg")),
+            MimeType(VIDEO, Subtype.OGG, listOf("ogv")),
+            MimeType(VIDEO, Subtype.THREE_GPP, listOf("3gp")),
+            MimeType(VIDEO, Subtype.THREE_GPP_2, listOf("3g2"))
+    )
+
+    /*
+     * The WordPress supported image types based on https://wordpress.com/support/accepted-filetypes/ are:
+     * .jpg, .jpeg, .png, .gif, .webp
+     * This translates (based on https://android.googlesource.com/platform/frameworks/base/+/cd92588/media/java/android/media/MediaFile.java) to:
+     * .jpg, .jpeg - "image/jpeg"
+     * .png - "image/png"
+     * .gif - "image/gif"
+     * .webp - "image/webp"
+     * .heic - "image/heic"
+     * .heif - "image/heif"
+     */
+    @Suppress("MaxLineLength")
+    private val imageTypes = listOf(
+            MimeType(IMAGE, Subtype.JPEG, listOf("jpg", "jpeg")),
+            MimeType(IMAGE, Subtype.PNG, listOf("png")),
+            MimeType(IMAGE, Subtype.GIF, listOf("gif")),
+            MimeType(IMAGE, Subtype.WEBP, listOf("webp")),
+            MimeType(IMAGE, Subtype.HEIC, listOf("heic")),
+            MimeType(IMAGE, Subtype.HEIF, listOf("heif"))
+    )
+
+    /*
+     * Free MIME Types
+     *
+     * The WordPress supported image types based on https://wordpress.com/support/accepted-filetypes/ are:
+     * .pdf (Portable Document Format; Adobe Acrobat), .doc, .docx (Microsoft Word Document), .ppt, .pptx, .pps, .ppsx (Microsoft PowerPoint Presentation), .odt (OpenDocument Text Document), .xls, .xlsx (Microsoft Excel Document), .key (Apple Keynote Presentation), .zip (Archive File Format)
+     * This translates (based on https://android.googlesource.com/platform/frameworks/base/+/cd92588/media/java/android/media/MediaFile.java) to:
+     * .pdf - "application/pdf"
+     * .doc - "application/msword", "application/doc", "application/ms-doc"
+     * .docx - "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+     * .ppt - "application/mspowerpoint", "application/powerpoint", "application/x-mspowerpoint"
+     * .pptx - "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+     * .pps - missing - "application/vnd.ms-powerpoint"
+     * .ppsx - missing - "application/vnd.openxmlformats-officedocument.presentationml.slideshow"
+     * .odt - missing - "application/vnd.oasis.opendocument.text"
+     * .xls - "application/excel", "application/x-excel", "application/x-msexcel", "application/vnd.ms-excel"
+     * .xlsx - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+     *
+     * Paid / Self hosted MIME Types
+     *
+     * .key - missing - "application/keynote"
+     * .zip (Archive File Format)
+     *
+     * General comment about each of the properties below.
+     *
+     * wpComFreeDocumentTypes - all MIME types allowed in the free plans.
+     *
+     * wpComPaidAndSelfHostedDocumentTypes - all MIME types allowed for paid plans and self hosted sites.
+     *
+     * documentTypes - all MIME types that are available.
+     */
+    @Suppress("MaxLineLength")
+    private val wpComFreeDocumentTypes = listOf(
+            MimeType(APPLICATION, Subtype.PDF, listOf("pdf")),
+            MimeType(APPLICATION, listOf(Subtype.MSWORD, Subtype.DOC, Subtype.MSDOC), listOf("doc")),
+            MimeType(APPLICATION, Subtype.DOCX, listOf("docx")),
+            MimeType(
+                    APPLICATION,
+                    listOf(Subtype.POWERPOINT, Subtype.MSPOWERPOINT, Subtype.X_MSPOWERPOINT),
+                    listOf("ppt")
+            ),
+            MimeType(APPLICATION, Subtype.VND_MSPOWERPOINT, listOf("pps")),
+            MimeType(APPLICATION, Subtype.PPTX, listOf("pptx")),
+            MimeType(APPLICATION, Subtype.PPSX, listOf("ppsx")),
+            MimeType(APPLICATION, Subtype.ODT, listOf("odt")),
+            MimeType(
+                    APPLICATION,
+                    listOf(Subtype.EXCEL, Subtype.X_EXCEL, Subtype.VND_MS_EXCEL, Subtype.X_MS_EXCEL),
+                    listOf("xls")
+            ),
+            MimeType(APPLICATION, Subtype.XLSX, listOf("xlsx"))
+    )
+
+    private val wpComPaidAndSelfHostedDocumentTypes = wpComFreeDocumentTypes + listOf(
+            MimeType(APPLICATION, Subtype.KEYNOTE, listOf("key")),
+            MimeType(APPLICATION, Subtype.ZIP, listOf("zip"))
+    )
+
+    private val documentTypes = wpComPaidAndSelfHostedDocumentTypes
+
+    fun isAudioType(type: String?): Boolean {
+        return isExpectedMimeType(audioTypes, type)
+    }
+
+    fun isVideoType(type: String?): Boolean {
+        return isExpectedMimeType(videoTypes, type)
+    }
+
+    fun isImageType(type: String?): Boolean {
+        return isExpectedMimeType(imageTypes, type)
+    }
+
+    fun isApplicationType(type: String?): Boolean {
+        return isExpectedMimeType(documentTypes, type)
+    }
+
+    fun isSupportedAudioType(type: String?): Boolean {
+        return isSupportedMimeType(audioTypes, type)
+    }
+
+    fun isSupportedVideoType(type: String?): Boolean {
+        return isSupportedMimeType(videoTypes, type)
+    }
+
+    fun isSupportedImageType(type: String?): Boolean {
+        return isSupportedMimeType(imageTypes, type)
+    }
+
+    fun isSupportedApplicationType(type: String?): Boolean {
+        return isSupportedMimeType(documentTypes, type)
+    }
+
+    fun getAllTypes(plan: Plan = NO_PLAN_SPECIFIED): Array<String> {
+        return (getAudioMimeTypesOnly(plan).toStrings() + videoTypes.toStrings() +
+                imageTypes.toStrings() + getDocumentMimeTypesOnly(
+                plan
+        ).toStrings())
+                .toSet()
+                .toTypedArray()
+    }
+
+    fun getVideoAndImageTypesOnly(): Array<String> {
+        return (videoTypes.toStrings() + imageTypes.toStrings())
+                .toSet()
+                .toTypedArray()
+    }
+
+    fun getVideoTypesOnly(): Array<String> {
+        return (videoTypes.toStrings())
+                .toSet()
+                .toTypedArray()
+    }
+
+    fun getImageTypesOnly(): Array<String> {
+        return (imageTypes.toStrings())
+                .toSet()
+                .toTypedArray()
+    }
+
+    fun getAudioTypesOnly(plan: Plan = NO_PLAN_SPECIFIED) =
+            (getAudioMimeTypesOnly(plan).toStrings()).toSet().toTypedArray()
+
+    fun getDocumentTypesOnly(plan: Plan = NO_PLAN_SPECIFIED) =
+        (getDocumentMimeTypesOnly(plan).toStrings()).toSet().toTypedArray()
+
+    private fun getAudioMimeTypesOnly(plan: Plan = NO_PLAN_SPECIFIED): List<MimeType> {
+        return when (plan) {
+            WP_COM_PAID, SELF_HOSTED, NO_PLAN_SPECIFIED -> audioTypes
+            WP_COM_FREE -> listOf()
+        }
+    }
+
+    private fun getDocumentMimeTypesOnly(plan: Plan = NO_PLAN_SPECIFIED): List<MimeType> {
+        return when (plan) {
+            WP_COM_PAID, SELF_HOSTED, NO_PLAN_SPECIFIED -> wpComPaidAndSelfHostedDocumentTypes
+            WP_COM_FREE -> wpComFreeDocumentTypes
+        }
+    }
+
+    private fun List<MimeType>.toStrings(): List<String> {
+        return this.map { mimeType -> mimeType.subtypes.map { print(mimeType.type, it) } }.flatten()
+    }
+
+    private fun isExpectedMimeType(
+        expected: List<MimeType>,
+        type: String?
+    ): Boolean {
+        if (type == null) return false
+        val split = type.split("/")
+        return split.size == 2 && expected.any { it.type.value == split[0] }
+    }
+
+    private fun isSupportedMimeType(
+        expected: List<MimeType>,
+        type: String?
+    ): Boolean {
+        if (type == null) return false
+        return expected.any { mimeType -> mimeType.subtypes.any { print(mimeType.type, it) == type } }
+    }
+
+    fun getMimeTypeForExtension(extension: String?): String? {
+        return (imageTypes + videoTypes + audioTypes + documentTypes).find { it.extensions.contains(extension) }
+                ?.toString()
+    }
+
+    private fun print(type: MimeType.Type, subtype: Subtype) = "${type.value}/${subtype.value}"
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/NetworkErrorMapper.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/NetworkErrorMapper.kt
new file mode 100644
index 00000000000..34a3a82705f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/NetworkErrorMapper.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.utils
+
+import org.wordpress.android.fluxc.network.BaseRequest
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+
+object NetworkErrorMapper {
+    fun <T> map(
+        error: WPComGsonNetworkError,
+        genericError: T,
+        invalidResponse: T?,
+        authorizationRequired: T? = null
+    ): T {
+        var errorType: T
+        mapGenericNetworkError(error, genericError, invalidResponse).also { errorType = it }
+        mapWPComGsonNetworkApiError(error, authorizationRequired)?.let { errorType = it }
+        return errorType
+    }
+
+    private fun <T> mapGenericNetworkError(
+        error: BaseNetworkError,
+        genericError: T,
+        invalidResponse: T? = null
+    ): T {
+        var errorType = genericError
+        if (error.isGeneric) {
+            if (error.type == BaseRequest.GenericErrorType.INVALID_RESPONSE && invalidResponse != null) {
+                errorType = invalidResponse
+            }
+        }
+        return errorType
+    }
+
+    private fun <T> mapWPComGsonNetworkApiError(
+        error: WPComGsonNetworkError,
+        authorizationRequired: T? = null
+    ): T? {
+        return if ("unauthorized" == error.apiError && authorizationRequired != null) {
+            authorizationRequired
+        } else {
+            null
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ObjectsUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ObjectsUtils.java
new file mode 100644
index 00000000000..414360c0671
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/ObjectsUtils.java
@@ -0,0 +1,23 @@
+package org.wordpress.android.fluxc.utils;
+
+public class ObjectsUtils {
+    /**
+     * Copy pasted code from java.util.Objects as it requires minSdkVersion 19.
+     * <p>
+     * Returns {@code true} if the arguments are equal to each other
+     * and {@code false} otherwise.
+     * Consequently, if both arguments are {@code null}, {@code true}
+     * is returned and if exactly one argument is {@code null}, {@code
+     * false} is returned.  Otherwise, equality is determined by using
+     * the Object.equals method of the first
+     * argument.
+     *
+     * @param a an object
+     * @param b an object to be compared with {@code a} for equality
+     * @return {@code true} if the arguments are equal to each other
+     * and {@code false} otherwise
+     */
+    public static boolean equals(Object a, Object b) {
+        return (a == b) || (a != null && a.equals(b));
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/PreferenceUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/PreferenceUtils.kt
new file mode 100644
index 00000000000..4fb924c289c
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/PreferenceUtils.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.fluxc.utils
+
+import android.content.Context
+import android.content.SharedPreferences
+import javax.inject.Inject
+
+object PreferenceUtils {
+    @JvmStatic
+    fun getFluxCPreferences(context: Context): SharedPreferences {
+        return context.getSharedPreferences("${context.packageName}_fluxc-preferences", Context.MODE_PRIVATE)
+    }
+
+    class PreferenceUtilsWrapper
+    @Inject constructor(private val context: Context) {
+        fun getFluxCPreferences(): SharedPreferences {
+            return PreferenceUtils.getFluxCPreferences(context)
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteErrorUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteErrorUtils.java
new file mode 100644
index 00000000000..646b14603c0
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteErrorUtils.java
@@ -0,0 +1,40 @@
+package org.wordpress.android.fluxc.utils;
+
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError;
+import org.wordpress.android.fluxc.store.SiteStore.SelfHostedErrorType;
+import org.wordpress.android.fluxc.store.SiteStore.SiteError;
+import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType;
+
+public class SiteErrorUtils {
+    public static SiteError genericToSiteError(BaseNetworkError error) {
+        SiteErrorType errorType = SiteErrorType.GENERIC_ERROR;
+        if (error.isGeneric()) {
+            switch (error.type) {
+                case INVALID_RESPONSE:
+                    errorType = SiteErrorType.INVALID_RESPONSE;
+                    break;
+                case NOT_AUTHENTICATED:
+                    errorType = SiteErrorType.NOT_AUTHENTICATED;
+                    break;
+            }
+        }
+
+        SiteError siteError = new SiteError(errorType, error.message, SelfHostedErrorType.NOT_SET);
+
+        switch (error.xmlRpcErrorType) {
+            case METHOD_NOT_ALLOWED:
+                siteError = new SiteError(errorType, error.message, SelfHostedErrorType.XML_RPC_SERVICES_DISABLED);
+                break;
+            case UNABLE_TO_READ_SITE:
+                siteError = new SiteError(errorType, error.message, SelfHostedErrorType.UNABLE_TO_READ_SITE);
+                break;
+            case AUTH_REQUIRED:
+            case NOT_SET:
+            default:
+                // Nothing to do
+                break;
+        }
+
+        return siteError;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteUtils.java
new file mode 100644
index 00000000000..d0fe9dd5a41
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/SiteUtils.java
@@ -0,0 +1,138 @@
+package org.wordpress.android.fluxc.utils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.wordpress.android.fluxc.model.PostFormatModel;
+import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.util.MapUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+
+public class SiteUtils {
+    /**
+     * Given a {@link SiteModel} and a {@link String} compatible with {@link SimpleDateFormat},
+     * returns a formatted date that accounts for the site's timezone setting.
+     * <p>
+     * Imported from WordPress-Android with some modifications.
+     */
+    public static @NonNull String getCurrentDateTimeForSite(@NonNull SiteModel site, @NonNull String pattern) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, Locale.ROOT);
+        return getCurrentDateTimeForSite(site, dateFormat);
+    }
+
+    /**
+     * Given a {@link SiteModel}, {@link String} and a {@link Date} compatible with {@link SimpleDateFormat},
+     * returns a formatted date that accounts for the site's timezone setting.
+     */
+    public static @NonNull String getDateTimeForSite(@NonNull SiteModel site,
+                                                     @NonNull String pattern,
+                                                     @NonNull Date date) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, Locale.ROOT);
+        return getDateTimeForSite(site, dateFormat, date);
+    }
+
+    /**
+     * Given a {@link SiteModel} and a {@link SimpleDateFormat},
+     * returns a formatted date that accounts for the site's timezone setting.
+     * <p>
+     * Imported from WordPress-Android with some modifications.
+     */
+    public static @NonNull String getCurrentDateTimeForSite(@NonNull SiteModel site,
+                                                            @NonNull SimpleDateFormat dateFormat) {
+        Date date = new Date();
+        return getDateTimeForSite(site, dateFormat, date);
+    }
+
+
+    /**
+     * Given a {@link SiteModel}, {@link SimpleDateFormat} and a {@link Date},
+     * returns a formatted date that accounts for the site's timezone setting.
+     */
+    public static @NonNull String getDateTimeForSite(@NonNull SiteModel site,
+                                                     @NonNull SimpleDateFormat dateFormat,
+                                                     @NonNull Date date) {
+        String wpTimeZone = site.getTimezone();
+        dateFormat.setTimeZone(getNormalizedTimezone(wpTimeZone));
+        return dateFormat.format(date);
+    }
+
+    /**
+     * Given a {@link SiteModel} timezone returns a standard Java timezone
+     * @param wpTimeZone from SiteModel
+     * @return
+     */
+    public static TimeZone getNormalizedTimezone(String wpTimeZone) {
+        /*
+        Convert the timezone to a form that is compatible with Java TimeZone class
+        WordPress returns something like the following:
+           UTC+0:30 ----> 0.5
+           UTC+1 ----> 1.0
+           UTC-0:30 ----> -1.0
+        */
+        String timezoneNormalized;
+        if (wpTimeZone == null || wpTimeZone.isEmpty() || wpTimeZone.equals("0") || wpTimeZone.equals("0.0")) {
+            timezoneNormalized = "GMT";
+        } else {
+            String[] timezoneSplit = StringUtils.split(wpTimeZone, ".");
+            timezoneNormalized = timezoneSplit[0];
+            if (timezoneSplit.length > 1) {
+                switch (timezoneSplit[1]) {
+                    case "5":
+                        timezoneNormalized += ":30";
+                        break;
+                    case "75":
+                        timezoneNormalized += ":45";
+                        break;
+                    case "25":
+                        // Not used by any timezones as of current writing, but you never know
+                        timezoneNormalized += ":15";
+                        break;
+                }
+            }
+            if (timezoneNormalized.startsWith("-")) {
+                timezoneNormalized = "GMT" + timezoneNormalized;
+            } else {
+                if (timezoneNormalized.startsWith("+")) {
+                    timezoneNormalized = "GMT" + timezoneNormalized;
+                } else {
+                    timezoneNormalized = "GMT+" + timezoneNormalized;
+                }
+            }
+        }
+
+        return TimeZone.getTimeZone(timezoneNormalized);
+    }
+
+    /**
+     * Given a formatsMap returns a List<PostFormatModel> or null
+     * @param formatsMap the map of post formats
+     * @return List<PostFormatModel> or null
+     */
+    public static @Nullable List<PostFormatModel> getValidPostFormatsOrNull(@Nullable Map<?, ?> formatsMap) {
+        if (formatsMap == null) return null;
+
+        List<PostFormatModel> res = new ArrayList<>();
+        for (Object key : formatsMap.keySet()) {
+            if (!(key instanceof String)) continue;
+            String skey = (String) key;
+            String sValue = MapUtils.getMapStr(formatsMap, skey);
+
+            if (sValue.isEmpty()) return null;
+
+            PostFormatModel postFormat = new PostFormatModel();
+            postFormat.setSlug(skey);
+            postFormat.setDisplayName(sValue);
+            res.add(postFormat);
+        }
+
+        return res.isEmpty() ? null : res;
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/TimeZoneProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/TimeZoneProvider.kt
new file mode 100644
index 00000000000..351bf7f0527
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/TimeZoneProvider.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.fluxc.utils
+
+import java.util.TimeZone
+import javax.inject.Inject
+
+class TimeZoneProvider @Inject constructor() {
+    fun getDefaultTimeZone(): TimeZone = TimeZone.getDefault()
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPComRestClientUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPComRestClientUtils.kt
new file mode 100644
index 00000000000..50f4732f49f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPComRestClientUtils.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.fluxc.utils
+
+import android.content.Context
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.wordpress.android.util.LanguageUtils
+
+object WPComRestClientUtils {
+    private const val WPCOM_V2_PREFIX = "/wpcom/v2"
+    private const val WPCOM_V3_PREFIX = "/wpcom/v3"
+    private const val LOCALE_PARAM = "locale"
+    private const val UNDERSCORE_LOCALE_PARAM = "_locale"
+
+    @JvmStatic
+    fun getLocaleParamName(url: String): String {
+        return if (url.contains(WPCOM_V2_PREFIX) || url.contains(WPCOM_V3_PREFIX))
+            UNDERSCORE_LOCALE_PARAM
+        else LOCALE_PARAM
+    }
+
+    @JvmStatic
+    fun getHttpUrlWithLocale(context: Context, url: String): HttpUrl? {
+        var httpUrl = url.toHttpUrlOrNull()
+
+        if (null != httpUrl) {
+            httpUrl = httpUrl.newBuilder().addQueryParameter(
+                getLocaleParamName(url),
+                LanguageUtils.getPatchedCurrentDeviceLanguage(context)
+            ).build()
+        }
+
+        return httpUrl
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPUrlUtils.java b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPUrlUtils.java
new file mode 100644
index 00000000000..e366697f2c7
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WPUrlUtils.java
@@ -0,0 +1,79 @@
+package org.wordpress.android.fluxc.utils;
+
+import com.android.volley.VolleyError;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.wordpress.android.util.UrlUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URL;
+
+/**
+ * From wpandroid
+ * TODO: move to wputils
+ */
+public class WPUrlUtils {
+    public static boolean safeToAddWordPressComAuthToken(String url) {
+        return UrlUtils.isHttps(url) && isWordPressCom(url);
+    }
+
+    public static boolean safeToAddWordPressComAuthToken(URL url) {
+        return UrlUtils.isHttps(url) && isWordPressCom(url);
+    }
+
+    public static boolean safeToAddWordPressComAuthToken(URI uri) {
+        return UrlUtils.isHttps(uri) && isWordPressCom(uri);
+    }
+
+    public static boolean isWordPressCom(String url) {
+        return UrlUtils.getHost(url).endsWith(".wordpress.com") || UrlUtils.getHost(url).equals("wordpress.com");
+    }
+
+    public static boolean isWordPressCom(URL url) {
+        if (url == null) {
+            return false;
+        }
+        return url.getHost().endsWith(".wordpress.com") || url.getHost().equals("wordpress.com");
+    }
+
+    public static boolean isWordPressCom(URI uri) {
+        if (uri == null || uri.getHost() == null) {
+            return false;
+        }
+        return uri.getHost().endsWith(".wordpress.com") || uri.getHost().equals("wordpress.com");
+    }
+
+    public static boolean isGravatar(URL url) {
+        if (url == null) {
+            return false;
+        }
+        return url.getHost().equals("gravatar.com") || url.getHost().endsWith(".gravatar.com");
+    }
+
+    /**
+     * Not strictly working with URLs, but this method exists already in WPUtils and will be removed
+     * when that library is imported.
+     */
+    public static JSONObject volleyErrorToJSON(VolleyError volleyError) {
+        if (volleyError == null || volleyError.networkResponse == null || volleyError.networkResponse.data == null
+                || volleyError.networkResponse.headers == null) {
+            return null;
+        }
+
+        String contentType = volleyError.networkResponse.headers.get("Content-Type");
+        if (contentType == null || !contentType.equals("application/json")) {
+            return null;
+        }
+
+        try {
+            String response = new String(volleyError.networkResponse.data, "UTF-8");
+            return new JSONObject(response);
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtils.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtils.kt
new file mode 100644
index 00000000000..9289a2e56dd
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/WhatsNewAppVersionUtils.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.fluxc.utils
+
+object WhatsNewAppVersionUtils {
+    fun versionNameToInt(appVersion: String): Int {
+        val majorMinor = Regex("(\\d+\\.)(\\d+)").find(appVersion, 0)?.value
+
+        majorMinor?.let {
+            return it.replace(".", "").toInt()
+        }
+        return -1
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/MapExtensions.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/MapExtensions.kt
new file mode 100644
index 00000000000..630fe017105
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/MapExtensions.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.fluxc.utils.extensions
+
+@Suppress("UNCHECKED_CAST")
+fun <K, V : Any> Map<out K, V?>.filterNotNull(): Map<K, V> =
+    filterValues { it != null } as Map<K, V>
+
+fun <T, K> MutableMap<T, K>.putIfNotNull(vararg pairs: Pair<T, K?>) = apply {
+    pairs.forEach { pair ->
+        pair.second?.let { put(pair.first, it) }
+    }
+}
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/StringExtensions.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/StringExtensions.kt
new file mode 100644
index 00000000000..9fe1579665f
--- /dev/null
+++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/utils/extensions/StringExtensions.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.utils.extensions
+
+import java.net.URLEncoder
+
+/**
+ * Encodes delimiting characters as per
+ * [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986#section-2.2)
+ */
+fun String.encodeRfc3986Delimiters(): String {
+    val rfc3986Delimiters = "!'()*"
+
+    return replace("[$rfc3986Delimiters]".toRegex()) {
+        URLEncoder.encode(it.value, "UTF-8")
+    }
+}
+
+fun String.slashJoin(end: String) = "${this.trimEnd('/')}/${end.trimStart('/')}"
diff --git a/libs/fluxc/src/main/res/values/strings.xml b/libs/fluxc/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..8542005550c
--- /dev/null
+++ b/libs/fluxc/src/main/res/values/strings.xml
@@ -0,0 +1,2 @@
+<resources>
+</resources>
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptorTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptorTest.kt
new file mode 100644
index 00000000000..a59afe85855
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/CustomRedirectInterceptorTest.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.fluxc.network
+
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Protocol
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class CustomRedirectInterceptorTest {
+    private val interceptor = CustomRedirectInterceptor()
+
+    @Test
+    fun `interceptor removes Authorization header when TLD and SLD are not the same`() {
+        val originalRequest = Request.Builder()
+            .url("https://original.com")
+            .header("Authorization", "Bearer token")
+            .build()
+        val redirectResponse = Response.Builder()
+            .request(originalRequest)
+            .protocol(Protocol.HTTP_1_1)
+            .code(302)
+            .message("Redirect")
+            .header("Location", "https://redirect.com")
+            .build()
+
+        val redirectRequest = interceptor.getRedirectRequest(originalRequest, redirectResponse)
+
+        assertNull(redirectRequest?.headers("Authorization")?.firstOrNull())
+    }
+
+    @Test
+    fun `interceptor keeps Authorization header when TLD and SLD are the same`() {
+        val originalRequest = Request.Builder()
+            .url("https://original.com")
+            .header("Authorization", "Bearer token")
+            .build()
+        val redirectResponse = Response.Builder()
+            .request(originalRequest)
+            .protocol(Protocol.HTTP_1_1)
+            .code(302)
+            .message("Redirect")
+            .header("Location", "https://original.com")
+            .build()
+
+        val redirectRequest = interceptor.getRedirectRequest(originalRequest, redirectResponse)
+
+        assertEquals(redirectRequest?.headers("Authorization")?.firstOrNull(), "Bearer token")
+    }
+}
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/UserAgentTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/UserAgentTest.kt
new file mode 100644
index 00000000000..755b61740e1
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/UserAgentTest.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.fluxc.network
+
+import android.webkit.WebSettings
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mockStatic
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.wordpress.android.util.PackageUtils
+import kotlin.test.assertEquals
+
+private const val APP_NAME = "App Name"
+private const val USER_AGENT = "Default User Agent"
+private const val APP_VERSION = "1.0"
+
+@RunWith(RobolectricTestRunner::class)
+class UserAgentTest {
+    private val context = RuntimeEnvironment.getApplication().applicationContext
+
+    @Test
+    fun testUserAgent() = withMockedPackageUtils {
+        mockStatic(WebSettings::class.java).use {
+            whenever(WebSettings.getDefaultUserAgent(context)).thenReturn(USER_AGENT)
+            val result = UserAgent(context, APP_NAME)
+            assertEquals("$USER_AGENT $APP_NAME/$APP_VERSION", result.toString())
+        }
+    }
+
+    @Test
+    fun testDefaultUserAgentFailure() = withMockedPackageUtils {
+        mockStatic(WebSettings::class.java).use {
+            whenever(WebSettings.getDefaultUserAgent(context)).thenThrow(RuntimeException(""))
+            val result = UserAgent(context, APP_NAME)
+            assertEquals("$APP_NAME/$APP_VERSION", result.toString())
+        }
+    }
+
+    private fun withMockedPackageUtils(test: () -> Unit) {
+        mockStatic(PackageUtils::class.java).use { utils ->
+            whenever(PackageUtils.getVersionName(context)).thenReturn(APP_VERSION)
+            test()
+        }
+    }
+}
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializerTest.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializerTest.kt
new file mode 100644
index 00000000000..a65ea203bf3
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/NumberAwareMapDeserializerTest.kt
@@ -0,0 +1,77 @@
+package org.wordpress.android.fluxc.network.rest
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParseException
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class NumberAwareMapDeserializerTest {
+    private val gson: Gson = GsonBuilder()
+        .registerTypeAdapter(Map::class.java, NumberAwareMapDeserializer())
+        .create()
+
+    @Test
+    fun testDeserializeSimpleMap() {
+        val json = """{"key1": "value1", "key2": 2, "key3": true}"""
+        val result: Map<*, *> = gson.fromJson(json, Map::class.java)
+
+        assertEquals("value1", result["key1"])
+        assertEquals(2, result["key2"])
+        assertEquals(true, result["key3"])
+    }
+
+    @Test
+    fun testDeserializeNestedMap() {
+        val json = """{"key1": {"nestedKey1": "nestedValue1", "nestedKey2": 5}}"""
+        val result: Map<*, *> = gson.fromJson(json, Map::class.java)
+
+        val nestedMap = result["key1"] as Map<*, *>
+        assertEquals("nestedValue1", nestedMap["nestedKey1"])
+        assertEquals(5, nestedMap["nestedKey2"])
+    }
+
+    @Test
+    fun testDeserializeArray() {
+        val json = """{"key1": [1, 2, 3], "key2": ["a", "b", "c"]}"""
+        val result: Map<*, *> = gson.fromJson(json, Map::class.java)
+
+        val array1 = result["key1"] as List<*>
+        val array2 = result["key2"] as List<*>
+        assertArrayEquals(arrayOf(1, 2, 3), array1.toTypedArray())
+        assertArrayEquals(arrayOf("a", "b", "c"), array2.toTypedArray())
+    }
+
+    @Test
+    fun testDeserializeNumbers() {
+        val json = """{"intKey": 2147483647, "longKey": 2147483648, "doubleKey": 1.5, "wholeDoubleKey": 3.0}"""
+        val result: Map<*, *> = gson.fromJson(json, Map::class.java)
+
+        assertEquals(2147483647, result["intKey"])
+        assertEquals(2147483648L, result["longKey"])
+        assertEquals(1.5, result["doubleKey"])
+        assertEquals(3L, result["wholeDoubleKey"])
+    }
+
+    @Test(expected = JsonParseException::class)
+    fun testInvalidKeyType() {
+        val json = """{"key1": "value1", "key2": 2, "key3"}""" // Malformed JSON
+        gson.fromJson(json, Map::class.java)
+    }
+
+    @Test(expected = JsonParseException::class)
+    fun testInvalidJson() {
+        val json = """{"key1": "value1", "key2":}""" // Malformed JSON
+        gson.fromJson(json, Map::class.java)
+    }
+
+    @Test
+    fun testNullValue() {
+        val json = """{"key1": null}"""
+        val result: Map<*, *> = gson.fromJson(json, Map::class.java)
+
+        assertNull(result["key1"])
+    }
+}
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordManagerTests.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordManagerTests.kt
new file mode 100644
index 00000000000..2b8171e5f65
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordManagerTests.kt
@@ -0,0 +1,272 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.android.volley.NetworkResponse
+import com.android.volley.VolleyError
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
+import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
+import java.util.Optional
+import kotlin.test.assertEquals
+
+@ExperimentalCoroutinesApi
+class ApplicationPasswordManagerTests {
+    private val applicationName = "name"
+    private val uuid = "uuid"
+    private val testSite = SiteModel().apply {
+        username = "username"
+        url = "http://test-site.com"
+    }
+    private val testCredentials = ApplicationPasswordCredentials(
+        userName = "username",
+        password = "password",
+        uuid = "uuid"
+    )
+    private val applicationPasswordsStore: ApplicationPasswordsStore = mock()
+    private val mJetpackApplicationPasswordsRestClient: JetpackApplicationPasswordsRestClient = mock()
+    private val mWpApiApplicationPasswordsRestClient: WPApiApplicationPasswordsRestClient = mock()
+
+    private val applicationPasswordsConfiguration = ApplicationPasswordsConfiguration(Optional.of(applicationName))
+
+    private lateinit var mApplicationPasswordsManager: ApplicationPasswordsManager
+
+    @Before
+    fun setup() {
+        mApplicationPasswordsManager = ApplicationPasswordsManager(
+            applicationPasswordsStore = applicationPasswordsStore,
+            jetpackApplicationPasswordsRestClient = mJetpackApplicationPasswordsRestClient,
+            wpApiApplicationPasswordsRestClient = mWpApiApplicationPasswordsRestClient,
+            configuration = applicationPasswordsConfiguration,
+            appLogWrapper = mock()
+        )
+    }
+
+    @Test
+    fun `given a local password exists, when we ask for a password, then return it`() = runBlockingTest {
+        whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(testCredentials)
+        val result = mApplicationPasswordsManager.getApplicationCredentials(
+            testSite
+        )
+
+        assertEquals(ApplicationPasswordCreationResult.Existing(testCredentials), result)
+    }
+
+    @Test
+    fun `given no local password is saved, when we ask for a password for a jetpack site, then create it`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_WPCOM_REST
+            }
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mJetpackApplicationPasswordsRestClient.fetchWPAdminUsername(site))
+                .thenReturn(UsernameFetchPayload(testCredentials.userName))
+            whenever(
+                mJetpackApplicationPasswordsRestClient.createApplicationPassword(
+                    site,
+                    applicationName
+                )
+            )
+                .thenReturn(
+                    ApplicationPasswordCreationPayload(
+                        testCredentials.password,
+                        testCredentials.uuid!!
+                    )
+                )
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            assertEquals(ApplicationPasswordCreationResult.Created(testCredentials), result)
+            verify(applicationPasswordsStore).saveCredentials(testSite, testCredentials)
+        }
+
+    @Test
+    fun `given no local password is saved, when we ask for a password for a non-jetpack site, then create it`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+                password = "password"
+            }
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(
+                mWpApiApplicationPasswordsRestClient.createApplicationPassword(
+                    site,
+                    applicationName
+                )
+            )
+                .thenReturn(
+                    ApplicationPasswordCreationPayload(
+                        testCredentials.password,
+                        testCredentials.uuid!!
+                    )
+                )
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            assertEquals(ApplicationPasswordCreationResult.Created(testCredentials), result)
+        }
+
+    @Test
+    fun `when a jetpack site returns 404, then return feature not available`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_WPCOM_REST
+            }
+            val networkError = BaseNetworkError(VolleyError(NetworkResponse(404, null, true, 0, emptyList())))
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mJetpackApplicationPasswordsRestClient.fetchWPAdminUsername(site))
+                .thenReturn(UsernameFetchPayload(testCredentials.userName))
+            whenever(mJetpackApplicationPasswordsRestClient.createApplicationPassword(site, applicationName))
+                .thenReturn(ApplicationPasswordCreationPayload(networkError))
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            assertEquals(ApplicationPasswordCreationResult.NotSupported(networkError), result)
+        }
+
+    @Test
+    fun `when a jetpack site returns application_passwords_disabled, then return feature not available`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_WPCOM_REST
+            }
+            val networkError = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.SERVER_ERROR)).apply {
+                apiError = "application_passwords_disabled"
+            }
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mJetpackApplicationPasswordsRestClient.fetchWPAdminUsername(site))
+                .thenReturn(UsernameFetchPayload(testCredentials.userName))
+            whenever(mJetpackApplicationPasswordsRestClient.createApplicationPassword(site, applicationName))
+                .thenReturn(ApplicationPasswordCreationPayload(networkError))
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            assertEquals(ApplicationPasswordCreationResult.NotSupported(networkError), result)
+        }
+
+    @Test
+    fun `when a non-jetpack site returns 404, then return feature not available`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+                password = "password"
+            }
+            val networkError = BaseNetworkError(VolleyError(NetworkResponse(404, null, true, 0, emptyList())))
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mWpApiApplicationPasswordsRestClient.createApplicationPassword(site, applicationName))
+                .thenReturn(ApplicationPasswordCreationPayload(networkError))
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            Assert.assertEquals(ApplicationPasswordCreationResult.NotSupported(networkError), result)
+        }
+
+    @Test
+    fun `when a non-jetpack site returns application_passwords_disabled, then return feature not available`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+                password = "password"
+            }
+            val networkError = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.SERVER_ERROR)).apply {
+                apiError = "application_passwords_disabled"
+            }
+
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mWpApiApplicationPasswordsRestClient.createApplicationPassword(site, applicationName))
+                .thenReturn(ApplicationPasswordCreationPayload(networkError))
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(
+                testSite
+            )
+
+            assertEquals(ApplicationPasswordCreationResult.NotSupported(networkError), result)
+        }
+
+    @Test
+    fun `given a duplicate password already exists, when creating a new password, then delete the previous one`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+                password = "password"
+            }
+            val creationNetworkError = BaseNetworkError(VolleyError(NetworkResponse(409, null, true, 0, emptyList())))
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mWpApiApplicationPasswordsRestClient.createApplicationPassword(site, applicationName))
+                .thenReturn(ApplicationPasswordCreationPayload(creationNetworkError))
+                .thenReturn(ApplicationPasswordCreationPayload(testCredentials.password, testCredentials.uuid!!))
+            whenever(mWpApiApplicationPasswordsRestClient.fetchApplicationPasswordUUID(site, applicationName))
+                .thenReturn(ApplicationPasswordUUIDFetchPayload(uuid))
+            whenever(mWpApiApplicationPasswordsRestClient.deleteApplicationPassword(site, uuid))
+                .thenReturn(ApplicationPasswordDeletionPayload(isDeleted = true))
+
+            val result = mApplicationPasswordsManager.getApplicationCredentials(site)
+
+            assertEquals(ApplicationPasswordCreationResult.Created(testCredentials), result)
+            verify(mWpApiApplicationPasswordsRestClient).fetchApplicationPasswordUUID(site, applicationName)
+            verify(mWpApiApplicationPasswordsRestClient).deleteApplicationPassword(site, uuid)
+        }
+
+    @Test
+    fun `given application password doesn't exist locally, when deleting a password, then fetch the UUID`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+            }
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(null)
+            whenever(mWpApiApplicationPasswordsRestClient.fetchApplicationPasswordUUID(site, applicationName))
+                .thenReturn(ApplicationPasswordUUIDFetchPayload(uuid))
+            whenever(mWpApiApplicationPasswordsRestClient.deleteApplicationPassword(site, uuid))
+                .thenReturn(ApplicationPasswordDeletionPayload(isDeleted = true))
+
+            val result = mApplicationPasswordsManager.deleteApplicationCredentials(site)
+
+            assertEquals(ApplicationPasswordDeletionResult.Success, result)
+            verify(mWpApiApplicationPasswordsRestClient).fetchApplicationPasswordUUID(site, applicationName)
+            verify(mWpApiApplicationPasswordsRestClient).deleteApplicationPassword(site, uuid)
+        }
+
+    @Test
+    fun `given application password exists locally, when deleting a password, then delete it using it itself`() =
+        runBlockingTest {
+            val site = testSite.apply {
+                origin = SiteModel.ORIGIN_XMLRPC
+                username = testCredentials.userName
+            }
+            whenever(applicationPasswordsStore.getCredentials(testSite)).thenReturn(testCredentials)
+            whenever(mWpApiApplicationPasswordsRestClient.deleteApplicationPassword(site, testCredentials))
+                .thenReturn(ApplicationPasswordDeletionPayload(isDeleted = true))
+
+            val result = mApplicationPasswordsManager.deleteApplicationCredentials(site)
+
+            assertEquals(ApplicationPasswordDeletionResult.Success, result)
+            verify(mWpApiApplicationPasswordsRestClient).deleteApplicationPassword(site, testCredentials)
+        }
+}
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetworkTests.kt b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetworkTests.kt
new file mode 100644
index 00000000000..e965751b814
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsNetworkTests.kt
@@ -0,0 +1,171 @@
+package org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords
+
+import com.android.volley.NetworkResponse
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import com.android.volley.VolleyError
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
+import org.wordpress.android.fluxc.network.HttpMethod
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequest
+import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
+import java.util.Optional
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+class ApplicationPasswordsNetworkTests {
+    private val testSite = SiteModel().apply {
+        url = "http://test-site.com"
+    }
+    private val testCredentials = ApplicationPasswordCredentials(
+        userName = "username",
+        password = "password",
+        uuid = "uuid"
+    )
+
+    private val requestQueue: RequestQueue = mock()
+    private val userAgent: UserAgent = mock()
+    private val listener: ApplicationPasswordsListener = mock()
+    private val mApplicationPasswordsManager: ApplicationPasswordsManager = mock()
+    private lateinit var network: ApplicationPasswordsNetwork
+
+    @Before
+    fun setup() {
+        network = ApplicationPasswordsNetwork(
+            requestQueue = requestQueue,
+            userAgent = userAgent,
+            listener = Optional.of(listener)
+        ).apply {
+            mApplicationPasswordsManager = this@ApplicationPasswordsNetworkTests.mApplicationPasswordsManager
+        }
+    }
+
+    @Test
+    fun `when sending a new request, then fetch the application password`() = runBlockingTest {
+        givenSuccessResponse()
+        whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+            .thenReturn(ApplicationPasswordCreationResult.Created(testCredentials))
+
+        network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+        verify(mApplicationPasswordsManager).getApplicationCredentials(testSite)
+    }
+
+    @Test
+    fun `given a locally existing password, when password is revoked, then regenerate a new one`() = runBlockingTest {
+        whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+            .thenReturn(ApplicationPasswordCreationResult.Existing(testCredentials))
+            .thenReturn(ApplicationPasswordCreationResult.Created(testCredentials))
+        val networkError = VolleyError(NetworkResponse(401, byteArrayOf(), true, 0, emptyList()))
+        givenErrorResponse(networkError)
+
+        network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+        verify(mApplicationPasswordsManager).deleteLocalApplicationPassword(testSite)
+        verify(mApplicationPasswordsManager, times(2)).getApplicationCredentials(testSite)
+    }
+
+    @Test
+    fun `given request succeeds, when request is executed, then return the response`() = runBlockingTest {
+        val expectedResponse = TestResponse("value")
+        givenSuccessResponse(expectedResponse)
+        whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+            .thenReturn(ApplicationPasswordCreationResult.Existing(testCredentials))
+
+        val response = network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+        assertIs<WPAPIResponse.Success<TestResponse>>(response)
+        assertEquals(expectedResponse, response.data)
+    }
+
+    @Test
+    fun `given request fails, when request is executed, then return the error`() = runBlockingTest {
+        val networkError = VolleyError(NetworkResponse(500, byteArrayOf(), true, 0, emptyList()))
+        givenErrorResponse(networkError)
+        whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+            .thenReturn(ApplicationPasswordCreationResult.Existing(testCredentials))
+
+        val response = network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+        assertIs<WPAPIResponse.Error<TestResponse>>(response)
+        assertEquals(networkError, response.error.volleyError)
+    }
+
+    @Test
+    fun `given site doesn't support application passwords, when a new request, then notify listener`() =
+        runBlockingTest {
+            val networkError = BaseNetworkError(VolleyError(NetworkResponse(501, byteArrayOf(), true, 0, emptyList())))
+            whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+                .thenReturn(ApplicationPasswordCreationResult.NotSupported(BaseNetworkError(networkError)))
+
+            network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+            verify(listener).onFeatureUnavailable(eq(testSite), any())
+        }
+
+    @Test
+    fun `when a new password is created, then notify listener`() =
+        runBlockingTest {
+            givenSuccessResponse()
+            whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+                .thenReturn(ApplicationPasswordCreationResult.Created(testCredentials))
+
+            network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+            verify(listener).onNewPasswordCreated(isPasswordRegenerated = false)
+        }
+
+    @Test
+    fun `given a revoked local password, when a new password is created, then notify listener`() =
+        runBlockingTest {
+            whenever(mApplicationPasswordsManager.getApplicationCredentials(testSite))
+                .thenReturn(ApplicationPasswordCreationResult.Existing(testCredentials))
+                .thenReturn(ApplicationPasswordCreationResult.Created(testCredentials))
+            val networkError = VolleyError(NetworkResponse(401, byteArrayOf(), true, 0, emptyList()))
+            givenErrorResponse(networkError)
+
+            network.executeGsonRequest(testSite, HttpMethod.GET, "path", TestResponse::class.java)
+
+            verify(listener).onNewPasswordCreated(isPasswordRegenerated = true)
+        }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun givenSuccessResponse(response: TestResponse = TestResponse("")) {
+        whenever(requestQueue.add(any<WPAPIGsonRequest<TestResponse>>())).thenAnswer { invocation ->
+            val request = (invocation.arguments.first() as WPAPIGsonRequest<TestResponse>)
+
+            val deliverMethod = Request::class.java.getDeclaredMethod("deliverResponse", Any::class.java)
+            deliverMethod.isAccessible = true
+            deliverMethod.invoke(request, response)
+
+            return@thenAnswer request
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun givenErrorResponse(error: VolleyError) {
+        whenever(requestQueue.add(any<WPAPIGsonRequest<TestResponse>>())).thenAnswer { invocation ->
+            val request = (invocation.arguments.first() as WPAPIGsonRequest<TestResponse>)
+            request.deliverError(error)
+
+            return@thenAnswer request
+        }
+    }
+
+    data class TestResponse(val value: String)
+}
diff --git a/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClientTest.java b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClientTest.java
new file mode 100644
index 00000000000..ce83d644cc3
--- /dev/null
+++ b/libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClientTest.java
@@ -0,0 +1,44 @@
+package org.wordpress.android.fluxc.network.rest.wpcom;
+
+import android.content.Context;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.wordpress.android.fluxc.utils.WPComRestClientUtils;
+
+import okhttp3.HttpUrl;
+
+@RunWith(RobolectricTestRunner.class)
+public class BaseWPComRestClientTest {
+    final Context mAppContext = RuntimeEnvironment.application.getApplicationContext();
+
+    @Test
+    public void shouldUseUnderscoreLocaleParameterForWPComV2Requests() {
+        final HttpUrl url = WPComRestClientUtils.getHttpUrlWithLocale(mAppContext,
+                "https://public-api.wordpress.com/wpcom/v2/something");
+        assertNotNull(url);
+        assertThat(url.queryParameter("_locale"), not(nullValue()));
+    }
+
+    @Test
+    public void shouldUseUnderscoreLocaleParameterForWPComV3Requests() {
+        final HttpUrl url = WPComRestClientUtils.getHttpUrlWithLocale(mAppContext,
+                "https://public-api.wordpress.com/wpcom/v3/something");
+        assertNotNull(url);
+        assertThat(url.queryParameter("_locale"), not(nullValue()));
+    }
+
+    @Test public void shouldUseLocaleParameterForV1Requests() {
+        final HttpUrl url =
+                WPComRestClientUtils.getHttpUrlWithLocale(mAppContext, "https://public-api.wordpress.com/rest/v1/");
+        assertNotNull(url);
+        assertThat(url.queryParameter("locale"), not(nullValue()));
+    }
+}